From 51a5c94be5c2005064ebf625e3c10b4186243be6 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 09:08:53 +0800
Subject: [PATCH] Changes

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java |   76 ++++++++++++++++++++++++++++++++++----
 1 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
index 79d1ee5..2188d53 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java
@@ -4,11 +4,15 @@
 import com.zt.life.modules.project.dao.EnvironDao;
 import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
 import com.zt.life.modules.project.model.*;
+import com.zt.life.sys.service.SysOssConfigService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zt.common.db.query.QueryFilter;
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -19,8 +23,6 @@
  */
 @Service
 public class EnvironService  extends BaseService<EnvironDao, Environ> {
-    @Autowired
-    private SoftwareTestOrder softwareTestOrder;
 
     @Autowired
     private EnvironSoftwareResourcesService environSoftwareResourcesService;
@@ -31,27 +33,39 @@
     @Autowired
     private SoftwareTestOrderService softwareTestOrderService;
 
-    public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
+    @Autowired
+    private SysCodeRuleService sysCodeRuleService;
+
+    @Autowired
+    private SysOssConfigService sysOssConfigService;
+
+    @Autowired
+    private EnvironAnalysisService environAnalysisService;
+
+    public SoftwareTestOrderDto getDto(Long projectId, Long environId) {
         SoftwareTestOrderDto data = new SoftwareTestOrderDto();
         if (environId != null) {
             data.setId(environId);
             Environ environ = this.get(environId);
             data.setEnviron(environ);
 
-            orderId = softwareTestOrder.getId();
+            projectId = environ.getProjectId();
 
             List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
             data.setSoftwareResourcesList(softwareResourcesList);
 
             List<EnvironHardwareResources> hardwareResourcesList = environHardwareResourcesService.getList(environId);
             data.setHardwareResourcesList(hardwareResourcesList);
+
+            List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
+            data.setEnvironAnalysisList(environAnalysesList);
         } else {
-            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
+            SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(projectId);
         }
 
-        if (orderId != null) {
-            data.setOrderId(orderId);
-            data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
+        if (projectId != null) {
+            data.setOrderId(projectId);
+            data.setSoftwareTestOrder(softwareTestOrderService.get(projectId));
         }
 
         return data;
@@ -76,4 +90,50 @@
         super.deleteLogic(ids);
     }
 
+    public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) {
+        Long environId = softwareTestOrderDto.getEnviron().getId();
+        if (environId != null)
+            baseDao.updateById(softwareTestOrderDto.getEnviron());
+        else {
+            Map<String, String> map = new HashMap<>();
+            map.put("funCode", "environ");
+            softwareTestOrderDto.getEnviron().setProjectId(softwareTestOrderDto.getProjectId());
+            softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
+            baseDao.insert(softwareTestOrderDto.getEnviron());
+            environId = softwareTestOrderDto.getEnviron().getId();
+        }
+
+        for (EnvironSoftwareResources environSoftwareResources : softwareTestOrderDto.getSoftwareResourcesList()) {
+            environSoftwareResources.setEnvironId(environId);
+            if (environSoftwareResources.getId() != null) {
+                environSoftwareResourcesService.update(environSoftwareResources);
+            } else {
+                environSoftwareResources.setEnvironId(environId);
+                environSoftwareResourcesService.insert(environSoftwareResources);
+            }
+        }
+
+        for (EnvironHardwareResources environHardwareResources : softwareTestOrderDto.getHardwareResourcesList()) {
+            environHardwareResources.setEnvironId(environId);
+            if (environHardwareResources.getId() != null) {
+                environHardwareResourcesService.update(environHardwareResources);
+            } else {
+                environHardwareResources.setEnvironId(environId);
+                environHardwareResourcesService.insert(environHardwareResources);
+            }
+        }
+
+        for (EnvironAnalysis environAnalysis : softwareTestOrderDto.getEnvironAnalysisList()) {
+            environAnalysis.setEnvironId(environId);
+            if (environAnalysis.getId() != null) {
+                environAnalysisService.update(environAnalysis);
+            } else {
+                environAnalysis.setEnvironId(environId);
+                environAnalysisService.insert(environAnalysis);
+            }
+        }
+
+        sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
+        return true;
+    }
 }

--
Gitblit v1.9.1