From 67c8dac39303431aef48238a70beef9720222810 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 20 十一月 2023 09:08:52 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironHardwareResourcesService.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java | 19 +++++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironAnalysisService.java | 8 ++++
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 16 ++++++-
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 62 +++++++++++++++++++++++++++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironSoftwareResourcesService.java | 2
6 files changed, 103 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
index 9152a1d..30bd0f6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java
@@ -17,6 +17,7 @@
import com.zt.life.modules.project.service.EnvironService;
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -26,7 +27,9 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -44,6 +47,9 @@
@Autowired
private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
@GetMapping("page")
@@ -75,14 +81,18 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody Environ environ) {
+ public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(environ, AddGroup.class, DefaultGroup.class);
- environService.insert(environ);
+ ValidatorUtils.validateEntity(softwareTestOrderDto, AddGroup.class, DefaultGroup.class);
+ Map<String,String> map = new HashMap<>();
+ map.put("funCode","environ");
+ softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
+ Boolean result = environService.save(softwareTestOrderDto);
return Result.ok();
}
+
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
index 582e6c0..c3f346c 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java
@@ -1,5 +1,6 @@
package com.zt.life.modules.project.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zt.common.entity.BusiEntity;
@@ -26,7 +27,7 @@
private String code;
@ApiModelProperty(value = "濮旀墭鍗旾D")
- private String orderId;
+ private Long orderId;
@ApiModelProperty(value = "纭蒋浠惰祫婧�")
private String hardSoftwareRes;
@@ -63,4 +64,20 @@
@ApiModelProperty(value = "鐥呮瘨搴撶増鏈�")
private String virusDatabaseVersion;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "涓撲笟瀹為獙瀹ゅ悕绉�")
+ private String agencyName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "娴嬭瘯鍦扮偣")
+ private String site;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "琚祴杞欢")
+ private String softwareName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐗堟湰")
+ private String softwareIdentity;
+
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironAnalysisService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironAnalysisService.java
index 388a177..04fed58 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironAnalysisService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironAnalysisService.java
@@ -3,10 +3,13 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.EnvironAnalysisDao;
import com.zt.life.modules.project.model.EnvironAnalysis;
+import com.zt.life.modules.project.model.EnvironHardwareResources;
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;
/**
@@ -37,4 +40,9 @@
super.deleteLogic(ids);
}
+ public List<EnvironAnalysis> getList(Long environId) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("environId",environId);
+ return baseDao.getList(params);
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironHardwareResourcesService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironHardwareResourcesService.java
index 74347ea..47e2a76 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironHardwareResourcesService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironHardwareResourcesService.java
@@ -42,7 +42,7 @@
public List<EnvironHardwareResources> getList(Long environId) {
Map<String, Object> params = new HashMap<>();
- params.put("orderId",environId);
+ params.put("environId",environId);
return baseDao.getList(params);
}
}
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..433d2af 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;
/**
@@ -31,6 +35,15 @@
@Autowired
private SoftwareTestOrderService softwareTestOrderService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private EnvironAnalysisService environAnalysisService;
+
public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (environId != null) {
@@ -45,6 +58,9 @@
List<EnvironHardwareResources> hardwareResourcesList = environHardwareResourcesService.getList(environId);
data.setHardwareResourcesList(hardwareResourcesList);
+
+ List<EnvironAnalysis> environAnalysesList = environAnalysisService.getList(environId);
+ data.setEnvironAnalysisList(environAnalysesList);
} else {
SoftwareTestOrder softwareTestOrder = softwareTestOrderService.get(orderId);
}
@@ -76,4 +92,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().setOrderId(softwareTestOrderDto.getOrderId());
+ 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;
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironSoftwareResourcesService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironSoftwareResourcesService.java
index 0e41101..4d6d48e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironSoftwareResourcesService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironSoftwareResourcesService.java
@@ -42,7 +42,7 @@
public List<EnvironSoftwareResources> getList(Long environId) {
Map<String, Object> params = new HashMap<>();
- params.put("orderId",environId);
+ params.put("environId",environId);
return baseDao.getList(params);
}
}
--
Gitblit v1.9.1