From c81dd7dcbd31fa81b7e9cc4d29d37c2c78ced916 Mon Sep 17 00:00:00 2001 From: songwenxuan <1924103812@qq.com> Date: Fri, 29 Dec 2023 11:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BB=A3=E7=A0=81dockData?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/controller/bus/CorpInfoController.java | 7 ++----- .../java/com/zcloud/controller/bus/HiddenController.java | 2 ++ .../controller/bus/IdentificationPartsController.java | 2 ++ .../com/zcloud/controller/bus/ListManagerController.java | 2 ++ .../zcloud/controller/bus/QualificationsController.java | 2 ++ .../com/zcloud/controller/bus/RiskCheckItemController.java | 2 ++ .../com/zcloud/controller/bus/RiskPointController.java | 7 ++++++- .../java/com/zcloud/controller/bus/RiskUnitController.java | 2 ++ .../com/zcloud/controller/bus/RiskWarningController.java | 1 + .../zcloud/controller/filemanager/MfolderController.java | 3 +++ .../inspection/SafetyEnvironmentalController.java | 1 + .../com/zcloud/controller/system/DepartmentController.java | 5 +++-- .../java/com/zcloud/controller/system/PostController.java | 2 ++ .../java/com/zcloud/controller/system/UsersController.java | 4 +++- 14 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java index 207eff14..faa62455 100644 --- a/src/main/java/com/zcloud/controller/bus/CorpInfoController.java +++ b/src/main/java/com/zcloud/controller/bus/CorpInfoController.java @@ -193,8 +193,6 @@ public class CorpInfoController extends BaseController { PageData userInfo = usersService.findByCorpInfoId(pd); pdNew.put("USER_ID", userInfo.getString("USER_ID")); pdNew.put("DEPARTMENT_ID", userInfo.getString("DEPARTMENT_ID")); - - //新增变量添加参数 根据原名称修改数据 pdNew.put("OLDNAME",pdOld.get("CORP_NAME")); pdNew.put("USERNAME",pd.getString("CORP_NAME")); @@ -202,8 +200,7 @@ public class CorpInfoController extends BaseController { pdNew.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("CORP_NAME"), Const.DEFAULT_PASSWORD).toString()); //密码加密 corpinfoService.editCorpUserNew(pdNew); corpinfoService.editCorpdeptNew(pdNew); - - + map.put("dockData","对接接口"); return map; } @RequestMapping(value="/editIsReceive") @@ -373,7 +370,7 @@ public class CorpInfoController extends BaseController { updateUser.put("PASSWORD", pwd); updateUser.put("USER_ID", pageData.getString("USER_ID")); usersService.editPassword(updateUser); - + map.put("dockData","对接接口"); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/HiddenController.java b/src/main/java/com/zcloud/controller/bus/HiddenController.java index f30065e5..fa2d6570 100644 --- a/src/main/java/com/zcloud/controller/bus/HiddenController.java +++ b/src/main/java/com/zcloud/controller/bus/HiddenController.java @@ -408,6 +408,7 @@ public class HiddenController extends BaseController { applicationContext.publishEvent(new DeviceHiddenEvent(new Object(), pd.getString("HIDDEN_ID"), "1")); FHLOG.save(Jurisdiction.getName(), "删除隐患ID:" + pd.getString("HIDDEN_ID"), ip); //记录日志 用户ID 隐患id 时间 map.put("result", errInfo); // 返回结果 + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -2111,6 +2112,7 @@ public class HiddenController 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/bus/IdentificationPartsController.java b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java index fa7c034f..e33b68f2 100644 --- a/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java +++ b/src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java @@ -147,6 +147,7 @@ public class IdentificationPartsController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 identificationpartsService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData","对接接口"); return map; } @@ -167,6 +168,7 @@ public class IdentificationPartsController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 identificationpartsService.edit(pd); map.put("result", errInfo); + map.put("dockData",JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/ListManagerController.java b/src/main/java/com/zcloud/controller/bus/ListManagerController.java index d2849029..360b5f7a 100644 --- a/src/main/java/com/zcloud/controller/bus/ListManagerController.java +++ b/src/main/java/com/zcloud/controller/bus/ListManagerController.java @@ -493,6 +493,7 @@ public class ListManagerController extends BaseController { } // 将本频率内已检查的记录，改为不计入 map.put("result", errInfo); //返回结果 + map.put("dockData",JSON.toJSONString(pd)); return map; } @@ -1082,6 +1083,7 @@ public class ListManagerController extends BaseController { errInfo = "fail"; } map.put("result", errInfo); //返回结果 + map.put("dockData",JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/QualificationsController.java b/src/main/java/com/zcloud/controller/bus/QualificationsController.java index 0060e5eb..d0c3060c 100644 --- a/src/main/java/com/zcloud/controller/bus/QualificationsController.java +++ b/src/main/java/com/zcloud/controller/bus/QualificationsController.java @@ -98,6 +98,7 @@ public class QualificationsController extends BaseController { } } map.put("result", errInfo); //返回结果 + map.put("dockData",JSON.toJSONString(pd)); return map; } @@ -119,6 +120,7 @@ public class QualificationsController extends BaseController { qualificationsService.edit(pd); map.put("result", errInfo); map.put("pd", pd); + map.put("dockData",JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/RiskCheckItemController.java b/src/main/java/com/zcloud/controller/bus/RiskCheckItemController.java index 7a5b5950..533b8de2 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskCheckItemController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskCheckItemController.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.alibaba.fastjson.JSON; import com.zcloud.aspect.DockAnnotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -90,6 +91,7 @@ public class RiskCheckItemController extends BaseController { pd = this.getPageData(); riskcheckitemService.edit(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/RiskPointController.java b/src/main/java/com/zcloud/controller/bus/RiskPointController.java index dfdee814..51f5ddf1 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskPointController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskPointController.java @@ -200,6 +200,7 @@ public class RiskPointController extends BaseController { pd = this.getPageData(); riskpointService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData",JSON.toJSONString(pd)); return map; } @@ -221,6 +222,7 @@ public class RiskPointController extends BaseController { riskToUserService.delete(pd); if(pd.get("OTHER")!=null && !pd.get("OTHER").equals("")) { List list = (List)JSON.parse(pd.get("OTHER").toString()); + ArrayList arrayList = new ArrayList<>(); for (JSONObject json : list) { if(json.get("DEPARTMENT_ID")!=null && json.get("DEPARTMENT_ID")!="" && json.get("USER_ID")!=null && json.get("USER_ID")!="") { PageData other = new PageData(); @@ -228,10 +230,11 @@ public class RiskPointController extends BaseController { other.put("RISKPOINT_ID", pd.get("RISKPOINT_ID")); other.put("DEPARTMENT_ID",json.get("DEPARTMENT_ID")); other.put("USER_ID",json.get("USER_ID")); + arrayList.add(other); riskToUserService.save(other); } - } + pd.put("arrayList",JSON.toJSONString(arrayList)); } // 修改冗余字段检查内容 PageData pd2 = new PageData(); @@ -239,6 +242,7 @@ public class RiskPointController extends BaseController { pd2.put("RISKPOINT_ID", pd.get("RISKPOINT_ID")); riskcheckitemService.editByPoint(pd2); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -424,6 +428,7 @@ public class RiskPointController extends BaseController { errInfo = "fail"; } map.put("result", errInfo); //返回结果 + map.put("dockData",JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java index 34035bff..48fce281 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskUnitController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskUnitController.java @@ -155,6 +155,7 @@ public class RiskUnitController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 riskunitService.delete(pd); map.put("result", errInfo); //返回结果 + pd.put("dockData",JSON.toJSONString(pd)); return map; } @@ -183,6 +184,7 @@ public class RiskUnitController extends BaseController { pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间 riskunitService.edit(pd); map.put("result", errInfo); + map.put("dockData","对接接口"); return map; } diff --git a/src/main/java/com/zcloud/controller/bus/RiskWarningController.java b/src/main/java/com/zcloud/controller/bus/RiskWarningController.java index b9b0bbf5..d8172f49 100644 --- a/src/main/java/com/zcloud/controller/bus/RiskWarningController.java +++ b/src/main/java/com/zcloud/controller/bus/RiskWarningController.java @@ -108,6 +108,7 @@ public class RiskWarningController extends BaseController { pd = this.getPageData(); riskwarningService.delete(pd); map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java index 7f245330..3523bcca 100644 --- a/src/main/java/com/zcloud/controller/filemanager/MfolderController.java +++ b/src/main/java/com/zcloud/controller/filemanager/MfolderController.java @@ -118,6 +118,7 @@ public class MfolderController extends BaseController { errInfo = "fail"; } map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); return map; } @@ -252,6 +253,7 @@ public class MfolderController extends BaseController { errInfo = "fail"; map.put("result", "errInfo"); //返回结果 map.put("msg","文件夹下有文件，请先删除文件夹中文件"); + map.put("dockData", JSON.toJSONString(pd)); return map; }else{ if(Tools.notEmpty(FILEPATH)){ @@ -262,6 +264,7 @@ public class MfolderController extends BaseController { map.put("dockData", JSON.toJSONString(pd)); //返回结果 } map.put("result", errInfo); //返回结果 + map.put("dockData", JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java index 59db4739..afe8dc04 100644 --- a/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java +++ b/src/main/java/com/zcloud/controller/inspection/SafetyEnvironmentalController.java @@ -475,6 +475,7 @@ public class SafetyEnvironmentalController extends BaseController { pd.put("hide", "1"); safetyenvironmentalService.delete(pd); map.put("result", errInfo); + map.put("dockData", JSON.toJSONString(pd)); return map; } diff --git a/src/main/java/com/zcloud/controller/system/DepartmentController.java b/src/main/java/com/zcloud/controller/system/DepartmentController.java index ca203613..7326851a 100644 --- a/src/main/java/com/zcloud/controller/system/DepartmentController.java +++ b/src/main/java/com/zcloud/controller/system/DepartmentController.java @@ -184,7 +184,7 @@ public class DepartmentController extends BaseController { } else { departmentService.delete(pd); //执行删除 } - + map.put("dockData","对接接口"); map.put("result", errInfo); //返回结果 return map; } @@ -250,6 +250,7 @@ public class DepartmentController extends BaseController { } } map.put("result", errInfo); //返回结果 + map.put("dockData","对接接口"); return map; } @@ -599,8 +600,8 @@ public class DepartmentController extends BaseController { return map; } departmentService.editByLeaderOrCharge(goEditPd); - map.put("result", "success"); + map.put("dockData","对接接口"); return map; } diff --git a/src/main/java/com/zcloud/controller/system/PostController.java b/src/main/java/com/zcloud/controller/system/PostController.java index 7d96f948..1f109c7f 100644 --- a/src/main/java/com/zcloud/controller/system/PostController.java +++ b/src/main/java/com/zcloud/controller/system/PostController.java @@ -87,6 +87,7 @@ public class PostController extends BaseController { postService.delete(pd); } map.put("result", errInfo); //返回结果 + map.put("dockData","对接接口"); return map; } @@ -105,6 +106,7 @@ public class PostController extends BaseController { pd = this.getPageData(); postService.edit(pd); map.put("result", errInfo); + map.put("dockData","对接接口"); return map; } diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 7de73477..76de0d22 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -506,6 +506,7 @@ public class UsersController extends BaseController { pd = usersService.findById(pd); //根据ID读取 map.put("result", errInfo); map.put("pd", pd); + map.put("dockData","对接接口"); return map; } @@ -777,6 +778,7 @@ public class UsersController extends BaseController { } map.put("result", errInfo); + map.put("dockData","对接接口"); return map; } @@ -1132,8 +1134,8 @@ public class UsersController extends BaseController { } } } - map.put("result", errInfo); //返回结果 + map.put("dockData","对接接口"); return map; }