From 486a95acdbd12bd1ecbc4c68d698e18a603bfab2 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 12 Dec 2023 13:46:12 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E7=9B=B2=E6=9D=BF=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFBlindBoardController.java | 227 ++++++++++++-- .../controller/gf/GFBlindBoardController.java | 5 + .../gf/GFBlindBoardAcceptUserMapper.java | 67 +++++ .../gf/GFBlindBoardAcceptUserService.java | 67 +++++ .../GFBlindBoardAcceptUserServiceImpl.java | 102 +++++++ .../gf/BlindBoardAcceptUserMapper.xml | 217 ++++++++++++++ .../datasource/gf/BlindBoardMapper.xml | 283 +++++++++++++++++- 7 files changed, 935 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/zcloud/mapper/datasource/gf/GFBlindBoardAcceptUserMapper.java create mode 100644 src/main/java/com/zcloud/service/gf/GFBlindBoardAcceptUserService.java create mode 100644 src/main/java/com/zcloud/service/gf/impl/GFBlindBoardAcceptUserServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/gf/BlindBoardAcceptUserMapper.xml diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index 79e3d14d..d4a2dadb 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -5,18 +5,18 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; -import com.zcloud.service.gf.GFBlindBoardLogService; -import com.zcloud.service.gf.GFBlindBoardService; -import com.zcloud.service.gf.GFBlindBoardToMeasuresService; -import com.zcloud.service.gf.GFBlindBoardInfoService; +import com.zcloud.service.gf.*; import com.zcloud.util.*; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -36,13 +36,18 @@ public class AppGFBlindBoardController extends BaseController { private GFBlindBoardService GFblindboardService; @Resource private GFBlindBoardInfoService GFblindBoardInfoService; + + @Autowired + private GFBlindBoardAcceptUserService blindboardacceptuserService; + @Resource private GFBlindBoardLogService GFblindBoardLogService; - @Resource + @Autowired private SendMessageUtil sendMessageUtil; @Resource private GFBlindBoardToMeasuresService GFblindBoardToMeasuresService; - + @Autowired + private Smb smb; /**获取编码 * @param * @throws Exception @@ -84,6 +89,19 @@ public class AppGFBlindBoardController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + System.out.println(pd.get("CORPINFO_ID")); + pd2 = GFblindboardService.getCode(pd2); //根据ID读取 + String code = "MB"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("BLINDBOARD_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); @@ -93,7 +111,7 @@ public class AppGFBlindBoardController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -195,7 +213,7 @@ public class AppGFBlindBoardController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); } @@ -216,7 +234,7 @@ public class AppGFBlindBoardController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - Smb.deleteFile(pd.getString("path")); + smb.deleteFile(pd.getString("path")); map.put("result", errInfo); return map; } @@ -257,7 +275,7 @@ public class AppGFBlindBoardController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -378,7 +396,7 @@ public class AppGFBlindBoardController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -387,6 +405,37 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); GFblindboardService.edit(pd2); log.put("ACTION", "作业负责人通过"); + GFblindBoardInfoService.delete(pd); + if(pd.get("boardList")!=null){ + List list = (List) JSON.parse(pd.get("boardList").toString()); + for (JSONObject json : list) { + PageData board = new PageData(); + board.put("BLINDBOARDINFO_ID", this.get32UUID()); // 主键 + board.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + board.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + board.put("BOARD_MATERIAL", json.get("BOARD_MATERIAL")); + board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION")); + board.put("BOARD_NO", json.get("BOARD_NO")); + board.put("ISDELETE", 0); + GFblindBoardInfoService.save(board); + } + } + + GFblindBoardToMeasuresService.delete(pd); + if(pd.get("measuresList")!=null){ + List list = (List) JSON.parse(pd.get("measuresList").toString()); + for (JSONObject json : list) { + PageData measures = new PageData(); + measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键 + measures.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + measures.put("BUS_BLINDBOARD_MEASURES_ID", json.get("BUS_BLINDBOARD_MEASURES_ID")); + measures.put("STATUS", json.get("STATUS")); + measures.put("CONFIRM_ID", pd.get("OPERATOR")); + measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + GFblindBoardToMeasuresService.save(measures); + } + } + // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -399,7 +448,7 @@ public class AppGFBlindBoardController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -420,7 +469,7 @@ public class AppGFBlindBoardController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -517,13 +566,114 @@ public class AppGFBlindBoardController extends BaseController { pd = this.getPageData(); pd = GFblindboardService.findById(pd); //根据ID读取 map.put("pd", pd); + map.put("imgList",blindboardacceptuserService.findByIds(pd)); + map.put("imgList1",blindboardacceptuserService.findById(pd)); map.put("measuresList", GFblindboardService.listAllMeasures(pd)); map.put("boardList", GFblindBoardInfoService.listAll(pd)); map.put("result", errInfo); return map; } - /**批量删除 + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + public Object editAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFblindboardService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("BLINDBOARDLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("BLINDBOARD_ID", pd.get("BLINDBOARD_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); + + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + switch (status) { + + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + } + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFblindboardService.edit(pd2); + log.put("ACTION", "验收通过"); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + + break; + + case "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFblindboardService.edit(pd2); + + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + default: + break; + } + GFblindboardService.save(log); + map.put("result", errInfo); + return map; + } + + private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData cpd = new PageData(); + cpd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + cpd.put("ACCEPT_USER_SIGNER_TIME", signertime); + cpd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 + cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + cpd.put("ISDELETE", '0'); + cpd.put("CORPINFO_ID", CORPINFO_ID); + cpd.put("BLINDBOARD_ID", BLINDBOARD_ID); + cpd.put("ACCEPT_USER_ID", ACCEPT_USER_ID); + cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); + cpd.put("ACCEPT_CONFESS_USER_ID", ""); + cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + blindboardacceptuserService.save(cpd); + } + } + } + + + + /**批量删除 * @param * @throws Exception */ @@ -736,7 +886,7 @@ public class AppGFBlindBoardController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -829,7 +979,7 @@ public class AppGFBlindBoardController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -846,7 +996,7 @@ public class AppGFBlindBoardController extends BaseController { @ResponseBody @Transactional public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files + MultipartRequest request ) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -856,18 +1006,43 @@ public class AppGFBlindBoardController extends BaseController { pd2 = GFblindboardService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - String ffile = DateUtil.getDays(); - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - - pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - GFblindboardService.edit(pd2); + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); } map.put("result", errInfo); return map; } + private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData pd = new PageData(); + pd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); + pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + pd.put("ISDELETE", '0'); + pd.put("CORPINFO_ID", CORPINFO_ID); + pd.put("BLINDBOARD_ID", BLINDBOARD_ID); + pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID); + pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); + pd.put("ACCEPT_USER_ID",""); + pd.put("ACCEPT_DEPARTMENT_ID", ""); + blindboardacceptuserService.save(pd); + } + } + } } diff --git a/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java index 0f426f6d..6a15271b 100644 --- a/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/GFBlindBoardController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFBlindBoardAcceptUserService; import com.zcloud.service.gf.GFBlindBoardInfoService; import com.zcloud.service.gf.GFBlindBoardService; import com.zcloud.util.Jurisdiction; @@ -35,6 +36,8 @@ public class GFBlindBoardController extends BaseController { private GFBlindBoardService GFblindboardService; @Autowired private GFBlindBoardInfoService GFblindBoardInfoService; + @Autowired + private GFBlindBoardAcceptUserService blindboardacceptuserService; /**新增 * @param @@ -132,6 +135,8 @@ public class GFBlindBoardController extends BaseController { pd = GFblindboardService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFblindboardService.listAllMeasures(pd)); + map.put("imgList",blindboardacceptuserService.findByIds(pd)); + map.put("imgList1",blindboardacceptuserService.findById(pd)); map.put("boardList", GFblindBoardInfoService.listAll(pd)); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFBlindBoardAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFBlindBoardAcceptUserMapper.java new file mode 100644 index 00000000..e33867bf --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFBlindBoardAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFBlindBoardAcceptUserMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void deleteList(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + List findById(PageData pd); + List findByIds(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + List listAllByIds(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/service/gf/GFBlindBoardAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFBlindBoardAcceptUserService.java new file mode 100644 index 00000000..c86c8c80 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFBlindBoardAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFBlindBoardAcceptUserService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception; + public List findByIds(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public List listAllByIds(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardAcceptUserServiceImpl.java new file mode 100644 index 00000000..6ed92f74 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFBlindBoardAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFBlindBoardAcceptUserMapper; +import com.zcloud.service.gf.GFBlindBoardAcceptUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class GFBlindBoardAcceptUserServiceImpl implements GFBlindBoardAcceptUserService { + + @Autowired + private GFBlindBoardAcceptUserMapper blindboardacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + blindboardacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + blindboardacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + blindboardacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + blindboardacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return blindboardacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return blindboardacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return blindboardacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return blindboardacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + blindboardacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return blindboardacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/resources/mybatis/datasource/gf/BlindBoardAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/BlindBoardAcceptUserMapper.xml new file mode 100644 index 00000000..f9ef97b6 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/BlindBoardAcceptUserMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + GF_BLINDBOARD_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.BLINDBOARD_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ISSELF, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + + + + + ACCEPT_CONFESS_ID, + BLINDBOARD_ID, + CORPINFO_ID, + ISDELETE, + OPERATTIME, + OPERATOR, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ISSELF, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_DEPARTMENT_ID + + + + + + #{ACCEPT_CONFESS_ID}, + #{BLINDBOARD_ID}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ISSELF}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_DEPARTMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + update + + set + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}, + BLINDBOARD_ID = #{BLINDBOARD_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + ISSELF = #{ISSELF} + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml index 2e3abd32..da5034b2 100644 --- a/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/BlindBoardMapper.xml @@ -355,7 +355,7 @@ f.WORK_TYPE, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.GUARDIAN_USER, f.WORK_USER, f.OTHER_PROTECTIVE_MEASURES, @@ -439,7 +439,74 @@ From f338b750da8338af51b83656b4bf52544d1d2cb5 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 12 Dec 2023 15:25:59 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=8A=A8=E5=9C=9F=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFBreakGroundController.java | 223 +++++++++++--- .../gf/GFBreakGroundController.java | 7 +- .../gf/GFBreakGroundAcceptUserMapper.java | 67 ++++ .../gf/GFBreakGroundAcceptUserService.java | 67 ++++ .../GFBreakGroundAcceptUserServiceImpl.java | 102 +++++++ .../gf/BreakGroundAcceptUserMapper.xml | 217 +++++++++++++ .../datasource/gf/BreakGroundMapper.xml | 286 +++++++++++++++++- 7 files changed, 919 insertions(+), 50 deletions(-) create mode 100644 src/main/java/com/zcloud/mapper/datasource/gf/GFBreakGroundAcceptUserMapper.java create mode 100644 src/main/java/com/zcloud/service/gf/GFBreakGroundAcceptUserService.java create mode 100644 src/main/java/com/zcloud/service/gf/impl/GFBreakGroundAcceptUserServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/gf/BreakGroundAcceptUserMapper.xml diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java index 41edfa79..533dff14 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java @@ -5,17 +5,20 @@ import com.alibaba.fastjson.JSONObject; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFBreakGroundAcceptUserService; import com.zcloud.service.gf.GFBreakGroundLogService; import com.zcloud.service.gf.GFBreakGroundService; import com.zcloud.service.gf.GFBreakGroundToMeasuresService; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -33,12 +36,16 @@ public class AppGFBreakGroundController extends BaseController { @Resource private GFBreakGroundService GFbreakGroundService; + @Autowired + private GFBreakGroundAcceptUserService breakgroundacceptuserService; @Resource private GFBreakGroundLogService GFbreakGroundLogService; @Resource private GFBreakGroundToMeasuresService GFbreakGroundToMeasuresService; @Resource private SendMessageUtil sendMessageUtil; + @Autowired + private Smb smb; /**获取编码 * @param * @throws Exception @@ -78,6 +85,18 @@ public class AppGFBreakGroundController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + pd2 = GFbreakGroundService.getCode(pd2); //根据ID读取 + String code = "DT"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("BREAKGROUND_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 @@ -88,28 +107,13 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); } GFbreakGroundService.save(pd); - GFbreakGroundToMeasuresService.delete(pd); - if(pd.get("measuresList")!=null){ - List list = (List) JSON.parse(pd.get("measuresList").toString()); - for (JSONObject json : list) { - PageData measures = new PageData(); - measures.put("BREAKGROUNDTOMEASURES_ID", this.get32UUID()); // 主键 - measures.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); - measures.put("BUS_BREAKGROUND_MEASURES_ID", json.get("BUS_BREAKGROUND_MEASURES_ID")); - measures.put("STATUS", json.get("STATUS")); - measures.put("ANSWER", json.get("ANSWER")); - measures.put("CONFIRM_ID", pd.get("OPERATOR")); - measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); - GFbreakGroundToMeasuresService.save(measures); - } - } if(pd.get("APPLY_STATUS").equals("1")) { PageData log = new PageData(); log.put("BREAKGROUNDLOG_ID", this.get32UUID()); @@ -178,7 +182,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -210,7 +214,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -226,9 +230,7 @@ public class AppGFBreakGroundController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -237,20 +239,46 @@ public class AppGFBreakGroundController extends BaseController { pd2 = GFbreakGroundService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - String ffile = DateUtil.getDays(); - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - - pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - GFbreakGroundService.edit(pd2); + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("BREAKGROUND_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); } map.put("result", errInfo); return map; } + private void saveImg(MultipartFile[] files,String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData pd = new PageData(); + pd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); + pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + pd.put("ISDELETE", '0'); + pd.put("CORPINFO_ID", CORPINFO_ID); + pd.put("BREAKGROUND_ID", BREAKGROUND_ID); + pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID); + pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); + pd.put("ACCEPT_USER_ID",""); + pd.put("ACCEPT_DEPARTMENT_ID", ""); + breakgroundacceptuserService.save(pd); + } + } + } + /**上传图 * @param * @throws Exception @@ -270,7 +298,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); } @@ -291,14 +319,14 @@ public class AppGFBreakGroundController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - Smb.deleteFile(pd.getString("path")); + smb.deleteFile(pd.getString("path")); map.put("result", errInfo); return map; } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -335,7 +363,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -402,6 +430,105 @@ public class AppGFBreakGroundController extends BaseController { return map; } + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + public Object editAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFbreakGroundService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + + PageData log = new PageData(); + log.put("BREAKGROUNDLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); + String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + + (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;"); + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + pd2.put("HAZARD_IDENTIFICATION", ""); + switch (status) { + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BREAKGROUND_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + } + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFbreakGroundService.edit(pd2); + log.put("ACTION", "验收通过"); + + + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + + case "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFbreakGroundService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + break; + default: + break; + } + GFbreakGroundLogService.save(log); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String BREAKGROUND_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData cpd = new PageData(); + cpd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + cpd.put("ACCEPT_USER_SIGNER_TIME", signertime); + cpd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 + cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + cpd.put("ISDELETE", '0'); + cpd.put("CORPINFO_ID", CORPINFO_ID); + cpd.put("BREAKGROUND_ID", BREAKGROUND_ID); + cpd.put("ACCEPT_USER_ID", ACCEPT_USER_ID); + cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); + cpd.put("ACCEPT_CONFESS_USER_ID", ""); + cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + breakgroundacceptuserService.save(cpd); + } + } + } + /**修改 * @param * @throws Exception @@ -443,7 +570,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -465,7 +592,21 @@ public class AppGFBreakGroundController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFbreakGroundService.edit(pd2); log.put("ACTION", "作业负责单位通过"); - + GFbreakGroundToMeasuresService.delete(pd); + if(pd.get("measuresList")!=null){ + List list = (List) JSON.parse(pd.get("measuresList").toString()); + for (JSONObject json : list) { + PageData measures = new PageData(); + measures.put("BREAKGROUNDTOMEASURES_ID", this.get32UUID()); // 主键 + measures.put("BREAKGROUND_ID", pd.get("BREAKGROUND_ID")); + measures.put("BUS_BREAKGROUND_MEASURES_ID", json.get("BUS_BREAKGROUND_MEASURES_ID")); + measures.put("STATUS", json.get("STATUS")); + measures.put("ANSWER", json.get("ANSWER")); + measures.put("CONFIRM_ID", pd.get("OPERATOR")); + measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + GFbreakGroundToMeasuresService.save(measures); + } + } // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); } @@ -478,7 +619,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -508,7 +649,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -534,7 +675,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -556,7 +697,7 @@ public class AppGFBreakGroundController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -733,6 +874,8 @@ public class AppGFBreakGroundController extends BaseController { pd = GFbreakGroundService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFbreakGroundService.listAllMeasures(pd)); + map.put("imgList1",breakgroundacceptuserService.findById(pd)); + map.put("imgList",breakgroundacceptuserService.findByIds(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java index 76e7fe7a..285fd878 100644 --- a/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/GFBreakGroundController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFBreakGroundAcceptUserService; import com.zcloud.service.gf.GFBreakGroundService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; @@ -31,6 +32,8 @@ public class GFBreakGroundController extends BaseController { @Autowired private GFBreakGroundService GFbreakgroundService; + @Autowired + private GFBreakGroundAcceptUserService breakgroundacceptuserService; /**新增 * @param @@ -51,7 +54,7 @@ public class GFBreakGroundController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -129,6 +132,8 @@ public class GFBreakGroundController extends BaseController { pd = GFbreakgroundService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFbreakgroundService.listAllMeasures(pd)); + map.put("imgList",breakgroundacceptuserService.findByIds(pd)); + map.put("imgList1",breakgroundacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFBreakGroundAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFBreakGroundAcceptUserMapper.java new file mode 100644 index 00000000..3c854668 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFBreakGroundAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFBreakGroundAcceptUserMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void deleteList(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + List findById(PageData pd); + List findByIds(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + List listAllByIds(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/service/gf/GFBreakGroundAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFBreakGroundAcceptUserService.java new file mode 100644 index 00000000..2feb52b0 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFBreakGroundAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFBreakGroundAcceptUserService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception; + public List findByIds(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public List listAllByIds(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFBreakGroundAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFBreakGroundAcceptUserServiceImpl.java new file mode 100644 index 00000000..9b9d0323 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFBreakGroundAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFBreakGroundAcceptUserMapper; +import com.zcloud.service.gf.GFBreakGroundAcceptUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class GFBreakGroundAcceptUserServiceImpl implements GFBreakGroundAcceptUserService { + + @Autowired + private GFBreakGroundAcceptUserMapper breakgroundacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + breakgroundacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + breakgroundacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + breakgroundacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + breakgroundacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return breakgroundacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return breakgroundacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return breakgroundacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return breakgroundacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + breakgroundacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return breakgroundacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/resources/mybatis/datasource/gf/BreakGroundAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/BreakGroundAcceptUserMapper.xml new file mode 100644 index 00000000..552997f9 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/BreakGroundAcceptUserMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + GF_BREAKGROUND_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.BREAKGROUND_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ISSELF, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + + + + + ACCEPT_CONFESS_ID, + BREAKGROUND_ID, + CORPINFO_ID, + ISDELETE, + OPERATTIME, + OPERATOR, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ISSELF, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_DEPARTMENT_ID + + + + + + #{ACCEPT_CONFESS_ID}, + #{BREAKGROUND_ID}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ISSELF}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_DEPARTMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + update + + set + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}, + BREAKGROUND_ID = #{BREAKGROUND_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + ISSELF = #{ISSELF} + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml b/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml index 8a4c1098..39018c32 100644 --- a/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/BreakGroundMapper.xml @@ -332,8 +332,8 @@ f.CHECK_NO, f.PROJECT_MANAGER, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.WORK_PLACE, f.CONSTRUCTION_DEPARTMENT_ID, f.CONSTRUCTION_USER_ID, @@ -366,7 +366,7 @@ f.HAZARD_IDENTIFICATION, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.GUARDIAN_USER, f.JOB_CONTENT, f.APPLY_USER_SIGNER_PATH, @@ -450,7 +450,74 @@ From e9fccd58fcdbeb70a35e36b62a8d4995fad4d7ba Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 12 Dec 2023 17:47:59 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=9C=89=E9=99=90=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=20=E8=BF=98=E7=BC=BA=E5=B0=91mq=20?= =?UTF-8?q?=E7=AD=89=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFConfinedSpaceController.java | 526 ++++++++++++++++-- .../gf/AppGFConfinedSpaceGasWHController.java | 18 +- .../gf/GFConfinedSpaceController.java | 9 +- .../gf/GFConfinedSpaceAcceptUserMapper.java | 67 +++ .../gf/GFConfinedSpaceGasMapper.java | 2 + .../gf/GFConfinedSpaceGasWHMapper.java | 2 +- .../datasource/gf/GFConfinedSpaceMapper.java | 15 + .../gf/GFConfinedSpaceAcceptUserService.java | 67 +++ .../service/gf/GFConfinedSpaceGasService.java | 1 + .../gf/GFConfinedSpaceGasWHService.java | 2 +- .../service/gf/GFConfinedSpaceService.java | 13 + .../GFConfinedSpaceAcceptUserServiceImpl.java | 102 ++++ .../impl/GFConfinedSpaceGasServiceImpl.java | 4 +- .../impl/GFConfinedSpaceGasWHServiceImpl.java | 4 +- .../gf/impl/GFConfinedSpaceServiceImpl.java | 35 ++ .../gf/ConfinedSpaceAcceptUserMapper.xml | 221 ++++++++ .../datasource/gf/ConfinedSpaceGasMapper.xml | 12 +- .../gf/ConfinedSpaceGasWHMapper.xml | 22 +- .../datasource/gf/ConfinedSpaceMapper.xml | 363 +++++++++++- 19 files changed, 1411 insertions(+), 74 deletions(-) create mode 100644 src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceAcceptUserMapper.java create mode 100644 src/main/java/com/zcloud/service/gf/GFConfinedSpaceAcceptUserService.java create mode 100644 src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceAcceptUserServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/gf/ConfinedSpaceAcceptUserMapper.xml diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index 34d46804..adf009e6 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java @@ -2,6 +2,10 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zcloud.clinet.MqClient; +import com.zcloud.dto.Response; +import com.zcloud.dto.TenCorpConst; +import com.zcloud.dto.TenCorpDto; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -11,13 +15,14 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.text.DecimalFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -39,7 +44,16 @@ public class AppGFConfinedSpaceController extends BaseController { @Resource private GFConfinedSpaceGasService GFconfinedspaceGasService; @Autowired + private GFConfinedSpaceAcceptUserService confinedspaceacceptuserService; + @Autowired + private GFConfinedSpaceGasWHService confinedspacegaswhService; + @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private Smb smb; + + @Resource + private MqClient mqClient; /**获取编码 * @param * @throws Exception @@ -76,6 +90,18 @@ public class AppGFConfinedSpaceController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + pd2 = GFconfinedspaceService.getCode(pd2); //根据ID读取 + String code = "YX"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("CONFINEDSPACE_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 @@ -119,14 +145,46 @@ public class AppGFConfinedSpaceController extends BaseController { params4.put("name", "params3");// 存入短信模板中的参数名称 params4.put("value", "确认");// 存入上面参数名称所传递的值 paramsList.add(params4); -// sendMessageUtil.sendMessages(mes, paramsList); + sendMessageUtil.sendMessages(mes, paramsList); + // 发短信 + + PageData mes1 = new PageData(); + mes1.put("RECEIVER_ID", pd.get("ANALYZE_USER_ID"));// 收信人userid + mes1.put("templateCode", "YX_QT");// 短信模板编码 + mes1.put("SMSCode", "SMS_223540753");// 短信模板编码 + mes1.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList1 = new ArrayList(); + // 第1个参数 + PageData params5 = new PageData(); + params5.put("name", "params1");// 存入短信模板中的参数名称 + params5.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList1.add(params5); + // 第2个参数 + PageData params6 = new PageData(); + params6.put("name", "params2");// 存入短信模板中的参数名称 + params6.put("value", "有限空间作业");// 存入上面参数名称所传递的值 + paramsList1.add(params6); + sendMessageUtil.sendMessages(mes1, paramsList1); } + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID")); + tenCorpDto.setMessage(TenCorpConst.confinedSpace); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setData(pd); + tenCorpDto.setMark_name("CONFINEDSPACE_ID"); + Response response = mqClient.sendDelayQueue(tenCorpDto); + if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ + throw new RuntimeException("系统异常"); + } + System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); map.put("result", errInfo); return map; } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -141,6 +199,138 @@ public class AppGFConfinedSpaceController extends BaseController { return map; } + + /**作废 + * @param + * @throws Exception + */ + @PostMapping(value="/cancel") + @ResponseBody + public void cancel(@RequestBody PageData pd) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + System.out.println(JSONObject.toJSONString(pd)); + PageData cpd = new PageData(); + cpd = GFconfinedspaceService.findById(pd); + if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") != null){ +// String WORK_START_DATE = pd.getString("WORK_START_DATE"); +// String ANALYZE_TIME = cpd.getString("ANALYZE_TIME"); +// String GUARDIAN_USER_SIGNER_TIME = cpd.getString("GUARDIAN_USER_SIGNER_TIME"); +// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); +// System.out.println(WORK_START_DATE); +// System.out.println(ANALYZE_TIME); +// System.out.println("-------------123----------"); +// try { +// Date date1 = format.parse(WORK_START_DATE); +// Date date2 = format.parse(ANALYZE_TIME); +// Date date3 = format.parse(GUARDIAN_USER_SIGNER_TIME); +// long workTime = date1.getTime(); +// long analyzeTime = date2.getTime(); +// long signtime = date3.getTime(); +// System.out.println(workTime - analyzeTime); +// System.out.println(analyzeTime - workTime); +// if (workTime - analyzeTime >= 0 && workTime - signtime >= 0) { + return; +// } else { +// pd.put("APPLY_STATUS",-99); +// confinedspaceService.cancel(pd); +// // 发短信 +// PageData mes = new PageData(); +// mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid +// mes.put("templateCode", "YX_ZF");// 短信模板编码 +// mes.put("SMSCode", "SMS_462060039");// 短信模板编码 +// mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id +// // 参数集合 +// List paramsList = new ArrayList(); +// // 第1个参数 +// PageData params1 = new PageData(); +// params1.put("name", "number");// 存入短信模板中的参数名称 +// params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 +// paramsList.add(params1); +// // 第2个参数 +// PageData params2 = new PageData(); +// params2.put("name", "params1");// 存入短信模板中的参数名称 +// params2.put("value", "有限空间作业");// 存入上面参数名称所传递的值 +// paramsList.add(params2); +// sendMessageUtil.sendMessages(mes, paramsList); +// } +// } catch (ParseException e) { +// e.printStackTrace(); +// } + }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") == null){ + pd.put("APPLY_STATUS",-98); + GFconfinedspaceService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = GFconfinedspaceService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + GFconfinedspaceService.editSpecialwork(pd3); + GFconfinedspaceService.editSpecialwork1(pd3); + GFconfinedspaceService.editSpecialwork2(pd3); + GFconfinedspaceService.editSpecialwork3(pd3); + GFconfinedspaceService.editSpecialwork4(pd3); + GFconfinedspaceService.editSpecialwork5(pd3); + GFconfinedspaceService.editSpecialwork6(pd3); + GFconfinedspaceService.editSpecialwork7(pd3); + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "YX_ZF1");// 短信模板编码 + mes.put("SMSCode", "SMS_462060039");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "受限空间作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + }else if (cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") == null){ + pd.put("APPLY_STATUS",-99); + GFconfinedspaceService.cancel(pd); + PageData pd2 = new PageData(); + pd2 = GFconfinedspaceService.checkno(pd); + PageData pd3 = new PageData(); + pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); + pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + GFconfinedspaceService.editSpecialwork(pd3); + GFconfinedspaceService.editSpecialwork1(pd3); + GFconfinedspaceService.editSpecialwork2(pd3); + GFconfinedspaceService.editSpecialwork3(pd3); + GFconfinedspaceService.editSpecialwork4(pd3); + GFconfinedspaceService.editSpecialwork5(pd3); + GFconfinedspaceService.editSpecialwork6(pd3); + GFconfinedspaceService.editSpecialwork7(pd3); + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid + mes.put("templateCode", "YX_ZF2");// 短信模板编码 + mes.put("SMSCode", "SMS_462060039");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "受限空间作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + } + map.put("result", errInfo); //返回结果 + return ; + } + + /**修改 * @param * @throws Exception @@ -194,6 +384,18 @@ public class AppGFConfinedSpaceController extends BaseController { paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); } + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID")); + tenCorpDto.setMessage(TenCorpConst.confinedSpace); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setData(pd); + tenCorpDto.setMark_name("CONFINEDSPACE_ID"); + Response response = mqClient.sendDelayQueue(tenCorpDto); + if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ + throw new RuntimeException("系统异常"); + } + System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); map.put("result", errInfo); return map; } @@ -221,7 +423,7 @@ public class AppGFConfinedSpaceController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -296,7 +498,7 @@ public class AppGFConfinedSpaceController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -306,7 +508,40 @@ public class AppGFConfinedSpaceController extends BaseController { } map.put("result", errInfo); return map; -} + } +// /**修改 +// * @param +// * @throws Exception +// */ +// @RequestMapping(value="/editAcceptconfess") +// @ResponseBody +// @Transactional +// @LogAnno(menuType= "手机",menuServer= "受限空间",instructionsOperate = "受限空间",instructionsType = "接受交底人签字") +// public Object editAcceptconfess( +// @RequestParam(value="FFILE",required=false) MultipartFile[] files +// ) throws Exception { +// Map map = new HashMap(); +// String errInfo = "success"; +// PageData pd = new PageData(); +// pd = this.getPageData(); +// PageData pd2 = new PageData(); +// pd2 = confinedspaceService.findById(pd); +// pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 +// pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 +// if (files != null && files.length > 0) { +// MultipartFile file = files[0]; +// +// String ffile = DateUtil.getDays(); +// String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); +// smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); +// pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); +// pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); +// confinedspaceacceptuserService.edit(pd2); +// } +// map.put("result", errInfo); +// return map; +// } + /**修改 * @param * @throws Exception @@ -314,9 +549,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -325,22 +558,183 @@ public class AppGFConfinedSpaceController extends BaseController { pd2 = GFconfinedspaceService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; - String ffile = DateUtil.getDays(); - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFconfinedspaceService.edit(pd2); + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); } + map.put("result", errInfo); return map; } + private void saveImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData pd = new PageData(); + pd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); + pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + pd.put("ISDELETE", '0'); + pd.put("CORPINFO_ID", CORPINFO_ID); + pd.put("CONFINEDSPACE_ID", CONFINEDSPACE_ID); + pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID); + pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); + pd.put("ACCEPT_USER_ID",""); + pd.put("ACCEPT_DEPARTMENT_ID", ""); + confinedspaceacceptuserService.save(pd); + } + } + } + + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + public Object editAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFconfinedspaceService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + PageData log = new PageData(); + log.put("CONFINEDSPACELOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("CONFINEDSPACE_ID", pd.get("CONFINEDSPACE_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) { + pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;")); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status) || "-6".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); + } + + switch (status) { + case "6"://验收人 + + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + } + + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFconfinedspaceService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "YX_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "有限空间作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFconfinedspaceService.edit(pd2); + + // 发短信 + PageData mes4 = new PageData(); + mes4.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes4.put("templateCode", "YX_N06");// 短信模板编码 + mes4.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes4.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList4 = new ArrayList(); + // 第1个参数 + PageData params13 = new PageData(); + params13.put("name", "params1");// 存入短信模板中的参数名称 + params13.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList4.add(params13); + // 第2个参数 + PageData params14 = new PageData(); + params14.put("name", "params2");// 存入短信模板中的参数名称 + params14.put("value", "有限空间作业");// 存入上面参数名称所传递的值 + paramsList4.add(params14); + // 第3个参数 + PageData params15 = new PageData(); + params15.put("name", "params3");// 存入短信模板中的参数名称 + params15.put("value", "验收人");// 存入上面参数名称所传递的值 + paramsList4.add(params15); + sendMessageUtil.sendMessages(mes4, paramsList4); + break; + default: + break; + } + GFconfinedspaceLogService.save(log); + + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData cpd = new PageData(); + cpd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + cpd.put("ACCEPT_USER_SIGNER_TIME", signertime); + cpd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 + cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + cpd.put("ISDELETE", '0'); + cpd.put("CORPINFO_ID", CORPINFO_ID); + cpd.put("CONFINEDSPACE_ID", CONFINEDSPACE_ID); + cpd.put("ACCEPT_USER_ID", ACCEPT_USER_ID); + cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); + cpd.put("ACCEPT_CONFESS_USER_ID", ""); + cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + confinedspaceacceptuserService.save(cpd); + } + } + } + + + /**修改 * @param * @throws Exception @@ -382,7 +776,7 @@ public class AppGFConfinedSpaceController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -445,6 +839,18 @@ public class AppGFConfinedSpaceController extends BaseController { params4.put("value", "审批");// 存入上面参数名称所传递的值 paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); + TenCorpDto tenCorpDto = new TenCorpDto(); + tenCorpDto.setTopic("eightWork"); + tenCorpDto.setMark(pd.getString("CONFINEDSPACE_ID")); + tenCorpDto.setMessage(TenCorpConst.confinedSpace); + tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); + tenCorpDto.setData(pd); + tenCorpDto.setMark_name("CONFINEDSPACE_ID"); + Response response = mqClient.sendDelayQueue(tenCorpDto); + if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ + throw new RuntimeException("系统异常"); + } + System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); } break; @@ -454,7 +860,7 @@ public class AppGFConfinedSpaceController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -504,7 +910,7 @@ public class AppGFConfinedSpaceController extends BaseController { // // String ffile = DateUtil.getDays(); // String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); -// Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); +// smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); // // pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); // pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -548,7 +954,7 @@ public class AppGFConfinedSpaceController extends BaseController { // // String ffile = DateUtil.getDays(); // String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); -// Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); +// smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); // // pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); // pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -564,7 +970,7 @@ public class AppGFConfinedSpaceController extends BaseController { // // String ffile = DateUtil.getDays(); // String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); -// Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); +// smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); // // pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); // pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -581,7 +987,7 @@ public class AppGFConfinedSpaceController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -621,25 +1027,25 @@ public class AppGFConfinedSpaceController extends BaseController { paramsList.add(params4); sendMessageUtil.sendMessages(mes, paramsList); - // 发短信 - PageData mes1 = new PageData(); - mes1.put("RECEIVER_ID", pd2.get("ANALYZE_USER_ID"));// 收信人userid - mes1.put("templateCode", "YX_QT");// 短信模板编码 - mes1.put("SMSCode", "SMS_223540753");// 短信模板编码 - mes1.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 参数集合 - List paramsList1 = new ArrayList(); - // 第1个参数 - PageData params5 = new PageData(); - params5.put("name", "params1");// 存入短信模板中的参数名称 - params5.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList1.add(params5); - // 第2个参数 - PageData params6 = new PageData(); - params6.put("name", "params2");// 存入短信模板中的参数名称 - params6.put("value", "有限空间作业");// 存入上面参数名称所传递的值 - paramsList1.add(params6); - sendMessageUtil.sendMessages(mes1, paramsList1); +// // 发短信 +// PageData mes1 = new PageData(); +// mes1.put("RECEIVER_ID", pd2.get("ANALYZE_USER_ID"));// 收信人userid +// mes1.put("templateCode", "YX_QT");// 短信模板编码 +// mes1.put("SMSCode", "SMS_223540753");// 短信模板编码 +// mes1.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id +// // 参数集合 +// List paramsList1 = new ArrayList(); +// // 第1个参数 +// PageData params5 = new PageData(); +// params5.put("name", "params1");// 存入短信模板中的参数名称 +// params5.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 +// paramsList1.add(params5); +// // 第2个参数 +// PageData params6 = new PageData(); +// params6.put("name", "params2");// 存入短信模板中的参数名称 +// params6.put("value", "有限空间作业");// 存入上面参数名称所传递的值 +// paramsList1.add(params6); +// sendMessageUtil.sendMessages(mes1, paramsList1); } break; @@ -649,7 +1055,7 @@ public class AppGFConfinedSpaceController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -861,6 +1267,25 @@ public class AppGFConfinedSpaceController extends BaseController { return map; } + + + /**去修改页面获取数据 + * @param + * @throws Exception + */ + @RequestMapping(value="/gasEdit") + @ResponseBody + public Object gasEdit() throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = GFconfinedspaceGasService.gasEdit(pd); //根据ID读取 + map.put("pd", pd); + map.put("result", errInfo); + return map; + } + /**列表 * @param page * @throws Exception @@ -922,7 +1347,7 @@ public class AppGFConfinedSpaceController extends BaseController { return map; } - /**去修改页面获取数据 + /**去修改页面获取数据 * @param * @throws Exception */ @@ -936,6 +1361,9 @@ public class AppGFConfinedSpaceController extends BaseController { pd = GFconfinedspaceService.findById(pd); //根据ID读取 map.put("measuresList", GFconfinedspaceService.listAllMeasures(pd)); map.put("gasList", GFconfinedspaceGasService.listAll(pd)); + map.put("imgList",confinedspaceacceptuserService.findByIds(pd)); + map.put("imgList1",confinedspaceacceptuserService.findById(pd)); + map.put("pd", pd); map.put("result", errInfo); return map; @@ -987,7 +1415,9 @@ public class AppGFConfinedSpaceController extends BaseController { pd = this.getPageData(); pd.put("CONFINEDSPACEGAS_ID", this.get32UUID()); //主键 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFconfinedspaceGasService.save(pd); + confinedspacegaswhService.edittime(pd); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java index b9f7ba14..13d4bb3b 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java @@ -4,13 +4,17 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.service.gf.GFConfinedSpaceGasWHService; +import com.zcloud.util.DateUtil; import com.zcloud.util.Tools; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; +import org.apache.shiro.authz.annotation.RequiresPermissions; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -39,14 +43,21 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); - pd.put("CONFINEDSPACEGASWH_ID", this.get32UUID()); //主键 - GFconfinedspacegaswhService.save(pd); + PageData pd2 = new PageData(); + pd2 = GFconfinedspacegaswhService.findById(pd); + if(pd2 != null && pd2.size()>0){ + GFconfinedspacegaswhService.edit(pd); + }else{ + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("CONFINEDSPACEGASWH_ID", this.get32UUID()); //主键 + GFconfinedspacegaswhService.save(pd); + } map.put("result", errInfo); return map; } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -72,6 +83,7 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFconfinedspacegaswhService.edit(pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java index 73d14fd1..1f6aa9f8 100644 --- a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFConfinedSpaceAcceptUserService; import com.zcloud.service.gf.GFConfinedSpaceGasService; import com.zcloud.service.gf.GFConfinedSpaceGasWHService; import com.zcloud.service.gf.GFConfinedSpaceService; @@ -38,6 +39,10 @@ public class GFConfinedSpaceController extends BaseController { private GFConfinedSpaceGasService GFconfinedspaceGasService; @Resource private GFConfinedSpaceGasWHService GFconfinedspacegaswhService; + @Autowired + private GFConfinedSpaceService confinedspaceService; + @Autowired + private GFConfinedSpaceAcceptUserService confinedspaceacceptuserService; /**新增 * @param * @throws Exception @@ -57,7 +62,7 @@ public class GFConfinedSpaceController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -135,6 +140,8 @@ public class GFConfinedSpaceController extends BaseController { pd = GFconfinedspaceService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFconfinedspaceService.listAllMeasures(pd)); + map.put("imgList",confinedspaceacceptuserService.findByIds(pd)); + map.put("imgList1",confinedspaceacceptuserService.findById(pd)); map.put("gasList", GFconfinedspaceGasService.listAll(pd)); map.put("gas", GFconfinedspacegaswhService.findById(pd)); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceAcceptUserMapper.java new file mode 100644 index 00000000..f4f0179c --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFConfinedSpaceAcceptUserMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void deleteList(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + List findById(PageData pd); + List findByIds(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + List listAllByIds(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasMapper.java index acdb18ea..7492ca35 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasMapper.java @@ -49,6 +49,8 @@ public interface GFConfinedSpaceGasMapper{ */ PageData findById(PageData pd); + PageData gasEdit(PageData pd); + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasWHMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasWHMapper.java index d8d112ac..0a2e6f26 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasWHMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceGasWHMapper.java @@ -30,7 +30,7 @@ public interface GFConfinedSpaceGasWHMapper{ * @throws Exception */ void edit(PageData pd); - + void edittime(PageData pd); /**列表 * @param page * @throws Exception diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceMapper.java index 87a9eac5..66b9fe31 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFConfinedSpaceMapper.java @@ -25,6 +25,21 @@ public interface GFConfinedSpaceMapper{ */ void delete(PageData pd); + void cancel(PageData pd); + + PageData checkno(PageData pd); + + + void editSpecialwork(PageData pd); + void editSpecialwork1(PageData pd); + void editSpecialwork2(PageData pd); + void editSpecialwork3(PageData pd); + void editSpecialwork4(PageData pd); + void editSpecialwork5(PageData pd); + void editSpecialwork6(PageData pd); + void editSpecialwork7(PageData pd); + + /**修改 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceAcceptUserService.java new file mode 100644 index 00000000..7de9a200 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFConfinedSpaceAcceptUserService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception; + public List findByIds(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public List listAllByIds(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasService.java b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasService.java index 8f4ccb3b..deaadb8d 100644 --- a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasService.java +++ b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasService.java @@ -48,6 +48,7 @@ public interface GFConfinedSpaceGasService{ * @throws Exception */ public PageData findById(PageData pd)throws Exception; + public PageData gasEdit(PageData pd)throws Exception; /**批量删除 * @param ArrayDATA_IDS diff --git a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasWHService.java b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasWHService.java index c6f6c43f..a8a22105 100644 --- a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasWHService.java +++ b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceGasWHService.java @@ -30,7 +30,7 @@ public interface GFConfinedSpaceGasWHService{ * @throws Exception */ public void edit(PageData pd)throws Exception; - + public void edittime(PageData pd)throws Exception; /**列表 * @param page * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceService.java b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceService.java index 43259d5c..edb8df75 100644 --- a/src/main/java/com/zcloud/service/gf/GFConfinedSpaceService.java +++ b/src/main/java/com/zcloud/service/gf/GFConfinedSpaceService.java @@ -25,6 +25,19 @@ public interface GFConfinedSpaceService{ */ public void delete(PageData pd)throws Exception; + public void cancel(PageData pd)throws Exception; + + public PageData checkno(PageData pd)throws Exception; + + public void editSpecialwork(PageData pd)throws Exception; + public void editSpecialwork1(PageData pd)throws Exception; + public void editSpecialwork2(PageData pd)throws Exception; + public void editSpecialwork3(PageData pd)throws Exception; + public void editSpecialwork4(PageData pd)throws Exception; + public void editSpecialwork5(PageData pd)throws Exception; + public void editSpecialwork6(PageData pd)throws Exception; + public void editSpecialwork7(PageData pd)throws Exception; + /**修改 * @param pd * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceAcceptUserServiceImpl.java new file mode 100644 index 00000000..751eac27 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFConfinedSpaceAcceptUserMapper; +import com.zcloud.service.gf.GFConfinedSpaceAcceptUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class GFConfinedSpaceAcceptUserServiceImpl implements GFConfinedSpaceAcceptUserService { + + @Autowired + private GFConfinedSpaceAcceptUserMapper confinedspaceacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + confinedspaceacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + confinedspaceacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + confinedspaceacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + confinedspaceacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return confinedspaceacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return confinedspaceacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return confinedspaceacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return confinedspaceacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + confinedspaceacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return confinedspaceacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasServiceImpl.java index 848d9407..c30692a5 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasServiceImpl.java @@ -70,7 +70,9 @@ public class GFConfinedSpaceGasServiceImpl implements GFConfinedSpaceGasService public PageData findById(PageData pd)throws Exception{ return GFconfinedspacegasMapper.findById(pd); } - + public PageData gasEdit(PageData pd)throws Exception{ + return GFconfinedspacegasMapper.gasEdit(pd); + } /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasWHServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasWHServiceImpl.java index 8f325324..4148df75 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasWHServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceGasWHServiceImpl.java @@ -46,7 +46,9 @@ public class GFConfinedSpaceGasWHServiceImpl implements GFConfinedSpaceGasWHServ public void edit(PageData pd)throws Exception{ GFconfinedspacegaswhMapper.edit(pd); } - + public void edittime(PageData pd)throws Exception{ + GFconfinedspacegaswhMapper.edittime(pd); + } /**列表 * @param page * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceServiceImpl.java index efecb163..080e48b8 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFConfinedSpaceServiceImpl.java @@ -39,6 +39,41 @@ public class GFConfinedSpaceServiceImpl implements GFConfinedSpaceService { GFconfinedspaceMapper.delete(pd); } + public void cancel(PageData pd)throws Exception{ + GFconfinedspaceMapper.cancel(pd); + } + + public PageData checkno(PageData pd)throws Exception{ + return GFconfinedspaceMapper.checkno(pd); + } + + public void editSpecialwork(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork(pd); + } + public void editSpecialwork1(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork1(pd); + } + public void editSpecialwork2(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork2(pd); + } + public void editSpecialwork3(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork3(pd); + } + public void editSpecialwork4(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork4(pd); + } + public void editSpecialwork5(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork5(pd); + } + public void editSpecialwork6(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork6(pd); + } + public void editSpecialwork7(PageData pd)throws Exception{ + GFconfinedspaceMapper.editSpecialwork7(pd); + } + + + /**修改 * @param pd * @throws Exception diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceAcceptUserMapper.xml new file mode 100644 index 00000000..2acd7bbd --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceAcceptUserMapper.xml @@ -0,0 +1,221 @@ + + + + + + + + GF_CONFINEDSPACE_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.CONFINEDSPACE_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ISSELF, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + + + + + ACCEPT_CONFESS_ID, + CONFINEDSPACE_ID, + CORPINFO_ID, + ISDELETE, + OPERATTIME, + OPERATOR, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ISSELF, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_DEPARTMENT_ID + + + + + + #{ACCEPT_CONFESS_ID}, + #{CONFINEDSPACE_ID}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ISSELF}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_DEPARTMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + update + + set + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}, + CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + ISSELF = #{ISSELF}, + ACCEPT_USER_ID = #{ACCEPT_USER_ID}, + ACCEPT_USER_SIGNER_PATH = #{ACCEPT_USER_SIGNER_PATH}, + ACCEPT_USER_SIGNER_TIME = #{ACCEPT_USER_SIGNER_TIME}, + ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID} + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasMapper.xml index e32ca93d..6d33ec03 100644 --- a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasMapper.xml @@ -115,8 +115,7 @@ from f - where - f.CONFINEDSPACEGAS_ID = #{CONFINEDSPACEGAS_ID} + where f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} @@ -149,6 +148,15 @@ ORDER BY f.ANALYZE_TIME desc + + update diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasWHMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasWHMapper.xml index 67a92e9e..86ef1ea3 100644 --- a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasWHMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceGasWHMapper.xml @@ -23,7 +23,8 @@ f.GAS_STANDARD3, f.GAS_NAME4, f.GAS_STANDARD4, - f.CONFINEDSPACEGASWH_ID + f.CONFINEDSPACEGASWH_ID, + f.OPERATTIME @@ -37,7 +38,8 @@ GAS_STANDARD3, GAS_NAME4, GAS_STANDARD4, - CONFINEDSPACEGASWH_ID + CONFINEDSPACEGASWH_ID, + OPERATTIME @@ -51,7 +53,8 @@ #{GAS_STANDARD3}, #{GAS_NAME4}, #{GAS_STANDARD4}, - #{CONFINEDSPACEGASWH_ID} + #{CONFINEDSPACEGASWH_ID}, + #{OPERATTIME} @@ -89,11 +92,22 @@ GAS_STANDARD3 = #{GAS_STANDARD3}, GAS_NAME4 = #{GAS_NAME4}, GAS_STANDARD4 = #{GAS_STANDARD4}, - CONFINEDSPACEGASWH_ID = CONFINEDSPACEGASWH_ID + CONFINEDSPACEGASWH_ID = CONFINEDSPACEGASWH_ID, + OPERATTIME = #{OPERATTIME} where CONFINEDSPACEGASWH_ID = #{CONFINEDSPACEGASWH_ID} + + + update + + set + OPERATTIME = #{OPERATTIME} + where + CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} + + + SELECT + CONCAT_WS( " ", "受限空间作业", f.CHECK_NO ) AS CHECK_NO, + f.CONFINEDSPACE_ID AS ID + FROM + GF_CONFINEDSPACE f + WHERE + f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} + AND f.ISDELETE = '0' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update + GF_CONFINEDSPACE f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_blindboard f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_electricity f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_hoisting f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_breakground f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_cutroad f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_highwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_hotwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + update @@ -306,8 +435,8 @@ f.OPERATOR, f.CHECK_NO, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONFIRM_DEPARTMENT_ID, f.CONFIRM_USER_ID, f.CONFIRM_USER_SIGNER_PATH, @@ -335,7 +464,7 @@ f.BELONG_CORP, f.LIMITSPACE_ID, f.WORK_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.RISK_IDENTIFICATION, f.MEDIUM_NAME, f.EDUCATE_USER, @@ -358,6 +487,10 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + (SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0' + AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID + ORDER BY + a.ANALYZE_TIME DESC LIMIT 1) as ANALYZE_TIME, sp.NAME as LIMITSPACE_NAME, ad.NAME as APPLY_DEPARTMENT_NAME, @@ -388,6 +521,7 @@ aacu.NAME as ACCEPT_CONFESS_USER_NAME from f + left join GF_confinedspacegaswh b on b.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID left join GF_LIMITSPACE sp on sp.LIMITSPACE_ID=f.LIMITSPACE_ID left join OA_DEPARTMENT aac on aac.DEPARTMENT_ID = f.ACCEPT_CONFESS_DEPARTMENT_ID @@ -423,7 +557,74 @@ select - , + f.CORPINFO_ID, + f.ISDELETE, + f.CREATTIME, + f.CREATOR, + f.OPERATTIME, + f.OPERATOR, + f.CHECK_NO, + f.WORK_CONTENT, + f.WORK_START_DATE, + f.WORK_END_DATE, + f.CONFIRM_DEPARTMENT_ID, + f.CONFIRM_USER_ID, + f.CONFIRM_USER_SIGNER_PATH, + f.CONFIRM_USER_SIGNER_TIME, + f.AUDIT_DEPARTMENT_ID, + f.AUDIT_USER_ID, + f.AUDIT_USER_SIGNER_PATH, + f.AUDIT_USER_SIGNER_TIME, + f.APPROVE_DEPARTMENT_ID, + f.APPROVE_USER_ID, + f.APPROVE_USER_SIGNER_PATH, + f.APPROVE_USER_SIGNER_TIME, + f.APPLY_STATUS, + f.CONFIRM_CONTENT, + f.AUDIT_CONTENT, + f.APPROVE_CONTENT, + f.OTHER_PROTECTIVE_MEASURES, + f.ACCEPT_DEPARTMENT_ID, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_CONTENT, + f.APPLY_DEPARTMENT_ID, + f.APPLY_USER_ID, + f.BELONG_CORP, + f.LIMITSPACE_ID, + f.WORK_USER, + f.SPECIAL_WORK, + f.RISK_IDENTIFICATION, + f.MEDIUM_NAME, + f.EDUCATE_USER, + f.ANALYZE_DEPARTMENT_ID, + f.ANALYZE_USER_ID, + f.GUARDIAN_DEPARTMENT_ID, + f.GUARDIAN_USER_ID, + f.GUARDIAN_USER_SIGNER_PATH, + f.GUARDIAN_USER_SIGNER_TIME, + f.GUARDIAN_CONTENT, + f.CONFESS_USER, + f.ACCEPT_CONFESS_USER, + f.GUARDIAN_USER, + f.CONFINEDSPACE_ID, + f.CONFESS_DEPARTMENT_ID, + f.CONFESS_USER_ID, + f.CONFESS_USER_SIGNER_PATH, + f.CONFESS_USER_SIGNER_TIME, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from GF_confinedspacegas a where a.ISDELETE = '0' + AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID + ORDER BY + a.ANALYZE_TIME DESC LIMIT 1),'无') as ANALYZE_TIME, + + (SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from GF_CONFINEDSPACE_ACCEPTUSER a where a.ISDELETE = '0' + AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID + ORDER BY + a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME, sp.NAME as LIMITSPACE_NAME, ad.NAME as APPLY_DEPARTMENT_NAME, @@ -642,7 +912,7 @@ left join OA_DEPARTMENT anad on anad.DEPARTMENT_ID = f.ANALYZE_DEPARTMENT_ID left join SYS_USER anau on anau.USER_ID = f.ANALYZE_USER_ID - where f.ISDELETE = '0' and f.APPLY_STATUS < 6 and f.GUARDIAN_USER_SIGNER_TIME is null and f.APPLY_STATUS > 0 + where f.APPLY_STATUS = '5' and f.GUARDIAN_USER_SIGNER_TIME is null and f.APPLY_STATUS > 0 and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -739,7 +1009,73 @@ From 1daf485e92f70bb094fa034a56ec2db5fe668a01 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 12 Dec 2023 18:02:22 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9Amq?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 ++ src/main/java/com/zcloud/dto/mq/Response.java | 68 +++++++++ .../java/com/zcloud/dto/mq/TenCorpDto.java | 46 +++++++ .../mq/controller/EightWorkListener.java | 87 ++++++++++++ .../com/zcloud/mq/controller/MqListener.java | 32 +++++ .../zcloud/mq/controller/SendController.java | 54 ++++++++ .../mq/mapper/MqErrorMessageLogMapper.java | 59 ++++++++ .../zcloud/mq/mapper/MqMessageLogMapper.java | 59 ++++++++ .../com/zcloud/mq/service/LogService.java | 11 ++ .../zcloud/mq/service/SendMessageService.java | 11 ++ .../mq/service/impl/LogServiceImpl.java | 43 ++++++ .../service/impl/SendMessageServiceImpl.java | 129 ++++++++++++++++++ src/main/java/com/zcloud/mq/util/Const.java | 6 + src/main/java/com/zcloud/mq/util/MqUtil.java | 84 ++++++++++++ 14 files changed, 704 insertions(+) create mode 100644 src/main/java/com/zcloud/dto/mq/Response.java create mode 100644 src/main/java/com/zcloud/dto/mq/TenCorpDto.java create mode 100644 src/main/java/com/zcloud/mq/controller/EightWorkListener.java create mode 100644 src/main/java/com/zcloud/mq/controller/MqListener.java create mode 100644 src/main/java/com/zcloud/mq/controller/SendController.java create mode 100644 src/main/java/com/zcloud/mq/mapper/MqErrorMessageLogMapper.java create mode 100644 src/main/java/com/zcloud/mq/mapper/MqMessageLogMapper.java create mode 100644 src/main/java/com/zcloud/mq/service/LogService.java create mode 100644 src/main/java/com/zcloud/mq/service/SendMessageService.java create mode 100644 src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java create mode 100644 src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java create mode 100644 src/main/java/com/zcloud/mq/util/Const.java create mode 100644 src/main/java/com/zcloud/mq/util/MqUtil.java diff --git a/pom.xml b/pom.xml index a046f419..6576b988 100644 --- a/pom.xml +++ b/pom.xml @@ -461,6 +461,21 @@ hutool-all 5.0.5 + + + org.apache.rocketmq + rocketmq-client-java + 5.0.5 + + + org.apache.rocketmq + rocketmq-spring-boot-starter + 2.2.2 + + + org.projectlombok + lombok + + + GF_CUTROAD_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.CUTROAD_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ISSELF, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + + + + + ACCEPT_CONFESS_ID, + CUTROAD_ID, + CORPINFO_ID, + ISDELETE, + OPERATTIME, + OPERATOR, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ISSELF, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_DEPARTMENT_ID + + + + + + #{ACCEPT_CONFESS_ID}, + #{CUTROAD_ID}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ISSELF}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_DEPARTMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + update + + set + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}, + CUTROAD_ID = #{CUTROAD_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + ISSELF = #{ISSELF} + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + From dfa04334c34ce6105c6aa8027024f017a5357b9b Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Wed, 13 Dec 2023 10:58:39 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E7=94=A8=E7=94=B5?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFConfinedSpaceController.java | 27 +- .../gf/AppGFElectricityController.java | 24 +- .../gf/GFElectricityController.java | 7 +- .../gf/GFElectricityAcceptUserMapper.java | 67 +++ .../datasource/gf/GFElectricityMapper.java | 17 + .../gf/GFElectricityAcceptUserService.java | 67 +++ .../service/gf/GFElectricityService.java | 16 +- .../GFElectricityAcceptUserServiceImpl.java | 102 ++++ .../gf/impl/GFElectricityServiceImpl.java | 35 ++ .../gf/ElectricityAcceptUserMapper.xml | 216 +++++++++ .../datasource/gf/ElectricityGasMapper.xml | 2 +- .../datasource/gf/ElectricityMapper.xml | 442 +++++++++++++++++- 12 files changed, 969 insertions(+), 53 deletions(-) create mode 100644 src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityAcceptUserMapper.java create mode 100644 src/main/java/com/zcloud/service/gf/GFElectricityAcceptUserService.java create mode 100644 src/main/java/com/zcloud/service/gf/impl/GFElectricityAcceptUserServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/gf/ElectricityAcceptUserMapper.xml diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index adf009e6..4ce881b9 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java @@ -2,13 +2,11 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.zcloud.clinet.MqClient; -import com.zcloud.dto.Response; -import com.zcloud.dto.TenCorpConst; -import com.zcloud.dto.TenCorpDto; import com.zcloud.controller.base.BaseController; +import com.zcloud.dto.mq.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mq.util.TenCorpConst; import com.zcloud.service.gf.*; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; @@ -18,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; +import com.zcloud.mq.service.SendMessageService; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -53,7 +52,7 @@ public class AppGFConfinedSpaceController extends BaseController { private Smb smb; @Resource - private MqClient mqClient; + private SendMessageService mqClient; /**获取编码 * @param * @throws Exception @@ -174,11 +173,7 @@ public class AppGFConfinedSpaceController extends BaseController { tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); tenCorpDto.setData(pd); tenCorpDto.setMark_name("CONFINEDSPACE_ID"); - Response response = mqClient.sendDelayQueue(tenCorpDto); - if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ - throw new RuntimeException("系统异常"); - } - System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); + mqClient.SendDelayQueue(tenCorpDto); map.put("result", errInfo); return map; } @@ -391,11 +386,7 @@ public class AppGFConfinedSpaceController extends BaseController { tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); tenCorpDto.setData(pd); tenCorpDto.setMark_name("CONFINEDSPACE_ID"); - Response response = mqClient.sendDelayQueue(tenCorpDto); - if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ - throw new RuntimeException("系统异常"); - } - System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); + mqClient.SendDelayQueue(tenCorpDto); map.put("result", errInfo); return map; } @@ -846,11 +837,7 @@ public class AppGFConfinedSpaceController extends BaseController { tenCorpDto.setTime_stamp(pd.getString("WORK_START_DATE") + ":00:000"); tenCorpDto.setData(pd); tenCorpDto.setMark_name("CONFINEDSPACE_ID"); - Response response = mqClient.sendDelayQueue(tenCorpDto); - if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ - throw new RuntimeException("系统异常"); - } - System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); + mqClient.SendDelayQueue(tenCorpDto); } break; diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java index 2ecd6b17..e5fa227c 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java @@ -7,6 +7,7 @@ import com.zcloud.dto.mq.Response; import com.zcloud.dto.mq.TenCorpDto; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.mq.util.TenCorpConst; import com.zcloud.service.gf.*; import com.zcloud.util.*; import org.apache.commons.lang.StringUtils; @@ -16,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartRequest; +import com.zcloud.mq.service.SendMessageService; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -49,7 +51,7 @@ public class AppGFElectricityController extends BaseController { private Smb smb; @Resource - private MqClient mqClient; + private SendMessageService mqClient; /**获取编码 * @param @@ -154,11 +156,7 @@ public class AppGFElectricityController extends BaseController { tenCorpDto.setData(pd); tenCorpDto.setMessage(TenCorpConst.electricity); - Response response = mqClient.sendDelayQueue(tenCorpDto); - if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ - throw new RuntimeException("系统异常"); - } - System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); + mqClient.SendDelayQueue(tenCorpDto); // 发短信 PageData mes1 = new PageData(); mes1.put("RECEIVER_ID", pd.get("ANALYZE_USER_ID"));// 收信人userid @@ -260,11 +258,7 @@ public class AppGFElectricityController extends BaseController { tenCorpDto.setData(pd); tenCorpDto.setMessage(TenCorpConst.electricity); - Response response = mqClient.sendDelayQueue(tenCorpDto); - if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ - throw new RuntimeException("系统异常"); - } - System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); + mqClient.SendDelayQueue(tenCorpDto); } map.put("result", errInfo); return map; @@ -636,11 +630,7 @@ public class AppGFElectricityController extends BaseController { tenCorpDto.setData(pd); tenCorpDto.setMessage(TenCorpConst.electricity); - Response response = mqClient.sendDelayQueue(tenCorpDto); - if (!"succeed".equals(response.getResult()) || !"0".equals(response.getCode())){ - throw new RuntimeException("系统异常"); - } - System.out.println("amazing:!!!!!"+JSONObject.toJSONString(response)); + mqClient.SendDelayQueue(tenCorpDto); } } @@ -989,7 +979,7 @@ public class AppGFElectricityController extends BaseController { } /**作废 - * @param out + * @paramout * @throws Exception */ @PostMapping(value="/cancel") diff --git a/src/main/java/com/zcloud/controller/gf/GFElectricityController.java b/src/main/java/com/zcloud/controller/gf/GFElectricityController.java index 95f0fc8d..0dd02f1a 100644 --- a/src/main/java/com/zcloud/controller/gf/GFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/GFElectricityController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFElectricityAcceptUserService; import com.zcloud.service.gf.GFElectricityGasService; import com.zcloud.service.gf.GFElectricityService; import com.zcloud.util.Jurisdiction; @@ -34,6 +35,8 @@ public class GFElectricityController extends BaseController { private GFElectricityService GFelectricityService; @Autowired private GFElectricityGasService GFelectricityGasService; + @Autowired + private GFElectricityAcceptUserService electricityacceptuserService; /**新增 * @param * @throws Exception @@ -53,7 +56,7 @@ public class GFElectricityController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -131,6 +134,8 @@ public class GFElectricityController extends BaseController { pd = GFelectricityService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFelectricityService.listAllMeasures(pd)); + map.put("imgList",electricityacceptuserService.findByIds(pd)); + map.put("imgList1",electricityacceptuserService.findById(pd)); map.put("gasList", GFelectricityGasService.listAll(pd)); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityAcceptUserMapper.java new file mode 100644 index 00000000..03fc6d6e --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFElectricityAcceptUserMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void deleteList(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + List findById(PageData pd); + List findByIds(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + List listAllByIds(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityMapper.java index 0b93c78e..17cbb7bc 100644 --- a/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFElectricityMapper.java @@ -30,6 +30,7 @@ public interface GFElectricityMapper{ * @throws Exception */ void edit(PageData pd); + void edittime(PageData pd); /**列表 * @param page @@ -52,6 +53,22 @@ public interface GFElectricityMapper{ */ PageData findById(PageData pd); + void cancel(PageData pd); + + PageData checkno(PageData pd); + + + void editSpecialwork(PageData pd); + void editSpecialwork1(PageData pd); + void editSpecialwork2(PageData pd); + void editSpecialwork3(PageData pd); + void editSpecialwork4(PageData pd); + void editSpecialwork5(PageData pd); + void editSpecialwork6(PageData pd); + void editSpecialwork7(PageData pd); + + + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/GFElectricityAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFElectricityAcceptUserService.java new file mode 100644 index 00000000..483492e1 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFElectricityAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFElectricityAcceptUserService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception; + public List findByIds(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public List listAllByIds(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/gf/GFElectricityService.java b/src/main/java/com/zcloud/service/gf/GFElectricityService.java index 91750cec..106aa3f0 100644 --- a/src/main/java/com/zcloud/service/gf/GFElectricityService.java +++ b/src/main/java/com/zcloud/service/gf/GFElectricityService.java @@ -30,7 +30,7 @@ public interface GFElectricityService{ * @throws Exception */ public void edit(PageData pd)throws Exception; - + public void edittime(PageData pd)throws Exception; /**列表 * @param page * @throws Exception @@ -52,6 +52,20 @@ public interface GFElectricityService{ */ public PageData findById(PageData pd)throws Exception; + public void cancel(PageData pd)throws Exception; + + public PageData checkno(PageData pd)throws Exception; + + public void editSpecialwork(PageData pd)throws Exception; + public void editSpecialwork1(PageData pd)throws Exception; + public void editSpecialwork2(PageData pd)throws Exception; + public void editSpecialwork3(PageData pd)throws Exception; + public void editSpecialwork4(PageData pd)throws Exception; + public void editSpecialwork5(PageData pd)throws Exception; + public void editSpecialwork6(PageData pd)throws Exception; + public void editSpecialwork7(PageData pd)throws Exception; + + /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/java/com/zcloud/service/gf/impl/GFElectricityAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFElectricityAcceptUserServiceImpl.java new file mode 100644 index 00000000..c9dfd45e --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFElectricityAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFElectricityAcceptUserMapper; +import com.zcloud.service.gf.GFElectricityAcceptUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class GFElectricityAcceptUserServiceImpl implements GFElectricityAcceptUserService { + + @Autowired + private GFElectricityAcceptUserMapper electricityacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + electricityacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + electricityacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + electricityacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + electricityacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return electricityacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return electricityacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return electricityacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return electricityacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + electricityacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return electricityacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFElectricityServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFElectricityServiceImpl.java index 9ff6fe29..b9b79ed5 100644 --- a/src/main/java/com/zcloud/service/gf/impl/GFElectricityServiceImpl.java +++ b/src/main/java/com/zcloud/service/gf/impl/GFElectricityServiceImpl.java @@ -80,7 +80,42 @@ public class GFElectricityServiceImpl implements GFElectricityService { public PageData findById(PageData pd)throws Exception{ return GFelectricityMapper.findById(pd); } + public void cancel(PageData pd)throws Exception{ + GFelectricityMapper.cancel(pd); + } + public PageData checkno(PageData pd)throws Exception{ + return GFelectricityMapper.checkno(pd); + } + + public void editSpecialwork(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork(pd); + } + public void editSpecialwork1(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork1(pd); + } + public void editSpecialwork2(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork2(pd); + } + public void editSpecialwork3(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork3(pd); + } + public void editSpecialwork4(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork4(pd); + } + public void editSpecialwork5(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork5(pd); + } + public void editSpecialwork6(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork6(pd); + } + public void editSpecialwork7(PageData pd)throws Exception{ + GFelectricityMapper.editSpecialwork7(pd); + } + + public void edittime(PageData pd)throws Exception{ + GFelectricityMapper.edittime(pd); + } /**批量删除 * @param ArrayDATA_IDS * @throws Exception diff --git a/src/main/resources/mybatis/datasource/gf/ElectricityAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityAcceptUserMapper.xml new file mode 100644 index 00000000..c3d7d5cc --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/ElectricityAcceptUserMapper.xml @@ -0,0 +1,216 @@ + + + + + + + + GF_ELECTRICITY_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.ELECTRICITY_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ISSELF, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + + + + + ACCEPT_CONFESS_ID, + ELECTRICITY_ID, + CORPINFO_ID, + ISDELETE, + OPERATTIME, + OPERATOR, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ISSELF, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_DEPARTMENT_ID + + + + + + #{ACCEPT_CONFESS_ID}, + #{ELECTRICITY_ID}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ISSELF}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_DEPARTMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + update + + set + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}, + ELECTRICITY_ID = #{ELECTRICITY_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + ISSELF = #{ISSELF} + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gf/ElectricityGasMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityGasMapper.xml index 7a8af77d..b8cb12f1 100644 --- a/src/main/resources/mybatis/datasource/gf/ElectricityGasMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ElectricityGasMapper.xml @@ -88,7 +88,7 @@ from f where - f.ELECTRICITYGAS_ID = #{ELECTRICITYGAS_ID} + f.ELECTRICITY_ID = #{ELECTRICITY_ID} diff --git a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml index f82510a1..ab53bbf7 100644 --- a/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ElectricityMapper.xml @@ -78,6 +78,8 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ANALYZE_TIME, + f.ISANALYZE, f.WORK_LONGITUDE, f.WORK_LATITUDE @@ -148,6 +150,8 @@ ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, ACCEPT_CONFESS_USER_SIGNER_TIME, + ANALYZE_TIME, + ISANALYZE, WORK_LONGITUDE, WORK_LATITUDE @@ -218,6 +222,8 @@ #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ANALYZE_TIME}, + #{ISANALYZE}, #{WORK_LONGITUDE}, #{WORK_LATITUDE} @@ -242,7 +248,14 @@ where ELECTRICITY_ID = #{ELECTRICITY_ID} - + + update + + set + ANALYZE_TIME = #{ANALYZE_TIME} + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + update @@ -312,8 +325,9 @@ ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, ELECTRICITY_ID = ELECTRICITY_ID, - WORK_LONGITUDE = #{WORK_LONGITUDE}, - WORK_LATITUDE = #{WORK_LATITUDE} + ISANALYZE = #{ISANALYZE}, + WORK_LONGITUDE = #{WORK_LONGITUDE}, + WORK_LATITUDE = #{WORK_LATITUDE} where ELECTRICITY_ID = #{ELECTRICITY_ID} @@ -329,8 +343,8 @@ f.OPERATOR, f.CHECK_NO, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONFIRM_DEPARTMENT_ID, f.CONFIRM_USER_ID, f.CONFIRM_USER_SIGNER_PATH, @@ -362,7 +376,7 @@ f.WORK_USER, f.CARD_NO, f.GUARDIAN, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.RISK_IDENTIFICATION, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, @@ -385,6 +399,11 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + (SELECT a.ANALYZE_TIME from GF_ELECTRICITYGAS a where a.ISDELETE = '0' + AND a.ELECTRICITY_ID = #{ELECTRICITY_ID} + ORDER BY + a.ANALYZE_TIME DESC LIMIT 1) as ANALYZE_TIME, + f.ISANALYZE, f.WORK_LATITUDE, f.WORK_LONGITUDE, @@ -446,10 +465,183 @@ f.ELECTRICITY_ID = #{ELECTRICITY_ID} + + update + + set + APPLY_STATUS = '-99' + where + ELECTRICITY_ID = #{ELECTRICITY_ID} + + + + + update + GF_confinedspace f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_blindboard f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_electricity f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_hoisting f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_breakground f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_cutroad f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_highwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + GF_hotwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + + select + f.ACCEPT_CONFESS_ID, + f.HOTWORK_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + from + f + where + f.HOTWORK_ID = #{HOTWORK_ID} and f.CORPINFO_ID = #{CORPINFO_ID} and f.ACCEPT_USER_ID = #{ACCEPT_USER_ID} + order by f.ACCEPT_USER_SIGNER_TIME asc + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gf/HotworkMapper.xml b/src/main/resources/mybatis/datasource/gf/HotworkMapper.xml index 2bd1ae62..fd43b6fa 100644 --- a/src/main/resources/mybatis/datasource/gf/HotworkMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/HotworkMapper.xml @@ -85,7 +85,8 @@ f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, - f.ACCEPT_CONFESS_USER_SIGNER_TIME + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ANALYZE_TIME @@ -161,7 +162,8 @@ ACCEPT_CONFESS_DEPARTMENT_ID, ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, - ACCEPT_CONFESS_USER_SIGNER_TIME + ACCEPT_CONFESS_USER_SIGNER_TIME, + ANALYZE_TIME @@ -237,7 +239,8 @@ #{ACCEPT_CONFESS_DEPARTMENT_ID}, #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, - #{ACCEPT_CONFESS_USER_SIGNER_TIME} + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ANALYZE_TIME} @@ -260,7 +263,14 @@ where HOTWORK_ID = #{HOTWORK_ID} - + + update + + set + ANALYZE_TIME = #{ANALYZE_TIME} + where + HOTWORK_ID = #{HOTWORK_ID} + update @@ -342,6 +352,105 @@ HOTWORK_ID = #{HOTWORK_ID} + + update + + set + APPLY_STATUS = #{APPLY_STATUS} + where + HOTWORK_ID = #{HOTWORK_ID} + + + + update + bus_confinedspace f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_blindboard f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_electricity f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_hoisting f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_breakground f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_cutroad f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_highwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + update + bus_hotwork f + set f.SPECIAL_WORK = REPLACE(f.SPECIAL_WORK,#{CHECK_NO},CONCAT(#{CHECK_NO},'(已作废)')) + WHERE + f.ISDELETE = '0' + AND f.APPLY_STATUS > 0 + AND f.CORPINFO_ID = #{CORPINFO_ID} + and ( FIND_IN_SET( #{CHECK_NO}, f.SPECIAL_WORK ) ) + + + select - , + f.CORPINFO_ID, + f.ISDELETE, + f.CREATTIME, + f.CREATOR, + f.OPERATTIME, + f.OPERATOR, + f.CHECK_NO, + f.WORK_CONTENT, + f.WORK_START_DATE, + f.WORK_END_DATE, + f.CONFIRM_DEPARTMENT_ID, + f.CONFIRM_USER_ID, + f.CONFIRM_USER_SIGNER_PATH, + f.CONFIRM_USER_SIGNER_TIME, + f.AUDIT_DEPARTMENT_ID, + f.AUDIT_USER_ID, + f.AUDIT_USER_SIGNER_PATH, + f.AUDIT_USER_SIGNER_TIME, + f.APPROVE_DEPARTMENT_ID, + f.APPROVE_USER_ID, + f.APPROVE_USER_SIGNER_PATH, + f.APPROVE_USER_SIGNER_TIME, + f.APPLY_STATUS, + f.CONFIRM_CONTENT, + f.AUDIT_CONTENT, + f.APPROVE_CONTENT, + f.OTHER_PROTECTIVE_MEASURES, + f.ACCEPT_DEPARTMENT_ID, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_CONTENT, + f.APPLY_DEPARTMENT_ID, + f.APPLY_USER_ID, + f.WORK_PLACE, + f.WORK_LEVEL, + f.WORK_USER, + f.SPECIAL_WORK, + f.RISK_IDENTIFICATION, + f.WORK_MANAGER, + f.ANALYZE_DEPARTMENT_ID, + f.ANALYZE_USER_ID, + f.GUARDIAN_DEPARTMENT_ID, + f.GUARDIAN_USER_ID, + f.GUARDIAN_USER_SIGNER_PATH, + f.GUARDIAN_USER_SIGNER_TIME, + f.GUARDIAN_CONTENT, + f.LEADER_DEPARTMENT_ID, + f.LEADER_USER_ID, + f.LEADER_USER_SIGNER_PATH, + f.LEADER_USER_SIGNER_TIME, + f.LEADER_CONTENT, + f.MONITOR_DEPARTMENT_ID, + f.MONITOR_USER_ID, + f.MONITOR_USER_SIGNER_PATH, + f.MONITOR_USER_SIGNER_TIME, + f.MONITOR_CONTENT, + f.CONFESS_USER, + f.EDUCATE_USER, + f.ACCEPT_EDUCATE_USER, + f.TRIAL_USER, + f.WORK_FUNCTION, + f.GUARDIAN_USER, + f.HOTWORK_ID, + f.CONFESS_DEPARTMENT_ID, + f.CONFESS_USER_ID, + f.CONFESS_USER_SIGNER_PATH, + f.CONFESS_USER_SIGNER_TIME, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + + IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from bus_hotworkgas a where a.ISDELETE = '0' + AND a.HOTWORK_ID = f.HOTWORK_ID + ORDER BY + a.ANALYZE_TIME DESC LIMIT 1),'无') as ANALYZE_TIME, + + (SELECT a.ACCEPT_CONFESS_USER_SIGNER_TIME from BUS_HOTWORK_ACCEPTUSER a where a.ISDELETE = '0' + AND a.HOTWORK_ID = f.HOTWORK_ID + ORDER BY + a.ACCEPT_CONFESS_USER_SIGNER_TIME DESC LIMIT 1) as ACCEPT_CONFESS_USER_SIGNER_TIME, + ad.NAME as APPLY_DEPARTMENT_NAME, getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL, au.NAME as APPLY_USER_NAME, @@ -562,7 +755,9 @@ and f.APPLY_STATUS = #{pd.APPLY_STATUS} - + + and f.APPLY_STATUS in ('1','2','4','5','6') + and f.CORPINFO_ID = #{pd.CORPINFO_ID} @@ -667,7 +862,82 @@ From e3b7a146011df5ffc974c1f9992528288b715351 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 13 Dec 2023 13:49:37 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=90=8A=E8=A3=85=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFHoistingController.java | 210 +++++++++++++++-- .../controller/gf/GFHoistingController.java | 5 + .../gf/GFHoistingAcceptUserMapper.java | 67 ++++++ .../gf/GFHoistingAcceptUserService.java | 67 ++++++ .../impl/GFHoistingAcceptUserServiceImpl.java | 102 +++++++++ .../gf/HoistingAcceptUserMapper.xml | 216 ++++++++++++++++++ 6 files changed, 653 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/zcloud/mapper/datasource/gf/GFHoistingAcceptUserMapper.java create mode 100644 src/main/java/com/zcloud/service/gf/GFHoistingAcceptUserService.java create mode 100644 src/main/java/com/zcloud/service/gf/impl/GFHoistingAcceptUserServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/gf/HoistingAcceptUserMapper.xml diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java index 7d87b63b..32c52b33 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.text.DecimalFormat; @@ -30,6 +31,8 @@ import java.util.*; @RequestMapping("/app/gfHoisting") public class AppGFHoistingController extends BaseController { + @Autowired + private GFHoistingAcceptUserService hoistingacceptuserService; @Resource private GFHoistingService GFhoistingService; @Resource @@ -74,6 +77,18 @@ public class AppGFHoistingController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + System.out.println(pd.get("CORPINFO_ID")); + pd2 = GFhoistingService.getCode(pd2); //根据ID读取 + String code = "DZ"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd.put("CHECK_NO", code); pd.put("HOISTING_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 @@ -267,9 +282,7 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -278,22 +291,189 @@ public class AppGFHoistingController extends BaseController { pd2 = GFhoistingService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - String ffile = DateUtil.getDays(); - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - - pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFhoistingService.edit(pd2); + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); } map.put("result", errInfo); return map; } + private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData pd = new PageData(); + pd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); + pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + pd.put("ISDELETE", '0'); + pd.put("CORPINFO_ID", CORPINFO_ID); + pd.put("HOISTING_ID", HOISTING_ID); + pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID); + pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); + pd.put("ACCEPT_USER_ID",""); + pd.put("ACCEPT_DEPARTMENT_ID", ""); + hoistingacceptuserService.save(pd); + } + } + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + public Object editAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFhoistingService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 +// pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人 +// pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人 + PageData log = new PageData(); + log.put("HOISTINGLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("HOISTING_ID", pd.get("HOISTING_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); +// String HAZARD_IDENTIFICATION = (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + +// (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;"); + + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); +// pd2.put("HAZARD_IDENTIFICATION", ""); + switch (status) { + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + } + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFhoistingService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes.put("templateCode", "DZ_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "吊装作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + + break; + + + case "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFhoistingService.edit(pd2); + + + // 发短信 + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes3.put("templateCode", "DZ_N06");// 短信模板编码 + mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList3 = new ArrayList(); + // 第1个参数 + PageData params10 = new PageData(); + params10.put("name", "params1");// 存入短信模板中的参数名称 + params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList3.add(params10); + // 第2个参数 + PageData params11 = new PageData(); + params11.put("name", "params2");// 存入短信模板中的参数名称 + params11.put("value", "吊装作业");// 存入上面参数名称所传递的值 + paramsList3.add(params11); + // 第3个参数 + PageData params12 = new PageData(); + params12.put("name", "params3");// 存入短信模板中的参数名称 + params12.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList3.add(params12); + sendMessageUtil.sendMessages(mes3, paramsList3); + break; + default: + break; + } + GFhighWorkLogService.save(log); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData cpd = new PageData(); + cpd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + Smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + cpd.put("ACCEPT_USER_SIGNER_TIME", signertime); + cpd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 + cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + cpd.put("ISDELETE", '0'); + cpd.put("CORPINFO_ID", CORPINFO_ID); + cpd.put("HOISTING_ID", HOISTING_ID); + cpd.put("ACCEPT_USER_ID", ACCEPT_USER_ID); + cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); + cpd.put("ACCEPT_CONFESS_USER_ID", ""); + cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + hoistingacceptuserService.save(cpd); + } + } + } + + /**修改 * @param * @throws Exception @@ -886,6 +1066,8 @@ public class AppGFHoistingController extends BaseController { pd = this.getPageData(); pd = GFhoistingService.findById(pd); //根据ID读取 map.put("measuresList", GFhoistingService.listAllMeasures(pd)); + map.put("imgList",hoistingacceptuserService.findByIds(pd)); + map.put("imgList1",hoistingacceptuserService.findById(pd)); map.put("pd", pd); map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/controller/gf/GFHoistingController.java b/src/main/java/com/zcloud/controller/gf/GFHoistingController.java index 08f9ecf1..3d13a354 100644 --- a/src/main/java/com/zcloud/controller/gf/GFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/GFHoistingController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFHoistingAcceptUserService; import com.zcloud.service.gf.GFHoistingService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; @@ -31,6 +32,8 @@ public class GFHoistingController extends BaseController { @Autowired private GFHoistingService GFhoistingService; + @Autowired + private GFHoistingAcceptUserService hoistingacceptuserService; /**新增 * @param @@ -129,6 +132,8 @@ public class GFHoistingController extends BaseController { pd = GFhoistingService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFhoistingService.listAllMeasures(pd)); + map.put("imgList",hoistingacceptuserService.findByIds(pd)); + map.put("imgList1",hoistingacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFHoistingAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFHoistingAcceptUserMapper.java new file mode 100644 index 00000000..e03f6ea7 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFHoistingAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHoistingAcceptUserMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void deleteList(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + List findById(PageData pd); + List findByIds(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + List listAllByIds(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/service/gf/GFHoistingAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFHoistingAcceptUserService.java new file mode 100644 index 00000000..2dc213c0 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFHoistingAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHoistingAcceptUserService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception; + public List findByIds(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public List listAllByIds(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHoistingAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHoistingAcceptUserServiceImpl.java new file mode 100644 index 00000000..50eee922 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFHoistingAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFHoistingAcceptUserMapper; +import com.zcloud.service.gf.GFHoistingAcceptUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class GFHoistingAcceptUserServiceImpl implements GFHoistingAcceptUserService { + + @Autowired + private GFHoistingAcceptUserMapper hoistingacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + hoistingacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + hoistingacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + hoistingacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + hoistingacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return hoistingacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return hoistingacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return hoistingacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return hoistingacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + hoistingacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return hoistingacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/resources/mybatis/datasource/gf/HoistingAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/HoistingAcceptUserMapper.xml new file mode 100644 index 00000000..20063d30 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/HoistingAcceptUserMapper.xml @@ -0,0 +1,216 @@ + + + + + + + + GF_HOISTING_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.HOISTING_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ISSELF, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + + + + + ACCEPT_CONFESS_ID, + HOISTING_ID, + CORPINFO_ID, + ISDELETE, + OPERATTIME, + OPERATOR, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ISSELF, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_DEPARTMENT_ID + + + + + + #{ACCEPT_CONFESS_ID}, + #{HOISTING_ID}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ISSELF}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_DEPARTMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + update + + set + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}, + HOISTING_ID = #{HOISTING_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + ISSELF = #{ISSELF} + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + From d55fd869161c891822075de1c81ff1f2900bc063 Mon Sep 17 00:00:00 2001 From: liujun Date: Wed, 13 Dec 2023 14:35:16 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFHighWorkController.java | 4 +- .../controller/gf/GFHighWorkController.java | 5 + .../gf/GFHighWorkAcceptUserMapper.java | 67 ++++++ .../gf/GFHighWorkAcceptUserService.java | 67 ++++++ .../impl/GFHighWorkAcceptUserServiceImpl.java | 102 ++++++++ .../gf/HighWorkAcceptUserMapper.xml | 217 ++++++++++++++++++ 6 files changed, 461 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java create mode 100644 src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java create mode 100644 src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/gf/HighWorkAcceptUserMapper.xml diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index 331d0a70..f2791176 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -32,7 +32,9 @@ import java.util.*; @RequestMapping("/app/gfHighwork") public class AppGFHighWorkController extends BaseController { - @Resource + @Autowired + private GFHighWorkAcceptUserService highworkacceptuserService; + @Autowired private GFHighWorkService GFhighworkService; @Resource private GFHighWorkLogService GFhighWorkLogService; diff --git a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java index 39590313..ea6f0a68 100644 --- a/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/GFHighWorkController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.gf; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; +import com.zcloud.service.gf.GFHighWorkAcceptUserService; import com.zcloud.service.gf.GFHighWorkService; import com.zcloud.util.Jurisdiction; import com.zcloud.util.ObjectExcelView; @@ -31,6 +32,8 @@ public class GFHighWorkController extends BaseController { @Autowired private GFHighWorkService GFhighworkService; + @Autowired + private GFHighWorkAcceptUserService highworkacceptuserService; /**新增 * @param @@ -129,6 +132,8 @@ public class GFHighWorkController extends BaseController { pd = GFhighworkService.findById(pd); //根据ID读取 map.put("pd", pd); map.put("measuresList", GFhighworkService.listAllMeasures(pd)); + map.put("imgList",highworkacceptuserService.findByIds(pd)); + map.put("imgList1",highworkacceptuserService.findById(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java new file mode 100644 index 00000000..9a7ea495 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/GFHighWorkAcceptUserMapper.java @@ -0,0 +1,67 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHighWorkAcceptUserMapper { + + /**新增 + * @param pd + * @throws Exception + */ + void save(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void delete(PageData pd); + + /**删除 + * @param pd + * @throws Exception + */ + void deleteList(PageData pd); + + /**修改 + * @param pd + * @throws Exception + */ + void edit(PageData pd); + + /**列表 + * @param page + * @throws Exception + */ + List datalistPage(Page page); + + /**列表(全部) + * @param pd + * @throws Exception + */ + List listAll(PageData pd); + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + List findById(PageData pd); + List findByIds(PageData pd); + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + void deleteAll(String[] ArrayDATA_IDS); + List listAllByIds(PageData pd); + +} + diff --git a/src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java b/src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java new file mode 100644 index 00000000..53966691 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/GFHighWorkAcceptUserService.java @@ -0,0 +1,67 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +public interface GFHighWorkAcceptUserService { + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception; + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception; + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception; + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception; + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception; + public List findByIds(PageData pd)throws Exception; + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception; + + public List listAllByIds(PageData pd)throws Exception; +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java new file mode 100644 index 00000000..5736429e --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/GFHighWorkAcceptUserServiceImpl.java @@ -0,0 +1,102 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.GFHighWorkAcceptUserMapper; +import com.zcloud.service.gf.GFHighWorkAcceptUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：图片管理 + * 作者：luoxiaobao + * 时间：2020-12-24 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class GFHighWorkAcceptUserServiceImpl implements GFHighWorkAcceptUserService { + + @Autowired + private GFHighWorkAcceptUserMapper highworkacceptuserMapper; + + /**新增 + * @param pd + * @throws Exception + */ + public void save(PageData pd)throws Exception{ + highworkacceptuserMapper.save(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void delete(PageData pd)throws Exception{ + highworkacceptuserMapper.delete(pd); + } + + /**删除 + * @param pd + * @throws Exception + */ + public void deleteList(PageData pd)throws Exception{ + highworkacceptuserMapper.deleteList(pd); + } + + /**修改 + * @param pd + * @throws Exception + */ + public void edit(PageData pd)throws Exception{ + highworkacceptuserMapper.edit(pd); + } + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return highworkacceptuserMapper.datalistPage(page); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAll(PageData pd)throws Exception{ + return highworkacceptuserMapper.listAll(pd); + } + + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public List findById(PageData pd)throws Exception{ + return highworkacceptuserMapper.findById(pd); + } + public List findByIds(PageData pd)throws Exception{ + return highworkacceptuserMapper.findByIds(pd); + } + + /**批量删除 + * @param ArrayDATA_IDS + * @throws Exception + */ + public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ + highworkacceptuserMapper.deleteAll(ArrayDATA_IDS); + } + + /**列表(全部) + * @param pd + * @throws Exception + */ + public List listAllByIds(PageData pd)throws Exception{ + return highworkacceptuserMapper.listAllByIds(pd); + } + +} + diff --git a/src/main/resources/mybatis/datasource/gf/HighWorkAcceptUserMapper.xml b/src/main/resources/mybatis/datasource/gf/HighWorkAcceptUserMapper.xml new file mode 100644 index 00000000..61068c10 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/HighWorkAcceptUserMapper.xml @@ -0,0 +1,217 @@ + + + + + + + + GF_HIGHWORK_ACCEPTUSER + + + + + SYS_DICTIONARIES + + + + f.ACCEPT_CONFESS_ID, + f.HIGHWORK_ID, + f.CORPINFO_ID, + f.ISDELETE, + f.OPERATTIME, + f.OPERATOR, + f.ACCEPT_CONFESS_DEPARTMENT_ID, + f.ACCEPT_CONFESS_USER_ID, + f.ACCEPT_CONFESS_USER_SIGNER_PATH, + f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.ISSELF, + f.ACCEPT_USER_ID, + f.ACCEPT_USER_SIGNER_PATH, + f.ACCEPT_USER_SIGNER_TIME, + f.ACCEPT_DEPARTMENT_ID + + + + + ACCEPT_CONFESS_ID, + HIGHWORK_ID, + CORPINFO_ID, + ISDELETE, + OPERATTIME, + OPERATOR, + ACCEPT_CONFESS_DEPARTMENT_ID, + ACCEPT_CONFESS_USER_ID, + ACCEPT_CONFESS_USER_SIGNER_PATH, + ACCEPT_CONFESS_USER_SIGNER_TIME, + ISSELF, + ACCEPT_USER_ID, + ACCEPT_USER_SIGNER_PATH, + ACCEPT_USER_SIGNER_TIME, + ACCEPT_DEPARTMENT_ID + + + + + + #{ACCEPT_CONFESS_ID}, + #{HIGHWORK_ID}, + #{CORPINFO_ID}, + #{ISDELETE}, + #{OPERATTIME}, + #{OPERATOR}, + #{ACCEPT_CONFESS_DEPARTMENT_ID}, + #{ACCEPT_CONFESS_USER_ID}, + #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{ISSELF}, + #{ACCEPT_USER_ID}, + #{ACCEPT_USER_SIGNER_PATH}, + #{ACCEPT_USER_SIGNER_TIME}, + #{ACCEPT_DEPARTMENT_ID} + + + + + insert into + + ( + + ) values ( + + ) + + + + + delete from + + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + update + + set + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID}, + HIGHWORK_ID = #{HIGHWORK_ID}, + CORPINFO_ID = #{CORPINFO_ID}, + OPERATTIME = #{OPERATTIME}, + OPERATOR = #{OPERATOR}, + ACCEPT_CONFESS_DEPARTMENT_ID = #{ACCEPT_CONFESS_DEPARTMENT_ID}, + ACCEPT_CONFESS_USER_ID = #{ACCEPT_CONFESS_USER_ID}, + ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, + ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + ISSELF = #{ISSELF} + where + ACCEPT_CONFESS_ID = #{ACCEPT_CONFESS_ID} + + + + + + + + + + + + + + + update + + set + ISDELETE = '1' + where + ACCEPT_CONFESS_ID in + + #{item} + + + + + + + From 09b85168810e9cd7dd6ca139d71335e207fad5f1 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 14 Dec 2023 14:47:02 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasource/mq}/MqErrorMessageLogMapper.java | 2 +- .../mapper => mapper/datasource/mq}/MqMessageLogMapper.java | 2 +- src/main/java/com/zcloud/mq/controller/EightWorkListener.java | 2 +- src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java | 4 ++-- .../com/zcloud/mq/service/impl/SendMessageServiceImpl.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/com/zcloud/{mq/mapper => mapper/datasource/mq}/MqErrorMessageLogMapper.java (95%) rename src/main/java/com/zcloud/{mq/mapper => mapper/datasource/mq}/MqMessageLogMapper.java (95%) diff --git a/src/main/java/com/zcloud/mq/mapper/MqErrorMessageLogMapper.java b/src/main/java/com/zcloud/mapper/datasource/mq/MqErrorMessageLogMapper.java similarity index 95% rename from src/main/java/com/zcloud/mq/mapper/MqErrorMessageLogMapper.java rename to src/main/java/com/zcloud/mapper/datasource/mq/MqErrorMessageLogMapper.java index 68dd153f..65cce5cf 100644 --- a/src/main/java/com/zcloud/mq/mapper/MqErrorMessageLogMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/mq/MqErrorMessageLogMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mq.mapper; +package com.zcloud.mapper.datasource.mq; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mq/mapper/MqMessageLogMapper.java b/src/main/java/com/zcloud/mapper/datasource/mq/MqMessageLogMapper.java similarity index 95% rename from src/main/java/com/zcloud/mq/mapper/MqMessageLogMapper.java rename to src/main/java/com/zcloud/mapper/datasource/mq/MqMessageLogMapper.java index bd586c64..b094046e 100644 --- a/src/main/java/com/zcloud/mq/mapper/MqMessageLogMapper.java +++ b/src/main/java/com/zcloud/mapper/datasource/mq/MqMessageLogMapper.java @@ -1,4 +1,4 @@ -package com.zcloud.mq.mapper; +package com.zcloud.mapper.datasource.mq; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; diff --git a/src/main/java/com/zcloud/mq/controller/EightWorkListener.java b/src/main/java/com/zcloud/mq/controller/EightWorkListener.java index 83e5dcb5..c99519e0 100644 --- a/src/main/java/com/zcloud/mq/controller/EightWorkListener.java +++ b/src/main/java/com/zcloud/mq/controller/EightWorkListener.java @@ -3,7 +3,7 @@ package com.zcloud.mq.controller; import com.alibaba.fastjson.JSON; import com.zcloud.controller.gf.GFEightWorkController; import com.zcloud.entity.PageData; -import com.zcloud.mq.mapper.MqMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; import com.zcloud.dto.mq.TenCorpDto; import com.zcloud.mq.service.LogService; import com.zcloud.mq.service.SendMessageService; diff --git a/src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java b/src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java index bd1222b1..7c8c0e2d 100644 --- a/src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java +++ b/src/main/java/com/zcloud/mq/service/impl/LogServiceImpl.java @@ -1,8 +1,8 @@ package com.zcloud.mq.service.impl; import com.zcloud.entity.PageData; -import com.zcloud.mq.mapper.MqErrorMessageLogMapper; -import com.zcloud.mq.mapper.MqMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; import com.zcloud.mq.service.LogService; import com.zcloud.util.DateUtil; import com.zcloud.util.Warden; diff --git a/src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java b/src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java index a9bccfff..0538a358 100644 --- a/src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java +++ b/src/main/java/com/zcloud/mq/service/impl/SendMessageServiceImpl.java @@ -3,8 +3,8 @@ package com.zcloud.mq.service.impl; import com.alibaba.fastjson.JSONObject; import com.zcloud.dto.mq.TenCorpDto; import com.zcloud.entity.PageData; -import com.zcloud.mq.mapper.MqErrorMessageLogMapper; -import com.zcloud.mq.mapper.MqMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqErrorMessageLogMapper; +import com.zcloud.mapper.datasource.mq.MqMessageLogMapper; import com.zcloud.mq.service.LogService; import com.zcloud.mq.service.SendMessageService; import com.zcloud.mq.util.MqUtil; From fcd6a6860f65d22fa0dafcbcc17c7ca69d9492a3 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Sun, 17 Dec 2023 09:31:34 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E9=AB=98=E5=A4=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFHighWorkController.java | 230 ++++++++++++++++-- 1 file changed, 207 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index f2791176..c003d0c9 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartRequest; import javax.annotation.Resource; import java.io.File; @@ -42,6 +43,8 @@ public class AppGFHighWorkController extends BaseController { private GFHighWorkToMeasuresService GFhighWorkToMeasuresService; @Autowired private SendMessageUtil sendMessageUtil; + @Autowired + private Smb smb; /**获取编码 * @param * @throws Exception @@ -78,6 +81,18 @@ public class AppGFHighWorkController extends BaseController { String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + PageData pd2 = new PageData(); + Calendar calendar = Calendar.getInstance(); + DecimalFormat dft=new DecimalFormat("00"); + int year = calendar.get(Calendar.YEAR); + String month = dft.format(calendar.get(Calendar.MONTH) + 1); + String day = dft.format(calendar.get(Calendar.DAY_OF_MONTH)); + pd2.put("CREATDATE",year + "-" + month + "-" + day); + pd2.put("CORPINFO_ID",pd.get("CORPINFO_ID")); + pd2 = GFhighworkService.getCode(pd2); //根据ID读取 + String code = "GK"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); + pd = this.getPageData(); + pd.put("CHECK_NO", code); pd.put("HIGHWORK_ID", this.get32UUID()); //主键 pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 @@ -128,7 +143,7 @@ public class AppGFHighWorkController extends BaseController { } /**删除 - * @param out + * @param * @throws Exception */ @RequestMapping(value="/delete") @@ -222,7 +237,7 @@ public class AppGFHighWorkController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -298,7 +313,7 @@ public class AppGFHighWorkController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -316,9 +331,7 @@ public class AppGFHighWorkController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - public Object editAcceptconfess( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception { + public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); @@ -327,22 +340,191 @@ public class AppGFHighWorkController extends BaseController { pd2 = GFhighworkService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - String ffile = DateUtil.getDays(); - String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); - - pd2.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); -// pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); -// pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFhighworkService.edit(pd2); + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveImg(fileList.toArray(fileArr),signertime,pd.getString("HIGHWORK_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + fileList.clear(); } map.put("result", errInfo); return map; } + private void saveImg(MultipartFile[] files,String signertime, String HIGHWORK_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData pd = new PageData(); + pd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); + pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("ACCEPT_CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + pd.put("ISDELETE", '0'); + pd.put("CORPINFO_ID", CORPINFO_ID); + pd.put("HIGHWORK_ID", HIGHWORK_ID); + pd.put("ACCEPT_CONFESS_USER_ID", ACCEPT_CONFESS_USER_ID); + pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); + pd.put("ACCEPT_USER_ID",""); + pd.put("ACCEPT_DEPARTMENT_ID", ""); + highworkacceptuserService.save(pd); + } + } + } + + /**修改 + * @param + * @throws Exception + */ + @RequestMapping(value="/editAcceptStatus") + @ResponseBody + @Transactional + public Object editAcceptStatus(MultipartRequest request) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFhighworkService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 +// pd2.put("OTHER_PROTECTIVE_MEASURES", pd.get("OTHER_PROTECTIVE_MEASURES")); //修改人 +// pd2.put("HAZARD_IDENTIFICATION", pd.get("HAZARD_IDENTIFICATION")); //修改人 + PageData log = new PageData(); + log.put("HIGHWORKLOG_ID", this.get32UUID()); +// log.put("ACTION", "审核打回"); + log.put("HIGHWORK_ID", pd.get("HIGHWORK_ID")); + log.put("CREATOR",pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + + String status = pd.get("STATUS").toString(); + String OTHER_PROTECTIVE_MEASURES = pd2.getString("OTHER_PROTECTIVE_MEASURES"); + if ("2".equals(status) || "3".equals(status) || "4".equals(status) || "5".equals(status)) { + OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + + (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;"); +// pd2.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + +// (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? (pd.getString("OTHER_PROTECTIVE_MEASURES") + ";_;") : ";_;")); +// pd2.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd2.getString("HAZARD_IDENTIFICATION")) ? pd2.getString("HAZARD_IDENTIFICATION") : "") + +// (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? (pd.getString("HAZARD_IDENTIFICATION") + ";_;") : ";_;")); + } else if ("-2".equals(status) || "-3".equals(status) || "-4".equals(status) || "-5".equals(status) || "-6".equals(status)) { + //打回清空数据 + pd2.put("OTHER_PROTECTIVE_MEASURES", ""); +// pd2.put("HAZARD_IDENTIFICATION", ""); + } + switch (status) { + + case "6"://验收人 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file"+i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HIGHWORK_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + fileList.clear(); + } + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFhighworkService.edit(pd2); + log.put("ACTION", "验收通过"); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes.put("templateCode", "GK_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList = new ArrayList(); + // 第1个参数 + PageData params1 = new PageData(); + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "高空作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + + break; + case "-6"://验收人打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFhighworkService.edit(pd2); + + + // 发短信 + PageData mes3 = new PageData(); + mes3.put("RECEIVER_ID", pd2.get("CREATOR"));// 收信人userid + mes3.put("templateCode", "GK_N06");// 短信模板编码 + mes3.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes3.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 参数集合 + List paramsList3 = new ArrayList(); + // 第1个参数 + PageData params10 = new PageData(); + params10.put("name", "params1");// 存入短信模板中的参数名称 + params10.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList3.add(params10); + // 第2个参数 + PageData params11 = new PageData(); + params11.put("name", "params2");// 存入短信模板中的参数名称 + params11.put("value", "高空作业");// 存入上面参数名称所传递的值 + paramsList3.add(params11); + // 第3个参数 + PageData params12 = new PageData(); + params12.put("name", "params3");// 存入短信模板中的参数名称 + params12.put("value", "验收人");// 存入上面参数名称所传递的值 + paramsList3.add(params12); + sendMessageUtil.sendMessages(mes3, paramsList3); + break; + default: + break; + } + GFhighWorkLogService.save(log); + map.put("result", errInfo); + return map; + } + private void saveAcceptImg(MultipartFile[] files,String signertime, String HIGHWORK_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ + if (files != null && files.length > 0) { + for (int i = 0; i < files.length; i++) { + PageData cpd = new PageData(); + cpd = this.getPageData(); + MultipartFile file = files[i]; + String ffile = DateUtil.getDays(); + String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); + smb.sshSftp(file, fileName,Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile); + cpd.put("ACCEPT_USER_SIGNER_TIME", signertime); + cpd.put("ACCEPT_CONFESS_ID", this.get32UUID()); + cpd.put("OPERATOR", cpd.get("OPERATOR")); //修改人 + cpd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + cpd.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName); + cpd.put("ISDELETE", '0'); + cpd.put("CORPINFO_ID", CORPINFO_ID); + cpd.put("HIGHWORK_ID", HIGHWORK_ID); + cpd.put("ACCEPT_USER_ID", ACCEPT_USER_ID); + cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); + cpd.put("ACCEPT_CONFESS_USER_ID", ""); + cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + highworkacceptuserService.save(cpd); + } + } + } + /**修改 * @param * @throws Exception @@ -394,7 +576,7 @@ public class AppGFHighWorkController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -417,7 +599,7 @@ public class AppGFHighWorkController extends BaseController { PageData measures = new PageData(); measures.put("HIGHWORKTOMEASURES_ID", this.get32UUID()); // 主键 measures.put("HIGHWORK_ID", pd2.get("HIGHWORK_ID")); - measures.put("BUS_HIGHWORK_MEASURES_ID", json.get("HIGHWORK_MEASURES_ID")); + measures.put("BUS_HIGHWORK_MEASURES_ID", json.get("BUS_HIGHWORK_MEASURES_ID")); measures.put("STATUS", json.get("STATUS")); measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); @@ -481,7 +663,7 @@ public class AppGFHighWorkController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -547,7 +729,7 @@ public class AppGFHighWorkController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -605,7 +787,7 @@ public class AppGFHighWorkController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -653,7 +835,7 @@ public class AppGFHighWorkController extends BaseController { String ffile = DateUtil.getDays(); String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - Smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); + smb.sshSftp(file, fileName, Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -943,6 +1125,8 @@ public class AppGFHighWorkController extends BaseController { pd = GFhighworkService.findById(pd); //根据ID读取 map.put("measuresList", GFhighworkService.listAllMeasures(pd)); map.put("pd", pd); + map.put("imgList1",highworkacceptuserService.findById(pd)); + map.put("imgList",highworkacceptuserService.findByIds(pd)); map.put("result", errInfo); return map; } From 343b66b9141986df11772235a015ff0383ca1053 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Sun, 17 Dec 2023 14:18:12 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=AD=A3=E5=90=91=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B5=B0=E9=80=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zcloud/controller/gf/AppGFBlindBoardController.java | 2 +- .../java/com/zcloud/controller/gf/AppGFHighWorkController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index d4a2dadb..dbf58c1d 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -640,7 +640,7 @@ public class AppGFBlindBoardController extends BaseController { default: break; } - GFblindboardService.save(log); + GFblindBoardLogService.save(log); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java index c003d0c9..0acf912e 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -599,7 +599,7 @@ public class AppGFHighWorkController extends BaseController { PageData measures = new PageData(); measures.put("HIGHWORKTOMEASURES_ID", this.get32UUID()); // 主键 measures.put("HIGHWORK_ID", pd2.get("HIGHWORK_ID")); - measures.put("BUS_HIGHWORK_MEASURES_ID", json.get("BUS_HIGHWORK_MEASURES_ID")); + measures.put("BUS_HIGHWORK_MEASURES_ID", json.get("HIGHWORK_MEASURES_ID")); measures.put("STATUS", json.get("STATUS")); measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); From 0d9228dda495f01df7c44ddf52e99e61bc3e9f7a Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Sun, 17 Dec 2023 15:53:55 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=AD=A3=E5=90=91=E6=B5=81=E7=A8=8Bbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/gf/AppEightWorkController.java | 89 +++++ .../mapper/datasource/gf/EightWorkMapper.java | 25 ++ .../zcloud/service/gf/EightWorkService.java | 25 ++ .../service/gf/impl/EightWorkServiceImpl.java | 36 ++ .../service/system/DictionariesService.java | 3 + .../system/impl/DictionariesServiceImpl.java | 13 + src/main/java/com/zcloud/util/Warden.java | 4 + .../mybatis/datasource/gf/CutRoadMapper.xml | 309 +++++++++++++++++- .../mybatis/datasource/gf/EightWorkMapper.xml | 58 ++++ .../mybatis/datasource/gf/HighWorkMapper.xml | 290 +++++++++++++++- .../mybatis/datasource/gf/HoistingMapper.xml | 288 +++++++++++++++- 11 files changed, 1114 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/zcloud/controller/gf/AppEightWorkController.java create mode 100644 src/main/java/com/zcloud/mapper/datasource/gf/EightWorkMapper.java create mode 100644 src/main/java/com/zcloud/service/gf/EightWorkService.java create mode 100644 src/main/java/com/zcloud/service/gf/impl/EightWorkServiceImpl.java create mode 100644 src/main/resources/mybatis/datasource/gf/EightWorkMapper.xml diff --git a/src/main/java/com/zcloud/controller/gf/AppEightWorkController.java b/src/main/java/com/zcloud/controller/gf/AppEightWorkController.java new file mode 100644 index 00000000..0a47751a --- /dev/null +++ b/src/main/java/com/zcloud/controller/gf/AppEightWorkController.java @@ -0,0 +1,89 @@ +package com.zcloud.controller.gf; + +import com.zcloud.controller.base.BaseController; +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.logs.LogAnno; +import com.zcloud.service.eightWork.*; +import com.zcloud.service.gf.EightWorkService; +import com.zcloud.service.system.DictionariesService; +import com.zcloud.util.*; +import com.zcloud.entity.Response; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +/** + * 说明：八项作业 + * 作者：luoxiaobao + * 时间：2021-08-31 + * 官网：www.zcloudchina.com + */ +@Controller +@RequestMapping("/app/eightwork") +public class AppEightWorkController extends BaseController { + + @Autowired + private EightWorkService eightworkService; + @Autowired + private DictionariesService dictionariesService; + + /**八项作业列表 + * @param page + * @throws Exception + */ + @RequestMapping(value="/list") + @ResponseBody + @LogAnno(menuType= "手机",menuServer= "八项作业",instructionsOperate = "八项作业",instructionsType = "列表") + public Object list(Page page) throws Exception{ + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件 + if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim()); +// pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); + page.setPd(pd); + List varList = eightworkService.list(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * description: + * accidentType-风险点 + * hiddenLevel-隐患级别 + * + * @return tree or list + * @throws Exception all + */ + @RequestMapping(value = "/getInfo") + @ResponseBody + public Response getInfo() throws Exception { + Response response = Response.getResponse(); + try { + PageData request = this.getPageData(); + if (StringUtils.isBlank(request.getString("vectors"))) throw new RuntimeException("未找到要获取的数据字典类型"); + List vectors = Warden.getList(request.getString("vectors"),String.class); + for (String vector: vectors) { + switch (vector) { + case "accidentType": + //事故类型 + response.put("accidentType", dictionariesService.getTreeById("cee1190ea96a4ca9b7bca81e11f0d0f8")); + continue; + default: + } + } + return response.OK(); + } catch (Exception e) { + e.printStackTrace(); + return response.errorMessage(e.getMessage()); + } + } + +} diff --git a/src/main/java/com/zcloud/mapper/datasource/gf/EightWorkMapper.java b/src/main/java/com/zcloud/mapper/datasource/gf/EightWorkMapper.java new file mode 100644 index 00000000..8a964f74 --- /dev/null +++ b/src/main/java/com/zcloud/mapper/datasource/gf/EightWorkMapper.java @@ -0,0 +1,25 @@ +package com.zcloud.mapper.datasource.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：有限空间作业 + * 作者：luoxiaobao + * 时间：2021-09-13 + * 官网：www.zcloudchina.com + */ +public interface EightWorkMapper { + + + + /**列表 + * @param page + * @throws Exception + */ + List datalist(Page page); + +} + diff --git a/src/main/java/com/zcloud/service/gf/EightWorkService.java b/src/main/java/com/zcloud/service/gf/EightWorkService.java new file mode 100644 index 00000000..fbfd0243 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/EightWorkService.java @@ -0,0 +1,25 @@ +package com.zcloud.service.gf; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; + +import java.util.List; + +/** + * 说明：有限空间作业 + * 作者：luoxiaobao + * 时间：2021-09-13 + * 官网：www.zcloudchina.com + */ +public interface EightWorkService { + + + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception; + +} + diff --git a/src/main/java/com/zcloud/service/gf/impl/EightWorkServiceImpl.java b/src/main/java/com/zcloud/service/gf/impl/EightWorkServiceImpl.java new file mode 100644 index 00000000..5da1e4c8 --- /dev/null +++ b/src/main/java/com/zcloud/service/gf/impl/EightWorkServiceImpl.java @@ -0,0 +1,36 @@ +package com.zcloud.service.gf.impl; + +import com.zcloud.entity.Page; +import com.zcloud.entity.PageData; +import com.zcloud.mapper.datasource.gf.EightWorkMapper; +import com.zcloud.service.gf.EightWorkService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 说明：有限空间作业 + * 作者：luoxiaobao + * 时间：2021-09-13 + * 官网：www.zcloudchina.com + */ +@Service +@Transactional //开启事物 +public class EightWorkServiceImpl implements EightWorkService { + + @Autowired + private EightWorkMapper eightworkMapper; + + + /**列表 + * @param page + * @throws Exception + */ + public List list(Page page)throws Exception{ + return eightworkMapper.datalist(page); + } + +} + diff --git a/src/main/java/com/zcloud/service/system/DictionariesService.java b/src/main/java/com/zcloud/service/system/DictionariesService.java index c4163465..a0e72a1f 100644 --- a/src/main/java/com/zcloud/service/system/DictionariesService.java +++ b/src/main/java/com/zcloud/service/system/DictionariesService.java @@ -148,4 +148,7 @@ public interface DictionariesService { * @throws Exception */ public List getIdsByParentIds(List parentIds) throws Exception; + + + public List getTreeById(String id) throws Exception; } diff --git a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java index baceaed7..1e13a329 100644 --- a/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java +++ b/src/main/java/com/zcloud/service/system/impl/DictionariesServiceImpl.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -243,4 +244,16 @@ public class DictionariesServiceImpl implements DictionariesService { return dictionariesMapper.getIdsByParentIds(parentIds); } + @Override + public List getTreeById(String id) throws Exception { + List _list = this.listSubDictByParentId(id); //用传过来的ID获取此ID下的子列表数据 + return _list.stream().map(n -> { + PageData entity = new PageData(); + entity.put("DICTIONARIES_ID", n.getDICTIONARIES_ID()); + entity.put("BIANMA", n.getBIANMA()); + entity.put("NAME", n.getNAME()); + return entity; + }).collect(Collectors.toList()); + } + } diff --git a/src/main/java/com/zcloud/util/Warden.java b/src/main/java/com/zcloud/util/Warden.java index 9fc496ab..8f2b9c81 100644 --- a/src/main/java/com/zcloud/util/Warden.java +++ b/src/main/java/com/zcloud/util/Warden.java @@ -42,6 +42,10 @@ public class Warden { return JSON.parseObject(raw.toJSONString(), PageData.class); } + public static List getList(String raw, Class clazz) { + return JSON.parseArray(raw, clazz); + } + public static void initData(PageData entity) { entity.put("CREATE_TIME", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); entity.put("CRATED_DATE", new Date()); diff --git a/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml b/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml index fe19ddf6..fa60e7f9 100644 --- a/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/CutRoadMapper.xml @@ -339,8 +339,8 @@ f.CHECK_NO, f.PROJECT_MANAGER, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONSTRUCTION_DEPARTMENT_ID, f.CONSTRUCTION_USER_ID, f.CONSTRUCTION_USER_SIGNER_PATH, @@ -372,7 +372,7 @@ f.HAZARD_IDENTIFICATION, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.GUARDIAN_USER, f.JOB_CONTENT, f.APPLY_USER_SIGNER_PATH, @@ -457,8 +457,80 @@ diff --git a/src/main/resources/mybatis/datasource/gf/EightWorkMapper.xml b/src/main/resources/mybatis/datasource/gf/EightWorkMapper.xml new file mode 100644 index 00000000..878efb06 --- /dev/null +++ b/src/main/resources/mybatis/datasource/gf/EightWorkMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + diff --git a/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml index 8b77f9dc..cd583107 100644 --- a/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/HighWorkMapper.xml @@ -327,8 +327,8 @@ f.CHECK_NO, f.PROJECT_MANAGER, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONSTRUCTION_DEPARTMENT_ID, f.CONSTRUCTION_USER_ID, f.CONSTRUCTION_USER_SIGNER_PATH, @@ -362,7 +362,7 @@ f.LEADER_USER_SIGNER_TIME, f.CONFESS_USER, f.ACCEPT_CONFESS_USER, - f.SPECIAL_WORK, + IFNULL(f.SPECIAL_WORK,'无') as SPECIAL_WORK, f.GUARDIAN_USER, f.WORK_HIGH, f.WORK_LEVEL, @@ -443,7 +443,75 @@ diff --git a/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml b/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml index eac0ca5c..4a4658d6 100644 --- a/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/HoistingMapper.xml @@ -77,6 +77,7 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.SPECIAL_WORK, f.WORK_LONGITUDE, f.WORK_LATITUDE @@ -146,6 +147,7 @@ ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, ACCEPT_CONFESS_USER_SIGNER_TIME, + SPECIAL_WORK, WORK_LONGITUDE, WORK_LATITUDE @@ -215,6 +217,7 @@ #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{SPECIAL_WORK}, #{WORK_LONGITUDE}, #{WORK_LATITUDE} @@ -308,6 +311,7 @@ ACCEPT_CONFESS_USER_SIGNER_PATH = #{ACCEPT_CONFESS_USER_SIGNER_PATH}, ACCEPT_CONFESS_USER_SIGNER_TIME = #{ACCEPT_CONFESS_USER_SIGNER_TIME}, HOISTING_ID = HOISTING_ID, + SPECIAL_WORK = #{SPECIAL_WORK}, WORK_LONGITUDE = #{WORK_LONGITUDE}, WORK_LATITUDE = #{WORK_LATITUDE} where @@ -328,8 +332,8 @@ f.CHECK_NO, f.PROJECT_MANAGER, f.WORK_CONTENT, - f.WORK_START_DATE, - f.WORK_END_DATE, + replace(f.WORK_START_DATE,'-','/') as WORK_START_DATE, + replace(f.WORK_END_DATE,'-','/') as WORK_END_DATE, f.CONSTRUCTION_DEPARTMENT_ID, f.CONSTRUCTION_USER_ID, f.CONSTRUCTION_USER_SIGNER_PATH, @@ -382,6 +386,7 @@ f.ACCEPT_CONFESS_USER_SIGNER_TIME, f.WORK_LATITUDE, f.WORK_LONGITUDE, + f.SPECIAL_WORK, ad.NAME as APPLY_DEPARTMENT_NAME, getFullName(ad.DEPARTMENT_ID) APPLY_DEPARTMENT_ALL, @@ -443,7 +448,74 @@ From 6cb9900bbf8b23349057ee2b2dc822f1c9d919aa Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Mon, 18 Dec 2023 09:36:47 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A031=E7=9A=84mq=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.properties | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 5bb49ecc..6dd4d9ea 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -69,3 +69,27 @@ smb.port=22 smb.user=root smb.password=Zcloud@zcloud88888 smb.basePath=/mnt/qgfile/file/ + +#Mq\u914D\u7F6E +rocketmq.consumer.group2=edu-admin-edit +rocketmq.consumer.group1=edu-admin-add +#rocketmq.name-server=10.0.140.141:9876 +#rocketmq.name-server=192.168.0.70:9876 +rocketmq.name-server=192.168.0.31:9876 +rocketmq.producer.group=libmiddle +rocketmq.producer.send-message-timeout=3000 +rocketmq.producer.compress-message-body-threshold=4096 +rocketmq.producer.max-message-size=4194304 +rocketmq.producer.retry-times-when-send-failed=3 +rocketmq.producer.retry-next-server=true +rocketmq.producer.retry-times-when-send-async-failed=3 +## topic \u524D\u7F00 + +mq.topic.info=info +mq.topic.eightWork=eightWork +mq.group.info=scheduled_tasks +mq.group.eightWork=scheduled_tasks_eightWork + + +corp.default.pic-path=https://qgqy.qhdsafety.com/file/ +corp.default.back-end-path=https://skqhdg.porthebei.com:9004/file/