From 27f2bf7925f7517aa2e16b2f58ff0db916b7e588 Mon Sep 17 00:00:00 2001 From: limingyu Date: Mon, 8 Jan 2024 16:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppHotWorkApplicationController.java | 13 +++++----- .../HotWorkApplicationUserService.java | 4 +++- .../HotWorkApplicationUserServiceImpl.java | 24 ++++++++++++++++++- 3 files changed, 32 insertions(+), 9 deletions(-) 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 49535cad..f9db54d4 100644 --- a/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java +++ b/src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java @@ -7,7 +7,6 @@ import com.zcloud.controller.base.BaseController; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.entity.system.Dictionaries; -import com.zcloud.entity.system.User; import com.zcloud.service.bus.*; import com.zcloud.service.highriskwork.HotWorkApplicationService; import com.zcloud.service.highriskwork.HotWorkApplicationUserService; @@ -17,11 +16,8 @@ import com.zcloud.service.system.DictionariesService; import com.zcloud.service.system.FHlogService; import com.zcloud.util.*; import com.zcloud.util.message.MessageService; -import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.crypto.hash.SimpleHash; -import org.apache.xpath.SourceTree; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.transaction.annotation.Transactional; @@ -31,7 +27,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; -import java.io.File; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -236,7 +231,9 @@ public class AppHotWorkApplicationController extends BaseController { PageData confinedPageData = new PageData(); // pd对接数据 confinedPageData.putAll(pd); dockData.put("dockData", JSON.toJSONString(confinedPageData)); - hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd); + Map hotuserMap = new HashMap<>(); + hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd,hotuserMap); + dockData.put("hotuserMap", JSON.toJSONString(hotuserMap)); hotworkapplicationService.save(pd); this.sendNotice(pd); //发送通知公告 map.put("dockData", JSON.toJSONString(dockData)); @@ -356,7 +353,9 @@ public class AppHotWorkApplicationController extends BaseController { confinedPageData.putAll(pd); dockData.put("dockData", JSON.toJSONString(confinedPageData)); hotworkapplicationService.edit(pd); - hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd); + Map hotuserMap = new HashMap<>(); + hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd, hotuserMap); + dockData.put("hotuserMap", JSON.toJSONString(hotuserMap)); this.sendNotice(pd); map.put("dockData", JSON.toJSONString(dockData)); map.put("result", errInfo); diff --git a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java index d5ac1286..5bb024e1 100644 --- a/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java +++ b/src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java @@ -1,6 +1,8 @@ package com.zcloud.service.highriskwork; import java.util.List; +import java.util.Map; + import com.zcloud.entity.Page; import com.zcloud.entity.PageData; @@ -73,7 +75,7 @@ public interface HotWorkApplicationUserService{ /**新增 * @throws Exception */ - public void saveUserByHot(String hotID, PageData hotPd)throws Exception; + public void saveUserByHot(String hotID, PageData hotPd, Map syncMap)throws Exception; /** * 延时监火转发前删除 diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java index 0a931c53..d1daf38c 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java @@ -1,5 +1,6 @@ package com.zcloud.service.highriskwork.impl; +import com.alibaba.fastjson.JSON; import com.zcloud.entity.Page; import com.zcloud.entity.PageData; import com.zcloud.mapper.datasource.highriskwork.HotWorkApplicationUserMapper; @@ -107,10 +108,13 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser /**新增 * @throws Exception */ - public void saveUserByHot(String hotID, PageData hotPd)throws Exception{ + public void saveUserByHot(String hotID, PageData hotPd, Map syncMap)throws Exception{ if(!Tools.isEmpty(hotID)){ PageData del = new PageData(); del.put("FOREIGN_KEY",hotID); + PageData dockDatadel = new PageData(); // pd对接数据 + dockDatadel.putAll(del); + syncMap.put("dockDatadel", JSON.toJSONString(dockDatadel)); hotworkapplicationuserMapper.delete(del); // 删除 项目相关人员 /** @@ -127,6 +131,8 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser "HOT_WORK_USER_ID","PROJECT_UNIT_LEADER_ID","UNIT_LEADER_ID", "ISSUING_USER_ID","SAFETY_DIRECTOR_USER_ID", "SITE_LEADER_ID" }; + Map userMap = new HashMap<>(); + int count = 1; for (int i = 0;i