From 2f7e7ad6c61ac3f239a4e9a87cde634a9c3fcf00 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 20 十一月 2023 14:50:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/EnvironController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 b696495..d048a09 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
@@ -27,6 +27,8 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -67,7 +69,7 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<SoftwareTestOrderDto> getDto(Long projectId, Long environId) {
+ public Result<SoftwareTestOrderDto> getDto(Long environId, Long projectId) {
SoftwareTestOrderDto data = environService.getDto(environId, projectId);
if (projectId != null) {
OssDto ossDto = sysOssConfigService.getOssByBusiType(projectId, "environ");
@@ -84,8 +86,12 @@
public Result insert(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
//鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(softwareTestOrderDto, AddGroup.class, DefaultGroup.class);
- Map<String,String> map = new HashMap<>();
- map.put("funCode","environ");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+ String year = sdf.format(new Date());
+ 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);
@@ -96,15 +102,15 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody Environ environ) {
+ public Result update(@RequestBody SoftwareTestOrderDto softwareTestOrderDto) {
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(environ, UpdateGroup.class, DefaultGroup.class);
- environService.update(environ);
+ ValidatorUtils.validateEntity(softwareTestOrderDto, UpdateGroup.class, DefaultGroup.class);
+ Boolean result = environService.save(softwareTestOrderDto);
return Result.ok();
}
- @DeleteMapping
+ @DeleteMapping("deleteEnviron")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids) {
@@ -115,4 +121,14 @@
return Result.ok();
}
+ @PostMapping("uploadDiagram")
+ @ApiOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
+ @LogOperation("涓婁紶娴嬭瘯鐜鍥剧墖")
+ public Result uploadDiagram(@RequestBody Long[] ids) {
+ //鏁堥獙鏁版嵁
+ AssertUtils.isArrayEmpty(ids, "id");
+ environService.delete(ids);
+
+ return Result.ok();
+ }
}
--
Gitblit v1.9.1