diff --git a/1703230140663.jpeg b/1703230140663.jpeg new file mode 100644 index 00000000..b5afce18 Binary files /dev/null and b/1703230140663.jpeg differ diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index 7708001e..34996d7e 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -52,7 +52,7 @@ public class MfolderController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("mfolder:add") @ResponseBody - @DockAnnotation(isAdd = true) + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -80,13 +80,7 @@ public class MfolderController extends BaseController { @RequiresPermissions("mfolder:add") @ResponseBody @DockAnnotation(hasAnnex = true) - public Object add( - @RequestParam(value="FFILE",required=false) MultipartFile file, - @RequestParam(value="NAME",required=false) String NAME, - @RequestParam(value="PARENT_ID",required=false) String PARENT_ID, - @RequestParam(value="REMARKS",required=false) String REMARKS, - @RequestParam(value="SHARE",required=false) String SHARE - ) throws Exception{ + public Object add(@RequestParam(value="FFILE",required=false) MultipartFile file, @RequestParam(value="NAME",required=false) String NAME, @RequestParam(value="PARENT_ID",required=false) String PARENT_ID, @RequestParam(value="REMARKS",required=false) String REMARKS, @RequestParam(value="SHARE",required=false) String SHARE) throws Exception{ Map map = new HashMap(); ArrayList pictureList = new ArrayList<>(); String errInfo = "success"; @@ -100,8 +94,6 @@ public class MfolderController extends BaseController { map.put("msg", "文件格式不正确！"); return map; } -// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径 -// fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传 Long size = file.getSize()/1024; fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName,Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); @@ -117,10 +109,6 @@ public class MfolderController extends BaseController { pd.put("MFOLDER_ID", this.get32UUID()); //主键 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业 mfolderService.save(pd); //存入数据库表 - //存自己表里的附件 使用文件全路径加文件名的方式 示例 - // /uploadFiles/yhtp/8415df13cc4c46f0ac32f579462dbb8f/20231215/d3bc85d1bbe84b75b1e6e8b6182dc547.jpg - // @@ - // d3bc85d1bbe84b75b1e6e8b6182dc547.jpg pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName+ "@@" +fileName); diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index ac74265d..edf9fa1f 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java @@ -109,6 +109,7 @@ public class AppGFBlindBoardController extends BaseController { pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -117,6 +118,8 @@ public class AppGFBlindBoardController extends BaseController { pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); } map.put("dockData",JSON.toJSONString(pd)); GFblindboardService.save(pd); @@ -224,13 +227,16 @@ public class AppGFBlindBoardController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); } map.put("result", errInfo); @@ -251,6 +257,7 @@ public class AppGFBlindBoardController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); smb.deleteFile(pd.getString("path")); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -260,12 +267,14 @@ public class AppGFBlindBoardController extends BaseController { */ @RequestMapping(value="/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFblindboardService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -277,6 +286,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/edit") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object edit( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -287,6 +297,7 @@ public class AppGFBlindBoardController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -295,12 +306,17 @@ public class AppGFBlindBoardController extends BaseController { pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); } GFblindboardService.edit(pd); GFblindBoardInfoService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); if(pd.get("boardList")!=null){ List list = (List) JSON.parse(pd.get("boardList").toString()); + HashMap infoMap = new HashMap(); + int count = 1; for (JSONObject json : list) { PageData board = new PageData(); board.put("BLINDBOARDINFO_ID", this.get32UUID()); // 主键 @@ -310,13 +326,18 @@ public class AppGFBlindBoardController extends BaseController { board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION")); board.put("BOARD_NO", json.get("BOARD_NO")); board.put("ISDELETE", 0); + infoMap.put("other"+count, JSON.toJSONString(board)); + count+=1; GFblindBoardInfoService.save(board); } + map.put("infoMap", JSON.toJSONString(infoMap)); } GFblindBoardToMeasuresService.delete(pd); if(pd.get("measuresList")!=null){ List list = (List) JSON.parse(pd.get("measuresList").toString()); + HashMap measuresMap = new HashMap(); + int count = 1; for (JSONObject json : list) { PageData measures = new PageData(); measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键 @@ -325,8 +346,11 @@ public class AppGFBlindBoardController extends BaseController { measures.put("STATUS", json.get("STATUS")); measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + measuresMap.put("other"+count, JSON.toJSONString(measures)); + count+=1; GFblindBoardToMeasuresService.save(measures); } + map.put("measuresMap", JSON.toJSONString(measuresMap)); } if(!pd.get("APPLY_STATUS").equals("0")) { @@ -337,6 +361,7 @@ public class AppGFBlindBoardController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); GFblindBoardLogService.save(log); + map.put("logData", JSON.toJSONString(log)); // 发短信 @@ -381,6 +406,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/editStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editStatus( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -408,22 +434,28 @@ public class AppGFBlindBoardController extends BaseController { switch (status) { case "4"://作业负责人 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); GFblindboardService.edit(pd2); + map.put("pd2Data", JSON.toJSONString(pd2)); log.put("ACTION", "作业负责人通过"); - GFblindBoardInfoService.delete(pd); if(pd.get("boardList")!=null){ + GFblindBoardInfoService.delete(pd); List list = (List) JSON.parse(pd.get("boardList").toString()); + HashMap boardMap = new HashMap(); + int boardCount = 1; for (JSONObject json : list) { PageData board = new PageData(); board.put("BLINDBOARDINFO_ID", this.get32UUID()); // 主键 @@ -433,13 +465,19 @@ public class AppGFBlindBoardController extends BaseController { board.put("BOARD_SPECIFICATION", json.get("BOARD_SPECIFICATION")); board.put("BOARD_NO", json.get("BOARD_NO")); board.put("ISDELETE", 0); + boardMap.put("other"+boardCount, JSON.toJSONString(board)); + boardCount+=1; GFblindBoardInfoService.save(board); } + map.put("boardMap", JSON.toJSONString(boardMap)); } GFblindBoardToMeasuresService.delete(pd); + map.put("pdData", JSON.toJSONString(pd)); if(pd.get("measuresList")!=null){ List list = (List) JSON.parse(pd.get("measuresList").toString()); + HashMap measuresMap = new HashMap(); + int measuresCount = 1; for (JSONObject json : list) { PageData measures = new PageData(); measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键 @@ -448,8 +486,11 @@ public class AppGFBlindBoardController extends BaseController { measures.put("STATUS", json.get("STATUS")); measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + measuresMap.put("other"+measuresCount, JSON.toJSONString(measures)); + measuresCount+=1; GFblindBoardToMeasuresService.save(measures); } + map.put("measuresData", JSON.toJSONString(measuresMap)); } @@ -460,11 +501,14 @@ public class AppGFBlindBoardController extends BaseController { case "5"://所在单位审核通过 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -472,6 +516,7 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFblindboardService.edit(pd2); + map.put("pd2Data", JSON.toJSONString(pd2)); log.put("ACTION", "所在单位审核通过"); // 发短信 @@ -481,18 +526,22 @@ public class AppGFBlindBoardController extends BaseController { case "6"://验收人 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); 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); + map.put("pd2Data", JSON.toJSONString(pd2)); log.put("ACTION", "验收通过"); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -503,6 +552,7 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); GFblindboardService.edit(pd2); + map.put("pd2Data", JSON.toJSONString(pd2)); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -512,6 +562,7 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("LEADER_CONTENT", pd.get("CONTENT")); GFblindboardService.edit(pd2); + map.put("pd2Data", JSON.toJSONString(pd2)); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -521,6 +572,7 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); GFblindboardService.edit(pd2); + map.put("pd2Data", JSON.toJSONString(pd2)); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -529,6 +581,7 @@ public class AppGFBlindBoardController extends BaseController { break; } GFblindBoardLogService.save(log); + map.put("logData", JSON.toJSONString(log)); map.put("result", errInfo); return map; } @@ -597,6 +650,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/editAcceptStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptStatus(MultipartRequest request) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -613,6 +667,7 @@ public class AppGFBlindBoardController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockData", JSON.toJSONString(pd)); 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") + ";_;") : ";_;"); @@ -628,16 +683,19 @@ public class AppGFBlindBoardController extends BaseController { String SIGNTIME[] = pd.getString("SIGNTIME").split(","); for (int i = 0; i < SIGNTIME.length; i++) { + ArrayList pictureList = new ArrayList(); 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")); + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("BLINDBOARD_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); 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); + map.put("pd2Data", JSON.toJSONString(pd2)); log.put("ACTION", "验收通过"); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -649,6 +707,7 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); GFblindboardService.edit(pd2); + map.put("pd2Data", JSON.toJSONString(pd2)); // 发短信 this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); @@ -657,11 +716,12 @@ public class AppGFBlindBoardController extends BaseController { break; } GFblindBoardLogService.save(log); + map.put("logData", JSON.toJSONString(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{ + private void saveAcceptImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList pictureList) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { PageData cpd = new PageData(); @@ -682,6 +742,7 @@ public class AppGFBlindBoardController extends BaseController { cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); cpd.put("ACCEPT_CONFESS_USER_ID", ""); cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + pictureList.add(Const.FILEPATHFILE + cpd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); blindboardacceptuserService.save(cpd); } } @@ -695,6 +756,7 @@ public class AppGFBlindBoardController extends BaseController { */ @RequestMapping(value="/deleteAll") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -708,6 +770,7 @@ public class AppGFBlindBoardController extends BaseController { }else{ errInfo = "error"; } + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -886,6 +949,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/editGuardian") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editGuardian( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -898,15 +962,19 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); GFblindboardService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); } map.put("result", errInfo); return map; @@ -979,6 +1047,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/editConfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editConfess( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -991,15 +1060,19 @@ public class AppGFBlindBoardController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); GFblindboardService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); } map.put("result", errInfo); return map; @@ -1011,6 +1084,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptconfess( MultipartRequest request ) throws Exception { @@ -1022,21 +1096,26 @@ public class AppGFBlindBoardController extends BaseController { pd2 = GFblindboardService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + map.put("dockData", JSON.toJSONString(pd2)); List fileList = new ArrayList(); String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + ArrayList pictureList = new ArrayList(); 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")); + 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"),pictureList); fileList.clear(); } + map.put("sendPicturesList", JSON.toJSONString(pictureList)); 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{ + private void saveImg(MultipartFile[] files,String signertime, String BLINDBOARD_ID, String CORPINFO_ID, + String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList pictureList) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { PageData pd = new PageData(); @@ -1057,6 +1136,7 @@ public class AppGFBlindBoardController extends BaseController { pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); pd.put("ACCEPT_USER_ID",""); pd.put("ACCEPT_DEPARTMENT_ID", ""); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); blindboardacceptuserService.save(pd); } } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java index c54e8169..095a708d 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBreakGroundController.java @@ -35,1207 +35,1323 @@ import java.util.*; @RequestMapping("/app/gfBreakGround") 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 - */ - @RequestMapping(value="/getCode") - @ResponseBody + @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 + */ + @RequestMapping(value = "/getCode") + @ResponseBody // @LogAnno(menuType= "手机",menuServer= "动土作业",instructionsOperate = "动土作业",instructionsType = "获取编码") - public Object getCode() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - 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)); - pd.put("CREATDATE",year + "-" + month + "-" + day); - pd = GFbreakGroundService.getCode(pd); //根据ID读取 - String code = "DT"+year + month + day + dft.format((Integer.parseInt(pd.get("code").toString())+1)); - map.put("code", code); - map.put("result", errInfo); - return map; - } + public Object getCode() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + 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)); + pd.put("CREATDATE", year + "-" + month + "-" + day); + pd = GFbreakGroundService.getCode(pd); //根据ID读取 + String code = "DT" + year + month + day + dft.format((Integer.parseInt(pd.get("code").toString()) + 1)); + map.put("code", code); + map.put("result", errInfo); + return map; + } - /**新增 - * @param - * @throws Exception - */ - @RequestMapping(value="/add") - @ResponseBody - @Transactional - @DockAnnotation(hasAnnex = true) - public Object add( - @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(); - ArrayList sendPicturesList = new ArrayList<>(); - 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-否 - pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); - pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); - 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); - sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName - +"@@"+fileName - ); - 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); - PageData breakGroundPageData = new PageData(); - PageData breakGroundLogPageData = new PageData(); + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + @Transactional + @DockAnnotation(hasAnnex = true) + public Object add( + @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(); + ArrayList sendPicturesList = new ArrayList<>(); + 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-否 + pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); + pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + + "@@" + fileName + ); + 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); + PageData breakGroundPageData = new PageData(); + PageData breakGroundLogPageData = new PageData(); - breakGroundPageData.putAll(pd); - if(pd.get("APPLY_STATUS").equals("1")) { - 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())); - GFbreakGroundLogService.save(log); - breakGroundLogPageData.putAll(log); - List paramsList = new ArrayList(); - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y01");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id - // 参数集合 - // 第1个参数 - PageData params1 = new PageData(); - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + breakGroundPageData.putAll(pd); + if (pd.get("APPLY_STATUS").equals("1")) { + 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())); + GFbreakGroundLogService.save(log); + breakGroundLogPageData.putAll(log); + List paramsList = new ArrayList(); + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y01");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd.get("CORPINFO_ID"));// 企业id + // 参数集合 + // 第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); - // 第3个参数 - PageData params3 = new PageData(); - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - PageData params4 = new PageData(); - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "确认");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - } - PageData dockData = new PageData(); - dockData.put("breakGroundPageData",breakGroundPageData); - dockData.put("breakGroundLogPageData",breakGroundLogPageData); - map.put("result", errInfo); - map.put("dockData", JSON.toJSONString(dockData)); - return map; - } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editGuardian") - @ResponseBody - @Transactional - public Object editGuardian( - @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 = 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]; + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "确认");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + } + PageData dockData = new PageData(); + dockData.put("breakGroundPageData", JSON.toJSONString(breakGroundPageData)); + dockData.put("breakGroundLogPageData", JSON.toJSONString(breakGroundLogPageData)); + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(dockData)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + return map; + } - 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); + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editGuardian") + @ResponseBody + @Transactional + @DockAnnotation + public Object editGuardian( + @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 = GFbreakGroundService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + ArrayList sendPicturesList = new ArrayList<>(); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; - pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - GFbreakGroundService.edit(pd2); - } - map.put("result", errInfo); - return map; - } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editConfess") - @ResponseBody - @Transactional - public Object editConfess( - @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 = 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]; + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + + "@@" + fileName + ); + pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + GFbreakGroundService.edit(pd2); + } + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + return map; + } - 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); + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editConfess") + @ResponseBody + @Transactional + @DockAnnotation + public Object editConfess( + @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 = GFbreakGroundService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + ArrayList sendPicturesList = new ArrayList<>(); - pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - GFbreakGroundService.edit(pd2); - } - map.put("result", errInfo); - return map; - } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editAcceptconfess") - @ResponseBody - @Transactional - public Object editAcceptconfess(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())); //修改时间 - List fileList = new ArrayList(); - String signertime = ""; - String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; - 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); - } - } - } + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + + "@@" + fileName + ); + pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + GFbreakGroundService.edit(pd2); + } + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + return map; + } - /**上传图 - * @param - * @throws Exception - */ - @RequestMapping(value="/uploadImg") - @ResponseBody - @Transactional - public Object uploadImg( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editAcceptconfess") + @ResponseBody + @Transactional + @DockAnnotation + public Object editAcceptconfess(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())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + PageData dockData = new PageData(); + ArrayList dataArrayList = new ArrayList<>(); + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file" + i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + PageData item = 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")); + dataArrayList.add(item); + fileList.clear(); + } + dockData.put("data", JSON.toJSONString(dataArrayList)); + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(dockData)); + return map; + } - 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); + private PageData 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) { + PageData dockData = new PageData(); + ArrayList dataArrayList = new ArrayList<>(); + ArrayList sendPicturesList = new ArrayList<>(); + for (int i = 0; i < files.length; i++) { + 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); + sendPicturesList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + + "@@" + fileName + ); + 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", ""); + dataArrayList.add(pd); + breakgroundacceptuserService.save(pd); + } + dockData.put("dataArrayList", JSON.toJSONString(dataArrayList)); + dockData.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + return dockData; + } + return null; + } - map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - } + /** + * 上传图 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/uploadImg") + @ResponseBody + @Transactional + public Object uploadImg( + @RequestParam(value = "FFILE", required = false) MultipartFile[] files + ) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + if (files != null && files.length > 0) { + MultipartFile file = files[0]; - map.put("result", errInfo); - return map; - } + 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); - /**删除图 - * @param - * @throws Exception - */ - @RequestMapping(value="/deleteImg") - @ResponseBody - @Transactional - public Object deleteImg() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - smb.deleteFile(pd.getString("path")); - map.put("result", errInfo); - return map; - } + map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + + map.put("result", errInfo); + return map; + } + + /** + * 删除图 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteImg") + @ResponseBody + @Transactional + public Object deleteImg() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + smb.deleteFile(pd.getString("path")); + map.put("result", errInfo); + return map; + } - /**删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/delete") - @ResponseBody - public Object delete() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - GFbreakGroundService.delete(pd); - map.put("result", errInfo); //返回结果 - return map; - } + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + @DockAnnotation + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + GFbreakGroundService.delete(pd); + map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 + return map; + } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/edit") - @ResponseBody - @Transactional - public Object edit( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); - pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @ResponseBody + @Transactional + @DockAnnotation(hasAnnex = true) + public Object edit( + @RequestParam(value = "FFILE", required = false) MultipartFile[] files + ) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + ArrayList sendPicturesList = new ArrayList<>(); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); + pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); + 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); + pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + } + PageData breakGroundEditData = new PageData(); + PageData breakGroundlogData = new PageData(); + ArrayList measuresList = new ArrayList<>(); + GFbreakGroundService.edit(pd); + GFbreakGroundToMeasuresService.delete(pd); + breakGroundEditData.putAll(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); + measuresList.add(measures); + } + } + if (!pd.get("APPLY_STATUS").equals("0")) { + 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())); + GFbreakGroundLogService.save(log); + breakGroundlogData.putAll(log); - 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); + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y01");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + 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); - 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.edit(pd); + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "确认");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + } + PageData dockData = new PageData(); + dockData.put("breakGroundEditData", JSON.toJSONString(breakGroundEditData)); + dockData.put("breakGroundlogData", JSON.toJSONString(breakGroundlogData)); + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(dockData)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + return map; + } - 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("0")) { - 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())); - GFbreakGroundLogService.save(log); + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editAcceptStatus") + @ResponseBody + @Transactional + @DockAnnotation + 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 mes = new PageData(); - mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y01");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - 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); - // 第3个参数 - PageData params3 = new PageData(); - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - PageData params4 = new PageData(); - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "确认");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - } - 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 = 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()); + 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())); + 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", ""); + ArrayList sendPicturesList = new ArrayList<>(); + ArrayList saveAcceptUserList = new ArrayList<>(); + switch (status) { - 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(","); - 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", "验收通过"); + for (int i = 0; i < SIGNTIME.length; i++) { + signertime = SIGNTIME[i]; + fileList.add(request.getFile("file" + i)); + MultipartFile[] fileArr = new MultipartFile[fileList.size()]; + saveAcceptImg(sendPicturesList,saveAcceptUserList,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; + // 发短信 + 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); - } - } - } + 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; + } + PageData dockData = new PageData(); + dockData.put("saveAcceptUserList", JSON.toJSONString(saveAcceptUserList)); + GFbreakGroundLogService.save(log); + dockData.put("logData", JSON.toJSONString(log)); + dockData.put("STATUS", status); + dockData.put("editData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + map.put("dockData", JSON.toJSONString(dockData)); + map.put("result", errInfo); + return map; + } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editStatus") - @ResponseBody - @Transactional - public Object editStatus( - @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 = GFbreakGroundService.findById(pd); - pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 - pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + private void saveAcceptImg(List sendPicturesList,List saveAcceptUserList,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); + sendPicturesList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName+ + "@@"+fileName); + 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); + saveAcceptUserList.add(cpd); + } + } + } - PageData log = new PageData(); - log.put("BREAKGROUNDLOG_ID", this.get32UUID()); + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editStatus") + @ResponseBody + @Transactional + @DockAnnotation(hasAnnex = true) + public Object editStatus( + @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 = GFbreakGroundService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + ArrayList sendPicturesList = new ArrayList<>(); + ArrayList toMeasuresList = new ArrayList<>(); + 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())); + 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 "2"://作业负责单位 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + 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 "2"://作业负责单位 + 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); + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); + if (pd2.get("PRODUCTION_USER_ID") == null || StringUtils.isBlank(pd2.getString("PRODUCTION_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; + HAZARD_IDENTIFICATION += ";_;"; + if (pd2.get("SAFETY_USER_ID") == null || StringUtils.isBlank(pd2.getString("SAFETY_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; + HAZARD_IDENTIFICATION += ";_;"; + if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; + HAZARD_IDENTIFICATION += ";_;"; + } + } + } + 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", "作业负责单位通过"); + 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); + toMeasuresList.add(measures); + } + } + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; - pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); - if (pd2.get("PRODUCTION_USER_ID") == null || StringUtils.isBlank(pd2.getString("PRODUCTION_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; - HAZARD_IDENTIFICATION += ";_;"; - if (pd2.get("SAFETY_USER_ID") == null || StringUtils.isBlank(pd2.getString("SAFETY_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; - HAZARD_IDENTIFICATION += ";_;"; - if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; - HAZARD_IDENTIFICATION += ";_;"; - } - } - } - 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", "作业负责单位通过"); - 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); - } - break; - - case "3"://所在单位 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + case "3"://所在单位 + 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); + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); - pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("PRODUCTION_CONTENT", pd.get("CONTENT")); - if (pd2.get("SAFETY_USER_ID") == null || StringUtils.isBlank(pd2.getString("SAFETY_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; - HAZARD_IDENTIFICATION += ";_;"; - if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; - HAZARD_IDENTIFICATION += ";_;"; - } - } - 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", "所在单位通过"); + pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("PRODUCTION_CONTENT", pd.get("CONTENT")); + if (pd2.get("SAFETY_USER_ID") == null || StringUtils.isBlank(pd2.getString("SAFETY_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; + HAZARD_IDENTIFICATION += ";_;"; + if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; + HAZARD_IDENTIFICATION += ";_;"; + } + } + 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; + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; - case "4"://安全部门 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + case "4"://安全部门 + 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); + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); - pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); - if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; - HAZARD_IDENTIFICATION += ";_;"; - } - 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", "安全部门通过"); + pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); + if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; + HAZARD_IDENTIFICATION += ";_;"; + } + 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; + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; - case "5"://审批部门 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + case "5"://审批部门 + 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); + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); - pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("LEADER_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", "审批部门通过"); + pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("LEADER_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; + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; - case "6"://验收人 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + case "6"://验收人 + 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); + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); - pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - 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", "验收通过"); + pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + 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 "-2"://作业负责单位 - log.put("ACTION", "作业负责单位打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); - GFbreakGroundService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; + case "-2"://作业负责单位 + log.put("ACTION", "作业负责单位打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); + GFbreakGroundService.edit(pd2); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - break; - case "-3"://所在单位打回 - log.put("ACTION", "所在单位打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("PRODUCTION_CONTENT", pd.get("CONTENT")); - GFbreakGroundService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + break; + case "-3"://所在单位打回 + log.put("ACTION", "所在单位打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("PRODUCTION_CONTENT", pd.get("CONTENT")); + GFbreakGroundService.edit(pd2); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - break; - case "-4"://安全部门打回 - log.put("ACTION", "安全部门打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); - GFbreakGroundService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + break; + case "-4"://安全部门打回 + log.put("ACTION", "安全部门打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); + GFbreakGroundService.edit(pd2); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - break; - case "-5"://审批打回 - log.put("ACTION", "审批部门打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("LEADER_CONTENT", pd.get("CONTENT")); - GFbreakGroundService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + break; + case "-5"://审批打回 + log.put("ACTION", "审批部门打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("LEADER_CONTENT", pd.get("CONTENT")); + GFbreakGroundService.edit(pd2); - // 发短信 - 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; - } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/jhlist") - @ResponseBody - public Object jhlist(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()); - page.setPd(pd); - List varList = GFbreakGroundService.jhlist(page); //列出confinedspace列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/aqlist") - @ResponseBody - public Object aqlist(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()); - page.setPd(pd); - List varList = GFbreakGroundService.aqlist(page); //列出confinedspace列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/jslist") - @ResponseBody - public Object jslist(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()); - page.setPd(pd); - List varList = GFbreakGroundService.jslist(page); //列出confinedspace列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/list") - @ResponseBody - 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()); - page.setPd(pd); - List varList = GFbreakGroundService.list(page); //列出BreakGround列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + // 发短信 + 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); + PageData dockData = new PageData(); + dockData.put("logData",JSON.toJSONString(log)); + dockData.put("STATUS",status); + dockData.put("saveData",JSON.toJSONString(pd2)); + dockData.put("requestData",JSON.toJSONString(pd)); + dockData.put("toMeasuresList",JSON.toJSONString(toMeasuresList)); + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(dockData)); + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goAdd") - @ResponseBody - public Object goAdd() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - map.put("measuresList", GFbreakGroundService.listAllMeasures(pd)); - map.put("result", errInfo); - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/jhlist") + @ResponseBody + public Object jhlist(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()); + page.setPd(pd); + List varList = GFbreakGroundService.jhlist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goEdit") - @ResponseBody - public Object goEdit() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - 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; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/aqlist") + @ResponseBody + public Object aqlist(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()); + page.setPd(pd); + List varList = GFbreakGroundService.aqlist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /**批量删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/deleteAll") - @ResponseBody - public Object deleteAll() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DATA_IDS = pd.getString("DATA_IDS"); - if(Tools.notEmpty(DATA_IDS)){ - String ArrayDATA_IDS[] = DATA_IDS.split(","); - GFbreakGroundService.deleteAll(ArrayDATA_IDS); - errInfo = "success"; - }else{ - errInfo = "error"; - } - map.put("result", errInfo); //返回结果 - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/jslist") + @ResponseBody + public Object jslist(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()); + page.setPd(pd); + List varList = GFbreakGroundService.jslist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 选择短信模板 - * @param appStatus 阶段 - * @param pd2 参数集合 - * @throws Exception - */ - private void switchMessages(String appStatus, PageData pd2) throws Exception { - PageData mes = new PageData(); - List paramsList = new ArrayList(); - PageData params1 = new PageData(); - PageData params2 = new PageData(); - PageData params3 = new PageData(); - PageData params4 = new PageData(); - switch (appStatus) { - case "2"://作业负责单位 - System.out.println(pd2.get("APPLY_STATUS")); - if("2".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("PRODUCTION_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y02");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("3".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y03");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("4".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y04");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("5".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y05");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("6".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - } - // 发短信 + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + 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()); + page.setPd(pd); + List varList = GFbreakGroundService.list(page); //列出BreakGround列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } + + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goAdd") + @ResponseBody + public Object goAdd() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + map.put("measuresList", GFbreakGroundService.listAllMeasures(pd)); + map.put("result", errInfo); + return map; + } + + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + 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; + } + + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + GFbreakGroundService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + } else { + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } + + /** + * 选择短信模板 + * + * @param appStatus 阶段 + * @param pd2 参数集合 + * @throws Exception + */ + private void switchMessages(String appStatus, PageData pd2) throws Exception { + PageData mes = new PageData(); + List paramsList = new ArrayList(); + PageData params1 = new PageData(); + PageData params2 = new PageData(); + PageData params3 = new PageData(); + PageData params4 = new PageData(); + switch (appStatus) { + case "2"://作业负责单位 + System.out.println(pd2.get("APPLY_STATUS")); + if ("2".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("PRODUCTION_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y02");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("3".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y03");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("4".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y04");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("5".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 发短信 - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "所在单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "审核");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - break; + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "所在单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审核");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + break; - case "3"://所在单位 - System.out.println(pd2.get("APPLY_STATUS")); - if("3".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y03");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("4".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y04");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("5".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y05");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("6".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - } - // 发短信 - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + case "3"://所在单位 + System.out.println(pd2.get("APPLY_STATUS")); + if ("3".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y03");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("4".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y04");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("5".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 发短信 + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "安全部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "审核");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - break; + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "安全部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审核");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + break; - case "4"://安全部门 - System.out.println(pd2.get("APPLY_STATUS")); - if("4".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y04");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("5".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y05");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("6".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - } - // 发短信 - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + case "4"://安全部门 + System.out.println(pd2.get("APPLY_STATUS")); + if ("4".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y04");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("5".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 发短信 + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "审批部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "审批");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - break; + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "审批部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审批");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + break; - case "5"://审批部门 - System.out.println(pd2.get("APPLY_STATUS")); - if("5".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y05");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("6".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - } - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + case "5"://审批部门 + System.out.println(pd2.get("APPLY_STATUS")); + if ("5".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "验收");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "验收");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - break; + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + break; - case "6"://验收人 - System.out.println(pd2.get("APPLY_STATUS")); - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + case "6"://验收人 + System.out.println(pd2.get("APPLY_STATUS")); + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "type");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-2"://作业负责单位 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_N02");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 第2个参数 + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-2"://作业负责单位 + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_N02");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-3"://所在单位打回 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_N03");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-3"://所在单位打回 + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_N03");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "所在单位意见");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-4"://安全部门打回 + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "所在单位意见");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-4"://安全部门打回 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_N04");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_N04");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "安全部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-5"://审批打回 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_N05");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "安全部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-5"://审批打回 + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_N05");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "审批部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-6"://验收打回 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DT_N06");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "审批部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-6"://验收打回 + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DT_N06");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "动土作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "验收部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - default: - break; - } - } + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "动土作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "验收部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + default: + break; + } + } - /**待办作业数统计 - * @param - * @throws Exception - */ - @RequestMapping(value="/countCheck") - @ResponseBody - public Object countCheck() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = this.getPageData(); - PageData count = GFbreakGroundService.countCheck(pd); - map.put("result", errInfo); - map.put("count", count); - return map; - } + /** + * 待办作业数统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/countCheck") + @ResponseBody + public Object countCheck() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + PageData count = GFbreakGroundService.countCheck(pd); + map.put("result", errInfo); + map.put("count", count); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index c049754b..7376b47f 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java @@ -422,6 +422,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -432,8 +433,10 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); GFconfinedspaceService.edit(pd2); map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); } if(pd.get("APPLY_STATUS").equals("1")) { @@ -500,6 +503,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList<>(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -510,8 +514,10 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pictureList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); GFconfinedspaceService.edit(pd2); map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); } map.put("result", errInfo); return map; @@ -556,7 +562,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional - @DockAnnotation + @DockAnnotation(hasAnnex = true) public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -571,18 +577,20 @@ public class AppGFConfinedSpaceController extends BaseController { String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + ArrayList pictureList = new ArrayList<>(); 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")); + 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"),pictureList); fileList.clear(); } map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); 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{ + private void saveImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList pictureList) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { PageData pd = new PageData(); @@ -603,6 +611,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); pd.put("ACCEPT_USER_ID",""); pd.put("ACCEPT_DEPARTMENT_ID", ""); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); confinedspaceacceptuserService.save(pd); } } @@ -611,7 +620,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editAcceptStatus") @ResponseBody @Transactional - @DockAnnotation + @DockAnnotation(hasAnnex = true) public Object editAcceptStatus(MultipartRequest request) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -644,13 +653,15 @@ public class AppGFConfinedSpaceController extends BaseController { String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + ArrayList pictureList = new ArrayList<>(); 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")); + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); fileList.clear(); } + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); @@ -719,7 +730,7 @@ public class AppGFConfinedSpaceController extends BaseController { 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{ + private void saveAcceptImg(MultipartFile[] files,String signertime, String CONFINEDSPACE_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList pictureList) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { PageData cpd = new PageData(); @@ -740,6 +751,7 @@ public class AppGFConfinedSpaceController extends BaseController { cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); cpd.put("ACCEPT_CONFESS_USER_ID", ""); cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); confinedspaceacceptuserService.save(cpd); } } @@ -754,7 +766,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editStatus") @ResponseBody @Transactional - @DockAnnotation + @DockAnnotation(hasAnnex = true) public Object editStatus( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -785,6 +797,7 @@ public class AppGFConfinedSpaceController extends BaseController { switch (status) { case "4"://确认 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -803,9 +816,11 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("ACCEPT_CONFESS_DEPARTMENT_ID", pd.get("ACCEPT_CONFESS_DEPARTMENT_ID")); pd2.put("ACCEPT_CONFESS_USER_ID", pd.get("ACCEPT_CONFESS_USER_ID")); pd2.put("EDUCATE_USER", pd.get("EDUCATE_USER")); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); GFconfinedspaceService.edit(pd2); GFconfinedspaceToMeasuresService.delete(pd2); map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); List list = (List) JSON.parse(pd.get("measuresList").toString()); for (JSONObject json : list) { PageData measures = new PageData(); @@ -867,6 +882,7 @@ public class AppGFConfinedSpaceController extends BaseController { case "3"://监护人确认 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -877,8 +893,10 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); GFconfinedspaceService.edit(pd2); map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); log.put("ACTION", "监护人确认通过"); } return map; @@ -995,6 +1013,7 @@ public class AppGFConfinedSpaceController extends BaseController { case "5"://所在单位确认 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -1005,8 +1024,10 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); GFconfinedspaceService.edit(pd2); map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); log.put("ACTION", "所在单位审批通过"); @@ -1064,6 +1085,7 @@ public class AppGFConfinedSpaceController extends BaseController { case "6"://验收人 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); MultipartFile file = files[0]; String ffile = DateUtil.getDays(); @@ -1074,8 +1096,10 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); GFconfinedspaceService.edit(pd2); map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); log.put("ACTION", "验收通过"); // 发短信 diff --git a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java index 9b3f375f..2d474e88 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFCutRoadController.java @@ -2,6 +2,7 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -31,1203 +32,1257 @@ import java.util.*; @RequestMapping("/app/gfCutRoad") public class AppGFCutRoadController extends BaseController { - @Resource - private GFCutRoadService GFcutRoadService; - @Resource - private GFCutRoadLogService GFcutRoadLogService; - @Resource - private GFCutRoadToMeasuresService GFcutRoadToMeasuresService; - @Autowired - private GFCutRoadAcceptUserService cutroadacceptuserService; - @Autowired - private SendMessageUtil sendMessageUtil; - /**获取编码 - * @param - * @throws Exception - */ - @RequestMapping(value="/getCode") - @ResponseBody - public Object getCode() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - 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)); - pd.put("CREATDATE",year + "-" + month + "-" + day); - pd = GFcutRoadService.getCode(pd); //根据ID读取 - String code = "DL"+year + month + day + dft.format((Integer.parseInt(pd.get("code").toString())+1)); - map.put("code", code); - map.put("result", errInfo); - return map; - } + @Resource + private GFCutRoadService GFcutRoadService; + @Resource + private GFCutRoadLogService GFcutRoadLogService; + @Resource + private GFCutRoadToMeasuresService GFcutRoadToMeasuresService; + @Autowired + private GFCutRoadAcceptUserService cutroadacceptuserService; + @Autowired + private SendMessageUtil sendMessageUtil; - /**新增 - * @param - * @throws Exception - */ - @RequestMapping(value="/add") - @ResponseBody - @Transactional - public Object add( - @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(); - 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 = GFcutRoadService.getCode(pd2); //根据ID读取 - String code = "DL"+year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString())+1)); - pd = this.getPageData(); - pd.put("CHECK_NO", code); - pd.put("CUTROAD_ID", this.get32UUID()); //主键 - pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 - pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 - pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); - pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + /** + * 获取编码 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/getCode") + @ResponseBody + public Object getCode() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + 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)); + pd.put("CREATDATE", year + "-" + month + "-" + day); + pd = GFcutRoadService.getCode(pd); //根据ID读取 + String code = "DL" + year + month + day + dft.format((Integer.parseInt(pd.get("code").toString()) + 1)); + map.put("code", code); + map.put("result", errInfo); + return map; + } - 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); + /** + * 新增 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/add") + @ResponseBody + @Transactional + @DockAnnotation(hasAnnex = true) + public Object add( + @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(); + 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 = GFcutRoadService.getCode(pd2); //根据ID读取 + ArrayList sendPicturesList = new ArrayList<>(); + String code = "DL" + year + month + day + dft.format((Integer.parseInt(pd2.get("code").toString()) + 1)); - pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - } - GFcutRoadService.save(pd); + pd = this.getPageData(); + pd.put("CHECK_NO", code); + pd.put("CUTROAD_ID", this.get32UUID()); //主键 + pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 + pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); + pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); + 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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + + "@@" + + fileName); + pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + } + GFcutRoadService.save(pd); + if ("1".equals(pd.get("APPLY_STATUS"))) { + PageData log = new PageData(); + log.put("CUTROADLOG_ID", this.get32UUID()); + log.put("ACTION", "提交申请"); + log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); + log.put("CREATOR", pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + GFcutRoadLogService.save(log); + pd.put("logData", JSON.toJSONString(log)); + + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y01");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + 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); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "确认");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + } + map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); + return map; + } + + /** + * 上传图 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/uploadImg") + @ResponseBody + @Transactional + public Object uploadImg( + @RequestParam(value = "FFILE", required = false) MultipartFile[] files + ) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + 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); + + map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + } + + map.put("result", errInfo); + return map; + } + + /** + * 删除图 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteImg") + @ResponseBody + @Transactional + public Object deleteImg() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + Smb.deleteFile(pd.getString("path")); + map.put("result", errInfo); + return map; + } - if(pd.get("APPLY_STATUS").equals("1")) { - PageData log = new PageData(); - log.put("CUTROADLOG_ID", this.get32UUID()); - log.put("ACTION", "提交申请"); - log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); - log.put("CREATOR",pd.get("ACTION_USER")); - log.put("CREATTIME", DateUtil.date2Str(new Date())); - GFcutRoadLogService.save(log); + /** + * 删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/delete") + @ResponseBody + public Object delete() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + GFcutRoadService.delete(pd); + map.put("result", errInfo); //返回结果 + return map; + } - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y01");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - 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); + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/edit") + @ResponseBody + @Transactional + @DockAnnotation + public Object edit( + @RequestParam(value = "FFILE", required = false) MultipartFile[] files + ) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = this.getPageData(); + ArrayList sendPicturesList = new ArrayList<>(); + pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); + pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); + 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); + pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + sendPicturesList.add(pd.getString("APPLY_USER_SIGNER_PATH") + "@@" + fileName); + pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + } + GFcutRoadService.edit(pd); - // 第2个参数 - PageData params2 = new PageData(); - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - PageData params3 = new PageData(); - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - PageData params4 = new PageData(); - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "确认");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - } + GFcutRoadToMeasuresService.delete(pd); + ArrayList measuresdataList = new ArrayList<>(); + if (pd.get("measuresList") != null) { + List list = (List) JSON.parse(pd.get("measuresList").toString()); + for (JSONObject json : list) { + PageData measures = new PageData(); + measures.put("CUTROADTOMEASURES_ID", this.get32UUID()); // 主键 + measures.put("CUTROAD_ID", pd.get("CUTROAD_ID")); + measures.put("BUS_CUTROAD_MEASURES_ID", json.get("BUS_CUTROAD_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")); + GFcutRoadToMeasuresService.save(measures); + measuresdataList.add(measures); + } + } + if (!pd.get("APPLY_STATUS").equals("0")) { + PageData log = new PageData(); + log.put("CUTROADLOG_ID", this.get32UUID()); + log.put("ACTION", "修改申请,重新提交"); + log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); + log.put("CREATOR", pd.get("ACTION_USER")); + log.put("CREATTIME", DateUtil.date2Str(new Date())); + GFcutRoadLogService.save(log); - map.put("result", errInfo); - return map; - } + // 发短信 + PageData mes = new PageData(); + mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y01");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + 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); - /**上传图 - * @param - * @throws Exception - */ - @RequestMapping(value="/uploadImg") - @ResponseBody - @Transactional - public Object uploadImg( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + // 第2个参数 + PageData params2 = new PageData(); + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + PageData params3 = new PageData(); + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + PageData params4 = new PageData(); + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "确认");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + } + map.put("result", errInfo); + return map; + } - 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); + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editGuardian") + @ResponseBody + @Transactional + public Object editGuardian( + @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 = GFcutRoadService.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]; - map.put("path", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - } + 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); - map.put("result", errInfo); - return map; - } + pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + GFcutRoadService.edit(pd2); + } - /**删除图 - * @param - * @throws Exception - */ - @RequestMapping(value="/deleteImg") - @ResponseBody - @Transactional - public Object deleteImg() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - Smb.deleteFile(pd.getString("path")); - map.put("result", errInfo); - return map; - } + map.put("result", errInfo); + return map; + } + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editConfess") + @ResponseBody + @Transactional + public Object editConfess( + @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 = GFcutRoadService.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]; - /**删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/delete") - @ResponseBody - public Object delete() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - GFcutRoadService.delete(pd); - map.put("result", errInfo); //返回结果 - return map; - } + 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); - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/edit") - @ResponseBody - @Transactional - public Object edit( - @RequestParam(value="FFILE",required=false) MultipartFile[] files - ) throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - pd.put("OTHER_PROTECTIVE_MEASURES", (StringUtils.isNotBlank(pd.getString("OTHER_PROTECTIVE_MEASURES")) ? pd.getString("OTHER_PROTECTIVE_MEASURES") : "") + ";_;"); - pd.put("HAZARD_IDENTIFICATION", (StringUtils.isNotBlank(pd.getString("HAZARD_IDENTIFICATION")) ? pd.getString("HAZARD_IDENTIFICATION") : "") + ";_;"); - 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); - - pd.put("APPLY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd.put("APPLY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - } - GFcutRoadService.edit(pd); - - GFcutRoadToMeasuresService.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("CUTROADTOMEASURES_ID", this.get32UUID()); // 主键 - measures.put("CUTROAD_ID", pd.get("CUTROAD_ID")); - measures.put("BUS_CUTROAD_MEASURES_ID", json.get("BUS_CUTROAD_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")); - GFcutRoadToMeasuresService.save(measures); - } - } - if(!pd.get("APPLY_STATUS").equals("0")) { - PageData log = new PageData(); - log.put("CUTROADLOG_ID", this.get32UUID()); - log.put("ACTION", "修改申请,重新提交"); - log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); - log.put("CREATOR",pd.get("ACTION_USER")); - log.put("CREATTIME", DateUtil.date2Str(new Date())); - GFcutRoadLogService.save(log); - - // 发短信 - PageData mes = new PageData(); - mes.put("RECEIVER_ID", pd.get("CONSTRUCTION_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y01");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - 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); - // 第3个参数 - PageData params3 = new PageData(); - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - PageData params4 = new PageData(); - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "确认");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - } - map.put("result", errInfo); - return map; - } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editGuardian") - @ResponseBody - @Transactional - public Object editGuardian( - @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 = GFcutRoadService.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("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - GFcutRoadService.edit(pd2); - } - - map.put("result", errInfo); - return map; - } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editConfess") - @ResponseBody - @Transactional - public Object editConfess( - @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 = GFcutRoadService.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("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFcutRoadService.edit(pd2); - } - map.put("result", errInfo); - return map; - } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editAcceptconfess") - @ResponseBody - @Transactional - public Object editAcceptconfess(MultipartRequest request) throws Exception { - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData pd2 = new PageData(); - pd2 = GFcutRoadService.findById(pd); - pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 - pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - List fileList = new ArrayList(); - String signertime = ""; - String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + GFcutRoadService.edit(pd2); + } + map.put("result", errInfo); + return map; + } - 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("CUTROAD_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 CUTROAD_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("CUTROAD_ID", CUTROAD_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", ""); - cutroadacceptuserService.save(pd); - } - } - } + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editAcceptconfess") + @ResponseBody + @Transactional + public Object editAcceptconfess(MultipartRequest request) throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData pd2 = new PageData(); + pd2 = GFcutRoadService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + List fileList = new ArrayList(); + String signertime = ""; + String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - /**修改 - * @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 = GFcutRoadService.findById(pd); - pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 - pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + 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("CUTROAD_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; + } - PageData log = new PageData(); - log.put("CUTROADLOG_ID", this.get32UUID()); + private void saveImg(MultipartFile[] files, String signertime, String CUTROAD_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("CUTROAD_ID", CUTROAD_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", ""); + cutroadacceptuserService.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 = GFcutRoadService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + + PageData log = new PageData(); + log.put("CUTROADLOG_ID", this.get32UUID()); // log.put("ACTION", "审核打回"); - log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); - log.put("CREATOR",pd.get("ACTION_USER")); - log.put("CREATTIME", DateUtil.date2Str(new Date())); + log.put("CUTROAD_ID", pd.get("CUTROAD_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 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("OTHER_PROTECTIVE_MEASURES", ""); // pd2.put("HAZARD_IDENTIFICATION", ""); - switch (status) { + switch (status) { - case "6"://验收人 - List fileList = new ArrayList(); - String signertime = ""; - String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + 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); + 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")); - GFcutRoadService.edit(pd2); - log.put("ACTION", "验收通过"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFcutRoadService.edit(pd2); + log.put("ACTION", "验收通过"); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); - break; + break; - case "-6"://审批打回 - log.put("ACTION", "验收人打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); - GFcutRoadService.edit(pd2); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - break; - default: - break; - } - GFcutRoadLogService.save(log); - map.put("result", errInfo); - return map; - } + case "-6"://审批打回 + log.put("ACTION", "验收人打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + GFcutRoadService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + break; + default: + break; + } + GFcutRoadLogService.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); - cutroadacceptuserService.save(cpd); - } - } - } + 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); + cutroadacceptuserService.save(cpd); + } + } + } - /**修改 - * @param - * @throws Exception - */ - @RequestMapping(value="/editStatus") - @ResponseBody - @Transactional - public Object editStatus( - @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 = GFcutRoadService.findById(pd); - pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 - pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + /** + * 修改 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/editStatus") + @ResponseBody + @Transactional + public Object editStatus( + @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 = GFcutRoadService.findById(pd); + pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 + pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 - PageData log = new PageData(); - log.put("CUTROADLOG_ID", this.get32UUID()); + PageData log = new PageData(); + log.put("CUTROADLOG_ID", this.get32UUID()); // log.put("ACTION", "审核打回"); - log.put("CUTROAD_ID", pd.get("CUTROAD_ID")); - log.put("CREATOR",pd.get("ACTION_USER")); - log.put("CREATTIME", DateUtil.date2Str(new Date())); + log.put("CUTROAD_ID", pd.get("CUTROAD_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 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("OTHER_PROTECTIVE_MEASURES", ""); // pd2.put("HAZARD_IDENTIFICATION", ""); - switch (status) { - case "2"://作业负责单位 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + switch (status) { + case "2"://作业负责单位 + 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); + 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("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); - if (pd2.get("PRODUCTION_USER_ID") == null || StringUtils.isBlank(pd2.getString("PRODUCTION_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; + pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); + if (pd2.get("PRODUCTION_USER_ID") == null || StringUtils.isBlank(pd2.getString("PRODUCTION_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; // HAZARD_IDENTIFICATION += ";_;"; - if (pd2.get("SAFETY_USER_ID") == null || StringUtils.isBlank(pd2.getString("SAFETY_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; + if (pd2.get("SAFETY_USER_ID") == null || StringUtils.isBlank(pd2.getString("SAFETY_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; // HAZARD_IDENTIFICATION += ";_;"; - if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; + if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; // HAZARD_IDENTIFICATION += ";_;"; - } - } - } - pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + } + } + } + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); // pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFcutRoadService.edit(pd2); - log.put("ACTION", "作业负责单位通过"); - GFcutRoadToMeasuresService.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("CUTROADTOMEASURES_ID", this.get32UUID()); // 主键 - measures.put("CUTROAD_ID", pd.get("CUTROAD_ID")); - measures.put("BUS_CUTROAD_MEASURES_ID", json.get("BUS_CUTROAD_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")); - GFcutRoadToMeasuresService.save(measures); - } - } - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - } - break; + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFcutRoadService.edit(pd2); + log.put("ACTION", "作业负责单位通过"); + GFcutRoadToMeasuresService.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("CUTROADTOMEASURES_ID", this.get32UUID()); // 主键 + measures.put("CUTROAD_ID", pd.get("CUTROAD_ID")); + measures.put("BUS_CUTROAD_MEASURES_ID", json.get("BUS_CUTROAD_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")); + GFcutRoadToMeasuresService.save(measures); + } + } + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; - case "3"://所在单位 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + case "3"://所在单位 + 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); + 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("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("PRODUCTION_CONTENT", pd.get("CONTENT")); - if (pd2.get("SAFETY_USER_ID") == null || StringUtils.isBlank(pd2.getString("SAFETY_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; + pd2.put("PRODUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("PRODUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("PRODUCTION_CONTENT", pd.get("CONTENT")); + if (pd2.get("SAFETY_USER_ID") == null || StringUtils.isBlank(pd2.getString("SAFETY_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; // HAZARD_IDENTIFICATION += ";_;"; - if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; + if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; // HAZARD_IDENTIFICATION += ";_;"; - } - } - pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + } + } + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); // pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFcutRoadService.edit(pd2); - log.put("ACTION", "所在单位通过"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFcutRoadService.edit(pd2); + log.put("ACTION", "所在单位通过"); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - } - break; + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; - case "4"://安全部门 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + case "4"://安全部门 + 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); + 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("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); - if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { - OTHER_PROTECTIVE_MEASURES += ";_;"; + pd2.put("SAFETY_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("SAFETY_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); + if (pd2.get("LEADER_USER_ID") == null || StringUtils.isBlank(pd2.getString("LEADER_USER_ID"))) { + OTHER_PROTECTIVE_MEASURES += ";_;"; // HAZARD_IDENTIFICATION += ";_;"; - } - pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + } + pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); // pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - GFcutRoadService.edit(pd2); - log.put("ACTION", "安全部门通过"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFcutRoadService.edit(pd2); + log.put("ACTION", "安全部门通过"); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - } - break; + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; - case "5"://审批部门 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + case "5"://审批部门 + 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); + 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("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("LEADER_CONTENT", pd.get("CONTENT")); - pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + pd2.put("LEADER_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")); - GFcutRoadService.edit(pd2); - log.put("ACTION", "审批部门通过"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFcutRoadService.edit(pd2); + log.put("ACTION", "审批部门通过"); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - } - break; + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; - case "6"://验收人 - if (files != null && files.length > 0) { - MultipartFile file = files[0]; + case "6"://验收人 + 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); + 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_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); - pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); - pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); - pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); + pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + 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")); - GFcutRoadService.edit(pd2); - log.put("ACTION", "验收通过"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + GFcutRoadService.edit(pd2); + log.put("ACTION", "验收通过"); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - } - break; - case "-2"://作业负责单位 - log.put("ACTION", "作业负责单位打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); - GFcutRoadService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + } + break; + case "-2"://作业负责单位 + log.put("ACTION", "作业负责单位打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); + GFcutRoadService.edit(pd2); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - break; - case "-3"://所在单位打回 - log.put("ACTION", "所在单位打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("PRODUCTION_CONTENT", pd.get("CONTENT")); - GFcutRoadService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + break; + case "-3"://所在单位打回 + log.put("ACTION", "所在单位打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("PRODUCTION_CONTENT", pd.get("CONTENT")); + GFcutRoadService.edit(pd2); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - break; - case "-4"://安全部门打回 - log.put("ACTION", "安全部门打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); - GFcutRoadService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + break; + case "-4"://安全部门打回 + log.put("ACTION", "安全部门打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("SAFETY_CONTENT", pd.get("CONTENT")); + GFcutRoadService.edit(pd2); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - break; - case "-5"://审批打回 - log.put("ACTION", "审批部门打回"); - pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); - pd2.put("LEADER_CONTENT", pd.get("CONTENT")); - GFcutRoadService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + break; + case "-5"://审批打回 + log.put("ACTION", "审批部门打回"); + pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + pd2.put("LEADER_CONTENT", pd.get("CONTENT")); + GFcutRoadService.edit(pd2); - // 发短信 - 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")); - GFcutRoadService.edit(pd2); - // 发短信 - this.switchMessages(pd.get("APPLY_STATUS").toString(),pd2); - break; - default: - break; - } - GFcutRoadLogService.save(log); - map.put("result", errInfo); - return map; - } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/jhlist") - @ResponseBody - public Object jhlist(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()); - page.setPd(pd); - List varList = GFcutRoadService.jhlist(page); //列出confinedspace列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/aqlist") - @ResponseBody - public Object aqlist(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()); - page.setPd(pd); - List varList = GFcutRoadService.aqlist(page); //列出confinedspace列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/jslist") - @ResponseBody - public Object jslist(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()); - page.setPd(pd); - List varList = GFcutRoadService.jslist(page); //列出confinedspace列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } - /**列表 - * @param page - * @throws Exception - */ - @RequestMapping(value="/list") - @ResponseBody - 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()); - page.setPd(pd); - List varList = GFcutRoadService.list(page); //列出CutRoad列表 - map.put("varList", varList); - map.put("page", page); - map.put("result", errInfo); - return map; - } + // 发短信 + 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")); + GFcutRoadService.edit(pd2); + // 发短信 + this.switchMessages(pd.get("APPLY_STATUS").toString(), pd2); + break; + default: + break; + } + GFcutRoadLogService.save(log); + map.put("result", errInfo); + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goAdd") - @ResponseBody - public Object goAdd() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - map.put("measuresList", GFcutRoadService.listAllMeasures(pd)); - map.put("result", errInfo); - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/jhlist") + @ResponseBody + public Object jhlist(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()); + page.setPd(pd); + List varList = GFcutRoadService.jhlist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /**去修改页面获取数据 - * @param - * @throws Exception - */ - @RequestMapping(value="/goEdit") - @ResponseBody - public Object goEdit() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - pd = GFcutRoadService.findById(pd); //根据ID读取 - map.put("pd", pd); - map.put("measuresList", GFcutRoadService.listAllMeasures(pd)); - map.put("imgList",cutroadacceptuserService.findByIds(pd)); - map.put("imgList1",cutroadacceptuserService.findById(pd)); - map.put("result", errInfo); - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/aqlist") + @ResponseBody + public Object aqlist(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()); + page.setPd(pd); + List varList = GFcutRoadService.aqlist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /**批量删除 - * @param - * @throws Exception - */ - @RequestMapping(value="/deleteAll") - @ResponseBody - public Object deleteAll() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - String DATA_IDS = pd.getString("DATA_IDS"); - if(Tools.notEmpty(DATA_IDS)){ - String ArrayDATA_IDS[] = DATA_IDS.split(","); - GFcutRoadService.deleteAll(ArrayDATA_IDS); - errInfo = "success"; - }else{ - errInfo = "error"; - } - map.put("result", errInfo); //返回结果 - return map; - } + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/jslist") + @ResponseBody + public Object jslist(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()); + page.setPd(pd); + List varList = GFcutRoadService.jslist(page); //列出confinedspace列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - /** - * 选择短信模板 - * @param appStatus 阶段 - * @param pd2 参数集合 - * @throws Exception - */ - private void switchMessages(String appStatus, PageData pd2) throws Exception { - PageData mes = new PageData(); + /** + * 列表 + * + * @param page + * @throws Exception + */ + @RequestMapping(value = "/list") + @ResponseBody + 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()); + page.setPd(pd); + List varList = GFcutRoadService.list(page); //列出CutRoad列表 + map.put("varList", varList); + map.put("page", page); + map.put("result", errInfo); + return map; + } - List paramsList = new ArrayList(); - PageData params1 = new PageData(); - PageData params2 = new PageData(); - PageData params3 = new PageData(); - PageData params4 = new PageData(); - System.out.println((pd2.get("APPLY_STATUS"))); - switch (appStatus) { - case "2"://作业负责单位 - System.out.println(pd2.get("APPLY_STATUS")); - if("2".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("PRODUCTION_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y02");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("3".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y03");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("4".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y04");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("5".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y05");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("6".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - } - // 发短信 + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goAdd") + @ResponseBody + public Object goAdd() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + map.put("measuresList", GFcutRoadService.listAllMeasures(pd)); + map.put("result", errInfo); + return map; + } - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + /** + * 去修改页面获取数据 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/goEdit") + @ResponseBody + public Object goEdit() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + pd = GFcutRoadService.findById(pd); //根据ID读取 + map.put("pd", pd); + map.put("measuresList", GFcutRoadService.listAllMeasures(pd)); + map.put("imgList", cutroadacceptuserService.findByIds(pd)); + map.put("imgList1", cutroadacceptuserService.findById(pd)); + map.put("result", errInfo); + return map; + } - // 第2个参数 - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "所在单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "审核");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - break; + /** + * 批量删除 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/deleteAll") + @ResponseBody + public Object deleteAll() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + String DATA_IDS = pd.getString("DATA_IDS"); + if (Tools.notEmpty(DATA_IDS)) { + String ArrayDATA_IDS[] = DATA_IDS.split(","); + GFcutRoadService.deleteAll(ArrayDATA_IDS); + errInfo = "success"; + } else { + errInfo = "error"; + } + map.put("result", errInfo); //返回结果 + return map; + } - case "3"://所在单位 + /** + * 选择短信模板 + * + * @param appStatus 阶段 + * @param pd2 参数集合 + * @throws Exception + */ + private void switchMessages(String appStatus, PageData pd2) throws Exception { + PageData mes = new PageData(); - // 发短信 - if("3".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y03");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("4".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y04");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("5".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y05");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("6".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - } - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + List paramsList = new ArrayList(); + PageData params1 = new PageData(); + PageData params2 = new PageData(); + PageData params3 = new PageData(); + PageData params4 = new PageData(); + System.out.println((pd2.get("APPLY_STATUS"))); + switch (appStatus) { + case "2"://作业负责单位 + System.out.println(pd2.get("APPLY_STATUS")); + if ("2".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("PRODUCTION_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y02");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("3".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y03");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("4".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y04");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("5".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 发短信 - // 第2个参数 - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "安全部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "审核");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - break; + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - case "4"://安全部门 + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "所在单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审核");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + break; - // 发短信 - if("4".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y04");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("5".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y05");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("6".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - } - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + case "3"://所在单位 - // 第2个参数 - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "审批部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "审批");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - break; + // 发短信 + if ("3".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("SAFETY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y03");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("4".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y04");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("5".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - case "5"://审批部门 + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "安全部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审核");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + break; - // 发短信 - if("4".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y05");// 短信模板编码 - mes.put("SMSCode", "SMS_227245922");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - }else if("5".equals(pd2.get("APPLY_STATUS"))){ - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - } - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + case "4"://安全部门 - // 第2个参数 - params2.put("name", "params1");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params2");// 存入短信模板中的参数名称 - params3.put("value", "验收");// 存入上面参数名称所传递的值 - paramsList.add(params3); - // 第4个参数 - params4.put("name", "params3");// 存入短信模板中的参数名称 - params4.put("value", "验收");// 存入上面参数名称所传递的值 - paramsList.add(params4); - sendMessageUtil.sendMessages(mes, paramsList); - break; + // 发短信 + if ("4".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("LEADER_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y04");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("5".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("6".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - case "6"://验收人 + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "审批部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "审批");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + break; - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_Y06");// 短信模板编码 - mes.put("SMSCode", "SMS_227250920");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "number");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + case "5"://审批部门 - // 第2个参数 - params2.put("name", "type");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-2"://作业负责单位 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_N02");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 发短信 + if ("4".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("ACCEPT_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y05");// 短信模板编码 + mes.put("SMSCode", "SMS_227245922");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } else if ("5".equals(pd2.get("APPLY_STATUS"))) { + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + } + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-3"://所在单位打回 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_N03");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 第2个参数 + params2.put("name", "params1");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params2");// 存入短信模板中的参数名称 + params3.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList.add(params3); + // 第4个参数 + params4.put("name", "params3");// 存入短信模板中的参数名称 + params4.put("value", "验收");// 存入上面参数名称所传递的值 + paramsList.add(params4); + sendMessageUtil.sendMessages(mes, paramsList); + break; - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "所在单位");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-4"://安全部门打回 + case "6"://验收人 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_N04");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_Y06");// 短信模板编码 + mes.put("SMSCode", "SMS_227250920");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "number");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "安全部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-5"://审批打回 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_N05");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 第2个参数 + params2.put("name", "type");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-2"://作业负责单位 + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_N02");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "审批部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - case "-6"://验收打回 - // 发短信 - mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid - mes.put("templateCode", "DL_N06");// 短信模板编码 - mes.put("SMSCode", "SMS_223580715");// 短信模板编码 - mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id - // 第1个参数 - params1.put("name", "params1");// 存入短信模板中的参数名称 - params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 - paramsList.add(params1); + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "作业负责单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-3"://所在单位打回 + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_N03");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); - // 第2个参数 - params2.put("name", "params2");// 存入短信模板中的参数名称 - params2.put("value", "断路作业");// 存入上面参数名称所传递的值 - paramsList.add(params2); - // 第3个参数 - params3.put("name", "params3");// 存入短信模板中的参数名称 - params3.put("value", "验收部门");// 存入上面参数名称所传递的值 - paramsList.add(params3); - sendMessageUtil.sendMessages(mes, paramsList); - break; - default: - break; - } - } + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "所在单位");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-4"://安全部门打回 - /**待办作业数统计 - * @param - * @throws Exception - */ - @RequestMapping(value="/countCheck") - @ResponseBody - public Object countCheck() throws Exception{ - Map map = new HashMap(); - String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); - PageData count = GFcutRoadService.countCheck(pd); - map.put("result", errInfo); - map.put("count", count); - return map; - } + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_N04");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "安全部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-5"://审批打回 + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_N05");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "审批部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + case "-6"://验收打回 + // 发短信 + mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid + mes.put("templateCode", "DL_N06");// 短信模板编码 + mes.put("SMSCode", "SMS_223580715");// 短信模板编码 + mes.put("CORPINFO_ID", pd2.get("CORPINFO_ID"));// 企业id + // 第1个参数 + params1.put("name", "params1");// 存入短信模板中的参数名称 + params1.put("value", pd2.get("CHECK_NO"));// 存入上面参数名称所传递的值 + paramsList.add(params1); + + // 第2个参数 + params2.put("name", "params2");// 存入短信模板中的参数名称 + params2.put("value", "断路作业");// 存入上面参数名称所传递的值 + paramsList.add(params2); + // 第3个参数 + params3.put("name", "params3");// 存入短信模板中的参数名称 + params3.put("value", "验收部门");// 存入上面参数名称所传递的值 + paramsList.add(params3); + sendMessageUtil.sendMessages(mes, paramsList); + break; + default: + break; + } + } + + /** + * 待办作业数统计 + * + * @param + * @throws Exception + */ + @RequestMapping(value = "/countCheck") + @ResponseBody + public Object countCheck() throws Exception { + Map map = new HashMap(); + String errInfo = "success"; + PageData pd = new PageData(); + pd = this.getPageData(); + PageData count = GFcutRoadService.countCheck(pd); + map.put("result", errInfo); + map.put("count", count); + return map; + } } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java index fc56ce84..e3f830a0 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFElectricityController.java @@ -2,6 +2,7 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.dto.TenCorpConst; import com.zcloud.dto.TenCorpDto; @@ -84,6 +85,7 @@ public class AppGFElectricityController extends BaseController { @RequestMapping(value="/add") @ResponseBody @Transactional + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -105,6 +107,7 @@ public class AppGFElectricityController extends BaseController { pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + map.put("dockData", JSON.toJSONString(pd)); GFelectricityService.save(pd); if(pd.get("APPLY_STATUS").equals("1")) { @@ -114,6 +117,7 @@ public class AppGFElectricityController extends BaseController { log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID")); log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockDataLog", JSON.toJSONString(log)); GFelectricityLogService.save(log); // 发短信 @@ -184,12 +188,14 @@ public class AppGFElectricityController extends BaseController { */ @RequestMapping(value="/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFelectricityService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -201,12 +207,14 @@ public class AppGFElectricityController extends BaseController { @RequestMapping(value="/edit") @ResponseBody @Transactional + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFelectricityService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); if(pd.get("APPLY_STATUS").equals("1")) { PageData log = new PageData(); log.put("ELECTRICITYLOG_ID", this.get32UUID()); @@ -214,6 +222,7 @@ public class AppGFElectricityController extends BaseController { log.put("ELECTRICITY_ID", pd.get("ELECTRICITY_ID")); log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockDataLog", JSON.toJSONString(log)); GFelectricityLogService.save(log); // 发短信 @@ -267,6 +276,7 @@ public class AppGFElectricityController extends BaseController { @RequestMapping(value="/editGuardian") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editGuardian( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -279,21 +289,26 @@ public class AppGFElectricityController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFelectricityService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); } map.put("result", errInfo); return map; } + /**修改 * @param * @throws Exception @@ -301,6 +316,7 @@ public class AppGFElectricityController extends BaseController { @RequestMapping(value="/editConfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editConfess( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -313,21 +329,26 @@ public class AppGFElectricityController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFelectricityService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); } map.put("result", errInfo); return map; } + /**修改 * @param * @throws Exception @@ -335,6 +356,7 @@ public class AppGFElectricityController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -348,17 +370,23 @@ public class AppGFElectricityController extends BaseController { String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + ArrayList pictureList = new ArrayList(); 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("ELECTRICITY_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); + saveImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"), + pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"), + pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID"),pictureList); fileList.clear(); } + map.put("sendPicturesList", JSON.toJSONString(pictureList)); map.put("result", errInfo); return map; } - private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID) throws Exception{ + private void saveImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, + String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, + String ACCEPT_CONFESS_DEPARTMENT_ID, ArrayList pictureList) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { PageData pd = new PageData(); @@ -379,6 +407,7 @@ public class AppGFElectricityController extends BaseController { pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); pd.put("ACCEPT_USER_ID",""); pd.put("ACCEPT_DEPARTMENT_ID", ""); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); electricityacceptuserService.save(pd); } } @@ -390,6 +419,7 @@ public class AppGFElectricityController extends BaseController { @RequestMapping(value="/editAcceptStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptStatus(MultipartRequest request) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -406,6 +436,7 @@ public class AppGFElectricityController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockData", JSON.toJSONString(pd)); String status = pd.get("STATUS").toString(); if ("2".equals(status) || "3".equals(status) || "4".equals(status)) { String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + @@ -425,15 +456,20 @@ public class AppGFElectricityController extends BaseController { String SIGNTIME[] = pd.getString("SIGNTIME").split(","); for (int i = 0; i < SIGNTIME.length; i++) { + ArrayList pictureList = new ArrayList(); signertime = SIGNTIME[i]; fileList.add(request.getFile("file"+i)); MultipartFile[] fileArr = new MultipartFile[fileList.size()]; - saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID")); + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("ELECTRICITY_ID"), + pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"), + pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); fileList.clear(); } pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); log.put("ACTION", "验收通过"); // 发短信 @@ -462,6 +498,7 @@ public class AppGFElectricityController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData mes3 = new PageData(); mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid @@ -492,12 +529,13 @@ public class AppGFElectricityController extends BaseController { break; } GFelectricityLogService.save(log); + map.put("dockDataLog", JSON.toJSONString(log)); map.put("result", errInfo); return map; } - private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID) throws Exception{ + private void saveAcceptImg(MultipartFile[] files,String signertime, String ELECTRICITY_ID, String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList pictureList) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { PageData cpd = new PageData(); @@ -518,6 +556,7 @@ public class AppGFElectricityController extends BaseController { cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); cpd.put("ACCEPT_CONFESS_USER_ID", ""); cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); electricityacceptuserService.save(cpd); } } @@ -531,6 +570,7 @@ public class AppGFElectricityController extends BaseController { @RequestMapping(value="/editStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editStatus( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -549,6 +589,7 @@ public class AppGFElectricityController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockData", JSON.toJSONString(pd)); String status = pd.get("STATUS").toString(); if ("2".equals(status) || "3".equals(status) || "4".equals(status)) { String OTHER_PROTECTIVE_MEASURES = (StringUtils.isNotBlank(pd2.getString("OTHER_PROTECTIVE_MEASURES")) ? pd2.getString("OTHER_PROTECTIVE_MEASURES") : "") + @@ -563,20 +604,27 @@ public class AppGFElectricityController extends BaseController { switch (status) { case "2"://作业单位 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.putAll(pd); pd2.put("CONFIRM_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFIRM_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); GFelectricityToMeasuresService.delete(pd); + map.put("dockDataDel", JSON.toJSONString(pd)); List list = (List) JSON.parse(pd.get("measuresList").toString()); + HashMap measuresMap = new HashMap(); + int measuresCount = 1; for (JSONObject json : list) { PageData measures = new PageData(); measures.put("ELECTRICITYTOMEASURES_ID", this.get32UUID()); // 主键 @@ -585,8 +633,11 @@ public class AppGFElectricityController extends BaseController { measures.put("STATUS", json.get("STATUS")); measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + measuresMap.put("other"+measuresCount, JSON.toJSONString(measures)); + measuresCount+=1; GFelectricityToMeasuresService.save(measures); } + map.put("dockDatameasures", JSON.toJSONString(measuresMap)); log.put("ACTION", "作业单位通过"); // 发短信 @@ -635,17 +686,21 @@ public class AppGFElectricityController extends BaseController { case "3"://用电单位审核 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); log.put("ACTION", "用电单位审核通过"); // 发短信 @@ -682,17 +737,21 @@ public class AppGFElectricityController extends BaseController { case "4"://配送电单位审批 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); log.put("ACTION", "配送电单位审批通过"); // 发短信 @@ -729,17 +788,21 @@ public class AppGFElectricityController extends BaseController { case "5"://验收人 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); log.put("ACTION", "验收通过"); // 发短信 @@ -768,6 +831,7 @@ public class AppGFElectricityController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData mes = new PageData(); mes.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid @@ -799,6 +863,7 @@ public class AppGFElectricityController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData mes1 = new PageData(); mes1.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid @@ -829,6 +894,7 @@ public class AppGFElectricityController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); // 发短信 PageData mes2 = new PageData(); @@ -861,6 +927,7 @@ public class AppGFElectricityController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); GFelectricityService.edit(pd2); + map.put("dockDatapd2", JSON.toJSONString(pd2)); PageData mes3 = new PageData(); mes3.put("RECEIVER_ID", pd2.get("APPLY_USER_ID"));// 收信人userid @@ -891,6 +958,7 @@ public class AppGFElectricityController extends BaseController { break; } GFelectricityLogService.save(log); + map.put("dockDataLog", JSON.toJSONString(log)); map.put("result", errInfo); return map; } @@ -981,6 +1049,7 @@ public class AppGFElectricityController extends BaseController { */ @PostMapping(value="/cancel") @ResponseBody + @DockAnnotation public void cancel(@RequestBody PageData pd) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -1004,6 +1073,7 @@ public class AppGFElectricityController extends BaseController { if (workTime - analyzeTime >= 0) { return; } else { + map.put("dockData", JSON.toJSONString(pd)); GFelectricityService.cancel(pd); PageData mes = new PageData(); mes.put("RECEIVER_ID", pd.get("CONFIRM_USER_ID"));// 收信人userid @@ -1028,12 +1098,14 @@ public class AppGFElectricityController extends BaseController { e.printStackTrace(); } }else{ + map.put("dockData", JSON.toJSONString(pd)); GFelectricityService.cancel(pd); PageData pd2 = new PageData(); pd2 = GFelectricityService.checkno(pd); PageData pd3 = new PageData(); pd3.put("CHECK_NO",pd2.getString("CHECK_NO")); pd3.put("CORPINFO_ID",pd.getString("CORPINFO_ID")); + map.put("dockDatapd2", JSON.toJSONString(pd3)); GFelectricityService.editSpecialwork(pd3); GFelectricityService.editSpecialwork1(pd3); GFelectricityService.editSpecialwork2(pd3); @@ -1109,12 +1181,14 @@ public class AppGFElectricityController extends BaseController { */ @RequestMapping(value="/gas/delete") @ResponseBody + @DockAnnotation public Object gasDel() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFelectricityGasService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -1125,6 +1199,7 @@ public class AppGFElectricityController extends BaseController { */ @RequestMapping(value="/gas/save") @ResponseBody + @DockAnnotation(isAdd = true) public Object gasSave() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -1134,6 +1209,7 @@ public class AppGFElectricityController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 GFelectricityGasService.save(pd); GFelectricityService.edittime(pd); + map.put("dockData", JSON.toJSONString(pd)); 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 0acf912e..96aa845c 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHighWorkController.java @@ -2,6 +2,7 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -76,6 +77,7 @@ public class AppGFHighWorkController extends BaseController { @RequestMapping(value="/add") @ResponseBody @Transactional + @DockAnnotation public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -101,12 +103,14 @@ public class AppGFHighWorkController extends BaseController { if(pd.get("APPLY_STATUS").equals("1")) { 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())); GFhighWorkLogService.save(log); + pd.put("logData",JSON.toJSONString(log)); // 发短信 PageData mes = new PageData(); @@ -139,6 +143,7 @@ public class AppGFHighWorkController extends BaseController { sendMessageUtil.sendMessages(mes, paramsList); } map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -148,6 +153,7 @@ public class AppGFHighWorkController extends BaseController { */ @RequestMapping(value="/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -155,6 +161,7 @@ public class AppGFHighWorkController extends BaseController { pd = this.getPageData(); GFhighworkService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); //返回结果 return map; } @@ -221,6 +228,7 @@ public class AppGFHighWorkController extends BaseController { @RequestMapping(value="/editGuardian") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editGuardian( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -232,13 +240,14 @@ public class AppGFHighWorkController extends BaseController { pd2 = GFhighworkService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + ArrayList sendPicturesList = new ArrayList<>(); 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); - + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName+"@@"+fileName); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); @@ -288,6 +297,8 @@ public class AppGFHighWorkController extends BaseController { // sendMessageUtil.sendMessages(mes, paramsList); // } map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); return map; } /**修改 @@ -297,6 +308,7 @@ public class AppGFHighWorkController extends BaseController { @RequestMapping(value="/editConfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editConfess( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -306,6 +318,7 @@ public class AppGFHighWorkController extends BaseController { pd = this.getPageData(); PageData pd2 = new PageData(); pd2 = GFhighworkService.findById(pd); + ArrayList sendPicturesList = new ArrayList<>(); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { @@ -314,7 +327,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); - + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName+"@@"+fileName); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); @@ -322,6 +335,8 @@ public class AppGFHighWorkController extends BaseController { GFhighworkService.edit(pd2); } map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd2)); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); return map; } /**修改 @@ -331,11 +346,11 @@ public class AppGFHighWorkController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; - PageData pd = new PageData(); - pd = this.getPageData(); + PageData pd = this.getPageData(); PageData pd2 = new PageData(); pd2 = GFhighworkService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 @@ -343,18 +358,23 @@ public class AppGFHighWorkController extends BaseController { List fileList = new ArrayList(); String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); - + ArrayList sendPicturesList = new ArrayList<>(); + ArrayList highworkacceptuserList = new ArrayList<>(); 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")); + saveImg(sendPicturesList,highworkacceptuserList,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(); } + PageData dockData = new PageData(); + dockData.put("highworkacceptuserList", JSON.toJSONString(highworkacceptuserList)); map.put("result", errInfo); + map.put("dockData", dockData); + map.put("sendPicturesList", JSON.toJSONString(sendPicturesList)); 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{ + private void saveImg(ArrayList sendPicturesList,ArrayList highworkacceptuserList,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(); @@ -363,6 +383,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 + CORPINFO_ID + "/" + ffile); + sendPicturesList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName+"@@"+fileName); pd.put("ACCEPT_CONFESS_USER_SIGNER_TIME", signertime); pd.put("ACCEPT_CONFESS_ID", this.get32UUID()); pd.put("OPERATOR", pd.get("OPERATOR")); //修改人 @@ -376,6 +397,7 @@ public class AppGFHighWorkController extends BaseController { pd.put("ACCEPT_USER_ID",""); pd.put("ACCEPT_DEPARTMENT_ID", ""); highworkacceptuserService.save(pd); + highworkacceptuserList.add(pd); } } } @@ -532,6 +554,7 @@ public class AppGFHighWorkController extends BaseController { @RequestMapping(value="/editStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editStatus( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -545,6 +568,8 @@ public class AppGFHighWorkController extends BaseController { 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")); //修改人 + ArrayList sendPicturesList = new ArrayList<>(); + ArrayList toMeasuresList = new ArrayList<>(); PageData log = new PageData(); log.put("HIGHWORKLOG_ID", this.get32UUID()); // log.put("ACTION", "审核打回"); @@ -577,6 +602,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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -604,6 +630,7 @@ public class AppGFHighWorkController extends BaseController { measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); GFhighWorkToMeasuresService.save(measures); + toMeasuresList.add(measures); } log.put("ACTION", "作业单位通过"); @@ -664,6 +691,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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -730,6 +758,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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -788,6 +817,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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -836,6 +866,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); + sendPicturesList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); @@ -1026,6 +1057,13 @@ public class AppGFHighWorkController extends BaseController { break; } GFhighWorkLogService.save(log); + PageData dockData = new PageData(); + dockData.put("logData",JSON.toJSONString(log)); + dockData.put("STATUS",status); + dockData.put("saveData",JSON.toJSONString(pd2)); + dockData.put("requestData",JSON.toJSONString(pd)); + dockData.put("toMeasuresList",JSON.toJSONString(toMeasuresList)); + map.put("dockData", JSON.toJSONString(dockData)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java index 32c52b33..01b6a4a1 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFHoistingController.java @@ -2,6 +2,7 @@ package com.zcloud.controller.gf; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -72,6 +73,7 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/add") @ResponseBody @Transactional + @DockAnnotation(isAdd = true,hasAnnex = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -93,6 +95,7 @@ public class AppGFHoistingController extends BaseController { pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 + map.put("dockData", JSON.toJSONString(pd)); GFhoistingService.save(pd); if(pd.get("APPLY_STATUS").equals("1")) { @@ -102,6 +105,7 @@ public class AppGFHoistingController extends BaseController { log.put("HOISTING_ID", pd.get("HOISTING_ID")); log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("logData", JSON.toJSONString(log)); GFhighWorkLogService.save(log); // 发短信 @@ -143,12 +147,14 @@ public class AppGFHoistingController extends BaseController { */ @RequestMapping(value="/delete") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFhoistingService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -160,12 +166,14 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/edit") @ResponseBody @Transactional + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFhoistingService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); if(pd.get("APPLY_STATUS").equals("1")) { PageData log = new PageData(); log.put("HOISTINGLOG_ID", this.get32UUID()); @@ -174,6 +182,7 @@ public class AppGFHoistingController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); GFhighWorkLogService.save(log); + map.put("logData", JSON.toJSONString(log)); // 发短信 PageData mes = new PageData(); @@ -215,6 +224,7 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/editGuardian") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editGuardian( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -227,14 +237,17 @@ public class AppGFHoistingController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); - + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("GUARDIAN_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("GUARDIAN_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); + map.put("dockData", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); } @@ -248,6 +261,7 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/editConfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editConfess( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -260,16 +274,20 @@ public class AppGFHoistingController extends BaseController { pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("CONFESS_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONFESS_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockData", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); } map.put("result", errInfo); @@ -282,30 +300,35 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); + map.put("dockData", JSON.toJSONString(pd)); PageData pd2 = new PageData(); pd2 = GFhoistingService.findById(pd); pd2.put("OPERATOR", pd.get("OPERATOR")); //修改人 pd2.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + map.put("dockData2", JSON.toJSONString(pd2)); List fileList = new ArrayList(); String signertime = ""; String SIGNTIME[] = pd.getString("SIGNTIME").split(","); + ArrayList pictureList = new ArrayList(); 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")); + 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"),pictureList); fileList.clear(); } + map.put("sendPicturesList", JSON.toJSONString(pictureList)); 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{ + private void saveImg(MultipartFile[] files,String signertime, String HOISTING_ID, String CORPINFO_ID, String ACCEPT_CONFESS_USER_ID, String ACCEPT_CONFESS_DEPARTMENT_ID,ArrayList pictureList) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { PageData pd = new PageData(); @@ -326,6 +349,7 @@ public class AppGFHoistingController extends BaseController { pd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ACCEPT_CONFESS_DEPARTMENT_ID); pd.put("ACCEPT_USER_ID",""); pd.put("ACCEPT_DEPARTMENT_ID", ""); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); hoistingacceptuserService.save(pd); } } @@ -338,6 +362,7 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/editAcceptStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editAcceptStatus(MultipartRequest request) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -356,6 +381,7 @@ public class AppGFHoistingController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockData", JSON.toJSONString(pd)); 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") + ";_;") : ";_;"); @@ -373,15 +399,18 @@ public class AppGFHoistingController extends BaseController { String SIGNTIME[] = pd.getString("SIGNTIME").split(","); for (int i = 0; i < SIGNTIME.length; i++) { + ArrayList pictureList = new ArrayList(); 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")); + saveAcceptImg(fileList.toArray(fileArr),signertime,pd.getString("HOISTING_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_USER_ID"),pd.getString("ACCEPT_DEPARTMENT_ID"),pictureList); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); 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")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); log.put("ACTION", "验收通过"); @@ -412,6 +441,7 @@ public class AppGFHoistingController extends BaseController { log.put("ACTION", "验收人打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); @@ -443,11 +473,13 @@ public class AppGFHoistingController extends BaseController { default: break; } + map.put("dockDataLog", JSON.toJSONString(log)); 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{ + private void saveAcceptImg(MultipartFile[] files,String signertime, String HOISTING_ID, + String CORPINFO_ID, String ACCEPT_USER_ID, String ACCEPT_DEPARTMENT_ID, ArrayList pictureList) throws Exception{ if (files != null && files.length > 0) { for (int i = 0; i < files.length; i++) { PageData cpd = new PageData(); @@ -468,6 +500,7 @@ public class AppGFHoistingController extends BaseController { cpd.put("ACCEPT_CONFESS_DEPARTMENT_ID", ""); cpd.put("ACCEPT_CONFESS_USER_ID", ""); cpd.put("ACCEPT_DEPARTMENT_ID", ACCEPT_DEPARTMENT_ID); + pictureList.add(Const.FILEPATHFILE + CORPINFO_ID + "/" + ffile + "/" + fileName + "@@" + fileName); hoistingacceptuserService.save(cpd); } } @@ -481,6 +514,7 @@ public class AppGFHoistingController extends BaseController { @RequestMapping(value="/editStatus") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editStatus( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -498,6 +532,7 @@ public class AppGFHoistingController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); + map.put("dockData", JSON.toJSONString(pd)); 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") + ";_;") : ";_;"); @@ -506,12 +541,15 @@ public class AppGFHoistingController extends BaseController { switch (status) { case "2"://作业指挥 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("LEADER_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("LEADER_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("LEADER_CONTENT", pd.get("CONTENT")); @@ -527,9 +565,13 @@ public class AppGFHoistingController extends BaseController { } pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); // pd2.put("HAZARD_IDENTIFICATION", HAZARD_IDENTIFICATION); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); + map.put("dockDataDel", JSON.toJSONString(pd)); GFhighWorkToMeasuresService.delete(pd); List list = (List) JSON.parse(pd.get("measuresList").toString()); + HashMap measuresMap = new HashMap(); + int measuresCount = 1; for (JSONObject json : list) { PageData measures = new PageData(); measures.put("HOISTINGTOMEASURES_ID", this.get32UUID()); // 主键 @@ -539,8 +581,11 @@ public class AppGFHoistingController extends BaseController { measures.put("STATUS", json.get("STATUS")); measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); + measuresMap.put("other"+measuresCount, JSON.toJSONString(measures)); + measuresCount+=1; GFhighWorkToMeasuresService.save(measures); } + map.put("measuresData", JSON.toJSONString(measuresMap)); log.put("ACTION", "作业指挥通过"); // 发短信 @@ -595,12 +640,15 @@ public class AppGFHoistingController extends BaseController { case "3"://所在单位 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("CONSTRUCTION_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("CONSTRUCTION_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); @@ -612,6 +660,7 @@ public class AppGFHoistingController extends BaseController { } pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); log.put("ACTION", "所在单位通过"); @@ -663,12 +712,15 @@ public class AppGFHoistingController extends BaseController { case "4"://审核部门 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("AUDIT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("AUDIT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); @@ -677,6 +729,7 @@ public class AppGFHoistingController extends BaseController { } pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); log.put("ACTION", "审核部门通过"); @@ -722,17 +775,21 @@ public class AppGFHoistingController extends BaseController { case "5"://审批部门 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("APPROVE_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("APPROVE_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); log.put("ACTION", "审批部门通过"); @@ -770,17 +827,21 @@ public class AppGFHoistingController extends BaseController { case "6"://验收人 if (files != null && files.length > 0) { + ArrayList pictureList = new ArrayList(); 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); + pictureList.add(Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(pictureList)); pd2.put("ACCEPT_USER_SIGNER_PATH", Const.FILEPATHFILE + pd.getString("CORPINFO_ID") + "/" + ffile + "/" + fileName); pd2.put("ACCEPT_USER_SIGNER_TIME", pd.get("SIGNER_TIME")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("OTHER_PROTECTIVE_MEASURES", OTHER_PROTECTIVE_MEASURES); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); log.put("ACTION", "验收通过"); @@ -810,6 +871,7 @@ public class AppGFHoistingController extends BaseController { log.put("ACTION", "作业指挥打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("LEADER_CONTENT", pd.get("CONTENT")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); @@ -843,6 +905,7 @@ public class AppGFHoistingController extends BaseController { log.put("ACTION", "所在单位打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("CONSTRUCTION_CONTENT", pd.get("CONTENT")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); // 发短信 @@ -874,6 +937,7 @@ public class AppGFHoistingController extends BaseController { log.put("ACTION", "审核部门打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("AUDIT_CONTENT", pd.get("CONTENT")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); // 发短信 @@ -905,6 +969,7 @@ public class AppGFHoistingController extends BaseController { log.put("ACTION", "审批部门打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); // 发短信 @@ -936,6 +1001,7 @@ public class AppGFHoistingController extends BaseController { log.put("ACTION", "验收人打回"); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); + map.put("dockData2", JSON.toJSONString(pd2)); GFhoistingService.edit(pd2); @@ -967,6 +1033,7 @@ public class AppGFHoistingController extends BaseController { default: break; } + map.put("dockDataLog", JSON.toJSONString(log)); GFhighWorkLogService.save(log); 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 1f6aa9f8..270916f2 100644 --- a/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/GFConfinedSpaceController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.gf; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -50,6 +52,7 @@ public class GFConfinedSpaceController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("confinedspace:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -57,6 +60,7 @@ public class GFConfinedSpaceController extends BaseController { pd = this.getPageData(); pd.put("CONFINEDSPACE_ID", this.get32UUID()); //主键 GFconfinedspaceService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -68,12 +72,14 @@ public class GFConfinedSpaceController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("confinedspace:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFconfinedspaceService.delete(pd); + map.put("pd", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -85,12 +91,14 @@ public class GFConfinedSpaceController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("confinedspace:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFconfinedspaceService.edit(pd); + map.put("pd", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -100,7 +108,7 @@ public class GFConfinedSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/list") - @RequiresPermissions("confinedspace:list") +// @RequiresPermissions("confinedspace:list") @ResponseBody public Object list(Page page) throws Exception{ Map map = new HashMap(); @@ -155,6 +163,7 @@ public class GFConfinedSpaceController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("confinedspace:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -168,6 +177,7 @@ public class GFConfinedSpaceController extends BaseController { }else{ errInfo = "error"; } + map.put("pd", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java b/src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java index c98b1e11..51622f7f 100644 --- a/src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java +++ b/src/main/java/com/zcloud/controller/gf/GFLimitSpaceApproveController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.gf; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -40,6 +42,7 @@ public class GFLimitSpaceApproveController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("limitspaceapprove:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -53,6 +56,7 @@ public class GFLimitSpaceApproveController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", ""); //是否删除 1-是 0-否 GFlimitspaceapproveService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -64,12 +68,14 @@ public class GFLimitSpaceApproveController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("limitspaceapprove:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; PageData pd = new PageData(); pd = this.getPageData(); GFlimitspaceapproveService.delete(pd); + map.put("pd", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -150,6 +156,7 @@ public class GFLimitSpaceApproveController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("limitspaceapprove:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -163,6 +170,7 @@ public class GFLimitSpaceApproveController extends BaseController { }else{ errInfo = "error"; } + map.put("pd", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java b/src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java index 6b8ea043..e1a01150 100644 --- a/src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.gf; +import com.alibaba.fastjson.JSON; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -46,6 +48,7 @@ public class GFLimitSpaceController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("limitspace:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -59,6 +62,7 @@ public class GFLimitSpaceController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 GFlimitspaceService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -70,6 +74,7 @@ public class GFLimitSpaceController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("limitspace:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -78,6 +83,7 @@ public class GFLimitSpaceController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFlimitspaceService.delete(pd); + map.put("pd",JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -89,6 +95,7 @@ public class GFLimitSpaceController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("limitspace:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -97,6 +104,7 @@ public class GFLimitSpaceController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFlimitspaceService.edit(pd); + map.put("pd", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -106,7 +114,7 @@ public class GFLimitSpaceController extends BaseController { * @throws Exception */ @RequestMapping(value="/list") - @RequiresPermissions("limitspace:list") +// @RequiresPermissions("limitspace:list") @ResponseBody public Object list(Page page) throws Exception{ Map map = new HashMap(); @@ -157,6 +165,7 @@ public class GFLimitSpaceController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("limitspace:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -173,6 +182,7 @@ public class GFLimitSpaceController extends BaseController { }else{ errInfo = "error"; } + map.put("pd",JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java index 40e3b44d..8e063a6f 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/OutSourcedController.java @@ -445,7 +445,8 @@ public class OutSourcedController extends BaseController { pdImg.put("TYPE", "300"); pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID")); imgfilesService.save(pdImg); - Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); + Smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + ,IMGFILES_ID,pd.getString("OUTSOURCED_ID"),"300"); } diff --git a/src/main/java/com/zcloud/controller/system/LoginController.java b/src/main/java/com/zcloud/controller/system/LoginController.java index ed51270e..e69a771a 100644 --- a/src/main/java/com/zcloud/controller/system/LoginController.java +++ b/src/main/java/com/zcloud/controller/system/LoginController.java @@ -68,6 +68,8 @@ public class LoginController extends BaseController { @Autowired private OffDutyService offdutyService; + @Autowired + private PhotoService photoService; @Value("${czks-useridentity}") private String czksIdentity; @Value("${czks-baseimgpath}") @@ -81,14 +83,6 @@ public class LoginController extends BaseController { private String gwjBaseimgpath; @Value("${gwj-backendaddr}") private String gwjBackendaddr; - - - - - - @Autowired - private PhotoService photoService; - /** * 请求登录验证用户接口 * @@ -208,8 +202,6 @@ public class LoginController extends BaseController { // 后台地址 map.put("BACKENDADDR", gwjBackendaddr); } - - PageData cpd = corpinfoService.findById(pd); //System.out.println(cpd.getString("ISUSE")); if (cpd != null) { diff --git a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml index 5dbd21d5..fe3e59d0 100644 --- a/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml +++ b/src/main/resources/mybatis/datasource/gf/ConfinedSpaceMapper.xml @@ -73,7 +73,9 @@ 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.WORK_LATITUDE, + f.WORK_LONGITUDE @@ -137,7 +139,9 @@ ACCEPT_CONFESS_DEPARTMENT_ID, ACCEPT_CONFESS_USER_ID, ACCEPT_CONFESS_USER_SIGNER_PATH, - ACCEPT_CONFESS_USER_SIGNER_TIME + ACCEPT_CONFESS_USER_SIGNER_TIME, + WORK_LATITUDE, + WORK_LONGITUDE @@ -202,7 +206,9 @@ #{ACCEPT_CONFESS_DEPARTMENT_ID}, #{ACCEPT_CONFESS_USER_ID}, #{ACCEPT_CONFESS_USER_SIGNER_PATH}, - #{ACCEPT_CONFESS_USER_SIGNER_TIME} + #{ACCEPT_CONFESS_USER_SIGNER_TIME}, + #{WORK_LATITUDE}, + #{WORK_LONGITUDE} @@ -487,6 +493,8 @@ f.ACCEPT_CONFESS_USER_ID, f.ACCEPT_CONFESS_USER_SIGNER_PATH, f.ACCEPT_CONFESS_USER_SIGNER_TIME, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, (SELECT replace(a.ANALYZE_TIME,'-','/') from GF_CONFINEDSPACEGAS a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -615,6 +623,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT a.ANALYZE_TIME from GF_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -845,6 +855,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT replace(a.ANALYZE_TIME,'-','/') from GF_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY @@ -1067,6 +1079,8 @@ f.CONFESS_USER_SIGNER_TIME, f.ACCEPT_CONFESS_DEPARTMENT_ID, f.ACCEPT_CONFESS_USER_ID, + f.WORK_LATITUDE, + f.WORK_LONGITUDE, IFNULL((SELECT a.ANALYZE_TIME from gf_confinedspacegas a where a.ISDELETE = '0' AND a.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID ORDER BY diff --git a/src/main/resources/mybatis/datasource/system/UsersMapper.xml b/src/main/resources/mybatis/datasource/system/UsersMapper.xml index d7dd2502..d9d4fca7 100644 --- a/src/main/resources/mybatis/datasource/system/UsersMapper.xml +++ b/src/main/resources/mybatis/datasource/system/UsersMapper.xml @@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"