From 9025b9cf7ec8610003d445a31d93e35e7bd73c2e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 31 一月 2024 17:54:52 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 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 114e3c0..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
@@ -14,7 +14,7 @@
import com.zt.common.validator.group.UpdateGroup;
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;
@@ -28,6 +28,7 @@
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;
@@ -51,6 +52,9 @@
private EnvironService environService;
@Autowired
+ private ProjectService projectService;
+
+ @Autowired
private SysOssConfigService sysOssConfigService;
@Autowired
@@ -67,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));
@@ -77,18 +82,6 @@
@ApiOperation("淇℃伅")
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);
}
@@ -126,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