fix

ruoyi-admin/Dockerfile

@@ -1,5 +1,4 @@
 FROM anapsix/alpine-java:8_server-jre_unlimited
-#FROM openjdk:8-jdk-alpine
 
 MAINTAINER XinTong
 
@@ -18,23 +17,66 @@ ENTRYPOINT ["./start.sh"]
 
 #EXPOSE 8081
 #ADD ./target/ruoyi-admin.jar ./app.jar
+#ADD ./Shanghai /home/Shanghai
 #ADD start-duty.sh ./start.sh
+#RUN ln -sf /home/Shanghai /etc/localtime \
+#    && echo "Asia/Shanghai" > /etc/timezone
 #RUN chmod +x ./start.sh
 #ENTRYPOINT ["./start.sh"]
 
 #EXPOSE 8082
 #ADD ./target/ruoyi-admin.jar ./app.jar
+#ADD ./Shanghai /home/Shanghai
 #ADD start-plan.sh ./start.sh
+#RUN ln -sf /home/Shanghai /etc/localtime \
+#    && echo "Asia/Shanghai" > /etc/timezone
 #RUN chmod +x ./start.sh
 #ENTRYPOINT ["./start.sh"]
 
 #EXPOSE 8083
 #ADD ./target/ruoyi-admin.jar ./app.jar
+#ADD ./Shanghai /home/Shanghai
 #ADD start-resource.sh ./start.sh
+#RUN ln -sf /home/Shanghai /etc/localtime \
+#    && echo "Asia/Shanghai" > /etc/timezone
 #RUN chmod +x ./start.sh
 #ENTRYPOINT ["./start.sh"]
 
+#EXPOSE 8084
+#ADD ./target/ruoyi-admin.jar ./app.jar
+#ADD ./Shanghai /home/Shanghai
+#ADD start-file.sh ./start.sh
+#RUN ln -sf /home/Shanghai /etc/localtime \
+#    && echo "Asia/Shanghai" > /etc/timezone
+#RUN chmod +x ./start.sh
+#ENTRYPOINT ["./start.sh"]
+
+#EXPOSE 8085
+#ADD ./target/ruoyi-admin.jar ./app.jar
+#ADD ./Shanghai /home/Shanghai
+#ADD start-task.sh ./start.sh
+#RUN ln -sf /home/Shanghai /etc/localtime \
+#    && echo "Asia/Shanghai" > /etc/timezone
+#RUN chmod +x ./start.sh
+#ENTRYPOINT ["./start.sh"]
 
+#EXPOSE 8086
+#ADD ./target/ruoyi-admin.jar ./app.jar
+#ADD ./Shanghai /home/Shanghai
+#ADD start-user.sh ./start.sh
+#RUN ln -sf /home/Shanghai /etc/localtime \
+#    && echo "Asia/Shanghai" > /etc/timezone
+#RUN chmod +x ./start.sh
+#ENTRYPOINT ["./start.sh"]
+
+#EXPOSE 8087
+#ADD ./target/ruoyi-admin.jar ./app.jar
+#ADD ./Shanghai /home/Shanghai
+#ADD start-incident.sh ./start.sh
+#RUN ln -sf /home/Shanghai /etc/localtime \
+#    && echo "Asia/Shanghai" > /etc/timezone
+#RUN chmod +x ./start.sh
+#ENTRYPOINT ["./start.sh"]
 
 
 

ruoyi-admin/docker-build.sh

@@ -8,3 +8,10 @@
 #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 .

ruoyi-admin/docker-push.sh

@@ -8,3 +8,10 @@
 #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/task/NoticeInfoListiner.java

@@ -132,6 +132,10 @@ public class NoticeInfoListiner {
                 incidentProcess.setStatus(0);
             }
             List<MessagePushUser> messagePushUsers = JSONUtil.toList(messageUser, MessagePushUser.class);
+            // 针对待办的消息，执行日志还需要把人名显示出来
+            if (2 == incidentProcess.getStatus()) {
+                incidentProcess.setDes(incidentProcess.getDes() + " 【待办】，发送给：" + messagePushUsers.stream().map(MessagePushUser::getNickName).collect(Collectors.joining(",")));
+            }
             incidentProcessService.save(incidentProcess);
             if (sendFlag) {
                 if ("1".equals(messageType)) {

ruoyi-admin/start-duty.sh

@@ -3,7 +3,7 @@
 # 命令后加入 & ，保持程序后台持续运行
 #脚本所在目录
 SHELL_FOLDER=$(cd "$(dirname "$0")" || exit;pwd)
-nohup java -jar -Druoyi.name=YJZH-SQ-DUTY -Dserver.port=8081 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
+nohup java -jar -Duser.timezone=Asia/Shanghai -Druoyi.name=yjzh-duty -Dserver.port=8081 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
 
 # 死循环，保持docker前台运行
 while [[ true ]]; do

ruoyi-admin/start-file.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# 命令后加入 & ，保持程序后台持续运行
+#脚本所在目录
+SHELL_FOLDER=$(cd "$(dirname "$0")" || exit;pwd)
+nohup java -jar -Duser.timezone=Asia/Shanghai -Druoyi.name=yjzh-file -Dserver.port=8084 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
+
+# 死循环，保持docker前台运行
+while [[ true ]]; do
+    sleep 1
+done

ruoyi-admin/start-incident.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# 命令后加入 & ，保持程序后台持续运行
+#脚本所在目录
+SHELL_FOLDER=$(cd "$(dirname "$0")" || exit;pwd)
+nohup java -jar -Duser.timezone=Asia/Shanghai -Druoyi.name=yjzh-incident -Dserver.port=8087 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
+
+# 死循环，保持docker前台运行
+while [[ true ]]; do
+    sleep 1
+done

ruoyi-admin/start-plan.sh

@@ -3,7 +3,7 @@
 # 命令后加入 & ，保持程序后台持续运行
 #脚本所在目录
 SHELL_FOLDER=$(cd "$(dirname "$0")" || exit;pwd)
-nohup java -jar -Druoyi.name=YJZH-SQ-PLAN -Dserver.port=8082 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
+nohup java -jar -Duser.timezone=Asia/Shanghai -Druoyi.name=yjzh-plan -Dserver.port=8082 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
 
 # 死循环，保持docker前台运行
 while [[ true ]]; do

ruoyi-admin/start-resource.sh

@@ -3,7 +3,7 @@
 # 命令后加入 & ，保持程序后台持续运行
 #脚本所在目录
 SHELL_FOLDER=$(cd "$(dirname "$0")" || exit;pwd)
-nohup java -jar -Druoyi.name=YJZH-SQ-RESOURCE -Dserver.port=8083 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
+nohup java -jar -Duser.timezone=Asia/Shanghai -Druoyi.name=yjzh-resource -Dserver.port=8083 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
 
 # 死循环，保持docker前台运行
 while [[ true ]]; do

ruoyi-admin/start-task.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# 命令后加入 & ，保持程序后台持续运行
+#脚本所在目录
+SHELL_FOLDER=$(cd "$(dirname "$0")" || exit;pwd)
+nohup java -jar -Duser.timezone=Asia/Shanghai -Druoyi.name=yjzh-task -Dserver.port=8085 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
+
+# 死循环，保持docker前台运行
+while [[ true ]]; do
+    sleep 1
+done

ruoyi-admin/start-user.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# 命令后加入 & ，保持程序后台持续运行
+#脚本所在目录
+SHELL_FOLDER=$(cd "$(dirname "$0")" || exit;pwd)
+nohup java -jar -Duser.timezone=Asia/Shanghai -Druoyi.name=yjzh-user -Dserver.port=8086 -Dspring.profiles.active=test app.jar > $SHELL_FOLDER/catalina.out 2>&1 &
+
+# 死循环，保持docker前台运行
+while [[ true ]]; do
+    sleep 1
+done

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -198,11 +198,13 @@
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
         where u.user_name = #{userName}
+        and u.del_flag = '0'
     </select>
 
     <select id="selectUserById" parameterType="string" resultMap="SysUserResult">
         <include refid="selectUserVo"/>
         where u.user_id = #{userId}
+        and u.del_flag = '0'
     </select>
 
 

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/IncidentTaskVo.java

@@ -1,11 +1,13 @@
 package com.ruoyi.zhdd.domain.vo;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.ruoyi.zhdd.domain.bo.MessagePushUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -57,4 +59,6 @@ public class IncidentTaskVo {
     private Date createTime;
 
     private String exprJson;
+
+    private List<MessagePushUser> messagePushUsers;
 }

ruoyi-zhdd/src/main/java/com/ruoyi/zhdd/domain/vo/ResourceVo.java

@@ -3,6 +3,7 @@ package com.ruoyi.zhdd.domain.vo;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.zhdd.domain.ResourceDetail;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -75,6 +76,7 @@ public class ResourceVo {
     @ApiModelProperty("管理单位")
     private String manageUnit;
     private String manageUnitId;
+    private List<TreeSelect> manageUnitList;
 
     private String deptId;
 

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

@@ -10,6 +10,7 @@ import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.RedisUtils;
 import com.ruoyi.zhdd.domain.IncidentTask;
@@ -72,35 +73,29 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(IncidentTasksBo bo) {
-        // 新增之前删除之前的内容
-//        String insertOrUpdateFlag = "新增";
+        JSONObject jsonObject = new JSONObject();
         if (StrUtil.isNotBlank(bo.getId())) {
-            removeById(bo.getId());
-//            incidentTaskPersonService.remove(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, bo.getId()));
-//            incidentTaskCommandService.remove(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, bo.getId()));
-//            insertOrUpdateFlag = "编辑";
+            // 更新操作
+            // 先查询是否已经发送过
+            IncidentTaskVo incidentTaskVo = this.queryById(bo.getId());
+            if (incidentTaskVo != null && "1".equals(incidentTaskVo.getTaskSend())) {
+                throw new ServiceException("该消息已发送，不能再次编辑！");
+            }
+            IncidentTask update = BeanUtil.toBean(bo, IncidentTask.class);
+            update.setExprJson(JSONUtil.toJsonStr(bo.getMessagePushUsers()));
+            updateById(update);
+            jsonObject.set("des", "更新处置方案：" + bo.getTaskName());
+        } else {
+            IncidentTask add = BeanUtil.toBean(bo, IncidentTask.class);
+            add.setId(null);
+            add.setExprJson(JSONUtil.toJsonStr(bo.getMessagePushUsers()));
+            save(add);
+            jsonObject.set("des", "新增处置方案：" + bo.getTaskName());
         }
-        IncidentTask add = BeanUtil.toBean(bo, IncidentTask.class);
-        add.setId(null);
-        add.setExprJson(JSONUtil.toJsonStr(bo.getMessagePushUsers()));
-        save(add);
         // 发送消息(1-应急处置消息、2-应急处置待办、3-资源管理待办)
-//        if (bo.isSendFlag()) {
-        // A:事件接报。B:处置方案
-        /*if (false) {
-            RedisUtils.publish(Constants.NOTICE_PUSH, bo.getSendFlag() + "B" + add.getId(), msg -> {
-                log.info("发布应急方案消息 => " + msg);
-            });
-        }*/
-//        }
-        /*else {}*/
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.set("des", "新增处置方案：" + bo.getTaskName());
         jsonObject.set("incidentId", bo.getIncidentId());
         jsonObject.set("incidentStatus", 3);
-        RedisUtils.publish(Constants.PROCESS_RECORD, jsonObject, msg -> {
-            log.info("事件处置方案新增消息 => " + msg);
-        });
+        RedisUtils.publish(Constants.PROCESS_RECORD, jsonObject);
 
         //对处置反馈的人员保存事件人员关系
         if (bo.getMessagePushUsers() != null && bo.getMessagePushUsers().size() > 0) {
@@ -155,13 +150,14 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
     @Override
     public List<IncidentTaskVo> listTaskInfo(String id) {
         List<IncidentTaskVo> incidentTaskVo = listVo(Wrappers.<IncidentTask>lambdaQuery().eq(IncidentTask::getIncidentId, id).orderByAsc(IncidentTask::getCreateTime));
-//        if (incidentTaskVo != null) {
-//            // 查询指令和人员
-//            for (IncidentTaskVo taskVo : incidentTaskVo) {
-//                taskVo.setTaskCommandVos(incidentTaskCommandService.listVo(Wrappers.<IncidentTaskCommand>lambdaQuery().eq(IncidentTaskCommand::getIncidentTaskId, taskVo.getId())));
-//                taskVo.setTaskPersonVos(incidentTaskPersonService.listVo(Wrappers.<IncidentTaskPerson>lambdaQuery().eq(IncidentTaskPerson::getIncidentTaskId, taskVo.getId())));
-//            }
-//        }
+        if (incidentTaskVo != null) {
+            // 查询指令和人员
+            for (IncidentTaskVo taskVo : incidentTaskVo) {
+                if (StrUtil.isNotBlank(taskVo.getExprJson())) {
+                    taskVo.setMessagePushUsers(JSONUtil.toList(taskVo.getExprJson(), MessagePushUser.class));
+                }
+            }
+        }
         return incidentTaskVo;
     }
 
@@ -208,6 +204,9 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
         String id = ids.iterator().next();
         IncidentTaskVo incidentTaskVo = queryById(id);
         if (incidentTaskVo != null) {
+            if ("1".equals(incidentTaskVo.getTaskSend())) {
+                throw new ServiceException("该消息已发送，不能删除！");
+            }
             JSONObject jsonObject = new JSONObject();
             jsonObject.set("des", "处置方案：" + incidentTaskVo.getTaskName() + "删除");
             jsonObject.set("incidentId", incidentTaskVo.getIncidentId());
@@ -218,4 +217,5 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
         }
         return removeByIds(ids);
     }
+
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
@@ -46,11 +47,23 @@ public class ResourceServiceImpl extends ServicePlusImpl<ResourceMapper, Resourc
     @Override
     public ResourceVo queryById(String id) {
         ResourceVo voById = getVoById(id);
-        if (voById != null && voById.getResourceType() == 1) {
+        if (voById == null) {
+            return voById;
+        }
+        if (voById.getResourceType() == 1) {
             // 应急仓库的类型查询仓库物资
             List<ResourceDetail> list = resourceDetailService.list(Wrappers.<ResourceDetail>lambdaQuery().eq(ResourceDetail::getResourceId, id));
             voById.setResourceDetailList(list);
         }
+        // 对管理单位使用数组返回
+        List<TreeSelect> unitList = new ArrayList<>();
+        if (StrUtil.isNotBlank(voById.getManageUnitId())) {
+            TreeSelect unit = new TreeSelect();
+            unit.setId(voById.getManageUnitId());
+            unit.setLabel(voById.getManageUnit());
+            unitList.add(unit);
+        }
+        voById.setManageUnitList(unitList);
         return voById;
     }