From 815cf005152ca73ca08aabd44021d5f6ac72b06a 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/controller/EnvironHardwareResourcesController.java | 96 ++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/model/Environ.java | 3
modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml | 20 +
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironHardwareResourcesDao.java | 23 +
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironAnalysisService.java | 40 ++
modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java | 15
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironSoftwareResourcesController.java | 96 ++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironService.java | 41 ++
modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml | 20 +
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironAnalysisController.java | 96 ++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java | 42 +++
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironAnalysisDao.java | 23 +
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironHardwareResourcesService.java | 48 +++
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironSoftwareResourcesDao.java | 23 +
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 42 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java | 45 +++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironSoftwareResourcesService.java | 48 +++
modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironAnalysis.java | 45 +++
modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml | 20 +
19 files changed, 766 insertions(+), 20 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironAnalysisController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironAnalysisController.java
new file mode 100644
index 0000000..e145ae0
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironAnalysisController.java
@@ -0,0 +1,96 @@
+package com.zt.life.modules.project.controller;
+
+
+import com.zt.common.annotation.LogOperation;
+import com.zt.common.constant.Constant;
+import com.zt.common.annotation.QueryParam;
+import com.zt.common.db.query.QueryFilter;
+import com.zt.common.servlet.Result;
+import com.zt.common.servlet.PageResult;
+import com.zt.common.validator.AssertUtils;
+import com.zt.common.validator.ValidatorUtils;
+import com.zt.common.validator.group.AddGroup;
+import com.zt.common.validator.group.DefaultGroup;
+import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.project.model.EnvironAnalysis;
+import com.zt.life.modules.project.service.EnvironAnalysisService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * environ_analysis
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@RestController
+@RequestMapping("/project/EnvironAnalysis/")
+@Api(tags="environ_analysis")
+public class EnvironAnalysisController {
+ @Autowired
+ private EnvironAnalysisService environAnalysisService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ })
+ public PageResult<EnvironAnalysis> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+
+ return PageResult.ok(environAnalysisService.page(queryFilter));
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("淇℃伅")
+ public Result<EnvironAnalysis> get(@PathVariable("id") Long id){
+ EnvironAnalysis data = environAnalysisService.get(id);
+
+ return Result.ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("鏂板")
+ @LogOperation("鏂板")
+ public Result insert(@RequestBody EnvironAnalysis environAnalysis){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(environAnalysis, AddGroup.class, DefaultGroup.class);
+ environAnalysisService.insert(environAnalysis);
+
+ return Result.ok();
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼")
+ @LogOperation("淇敼")
+ public Result update(@RequestBody EnvironAnalysis environAnalysis){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(environAnalysis, UpdateGroup.class, DefaultGroup.class);
+ environAnalysisService.update(environAnalysis);
+
+ return Result.ok();
+ }
+
+ @DeleteMapping
+ @ApiOperation("鍒犻櫎")
+ @LogOperation("鍒犻櫎")
+ public Result delete(@RequestBody Long[] ids){
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ environAnalysisService.delete(ids);
+
+ return Result.ok();
+ }
+
+}
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 4e3d86a..9152a1d 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
@@ -12,8 +12,11 @@
import com.zt.common.validator.group.AddGroup;
import com.zt.common.validator.group.DefaultGroup;
import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
import com.zt.life.modules.project.model.Environ;
import com.zt.life.modules.project.service.EnvironService;
+import com.zt.life.sys.dto.OssDto;
+import com.zt.life.sys.service.SysOssConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -29,41 +32,50 @@
/**
* environ
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-17
*/
@RestController
@RequestMapping("/project/Environ/")
-@Api(tags="environ")
+@Api(tags = "environ")
public class EnvironController {
@Autowired
private EnvironService environService;
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
- @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
- @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "CODE^LK") })
- public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "CODE^LK")})
+ public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(environService.page(queryFilter));
}
- @GetMapping("{id}")
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<Environ> get(@PathVariable("id") Long id){
- Environ data = environService.get(id);
-
+ public Result<SoftwareTestOrderDto> getDto(Long orderId, Long environId) {
+ SoftwareTestOrderDto data = environService.getDto(environId, orderId);
+ if (orderId != null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "environ");
+ if (ossDto != null) {
+ data.setFiles(ossDto);
+ }
+ }
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody Environ environ){
+ public Result insert(@RequestBody Environ environ) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(environ, AddGroup.class, DefaultGroup.class);
environService.insert(environ);
@@ -74,7 +86,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody Environ environ){
+ public Result update(@RequestBody Environ environ) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
environService.update(environ);
@@ -85,7 +97,7 @@
@DeleteMapping
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
- public Result delete(@RequestBody Long[] ids){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
environService.delete(ids);
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironHardwareResourcesController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironHardwareResourcesController.java
new file mode 100644
index 0000000..fe758bb
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironHardwareResourcesController.java
@@ -0,0 +1,96 @@
+package com.zt.life.modules.project.controller;
+
+
+import com.zt.common.annotation.LogOperation;
+import com.zt.common.constant.Constant;
+import com.zt.common.annotation.QueryParam;
+import com.zt.common.db.query.QueryFilter;
+import com.zt.common.servlet.Result;
+import com.zt.common.servlet.PageResult;
+import com.zt.common.validator.AssertUtils;
+import com.zt.common.validator.ValidatorUtils;
+import com.zt.common.validator.group.AddGroup;
+import com.zt.common.validator.group.DefaultGroup;
+import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.project.model.EnvironHardwareResources;
+import com.zt.life.modules.project.service.EnvironHardwareResourcesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * environ_hardware_resources
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@RestController
+@RequestMapping("/project/EnvironHardwareResources/")
+@Api(tags="environ_hardware_resources")
+public class EnvironHardwareResourcesController {
+ @Autowired
+ private EnvironHardwareResourcesService environHardwareResourcesService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ })
+ public PageResult<EnvironHardwareResources> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+
+ return PageResult.ok(environHardwareResourcesService.page(queryFilter));
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("淇℃伅")
+ public Result<EnvironHardwareResources> get(@PathVariable("id") Long id){
+ EnvironHardwareResources data = environHardwareResourcesService.get(id);
+
+ return Result.ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("鏂板")
+ @LogOperation("鏂板")
+ public Result insert(@RequestBody EnvironHardwareResources environHardwareResources){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(environHardwareResources, AddGroup.class, DefaultGroup.class);
+ environHardwareResourcesService.insert(environHardwareResources);
+
+ return Result.ok();
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼")
+ @LogOperation("淇敼")
+ public Result update(@RequestBody EnvironHardwareResources environHardwareResources){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(environHardwareResources, UpdateGroup.class, DefaultGroup.class);
+ environHardwareResourcesService.update(environHardwareResources);
+
+ return Result.ok();
+ }
+
+ @DeleteMapping
+ @ApiOperation("鍒犻櫎")
+ @LogOperation("鍒犻櫎")
+ public Result delete(@RequestBody Long[] ids){
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ environHardwareResourcesService.delete(ids);
+
+ return Result.ok();
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironSoftwareResourcesController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironSoftwareResourcesController.java
new file mode 100644
index 0000000..ae91210
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironSoftwareResourcesController.java
@@ -0,0 +1,96 @@
+package com.zt.life.modules.project.controller;
+
+
+import com.zt.common.annotation.LogOperation;
+import com.zt.common.constant.Constant;
+import com.zt.common.annotation.QueryParam;
+import com.zt.common.db.query.QueryFilter;
+import com.zt.common.servlet.Result;
+import com.zt.common.servlet.PageResult;
+import com.zt.common.validator.AssertUtils;
+import com.zt.common.validator.ValidatorUtils;
+import com.zt.common.validator.group.AddGroup;
+import com.zt.common.validator.group.DefaultGroup;
+import com.zt.common.validator.group.UpdateGroup;
+import com.zt.life.modules.project.model.EnvironSoftwareResources;
+import com.zt.life.modules.project.service.EnvironSoftwareResourcesService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * environ_software_resources
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@RestController
+@RequestMapping("/project/EnvironSoftwareResources/")
+@Api(tags="environ_software_resources")
+public class EnvironSoftwareResourcesController {
+ @Autowired
+ private EnvironSoftwareResourcesService environSoftwareResourcesService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
+ @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
+ @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
+ })
+ public PageResult<EnvironSoftwareResources> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+
+ return PageResult.ok(environSoftwareResourcesService.page(queryFilter));
+ }
+
+ @GetMapping("{id}")
+ @ApiOperation("淇℃伅")
+ public Result<EnvironSoftwareResources> get(@PathVariable("id") Long id){
+ EnvironSoftwareResources data = environSoftwareResourcesService.get(id);
+
+ return Result.ok(data);
+ }
+
+ @PostMapping
+ @ApiOperation("鏂板")
+ @LogOperation("鏂板")
+ public Result insert(@RequestBody EnvironSoftwareResources environSoftwareResources){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(environSoftwareResources, AddGroup.class, DefaultGroup.class);
+ environSoftwareResourcesService.insert(environSoftwareResources);
+
+ return Result.ok();
+ }
+
+ @PutMapping
+ @ApiOperation("淇敼")
+ @LogOperation("淇敼")
+ public Result update(@RequestBody EnvironSoftwareResources environSoftwareResources){
+ //鏁堥獙鏁版嵁
+ ValidatorUtils.validateEntity(environSoftwareResources, UpdateGroup.class, DefaultGroup.class);
+ environSoftwareResourcesService.update(environSoftwareResources);
+
+ return Result.ok();
+ }
+
+ @DeleteMapping
+ @ApiOperation("鍒犻櫎")
+ @LogOperation("鍒犻櫎")
+ public Result delete(@RequestBody Long[] ids){
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ environSoftwareResourcesService.delete(ids);
+
+ return Result.ok();
+ }
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironAnalysisDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironAnalysisDao.java
new file mode 100644
index 0000000..bfc96d8
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironAnalysisDao.java
@@ -0,0 +1,23 @@
+package com.zt.life.modules.project.dao;
+
+import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.project.model.EnvironAnalysis;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * environ_analysis
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Mapper
+public interface EnvironAnalysisDao extends BaseDao<EnvironAnalysis> {
+
+ List<EnvironAnalysis> getList(Map<String, Object> params);
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironHardwareResourcesDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironHardwareResourcesDao.java
new file mode 100644
index 0000000..baffcd6
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironHardwareResourcesDao.java
@@ -0,0 +1,23 @@
+package com.zt.life.modules.project.dao;
+
+import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.project.model.EnvironHardwareResources;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * environ_hardware_resources
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Mapper
+public interface EnvironHardwareResourcesDao extends BaseDao<EnvironHardwareResources> {
+
+ List<EnvironHardwareResources> getList(Map<String, Object> params);
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironSoftwareResourcesDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironSoftwareResourcesDao.java
new file mode 100644
index 0000000..afc215a
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/EnvironSoftwareResourcesDao.java
@@ -0,0 +1,23 @@
+package com.zt.life.modules.project.dao;
+
+import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.project.model.EnvironSoftwareResources;
+import org.apache.ibatis.annotations.Mapper;
+
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * environ_software_resources
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Mapper
+public interface EnvironSoftwareResourcesDao extends BaseDao<EnvironSoftwareResources> {
+
+ List<EnvironSoftwareResources> getList(Map<String, Object> params);
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
index 466f9b8..527ef61 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
@@ -1,9 +1,6 @@
package com.zt.life.modules.project.dto;
-import com.zt.life.modules.project.model.Project;
-import com.zt.life.modules.project.model.SoftwareTestOrder;
-import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
-import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
+import com.zt.life.modules.project.model.*;
import com.zt.life.modules.sysBaseInfo.model.TestAgencyInfo;
import com.zt.life.sys.dto.OssDto;
import io.swagger.annotations.ApiModelProperty;
@@ -16,11 +13,14 @@
public class SoftwareTestOrderDto {
private Long id;
private Long projectId;
+ private Long orderId;
@ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曡褰�")
private SoftwareTestOrder softwareTestOrder;
@ApiModelProperty(value = "娴嬭瘯椤圭洰鍩烘湰淇℃伅")
private Project project;
+ @ApiModelProperty(value = "娴嬭瘯鐜寤虹珛纭")
+ private Environ environ;
@ApiModelProperty(value = "娴嬭瘯鏈烘瀯淇℃伅")
private TestAgencyInfo TestAgencyInfo;
@ApiModelProperty(value = "娴嬭瘯濮旀墭鍗曢檮浠�")
@@ -30,5 +30,12 @@
private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>();
@ApiModelProperty(value = "浜や粯浠�")
private List<SoftwareTestOrderDeliverable> deliverableList = new ArrayList<>();
+ @ApiModelProperty(value = "杞欢璧勬簮")
+ private List<EnvironSoftwareResources> softwareResourcesList = new ArrayList<>();
+ @ApiModelProperty(value = "纭欢璧勬簮")
+ private List<EnvironHardwareResources> hardwareResourcesList = new ArrayList<>();
+ @ApiModelProperty(value = "鐜宸紓鎬у垎鏋�")
+ private List<EnvironAnalysis> environAnalysisList = new ArrayList<>();
+
}
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 1c8f2e8..582e6c0 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
@@ -25,6 +25,9 @@
@ApiModelProperty(value = "缂栧彿")
private String code;
+ @ApiModelProperty(value = "濮旀墭鍗旾D")
+ private String orderId;
+
@ApiModelProperty(value = "纭蒋浠惰祫婧�")
private String hardSoftwareRes;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironAnalysis.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironAnalysis.java
new file mode 100644
index 0000000..666826f
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironAnalysis.java
@@ -0,0 +1,45 @@
+package com.zt.life.modules.project.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.entity.BusiEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * environ_analysis
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("environ_analysis")
+public class EnvironAnalysis extends BusiEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鐜娴嬭瘯鍗旾D")
+ private Long environId;
+
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer no;
+
+ @ApiModelProperty(value = "鐪熷疄鐜")
+ private String realEnviron;
+
+ @ApiModelProperty(value = "娴嬭瘯鐜")
+ private String testEnviron;
+
+ @ApiModelProperty(value = "鐜宸紓")
+ private String environDifference;
+
+ @ApiModelProperty(value = "瀵规祴璇曠粨鏋滃奖鍝�")
+ private String resultImpact;
+
+ @ApiModelProperty(value = "鎺柦")
+ private String measure;
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
new file mode 100644
index 0000000..26f6414
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironHardwareResources.java
@@ -0,0 +1,45 @@
+package com.zt.life.modules.project.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.entity.BusiEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * environ_hardware_resources
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("environ_hardware_resources")
+public class EnvironHardwareResources extends BusiEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鐜娴嬭瘯鍗旾D")
+ private Long environId;
+
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer no;
+
+ @ApiModelProperty(value = "纭欢鍜屽浐浣撻」鍚嶇О")
+ private String itemName;
+
+ @ApiModelProperty(value = "鐢ㄩ��")
+ private String usage;
+
+ @ApiModelProperty(value = "鐘舵��")
+ private String state;
+
+ @ApiModelProperty(value = "鏁伴噺")
+ private Integer number;
+
+ @ApiModelProperty(value = "鎻愪緵鍗曚綅")
+ private String provideUnit;
+
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
new file mode 100644
index 0000000..d8dcfcb
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/EnvironSoftwareResources.java
@@ -0,0 +1,42 @@
+package com.zt.life.modules.project.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.entity.BusiEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * environ_software_resources
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("environ_software_resources")
+public class EnvironSoftwareResources extends BusiEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "鐜娴嬭瘯鍗旾D")
+ private Long environId;
+
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer no;
+
+ @ApiModelProperty(value = "杞欢椤瑰悕绉�")
+ private String itemName;
+
+ @ApiModelProperty(value = "鐗堟湰")
+ private String version;
+
+ @ApiModelProperty(value = "鐢ㄩ��")
+ private String usage;
+
+ @ApiModelProperty(value = "鎻愪緵鍗曚綅")
+ private String provideUnit;
+
+}
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
new file mode 100644
index 0000000..388a177
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironAnalysisService.java
@@ -0,0 +1,40 @@
+package com.zt.life.modules.project.service;
+
+import com.zt.common.service.BaseService;
+import com.zt.life.modules.project.dao.EnvironAnalysisDao;
+import com.zt.life.modules.project.model.EnvironAnalysis;
+import org.springframework.stereotype.Service;
+import com.zt.common.db.query.QueryFilter;
+import javax.annotation.Resource;
+import java.util.List;
+
+
+/**
+ * environ_analysis
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Service
+public class EnvironAnalysisService extends BaseService<EnvironAnalysisDao, EnvironAnalysis> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param queryFilter
+ * @return
+ */
+ public List<EnvironAnalysis> page(QueryFilter queryFilter) {
+ return baseDao.getList(queryFilter.getQueryParams());
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ids
+ */
+ public void delete(Long[] ids) {
+ super.deleteLogic(ids);
+ }
+
+}
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
new file mode 100644
index 0000000..74347ea
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironHardwareResourcesService.java
@@ -0,0 +1,48 @@
+package com.zt.life.modules.project.service;
+
+import com.zt.common.service.BaseService;
+import com.zt.life.modules.project.dao.EnvironHardwareResourcesDao;
+import com.zt.life.modules.project.model.EnvironHardwareResources;
+import com.zt.life.modules.project.model.EnvironSoftwareResources;
+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;
+
+
+/**
+ * environ_hardware_resources
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Service
+public class EnvironHardwareResourcesService extends BaseService<EnvironHardwareResourcesDao, EnvironHardwareResources> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param queryFilter
+ * @return
+ */
+ public List<EnvironHardwareResources> page(QueryFilter queryFilter) {
+ return baseDao.getList(queryFilter.getQueryParams());
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ids
+ */
+ public void delete(Long[] ids) {
+ super.deleteLogic(ids);
+ }
+
+ public List<EnvironHardwareResources> getList(Long environId) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("orderId",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 d030877..79d1ee5 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
@@ -2,7 +2,9 @@
import com.zt.common.service.BaseService;
import com.zt.life.modules.project.dao.EnvironDao;
-import com.zt.life.modules.project.model.Environ;
+import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.model.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;
import javax.annotation.Resource;
@@ -17,6 +19,43 @@
*/
@Service
public class EnvironService extends BaseService<EnvironDao, Environ> {
+ @Autowired
+ private SoftwareTestOrder softwareTestOrder;
+
+ @Autowired
+ private EnvironSoftwareResourcesService environSoftwareResourcesService;
+
+ @Autowired
+ private EnvironHardwareResourcesService environHardwareResourcesService;
+
+ @Autowired
+ private SoftwareTestOrderService softwareTestOrderService;
+
+ public SoftwareTestOrderDto getDto(Long orderId, Long environId) {
+ SoftwareTestOrderDto data = new SoftwareTestOrderDto();
+ if (environId != null) {
+ data.setId(environId);
+ Environ environ = this.get(environId);
+ data.setEnviron(environ);
+
+ orderId = softwareTestOrder.getId();
+
+ 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));
+ }
+
+ return data;
+ }
/**
* 鍒嗛〉鏌ヨ
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
new file mode 100644
index 0000000..0e41101
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/EnvironSoftwareResourcesService.java
@@ -0,0 +1,48 @@
+package com.zt.life.modules.project.service;
+
+import com.zt.common.service.BaseService;
+import com.zt.life.modules.project.dao.EnvironSoftwareResourcesDao;
+import com.zt.life.modules.project.model.EnvironSoftwareResources;
+import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
+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;
+
+
+/**
+ * environ_software_resources
+ *
+ * @author zt generator
+ * @since 1.0.0 2023-11-17
+ */
+@Service
+public class EnvironSoftwareResourcesService extends BaseService<EnvironSoftwareResourcesDao, EnvironSoftwareResources> {
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param queryFilter
+ * @return
+ */
+ public List<EnvironSoftwareResources> page(QueryFilter queryFilter) {
+ return baseDao.getList(queryFilter.getQueryParams());
+ }
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param ids
+ */
+ public void delete(Long[] ids) {
+ super.deleteLogic(ids);
+ }
+
+ public List<EnvironSoftwareResources> getList(Long environId) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("orderId",environId);
+ return baseDao.getList(params);
+ }
+}
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml
new file mode 100644
index 0000000..7c61953
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironAnalysisDao.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.zt.life.modules.project.dao.EnvironAnalysisDao">
+
+ <select id="getList" resultType="com.zt.life.modules.project.model.EnvironAnalysis">
+ select a.*
+ from environ_analysis a
+ <where>
+ a.is_delete = 0
+ <if test="whereSql!=null">
+ and ${whereSql}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
+</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
new file mode 100644
index 0000000..db884be
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironHardwareResourcesDao.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.zt.life.modules.project.dao.EnvironHardwareResourcesDao">
+
+ <select id="getList" resultType="com.zt.life.modules.project.model.EnvironHardwareResources">
+ select a.*
+ from environ_hardware_resources a
+ <where>
+ a.is_delete = 0
+ <if test="whereSql!=null">
+ and ${whereSql}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
+</mapper>
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
new file mode 100644
index 0000000..d55ed3e
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.zt.life.modules.project.dao.EnvironSoftwareResourcesDao">
+
+ <select id="getList" resultType="com.zt.life.modules.project.model.EnvironSoftwareResources">
+ select a.*
+ from environ_software_resources a
+ <where>
+ a.is_delete = 0
+ <if test="whereSql!=null">
+ and ${whereSql}
+ </if>
+ </where>
+ <if test="orderBySql!=null">
+ ORDER BY ${orderBySql}
+ </if>
+ </select>
+
+</mapper>
--
Gitblit v1.9.1