From 1d92d1ba80928578b54a9baba13e9c2cdd12d9e9 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 22 十一月 2023 14:20:53 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 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..d0c3dd8 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,11 +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;
@@ -26,7 +29,12 @@
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;
import java.util.List;
+import java.util.Map;
/**
@@ -45,6 +53,12 @@
@Autowired
private SysOssConfigService sysOssConfigService;
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssService sysOssService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@@ -61,12 +75,18 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrderDto> getDto(Long orderId, Long environId) {
- SoftwareTestOrderDto data = environService.getDto(environId, orderId);
- if (orderId != null) {
- OssDto ossDto = sysOssConfigService.getOssByBusiType(orderId, "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);
@@ -75,26 +95,31 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody Environ environ) {
+ public Result insert(@RequestBody EnvironDto environDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(environ, AddGroup.class, DefaultGroup.class);
- environService.insert(environ);
+ ValidatorUtils.validateEntity(environDto, AddGroup.class, DefaultGroup.class);
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "environ");
+ map.put("projectId",environDto.getProjectId().toString());
+ environDto.getEnviron().setCode(sysCodeRuleService.getNewCode(map));
+ Boolean result = environService.save(environDto);
return Result.ok();
}
+
@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) {
@@ -104,5 +129,4 @@
return Result.ok();
}
-
}
--
Gitblit v1.9.1