From d44ba70a524eb5aa7f59b2e3667a2d22edcc3bf3 Mon Sep 17 00:00:00 2001 From: limingyu Date: Wed, 20 Dec 2023 15:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=A7=E5=B7=9E=E7=9F=BF=E7=9F=B3=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AF=B9=E6=8E=A5=E6=9C=89=E9=99=90=E7=A9=BA=E9=97=B4?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gf/AppGFBlindBoardController.java | 16 ++++++++ .../gf/AppGFConfinedSpaceController.java | 37 ++++++++++++++++++- .../gf/AppGFConfinedSpaceGasWHController.java | 11 ++++++ .../gf/AppGFLimitSpaceApproveController.java | 14 +++++++ .../gf/AppGFLimitSpaceController.java | 11 ++++++ 5 files changed, 88 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java index dbf58c1d..ac74265d 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFBlindBoardController.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; @@ -82,6 +83,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/add") @ResponseBody @Transactional + @DockAnnotation(isAdd = true,hasAnnex = true) public Object add( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -116,11 +118,14 @@ 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")); } + map.put("dockData",JSON.toJSONString(pd)); GFblindboardService.save(pd); GFblindBoardInfoService.delete(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()); // 主键 @@ -130,13 +135,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 toMeasuresMap = new HashMap(); + int count = 1; for (JSONObject json : list) { PageData measures = new PageData(); measures.put("BLINDBOARDTOMEASURES_ID", this.get32UUID()); // 主键 @@ -145,8 +155,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")); + toMeasuresMap.put("count"+count, JSON.toJSONString(measures)); + count+=1; GFblindBoardToMeasuresService.save(measures); } + map.put("toMeasuresMap",JSON.toJSONString(toMeasuresMap)); } if(pd.get("APPLY_STATUS").equals("1")) { @@ -157,6 +170,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)); // 发短信 PageData mes = new PageData(); @@ -201,6 +215,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/uploadImg") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object uploadImg( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -229,6 +244,7 @@ public class AppGFBlindBoardController extends BaseController { @RequestMapping(value="/deleteImg") @ResponseBody @Transactional + @DockAnnotation public Object deleteImg() throws Exception{ Map map = new HashMap(); String errInfo = "success"; diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java index 76e94b66..c049754b 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceController.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 AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/add") @ResponseBody @Transactional + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -106,6 +108,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("ISDELETE", "0"); //是否删除 1-是 0-否 GFconfinedspaceService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); if(pd.get("APPLY_STATUS").equals("1")) { PageData log = new PageData(); @@ -115,6 +118,7 @@ public class AppGFConfinedSpaceController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); GFconfinedspaceLogService.save(log); + map.put("logDockData",JSON.toJSONString(log)); // 发短信 PageData mes = new PageData(); @@ -184,12 +188,14 @@ public class AppGFConfinedSpaceController 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(); GFconfinedspaceService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -201,12 +207,14 @@ public class AppGFConfinedSpaceController extends BaseController { */ @PostMapping(value="/cancel") @ResponseBody + @DockAnnotation public void cancel(@RequestBody PageData pd) throws Exception{ Map map = new HashMap(); String errInfo = "success"; System.out.println(JSONObject.toJSONString(pd)); PageData cpd = new PageData(); cpd = GFconfinedspaceService.findById(pd); + map.put("dockData", JSON.toJSONString(pd)); if(cpd!=null && cpd.size()>0 && cpd.getString("ANALYZE_TIME") != null && cpd.getString("GUARDIAN_USER_SIGNER_TIME") != null){ // String WORK_START_DATE = pd.getString("WORK_START_DATE"); // String ANALYZE_TIME = cpd.getString("ANALYZE_TIME"); @@ -333,12 +341,14 @@ public class AppGFConfinedSpaceController 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(); GFconfinedspaceService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); if(pd.get("APPLY_STATUS").equals("1")) { PageData log = new PageData(); log.put("CONFINEDSPACELOG_ID", this.get32UUID()); @@ -347,6 +357,7 @@ public class AppGFConfinedSpaceController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); GFconfinedspaceLogService.save(log); + map.put("logDockData", JSON.toJSONString(pd)); // 发短信 @@ -398,6 +409,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editGuardian") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editGuardian( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -421,6 +433,7 @@ public class AppGFConfinedSpaceController extends BaseController { // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFconfinedspaceService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); } if(pd.get("APPLY_STATUS").equals("1")) { @@ -431,6 +444,7 @@ public class AppGFConfinedSpaceController extends BaseController { log.put("CREATOR",pd.get("ACTION_USER")); log.put("CREATTIME", DateUtil.date2Str(new Date())); GFconfinedspaceLogService.save(log); + map.put("logDockData", JSON.toJSONString(log)); // // 发短信 @@ -473,6 +487,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editConfess") @ResponseBody @Transactional + @DockAnnotation(hasAnnex = true) public Object editConfess( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -496,6 +511,7 @@ public class AppGFConfinedSpaceController extends BaseController { // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFconfinedspaceService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); } map.put("result", errInfo); return map; @@ -540,6 +556,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editAcceptconfess") @ResponseBody @Transactional + @DockAnnotation public Object editAcceptconfess(MultipartRequest request) throws Exception { Map map = new HashMap(); String errInfo = "success"; @@ -561,7 +578,7 @@ public class AppGFConfinedSpaceController extends BaseController { saveImg(fileList.toArray(fileArr),signertime,pd.getString("CONFINEDSPACE_ID"),pd.getString("CORPINFO_ID"),pd.getString("ACCEPT_CONFESS_USER_ID"),pd.getString("ACCEPT_CONFESS_DEPARTMENT_ID")); fileList.clear(); } - + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -594,6 +611,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editAcceptStatus") @ResponseBody @Transactional + @DockAnnotation public Object editAcceptStatus(MultipartRequest request) throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -637,6 +655,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); GFconfinedspaceService.edit(pd2); + map.put("pd2", JSON.toJSONString(pd2)); log.put("ACTION", "验收通过"); // 发短信 @@ -664,6 +683,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); GFconfinedspaceService.edit(pd2); + map.put("pd2", JSON.toJSONString(pd2)); // 发短信 PageData mes4 = new PageData(); @@ -694,6 +714,7 @@ public class AppGFConfinedSpaceController extends BaseController { break; } GFconfinedspaceLogService.save(log); + map.put("log", JSON.toJSONString(log)); map.put("result", errInfo); return map; @@ -733,6 +754,7 @@ public class AppGFConfinedSpaceController extends BaseController { @RequestMapping(value="/editStatus") @ResponseBody @Transactional + @DockAnnotation public Object editStatus( @RequestParam(value="FFILE",required=false) MultipartFile[] files ) throws Exception{ @@ -783,6 +805,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("EDUCATE_USER", pd.get("EDUCATE_USER")); GFconfinedspaceService.edit(pd2); GFconfinedspaceToMeasuresService.delete(pd2); + map.put("dockData", JSON.toJSONString(pd2)); List list = (List) JSON.parse(pd.get("measuresList").toString()); for (JSONObject json : list) { PageData measures = new PageData(); @@ -796,6 +819,7 @@ public class AppGFConfinedSpaceController extends BaseController { measures.put("CONFIRM_ID", pd.get("OPERATOR")); measures.put("CONFIRM_NAME", pd.get("ACTION_USER")); GFconfinedspaceToMeasuresService.save(measures); + map.put("measuresDockData", JSON.toJSONString(measures)); } log.put("ACTION", "作业单位通过"); @@ -854,6 +878,7 @@ public class AppGFConfinedSpaceController extends BaseController { // pd2.put("GUARDIAN_CONTENT", pd.get("CONTENT")); // pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFconfinedspaceService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); log.put("ACTION", "监护人确认通过"); } return map; @@ -981,6 +1006,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFconfinedspaceService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); log.put("ACTION", "所在单位审批通过"); @@ -1049,6 +1075,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); GFconfinedspaceService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); log.put("ACTION", "验收通过"); // 发短信 @@ -1077,6 +1104,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("CONFIRM_CONTENT", pd.get("CONTENT")); GFconfinedspaceService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); // 发短信 PageData mes = new PageData(); @@ -1168,6 +1196,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("APPROVE_CONTENT", pd.get("CONTENT")); GFconfinedspaceService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); // 发短信 PageData mes3 = new PageData(); @@ -1199,6 +1228,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd2.put("APPLY_STATUS", pd.get("APPLY_STATUS")); pd2.put("ACCEPT_CONTENT", pd.get("CONTENT")); GFconfinedspaceService.edit(pd2); + map.put("dockData", JSON.toJSONString(pd2)); // 发短信 PageData mes4 = new PageData(); @@ -1229,6 +1259,7 @@ public class AppGFConfinedSpaceController extends BaseController { break; } GFconfinedspaceLogService.save(log); + map.put("logDockData", JSON.toJSONString(log)); map.put("result", errInfo); return map; } @@ -1379,12 +1410,14 @@ public class AppGFConfinedSpaceController 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(); GFconfinedspaceGasService.delete(pd); + map.put("dockData",JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -1395,6 +1428,7 @@ public class AppGFConfinedSpaceController extends BaseController { */ @RequestMapping(value="/gas/save") @ResponseBody + @DockAnnotation public Object gasSave() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -1405,6 +1439,7 @@ public class AppGFConfinedSpaceController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFconfinedspaceGasService.save(pd); confinedspacegaswhService.edittime(pd); + map.put("dockData",JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } diff --git a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java index 13d4bb3b..9462dcef 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFConfinedSpaceGasWHController.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; @@ -38,6 +40,7 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -47,10 +50,12 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { pd2 = GFconfinedspacegaswhService.findById(pd); if(pd2 != null && pd2.size()>0){ GFconfinedspacegaswhService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); }else{ pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 pd.put("CONFINEDSPACEGASWH_ID", this.get32UUID()); //主键 GFconfinedspacegaswhService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); } map.put("result", errInfo); return map; @@ -62,12 +67,14 @@ public class AppGFConfinedSpaceGasWHController 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(); GFconfinedspacegaswhService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -78,6 +85,7 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { */ @RequestMapping(value="/edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -85,6 +93,7 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { pd = this.getPageData(); pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFconfinedspacegaswhService.edit(pd); + map.put("dockingData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -133,6 +142,7 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { */ @RequestMapping(value="/deleteAll") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -142,6 +152,7 @@ public class AppGFConfinedSpaceGasWHController extends BaseController { if(Tools.notEmpty(DATA_IDS)){ String ArrayDATA_IDS[] = DATA_IDS.split(","); GFconfinedspacegaswhService.deleteAll(ArrayDATA_IDS); + map.put("dockData", JSON.toJSONString(pd)); errInfo = "success"; }else{ errInfo = "error"; diff --git a/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceApproveController.java b/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceApproveController.java index 2195d38f..b0576b09 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceApproveController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceApproveController.java @@ -1,6 +1,8 @@ package com.zcloud.controller.gf; +import com.alibaba.fastjson.JSON; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; +import com.zcloud.aspect.DockAnnotation; import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -55,6 +57,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -68,6 +71,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { pd.put("ISDELETE", "0"); //是否删除 GFlimitspaceapproveService.save(pd); + map.put("dockData", JSON.toJSONString(pd)); if(pd.get("STATUS")!= null && Tools.notEmpty(pd.get("STATUS").toString()) && pd.get("STATUS").toString().equals("2")) {//如果通过，发送短息能给现场负责人 PageData corpinfo = new PageData(); corpinfo.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); @@ -145,12 +149,14 @@ public class AppGFLimitSpaceApproveController 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(); GFlimitspaceapproveService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -161,6 +167,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { */ @RequestMapping(value="/edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -169,6 +176,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { pd.put("OPERATOR", pd.get("USER")); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFlimitspaceapproveService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); pd = GFlimitspaceapproveService.findById(pd); if(pd.get("STATUS")!= null && Tools.notEmpty(pd.get("STATUS").toString()) && "2".equals(pd.get("STATUS").toString())) { PageData corpinfo = new PageData(); @@ -245,6 +253,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { */ @RequestMapping(value="/editStatus") @ResponseBody + @DockAnnotation public Object editStatus() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -256,6 +265,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { pd.put("OPERATOR", pd.get("USER")); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFlimitspaceapproveService.editStatus(pd); + map.put("dockData", JSON.toJSONString(pd)); pd = GFlimitspaceapproveService.findById(pd); if(pd.get("STATUS")!= null && Tools.notEmpty(pd.get("STATUS").toString())) {//如果通过，发送短息能给现场负责人 String status = pd.get("STATUS").toString(); @@ -510,6 +520,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { */ @RequestMapping(value="/pigeonhole") @ResponseBody + @DockAnnotation public Object pigeonhole() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -520,6 +531,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { GFlimitspaceapproveService.editStatus(pd); // 完成气体检测单 GFgasDetectionService.finish(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -581,6 +593,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { */ @RequestMapping(value="/deleteAll") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -590,6 +603,7 @@ public class AppGFLimitSpaceApproveController extends BaseController { if(Tools.notEmpty(DATA_IDS)){ String ArrayDATA_IDS[] = DATA_IDS.split(","); GFlimitspaceapproveService.deleteAll(ArrayDATA_IDS); + map.put("dockData", JSON.toJSONString(pd)); errInfo = "success"; }else{ errInfo = "error"; diff --git a/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceController.java b/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceController.java index 2e37951b..acee4d3c 100644 --- a/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceController.java +++ b/src/main/java/com/zcloud/controller/gf/AppGFLimitSpaceController.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; @@ -37,6 +39,7 @@ public class AppGFLimitSpaceController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -49,6 +52,7 @@ public class AppGFLimitSpaceController 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; } @@ -60,6 +64,7 @@ public class AppGFLimitSpaceController extends BaseController { @RequestMapping(value="/delete") @RequiresPermissions("limitspace:del") @ResponseBody + @DockAnnotation public Object delete() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -68,6 +73,7 @@ public class AppGFLimitSpaceController extends BaseController { pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFlimitspaceService.delete(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; } @@ -78,6 +84,7 @@ public class AppGFLimitSpaceController extends BaseController { */ @RequestMapping(value="/edit") @ResponseBody + @DockAnnotation public Object edit() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -86,6 +93,7 @@ public class AppGFLimitSpaceController extends BaseController { pd.put("OPERATOR", pd.get("USER")); //修改人 pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 GFlimitspaceService.edit(pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -124,6 +132,7 @@ public class AppGFLimitSpaceController extends BaseController { pd = this.getPageData(); pd = GFlimitspaceService.findById(pd); //根据ID读取 map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } @@ -152,6 +161,7 @@ public class AppGFLimitSpaceController extends BaseController { @RequestMapping(value="/deleteAll") @RequiresPermissions("limitspace:del") @ResponseBody + @DockAnnotation public Object deleteAll() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -168,6 +178,7 @@ public class AppGFLimitSpaceController extends BaseController { }else{ errInfo = "error"; } + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); //返回结果 return map; }