diff --git a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java index 2a41cd86..9b43b4a2 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -1582,6 +1582,9 @@ public class AppHotWorkApplicationController extends BaseController { dockData.put("dockDatahotWork", JSON.toJSONString(confinedhotWork)); hotworkapplicationService.save(hotWork); pd.put("FOREIGN_KEY",pd.get("HOTWORKAPPLICATION_ID").toString()); + PageData confinedPageData = new PageData(); + confinedPageData.putAll(pd); + dockData.put("dockData", JSON.toJSONString(confinedPageData)); List hotWorkUser = hotWorkApplicationUserService.listAll(pd); //添加一个新的动火申请 PageData confinedoldHotWork = new PageData(); diff --git a/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java b/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java index 9efe2952..94b73add 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenExamineController.java @@ -516,6 +516,7 @@ public class HiddenExamineController extends BaseController { } map.put("pd", pd); map.put("result", errInfo); + map.put("dockData",JSON.toJSONString(pd)); return map; } } diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java index 053d3a30..62170e20 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillAttachmentController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.emergency; +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; @@ -41,6 +43,7 @@ public class EmergencyDrillAttachmentController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("emergencydrillbasic:add") @ResponseBody + @DockAnnotation(isAdd = true,hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -54,6 +57,7 @@ public class EmergencyDrillAttachmentController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID if (null != file && !file.isEmpty()) { + ArrayList picturesList = new ArrayList(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { errInfo = "fail"; @@ -68,9 +72,12 @@ public class EmergencyDrillAttachmentController extends BaseController { //服务器 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + picturesList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(picturesList)); pd.put("DRILL_ATTACHMENT_FILE_NAME", file.getOriginalFilename()); pd.put("DRILL_ATTACHMENT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } + map.put("dockData", JSON.toJSONString(pd)); emergencydrillattachmentService.save(pd); map.put("pd", pd); map.put("result", errInfo); @@ -84,6 +91,7 @@ public class EmergencyDrillAttachmentController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -92,6 +100,7 @@ public class EmergencyDrillAttachmentController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillattachmentService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -103,6 +112,7 @@ public class EmergencyDrillAttachmentController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("emergencydrillbasic:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -111,6 +121,7 @@ public class EmergencyDrillAttachmentController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (null != file && !file.isEmpty()) { + ArrayList picturesList = new ArrayList(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { errInfo = "fail"; @@ -125,10 +136,13 @@ public class EmergencyDrillAttachmentController extends BaseController { //服务器 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + picturesList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(picturesList)); pd.put("DRILL_ATTACHMENT_FILE_NAME", file.getOriginalFilename()); pd.put("DRILL_ATTACHMENT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } emergencydrillattachmentService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("pd", pd); map.put("result", errInfo); return map; @@ -182,6 +196,7 @@ public class EmergencyDrillAttachmentController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -193,6 +208,7 @@ public class EmergencyDrillAttachmentController extends BaseController { if(Tools.notEmpty(DATA_IDS)){ String ArrayDATA_IDS[] = DATA_IDS.split(","); pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids + map.put("dockData", JSON.toJSONString(pd)); emergencydrillattachmentService.deleteAll(pd); errInfo = "success"; }else{ diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.java index 1570e0f9..46f9ba02 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillContentController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.emergency; +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; @@ -37,6 +39,7 @@ public class EmergencyDrillContentController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("emergencydrillbasic:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -49,6 +52,7 @@ public class EmergencyDrillContentController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + map.put("dockData", JSON.toJSONString(pd)); emergencydrillcontentService.save(pd); map.put("result", errInfo); return map; @@ -61,6 +65,7 @@ public class EmergencyDrillContentController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -69,6 +74,7 @@ public class EmergencyDrillContentController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillcontentService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -80,6 +86,7 @@ public class EmergencyDrillContentController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("emergencydrillbasic:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -88,6 +95,7 @@ public class EmergencyDrillContentController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillcontentService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -140,6 +148,7 @@ public class EmergencyDrillContentController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -152,6 +161,7 @@ public class EmergencyDrillContentController extends BaseController { String ArrayDATA_IDS[] = DATA_IDS.split(","); pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids emergencydrillcontentService.deleteAll(pd); + map.put("dockData", JSON.toJSONString(pd)); errInfo = "success"; }else{ errInfo = "fail"; diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.java index fa8dacdf..b0a56ce2 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.emergency; +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; @@ -37,6 +39,7 @@ public class EmergencyDrillOrgController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("emergencydrillbasic:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -49,6 +52,7 @@ public class EmergencyDrillOrgController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID + map.put("dockData", JSON.toJSONString(pd)); emergencydrillorgService.save(pd); map.put("result", errInfo); return map; @@ -61,6 +65,7 @@ public class EmergencyDrillOrgController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -69,6 +74,7 @@ public class EmergencyDrillOrgController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillorgService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -80,6 +86,7 @@ public class EmergencyDrillOrgController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("emergencydrillbasic:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -88,6 +95,7 @@ public class EmergencyDrillOrgController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillorgService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -140,6 +148,7 @@ public class EmergencyDrillOrgController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -152,6 +161,7 @@ public class EmergencyDrillOrgController extends BaseController { String ArrayDATA_IDS[] = DATA_IDS.split(","); pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids emergencydrillorgService.deleteAll(pd); + map.put("dockData", JSON.toJSONString(pd)); errInfo = "success"; }else{ errInfo = "fail"; diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.java index c91bb8b1..7c2ff9e8 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillOrgMemberController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.emergency; +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; @@ -37,6 +39,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("emergencydrillbasic:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -50,6 +53,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID emergencydrillorgmemberService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -61,6 +65,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -69,6 +74,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillorgmemberService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -80,6 +86,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("emergencydrillbasic:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -88,6 +95,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillorgmemberService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -140,6 +148,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -152,6 +161,7 @@ public class EmergencyDrillOrgMemberController extends BaseController { String ArrayDATA_IDS[] = DATA_IDS.split(","); pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids emergencydrillorgmemberService.deleteAll(pd); + map.put("dockData", JSON.toJSONString(pd)); errInfo = "success"; }else{ errInfo = "fail"; diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java index 2613798c..7c4c2064 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillReportController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.emergency; +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; @@ -41,6 +43,7 @@ public class EmergencyDrillReportController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("emergencydrillbasic:add") @ResponseBody + @DockAnnotation(isAdd = true,hasAnnex = true) public Object add(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -54,6 +57,7 @@ public class EmergencyDrillReportController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID if (null != file && !file.isEmpty()) { + ArrayList picturesList = new ArrayList(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { errInfo = "fail"; @@ -68,10 +72,13 @@ public class EmergencyDrillReportController extends BaseController { //服务器 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + picturesList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(picturesList)); pd.put("DRILL_REPORT_FILE_NAME", file.getOriginalFilename()); pd.put("DRILL_REPORT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } emergencydrillreportService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("pd", pd); map.put("result", errInfo); return map; @@ -84,6 +91,7 @@ public class EmergencyDrillReportController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -91,6 +99,7 @@ public class EmergencyDrillReportController extends BaseController { pd = this.getPageData(); pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 + map.put("dockData", JSON.toJSONString(pd)); emergencydrillreportService.delete(pd); map.put("result", errInfo); //返回结果 return map; @@ -103,6 +112,7 @@ public class EmergencyDrillReportController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("emergencydrillbasic:edit") @ResponseBody + @DockAnnotation(hasAnnex = true) public Object edit(@RequestParam(value="file",required=false) MultipartFile file) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -111,6 +121,7 @@ public class EmergencyDrillReportController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 if (null != file && !file.isEmpty()) { + ArrayList picturesList = new ArrayList(); String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")+1).toLowerCase(); if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) { errInfo = "fail"; @@ -125,10 +136,13 @@ public class EmergencyDrillReportController extends BaseController { //服务器 String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); Smb.sshSftp(file, fileName, Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile); + picturesList.add(Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName + "@@" + fileName); + map.put("sendPicturesList", JSON.toJSONString(picturesList)); pd.put("DRILL_REPORT_FILE_NAME", file.getOriginalFilename()); pd.put("DRILL_REPORT_FILE_PATH", Const.FILEPATHFILE + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName); } emergencydrillreportService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("pd", pd); map.put("result", errInfo); return map; @@ -182,6 +196,7 @@ public class EmergencyDrillReportController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -194,6 +209,7 @@ public class EmergencyDrillReportController extends BaseController { String ArrayDATA_IDS[] = DATA_IDS.split(","); pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids emergencydrillreportService.deleteAll(pd); + map.put("dockData", JSON.toJSONString(pd)); errInfo = "success"; }else{ errInfo = "fail"; diff --git a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.java b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.java index 8e36598d..3dfeedfa 100644 --- a/src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.java +++ b/src/main/java/com/zcloud/controller/emergency/EmergencyDrillSceneController.java @@ -1,5 +1,7 @@ package com.zcloud.controller.emergency; +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; @@ -37,6 +39,7 @@ public class EmergencyDrillSceneController extends BaseController { @RequestMapping(value="/add") @RequiresPermissions("emergencydrillbasic:add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -50,6 +53,7 @@ public class EmergencyDrillSceneController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID emergencydrillsceneService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -61,6 +65,7 @@ public class EmergencyDrillSceneController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -69,6 +74,7 @@ public class EmergencyDrillSceneController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillsceneService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -80,6 +86,7 @@ public class EmergencyDrillSceneController extends BaseController { @RequestMapping(value="/edit") @RequiresPermissions("emergencydrillbasic:edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -88,6 +95,7 @@ public class EmergencyDrillSceneController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 emergencydrillsceneService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -140,6 +148,7 @@ public class EmergencyDrillSceneController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("emergencydrillbasic:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -152,6 +161,7 @@ public class EmergencyDrillSceneController extends BaseController { String ArrayDATA_IDS[] = DATA_IDS.split(","); pd.put("ArrayDATA_IDS", ArrayDATA_IDS); //待删除ids emergencydrillsceneService.deleteAll(pd); + map.put("dockData", JSON.toJSONString(pd)); errInfo = "success"; }else{ errInfo = "fail"; diff --git a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java index 9c798514..6d52de84 100644 --- a/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java +++ b/src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java @@ -588,7 +588,8 @@ public class HiddenApiController extends BaseController { @RequiresPermissions("hidden:list") @ResponseBody @DockAnnotation(isAdd = true) - public Object unableRectify() throws Exception { + public Object + unableRectify() throws Exception { Map map = new HashMap(); Integer code = 000000; PageData pd = new PageData();