From 65b2c2fa5c2fdbff8cb4c30a5326cf92aa30ac2e Mon Sep 17 00:00:00 2001 From: z Date: Wed, 20 Dec 2023 17:10:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=B7=A5=E7=A8=8B=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/keyProjects/KeyprojectCheckController.java | 3 +++ .../keyProjects/app/AppKeyprojectCheckController.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java index 309d9af1..eae3b74a 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/KeyprojectCheckController.java @@ -2,6 +2,7 @@ package com.zcloud.controller.keyProjects; 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; @@ -43,6 +44,7 @@ public class KeyprojectCheckController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -111,6 +113,7 @@ public class KeyprojectCheckController extends BaseController { pd.put("hiddenList", hiddenList); } map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); return map; } diff --git a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java index 9b5ce3a1..d9b7f91b 100644 --- a/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java +++ b/src/main/java/com/zcloud/controller/keyProjects/app/AppKeyprojectCheckController.java @@ -3,6 +3,7 @@ package com.zcloud.controller.keyProjects.app; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; 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; @@ -55,6 +56,7 @@ public class AppKeyprojectCheckController extends BaseController { */ @RequestMapping(value="/add") @ResponseBody + @DockAnnotation(isAdd = true) public Object add() throws Exception{ Map map = new HashMap(); String errInfo = "success"; @@ -117,6 +119,7 @@ public class AppKeyprojectCheckController extends BaseController { hidden.put("ISDELETE", "0"); //是否删除(0:有效 1：删除) hidden.put("POSITIONDESC",json.getString("POSITIONDESC"));// 隐患位置描述 + keyprojectHiddenService.save(hidden); hiddenList.add(hidden); time = DateUtil.calculateDateSecond(time, 1); @@ -174,6 +177,7 @@ public class AppKeyprojectCheckController extends BaseController { e.printStackTrace(); }finally { map.put("pd", pd); + map.put("dockData", JSON.toJSONString(pd)); map.put("result", errInfo); } return map;