From 316439a908d0b2363966ebbad23e3b8001291850 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 14:48:46 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 94 insertions(+), 15 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..9b9fb1a 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,23 +4,27 @@
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.modules.sysBaseInfo.model.TestAgencyInfo;
+import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
+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.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* environ
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-17
*/
@Service
-public class EnvironService extends BaseService<EnvironDao, Environ> {
- @Autowired
- private SoftwareTestOrder softwareTestOrder;
+public class EnvironService extends BaseService<EnvironDao, Environ> {
@Autowired
private EnvironSoftwareResourcesService environSoftwareResourcesService;
@@ -31,28 +35,48 @@
@Autowired
private SoftwareTestOrderService softwareTestOrderService;
- public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private EnvironAnalysisService environAnalysisService;
+
+ @Autowired
+ private ProjectService projectService;
+
+ @Autowired
+ private TestAgencyInfoService testAgencyInfoService;
+
+
+ public SoftwareTestOrderDto getDto(Long environId, Long projectId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (environId != null) {
- data.setId(environId);
Environ environ = this.get(environId);
data.setEnviron(environ);
+ data.setTestAgencyInfo(testAgencyInfoService.get(environId));
- orderId = softwareTestOrder.getId();
-
+ projectId = environ.getProjectId();
List<EnvironSoftwareResources> softwareResourcesList = environSoftwareResourcesService.getList(environId);
data.setSoftwareResourcesList(softwareResourcesList);
List<EnvironHardwareResources> hardwareResourcesList = environHardwareResourcesService.getList(environId);
data.setHardwareResourcesList(hardwareResourcesList);
- } else {
- SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
- }
- if (orderId != null) {
- data.setOrderId(orderId);
- data.setSoftwareTestOrder(softwareTestOrderService.get(orderId));
+ List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
+ data.setEnvironAnalysisList(environAnalysesList);
+ } else {
+ Environ environ =new Environ();
+ data.setEnviron(environ);
}
+ if (projectId != null) {
+ data.setProjectId(projectId);
+ data.setProject(projectService.get(projectId));
+ }
+ if (data.getTestAgencyInfo() == null)
+ data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
return data;
}
@@ -76,4 +100,59 @@
super.deleteLogic(ids);
}
+ public Boolean save(SoftwareTestOrderDto softwareTestOrderDto) {
+ Long environId = softwareTestOrderDto.getEnviron().getId();
+ if (environId != null)
+ baseDao.updateById(softwareTestOrderDto.getEnviron());
+ else {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "environ");
+ map.put("year",year);
+ softwareTestOrderDto.getEnviron().setYear(year);
+ 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);
+ }
+ }
+ if (softwareTestOrderDto.getTestAgencyInfo().getId() == 10000) {
+ softwareTestOrderDto.getTestAgencyInfo().setId(environId);
+ testAgencyInfoService.insert(softwareTestOrderDto.getTestAgencyInfo());
+ } else {
+ testAgencyInfoService.update(softwareTestOrderDto.getTestAgencyInfo());
+ }
+ sysOssConfigService.updateOss(softwareTestOrderDto.getId(), softwareTestOrderDto.getFiles());// 淇濆瓨闄勪欢
+ return true;
+ }
}
--
Gitblit v1.9.1