fix

ruoyi-admin/docker-build.sh

@@ -1,17 +1,16 @@
 #!/usr/bin/env bash
-#docker build -t docker.xt.wenhq.top:8083/docker_r/yjzh_server:3.1 .
+# 新通测试环境
+#docker build -t docker.xt.wenhq.top:8083/docker_r/yjzh_server:3.1 . && docker push docker.xt.wenhq.top:8083/docker_r/yjzh_server:3.1
+#docker build -t docker.xt.wenhq.top:8083/docker_r/yjzh_server_duty:3.1 . && docker push docker.xt.wenhq.top:8083/docker_r/yjzh_server_duty:3.1
+#docker build -t docker.xt.wenhq.top:8083/docker_r/yjzh_server_plan:3.1 . && docker push docker.xt.wenhq.top:8083/docker_r/yjzh_server_plan:3.1
+#docker build -t docker.xt.wenhq.top:8083/docker_r/yjzh_server_resource:1.0 . && docker push docker.xt.wenhq.top:8083/docker_r/yjzh_server_resource:3.1
 
-#docker build -t docker.xt.wenhq.top:8083/docker_r/yjzh_server_duty:3.1 .
-
-#docker build -t docker.xt.wenhq.top:8083/docker_r/yjzh_server_plan:3.1 .
-
-#docker build -t docker.xt.wenhq.top:8083/docker_r/yjzh_server_resource:1.0 .
-
-docker build -t 10.11.208.18:18080/hses/yjzh_server:v3.1 .
-#docker build -t 10.11.208.18:18080/hses/yjzh_server_duty:v3.1 .
-#docker build -t 10.11.208.18:18080/hses/yjzh_server_plan:v3.1 .
-#docker build -t 10.11.208.18:18080/hses/yjzh_server_resource:v3.1 .
-#docker build -t 10.11.208.18:18080/hses/yjzh_server_file:v3.1 .
-#docker build -t 10.11.208.18:18080/hses/yjzh_server_task:v3.1 .
-#docker build -t 10.11.208.18:18080/hses/yjzh_server_user:v3.1 .
-#docker build -t 10.11.208.18:18080/hses/yjzh_server_incident:v3.1 .
+# 宿迁内网环境
+docker build -t 10.11.208.18:18080/hses/yjzh_server:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server:v3.1
+#docker build -t 10.11.208.18:18080/hses/yjzh_server_duty:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_duty:v3.1
+#docker build -t 10.11.208.18:18080/hses/yjzh_server_plan:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_plan:v3.1
+#docker build -t 10.11.208.18:18080/hses/yjzh_server_resource:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_resource:v3.1
+#docker build -t 10.11.208.18:18080/hses/yjzh_server_file:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_file:v3.1
+#docker build -t 10.11.208.18:18080/hses/yjzh_server_task:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_task:v3.1
+#docker build -t 10.11.208.18:18080/hses/yjzh_server_user:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_user:v3.1
+#docker build -t 10.11.208.18:18080/hses/yjzh_server_incident:v3.1 . && docker push 10.11.208.18:18080/hses/yjzh_server_incident:v3.1

ruoyi-admin/docker-push.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-#docker push docker.xt.wenhq.top:8083/docker_r/yjzh_server:3.1
-
-#docker push docker.xt.wenhq.top:8083/docker_r/yjzh_server_duty:3.1
-
-#docker push docker.xt.wenhq.top:8083/docker_r/yjzh_server_plan:3.1
-
-#docker push docker.xt.wenhq.top:8083/docker_r/yjzh_server_resource:3.1
-
-docker push 10.11.208.18:18080/hses/yjzh_server:v3.1
-#docker push 10.11.208.18:18080/hses/yjzh_server_duty:v3.1
-#docker push 10.11.208.18:18080/hses/yjzh_server_plan:v3.1
-#docker push 10.11.208.18:18080/hses/yjzh_server_resource:v3.1
-#docker push 10.11.208.18:18080/hses/yjzh_server_file:v3.1
-#docker push 10.11.208.18:18080/hses/yjzh_server_task:v3.1
-#docker push 10.11.208.18:18080/hses/yjzh_server_user:v3.1
-#docker push 10.11.208.18:18080/hses/yjzh_server_incident:v3.1

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -240,10 +240,10 @@ public class SysUserController extends BaseController {
     @GetMapping("/searchGatewayUser")
     @Security
     public AjaxResult searchGatewayUser(@RequestParam String name) {
-        GatewayUserPage gatewayUserPage = feignUserManageService.userPage(name);
+        GatewayUserPage gatewayUserPage = feignUserManageService.userPage(name, 1, 500);
         log.info("获取网关用户数据：{}", gatewayUserPage);
         List<GatewayUserPage.UserDetail> users = new ArrayList<>();
-        if (gatewayUserPage != null && gatewayUserPage.getCode() == 0) {
+        if (gatewayUserPage != null && gatewayUserPage.getCode() == 200) {
             int total = gatewayUserPage.getData().getTotal();
             if (total > 0) {
                 users = gatewayUserPage.getData().getRows();
@@ -268,6 +268,11 @@ public class SysUserController extends BaseController {
         if (StrUtil.isBlank(userId)) {
             return AjaxResult.error("用户id不能为空！");
         }
+        // 先查询本系统是否存在
+        SysUser sysUser = userService.selectUserById(userId);
+        if (sysUser != null) {
+            return AjaxResult.error("系统已存在，请在本系统管理该用户！");
+        }
         // 查询网关用户信息，并保存到系统
         GatewayUserDetail gatewayUserDetail = feignUserManageService.userDetail(userId);
         log.info("四维用户详情：{}", gatewayUserDetail);
@@ -289,7 +294,7 @@ public class SysUserController extends BaseController {
             newUser.setCreateTime(new Date());
             userService.insertUser(newUser);
         } else {
-            AjaxResult.error("网关未查询到该用户信息！");
+            return AjaxResult.error("网关未查询到该用户信息！");
         }
         return AjaxResult.success();
     }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/NoticeInfoListiner.java

@@ -164,7 +164,8 @@ public class NoticeInfoListiner {
                     messagePushBo.setMessageReadInfoList(messagePushUsers);
                     log.info("发送普通消息 => {}", messagePushBo);
                     if (!"dev".equals(env)) {
-                        feignNoticeInfoService.messagePush(messagePushBo);
+                        JSONObject jsonObject = feignNoticeInfoService.messagePush(messagePushBo);
+                        log.info("发送普通消息结果：{}", jsonObject);
                     }
                 } else if ("2".equals(messageType) || "3".equals(messageType)) {
                     // 应急处置待办
@@ -282,7 +283,8 @@ public class NoticeInfoListiner {
             messagePushBo.setMessageReadInfoList(messagePushUsers);
             log.info("发送普通消息 => {}", messagePushBo);
             if (!"dev".equals(env)) {
-                feignNoticeInfoService.messagePush(messagePushBo);
+                JSONObject jsonObject = feignNoticeInfoService.messagePush(messagePushBo);
+                log.info("发送普通消息结果：{}", jsonObject);
             }
 
             // 查询发送用户的手机号
@@ -354,7 +356,7 @@ public class NoticeInfoListiner {
     @Bean
     public void removeIncidentUser() {
         RedisUtils.subscribe(Constants.INCIDENT_USER_DELETE, JSONArray.class, msg -> {
-            log.info("移出事件人员关系 => " + msg);
+            log.info("移除事件人员关系 => " + msg);
             List<IncidentUser> incidentUsers = JSONUtil.toList(msg, IncidentUser.class);
             for (IncidentUser incidentUser : incidentUsers) {
                 incidentUserService.remove(Wrappers.<IncidentUser>lambdaQuery()

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -222,12 +222,12 @@ public class SysDeptServiceImpl extends ServicePlusImpl<SysDeptMapper, SysDept,
     public int updateDept(SysDept dept) {
         SysDept newParentDept = getById(dept.getParentId());
         SysDept oldDept = getById(dept.getDeptId());
-        if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
+        /*if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
             String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
             String oldAncestors = oldDept.getAncestors();
             dept.setAncestors(newAncestors);
             updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
-        }
+        }*/
         int result = baseMapper.updateById(dept);
         if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
             && !StringUtils.equals("0", dept.getAncestors())) {

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/feign/FeignNoticeInfoService.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface FeignNoticeInfoService {
 
     @PostMapping("/messagepushinfo")
-    void messagePush(@RequestBody MessagePushBo messagePushBo);
+    JSONObject messagePush(@RequestBody MessagePushBo messagePushBo);
 
     @GetMapping("/messagepushinfo/list")
     JSONObject messagePushInfoList(@RequestParam(value = "msSource") String msSource, @RequestParam(value = "msType") String msType, @RequestParam(value = "msNo") String msNo);

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/feign/FeignUserManageService.java

@@ -25,6 +25,6 @@ public interface FeignUserManageService {
     GatewayUserDetail userDetail(@RequestParam(value = "userId") String userId);
 
     @GetMapping("/user/pageList")
-    GatewayUserPage userPage(@RequestParam(value = "name") String name);
+    GatewayUserPage userPage(@RequestParam(value = "name") String name, @RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize);
 
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/feign/fallback/FeignNoticeInfoFallback.java

@@ -17,8 +17,9 @@ import org.springframework.stereotype.Component;
 public class FeignNoticeInfoFallback implements FeignNoticeInfoService {
 
     @Override
-    public void messagePush(MessagePushBo messagePushBo) {
+    public JSONObject messagePush(MessagePushBo messagePushBo) {
         log.error("APP发送消息失败");
+        return null;
     }
 
     @Override

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/feign/fallback/FeignUserManageFallback.java

@@ -24,7 +24,7 @@ public class FeignUserManageFallback implements FeignUserManageService {
     }
 
     @Override
-    public GatewayUserPage userPage(String name) {
+    public GatewayUserPage userPage(String name, Integer pageNum, Integer pageSize) {
         log.error("获取用户列表失败");
         return null;
     }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/service/impl/IncidentServiceImpl.java

@@ -135,11 +135,16 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
     public Boolean updateByBo(IncidentBo bo) {
         bo.setCreateBy(null);
         bo.setCreateDept(null);
+        bo.setAssistDept(StrUtil.nullToEmpty(bo.getAssistDept()));
+        bo.setAssistTaskUser(StrUtil.nullToEmpty(bo.getAssistTaskUser()));
+        bo.setAssistDeptUser(StrUtil.nullToEmpty(bo.getAssistDeptUser()));
         // 是否为状态变更
         boolean flag;
 
         // 查询变更前信息
         IncidentVo beforeInfo = getVoById(bo.getId());
+        log.info("事件变更前信息：{}", beforeInfo);
+        log.info("事件变更后信息：{}", bo);
         if (beforeInfo != null) {
             flag = !(beforeInfo.getStatus().equals(bo.getStatus()));
         } else {
@@ -192,17 +197,19 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
         } else if (!flag
             && bo.getStatus() == 3
             && (!StrUtil.equals(bo.getAssistDept(), beforeInfo.getAssistDept())
-            || !StrUtil.equals(bo.getCommander(), beforeInfo.getCommander())
+//            || !StrUtil.equals(bo.getCommander(), beforeInfo.getCommander())
             || !StrUtil.equals(bo.getAssistTaskUser(), beforeInfo.getAssistTaskUser())
             || !StrUtil.equals(bo.getAssistDeptUser(), beforeInfo.getAssistDeptUser()))) {
             // 协办部门派发或再次对协办修改
             // 重新冗余协办部门、总指挥
-            if (StrUtil.isBlank(bo.getCommander())) {
+            /*if (StrUtil.isBlank(bo.getCommander())) {
                 throw new ServiceException("请选择总指挥！");
-            }
-            SysUser commanderText = sysUserService.selectUserById(bo.getCommander());
-            if (commanderText != null) {
-                update.setCommanderText(commanderText.getNickName());
+            }*/
+            if (StrUtil.isNotBlank(bo.getCommander())) {
+                SysUser commanderText = sysUserService.selectUserById(bo.getCommander());
+                if (commanderText != null) {
+                    update.setCommanderText(commanderText.getNickName());
+                }
             }
             if (StrUtil.isBlank(bo.getAssistDept())) {
                 update.setAssistDeptText("");
@@ -219,19 +226,19 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
                 }
             }
             // 分析变更的派发对象
-            // 变更的总指挥
+            // 变更的总指挥(目前需求：总指挥不能变更)
             String oldCommander = beforeInfo.getCommander();
             String newCommander = bo.getCommander();
-            if (StrUtil.isNotBlank(oldCommander) && !StrUtil.equals(oldCommander, newCommander)) {
+            /*if (StrUtil.isNotBlank(oldCommander) && !StrUtil.equals(oldCommander, newCommander)) {
                 // 删除关系
                 IncidentUser remove = new IncidentUser();
                 remove.setIncidentId(bo.getId());
                 remove.setUserId(oldCommander);
                 remove.setSource("5");
                 removeJsonArray.add(remove);
-            }
+            }*/
             // 将总指挥加入到关系
-            if (!StrUtil.equals(oldCommander, newCommander)) {
+            if (StrUtil.isNotBlank(newCommander) && !StrUtil.equals(oldCommander, newCommander)) {
                 IncidentUser save = new IncidentUser();
                 save.setIncidentId(bo.getId());
                 save.setUserId(newCommander);
@@ -328,9 +335,11 @@ public class IncidentServiceImpl extends ServicePlusImpl<IncidentMapper, Inciden
         boolean b = updateById(update);
 
         if (removeJsonArray.size() > 0) {
+            log.info("需要移除的用户事件关系：{}", removeJsonArray);
             RedisUtils.publish(Constants.INCIDENT_USER_DELETE, removeJsonArray);
         }
         if (saveJsonArray.size() > 0) {
+            log.info("需要新增的用户事件关系：{}", saveJsonArray);
             RedisUtils.publish(Constants.INCIDENT_USER_BATCH, saveJsonArray);
         }