From d363e8168a9d821a87ff75406aec9a87ed19722a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 22 十一月 2023 17:20:09 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 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 02608e5..2b8895c 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,12 +12,14 @@
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.dto.EnvironDto;
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 com.zt.modules.coderule.service.SysCodeRuleService;
+import com.zt.modules.oss.model.SysOss;
+import com.zt.modules.oss.service.SysOssService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +29,7 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import javax.swing.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -53,6 +56,9 @@
@Autowired
private SysCodeRuleService sysCodeRuleService;
+ @Autowired
+ private SysOssService sysOssService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -61,7 +67,8 @@
@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")})
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "CODE^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^EQ"),})
public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(environService.page(queryFilter));
@@ -69,12 +76,18 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrderDto> getDto(Long environId, Long projectId) {
- SoftwareTestOrderDto data = environService.getDto(environId, projectId);
- if (projectId != null) {
- OssDto ossDto = sysOssConfigService.getOssByBusiType(projectId, "environ");
+ public Result<EnvironDto> getDto(Long environId, Long projectId) {
+ EnvironDto data = environService.getDto(environId, projectId);
+ if (environId != null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(environId, "test_environt_diagram");
+ List<SysOss> sysOss1 =sysOssService.getSysOssByBusiIdAnd(environId,"test_environt_diagram");
+ String Url = "";
+ for (SysOss sysOss: sysOss1){
+ Url=sysOss.getUrl();
+ }
if (ossDto != null) {
data.setFiles(ossDto);
+ data.setUrl(Url);
}
}
return Result.ok(data);
@@ -83,17 +96,14 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
+ public Result insert(@RequestBody EnvironDto environDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(softwareTestOrderDto, AddGroup.class, DefaultGroup.class);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
- String year = sdf.format(new Date());
+ ValidatorUtils.validateEntity(environDto, AddGroup.class, DefaultGroup.class);
Map<String, String> map = new HashMap<>();
map.put("funCode", "environ");
- map.put("year",year);
- softwareTestOrderDto.getEnviron().setYear(year);
- softwareTestOrderDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
- Boolean result = environService.save(softwareTestOrderDto);
+ map.put("projectId",environDto.getProjectId().toString());
+ environDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
+ Boolean result = environService.save(environDto);
return Result.ok();
}
@@ -102,15 +112,15 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody Environ environ) {
+ public Result update(@RequestBody EnvironDto environDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
- environService.update(environ);
+ ValidatorUtils.validateEntity(environDto, UpdateGroup.class, DefaultGroup.class);
+ Boolean result = environService.save(environDto);
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteEnviron")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids) {
@@ -120,5 +130,4 @@
return Result.ok();
}
-
}
--
Gitblit v1.9.1