From e48bca3730f099be8e0b872985cd53e2776953f5 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 13 十二月 2023 10:11:39 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java |   55 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 17 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..1ba5a27 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;
@@ -25,8 +28,14 @@
 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;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -45,6 +54,12 @@
     @Autowired
     private SysOssConfigService sysOssConfigService;
 
+    @Autowired
+    private SysCodeRuleService sysCodeRuleService;
+
+    @Autowired
+    private SysOssService sysOssService;
+
 
     @GetMapping("page")
     @ApiOperation("鍒嗛〉")
@@ -53,7 +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 = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "a.CODE^LK"),
+            @ApiImplicitParam(name = "softwareName", value = "杞欢鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^EQ"),})
     public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
 
         return PageResult.ok(environService.page(queryFilter));
@@ -61,40 +77,39 @@
 
     @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");
-            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 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) {
@@ -105,4 +120,10 @@
         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