From b27d06b8f0b805efd16e28fd80a57a0ed8a053ce Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 21 二月 2024 15:31:31 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 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 d048a09..a391612 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.modules.project.service.*;
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 +28,9 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.swing.*;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -48,10 +52,16 @@
private EnvironService environService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private SysOssConfigService sysOssConfigService;
@Autowired
private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssService sysOssService;
@GetMapping("page")
@@ -61,7 +71,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 = "a.CODE^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^LK"),})
public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(environService.page(queryFilter));
@@ -69,31 +80,22 @@
@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");
- if (ossDto != null) {
- data.setFiles(ossDto);
- }
- }
+ public Result<EnvironDto> getDto(Long environId, Long projectId) {
+ EnvironDto data = environService.getDto(environId, projectId);
return Result.ok(data);
}
@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,10 +104,10 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
+ public Result update(@RequestBody EnvironDto environDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(softwareTestOrderDto, UpdateGroup.class, DefaultGroup.class);
- Boolean result = environService.save(softwareTestOrderDto);
+ ValidatorUtils.validateEntity(environDto, UpdateGroup.class, DefaultGroup.class);
+ Boolean result = environService.save(environDto);
return Result.ok();
}
@@ -117,18 +119,16 @@
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
environService.delete(ids);
-
+ projectService.deleteItem(ids,"environ_analysis","environ_id");
+ projectService.deleteItem(ids,"environ_hardware_resources","environ_id");
+ projectService.deleteItem(ids,"environ_software_resources","environ_id");
return Result.ok();
}
- @PostMapping("uploadDiagram")
- @ApiOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
- @LogOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
- public Result uploadDiagram(@RequestBody Long[] ids) {
- //鏁堥獙鏁版嵁
- AssertUtils.isArrayEmpty(ids, "id");
- environService.delete(ids);
-
- return Result.ok();
+ @GetMapping("exportEnviron")
+ @ApiOperation("鎵撳嵃娴嬭瘯鐜寤虹珛纭琛�")
+ @LogOperation("鎵撳嵃娴嬭瘯鐜寤虹珛纭琛�")
+ public void exportEnviron(Long id, HttpServletRequest request, HttpServletResponse response) {
+ environService.exportEnviron(id, request, response);
}
}
--
Gitblit v1.9.1