From cdf29a8f6fb9990f82ccc1d3f47bfba48cfaf4fc Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 10 一月 2024 17:24:53 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 2b8895c..daf0cac 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
@@ -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;
@@ -67,8 +68,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 = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "software_name^EQ"),})
+ @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));
@@ -78,18 +79,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);
}
@@ -130,4 +119,11 @@
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