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("修改") 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 = "委托单ID") 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; } 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); } } 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); } } 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; } } 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); } }
