From b27d06b8f0b805efd16e28fd80a57a0ed8a053ce Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 21 二月 2024 15:31:31 +0800
Subject: [PATCH] 修改
---
modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
index 43bc23d..c5cb399 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/configAuditReport/controller/ConfigAuditReportController.java
@@ -12,8 +12,13 @@
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.configAuditReport.dto.ConfigAuditDto;
import com.zt.life.modules.configAuditReport.model.ConfigAuditReport;
import com.zt.life.modules.configAuditReport.service.ConfigAuditReportService;
+import com.zt.life.modules.project.service.ProjectService;
+import com.zt.life.sys.dto.OssDto;
+import com.zt.life.sys.service.SysOssConfigService;
+import com.zt.modules.coderule.service.SysCodeRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -22,8 +27,11 @@
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
@@ -39,6 +47,15 @@
@Autowired
private ConfigAuditReportService configAuditReportService;
+ @Autowired
+ private ProjectService projectService;
+
+ @Autowired
+ private SysCodeRuleService sysCodeRuleService;
+
+ @Autowired
+ private SysOssConfigService sysOssConfigService;
+
@GetMapping("page")
@ApiOperation("鍒嗛〉")
@ApiImplicitParams({
@@ -46,53 +63,70 @@
@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 = "libraryType", value = "搴撶被鍨�", dataType = Constant.QT.STRING, format = "a.library_type^EQ")
-})
+ @ApiImplicitParam(name = "code", value = "缂栧彿", dataType = Constant.QT.STRING, format = "a.code^LK"),
+ @ApiImplicitParam(name = "softwareIdentity", value = "椤圭洰鏍囪瘑", dataType = Constant.QT.STRING, format = "p.software_identity^LK"),
+ @ApiImplicitParam(name = "softwareName", value = "椤圭洰鍚嶇О", dataType = Constant.QT.STRING, format = "p.software_name^LK"),
+ })
public PageResult<ConfigAuditReport> page(@ApiIgnore @QueryParam QueryFilter queryFilter){
return PageResult.ok(configAuditReportService.page(queryFilter));
}
- @GetMapping("{id}")
+ @GetMapping("getDto")
@ApiOperation("淇℃伅")
- public Result<ConfigAuditReport> get(@PathVariable("id") Long id){
- ConfigAuditReport data = configAuditReportService.get(id);
-
+ public Result<ConfigAuditDto> getDto(Long projectId, Long reportId) {
+ ConfigAuditDto data =configAuditReportService.getDto(projectId, reportId);
+ if (reportId!=null) {
+ OssDto ossDto = sysOssConfigService.getOssByBusiType(reportId, "config_audit_report");
+ if (ossDto != null) {
+ data.setFiles(ossDto);
+ }
+ }
return Result.ok(data);
}
@PostMapping
@ApiOperation("鏂板")
@LogOperation("鏂板")
- public Result insert(@RequestBody ConfigAuditReport configAuditReport){
+ public Result insert(@RequestBody ConfigAuditDto configAuditDto){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(configAuditReport, AddGroup.class, DefaultGroup.class);
- configAuditReportService.insert(configAuditReport);
-
+ ValidatorUtils.validateEntity(configAuditDto, AddGroup.class, DefaultGroup.class);
+ Map<String, String> map = new HashMap<>();
+ map.put("funCode", "config_audit_report");
+ map.put("projectId",configAuditDto.getProjectId().toString());
+ configAuditDto.getAuditReport().setCode(sysCodeRuleService.getNewCode(map));
+ Boolean result = configAuditReportService.save(configAuditDto);
return Result.ok();
}
@PutMapping
@ApiOperation("淇敼")
@LogOperation("淇敼")
- public Result update(@RequestBody ConfigAuditReport configAuditReport){
+ public Result update(@RequestBody ConfigAuditDto configAuditDto){
//鏁堥獙鏁版嵁
- ValidatorUtils.validateEntity(configAuditReport, UpdateGroup.class, DefaultGroup.class);
- configAuditReportService.update(configAuditReport);
-
+ ValidatorUtils.validateEntity(configAuditDto, UpdateGroup.class, DefaultGroup.class);
+ Boolean result = configAuditReportService.save(configAuditDto);
return Result.ok();
}
- @DeleteMapping
+
+ @DeleteMapping("deleteConfigAudit")
@ApiOperation("鍒犻櫎")
@LogOperation("鍒犻櫎")
public Result delete(@RequestBody Long[] ids){
//鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "id");
configAuditReportService.delete(ids);
-
+ projectService.deleteItem(ids,"config_audit_report_content","report_id");
+ projectService.deleteItem(ids,"config_audit_report_problem","report_id");
return Result.ok();
}
+ @GetMapping("exportConfigAudit")
+ @ApiOperation("鎵撳嵃瀹℃牳鎶ュ憡")
+ @LogOperation("鎵撳嵃瀹℃牳鎶ュ憡")
+ public void exportConfigAudit(Long id, HttpServletRequest request, HttpServletResponse response) {
+ configAuditReportService.exportConfigAudit(id, request, response);
+ }
+
}
--
Gitblit v1.9.1