Browse Source

复制事件应急方案

459242451@qq.com 3 years ago
parent
commit
97e95d50f3

+ 3 - 1
ruoyi-admin/docker-build.sh

@@ -1,8 +1,10 @@
 #!/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 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 .

+ 3 - 1
ruoyi-admin/docker-push.sh

@@ -1,8 +1,10 @@
 #!/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: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

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

@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -144,8 +145,20 @@ public class IncidentTaskServiceImpl extends ServicePlusImpl<IncidentTaskMapper,
      */
     @Override
     public boolean copyTask(String oldId, String newId) {
-
-        return false;
+        // 查询旧的方案
+        List<IncidentTaskVo> incidentTaskVos = listTaskInfo(oldId);
+        if (incidentTaskVos != null && incidentTaskVos.size() > 0) {
+            List<IncidentTask> incidentTasks = new ArrayList<>();
+            for (IncidentTaskVo incidentTaskVo : incidentTaskVos) {
+                IncidentTask incidentTask = new IncidentTask();
+                incidentTask.setTaskName(incidentTaskVo.getTaskName());
+                incidentTask.setIncidentId(newId);
+                incidentTask.setSendFlag(incidentTaskVo.getSendFlag());
+                incidentTasks.add(incidentTask);
+            }
+            saveAll(incidentTasks);
+        }
+        return true;
     }
 
     /**