From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期二, 28 十一月 2023 09:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 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 4e3d86a..2b8895c 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,8 +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.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;
@@ -23,74 +29,105 @@
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;
/**
* environ
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-17
*/
@RestController
@RequestMapping("/project/Environ/")
-@Api(tags="environ")
+@Api(tags = "environ")
public class EnvironController {
@Autowired
private EnvironService environService;
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssService sysOssService;
+
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
- @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
- @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") })
- public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
+ @ApiImplicitParam(name = Constant.Q.PAGE, value = Constant.QV.PAGE, required = true, dataType = Constant.QT.INT),
+ @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"),})
+ public PageResult<Environ> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {
return PageResult.ok(environService.page(queryFilter));
}
- @GetMapping("{id}")
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<Environ> get(@PathVariable("id") Long id){
- Environ data = environService.get(id);
-
+ 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);
}
@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){
+ public Result delete(@RequestBody Long[] ids) {
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
environService.delete(ids);
return Result.ok();
}
-
}
--
Gitblit v1.9.1