pc端对接问题修复

src/main/java/com/zcloud/controller/bus/CheckRecordController.java

@@ -250,6 +250,7 @@ public class CheckRecordController extends BaseController {
 		pd = this.getPageData();
 		checkrecordService.delete(pd);
 		map.put("result", errInfo); // 返回结果
+		map.put("dockData",JSON.toJSONString(pd));
 		return map;
 	}
 

src/main/java/com/zcloud/controller/bus/HiddenExamineController.java

@@ -1,5 +1,6 @@
 package com.zcloud.controller.bus;
 
+import com.alibaba.fastjson.JSON;
 import com.zcloud.aspect.DockAnnotation;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
@@ -319,6 +320,7 @@ public class HiddenExamineController extends BaseController {
                     hiddenpd.getString("HIDDENDESCR"), "隐患整改", "确认", "", "");
         }
         map.put("result", errInfo);
+        map.put("dockData", JSON.toJSONString(pd));
         return map;
     }
 

src/main/java/com/zcloud/controller/bus/HiddenRegionController.java

@@ -87,6 +87,7 @@ public class HiddenRegionController extends BaseController {
             hiddenRegionService.delete(pd);			//执行删除
         }
         map.put("result", errInfo);					//返回结果
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 
@@ -108,6 +109,7 @@ public class HiddenRegionController extends BaseController {
         pd = this.getPageData();
         hiddenRegionService.edit(pd);
         map.put("result",errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 

src/main/java/com/zcloud/controller/firemanager/FireCheckListController.java

@@ -245,6 +245,7 @@ public class FireCheckListController extends BaseController {
             map.put("result", "error");
             map.put("msg", "只有主账号可以删除清单");
         }
+        map.put("dockData",JSON.toJSONString(map));
         return map;
     }
 
@@ -315,6 +316,7 @@ public class FireCheckListController extends BaseController {
         PageData pageData = this.getPageData();
         fireCheckListService.closeCheck(pageData);
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pageData));
         return map;
     }
 

src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java

@@ -118,6 +118,7 @@ public class FireDeviceController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
         fireDeviceService.updFireDeviceById(pd);
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 
@@ -139,6 +140,7 @@ public class FireDeviceController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
         fireDeviceService.removeFireDeviceByIds(pd);
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 

src/main/java/com/zcloud/controller/firemanager/FirePointController.java

@@ -159,6 +159,7 @@ public class FirePointController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
         firePointService.updFirePointById(files,pd);
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 
@@ -197,7 +198,7 @@ public class FirePointController extends BaseController {
         pd.put("OPERATTIME", DateUtil.date2Str(new Date()));
         firePointService.removeFirePointByIds(pd);
         map.put("result", errInfo);
-
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 

src/main/java/com/zcloud/controller/firemanager/FireRegionController.java

@@ -117,6 +117,7 @@ public class FireRegionController extends BaseController {
             map.put("msg", "修改成功");
         }
         map.put("result", errInfo);
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 
@@ -191,6 +192,7 @@ public class FireRegionController extends BaseController {
             map.put("result", "error");
             map.put("msg", "当前有启用的检查项使用该区域禁止禁用");
         }
+        map.put("dockData",JSON.toJSONString(pd));
         return map;
     }
 

src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java

@@ -457,6 +457,7 @@ public class HiddenApiController extends BaseController {
     @RequestMapping(value = "/repulseHidden")
     @RequiresPermissions("hidden:list")
     @ResponseBody
+    @DockAnnotation
     public Object repulseHidden() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         Integer code = 000000;
@@ -484,13 +485,15 @@ public class HiddenApiController extends BaseController {
         before.put("OPERATOR", Jurisdiction.getUSER_ID());
         before.put("OPERATTIME", DateUtil.date2Str(new Date()));
         before.put("REPULSE_CAUSE", pd.getString("REJECTOPINION"));
-        hiddenExamineApiService.save(before);
+        before = hiddenExamineApiService.save(before);
+        pd.put("before",JSON.toJSONString(before));
         List<PageData> hiddenUserList = hiddenUserApiService.getListByHiddenId(pd.getString("HIDDEN_ID"));
         for (PageData pageData : hiddenUserList) {
             messageService.sendMessageByParameter("HIDDEN_MAIL_001", "友情提示：有一条隐患被打回",
                     Jurisdiction.getCORPINFO_ID(), pageData.getString("USER_ID"), pd.getString("HIDDEN_ID"),
                     pd.getString("HIDDENDESCR"), "上报", "查看", "", "");
         }
+        map.put("dockData",JSON.toJSONString(pd));
         return ResultCodeConstant.resMap(code, map);
     }