diff --git a/src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java b/src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java index 94c43e1..8efd390 100644 --- a/src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java +++ b/src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java @@ -73,6 +73,11 @@ public class Template { @Schema(description = "防御策略模板创建人处室", example = "xxx", accessMode = Schema.AccessMode.READ_ONLY) private String createDepart; + @JsonProperty("audit_status") + @Schema(description = "防御策略模板审核状态(0为未审核,1为已退回,2为审核通过)", example = "1", accessMode = Schema.AccessMode.READ_ONLY) + private String auditStatus; + + /** * 设置是否含有日常/应急/紧急防护等级态字段的字段 */ diff --git a/src/main/java/com/realtime/protection/server/defense/template/TemplateController.java b/src/main/java/com/realtime/protection/server/defense/template/TemplateController.java index 399b61a..ef45b31 100644 --- a/src/main/java/com/realtime/protection/server/defense/template/TemplateController.java +++ b/src/main/java/com/realtime/protection/server/defense/template/TemplateController.java @@ -129,4 +129,46 @@ public class TemplateController implements TemplateControllerApi { AuditStatusEnum.getNumByState(AuditStatusEnum.PENDING.getState()) )); } + + + /** + * 审批 + */ + @GetMapping("/{id}/audit/{auditStatus}") + public ResponseResult updateTemplateAuditStatus(@PathVariable Integer id, @PathVariable Integer auditStatus) { + if (id <= 0 || auditStatus < 0 || auditStatus > 2) { + return new ResponseResult(400, "id or status is invalid") + .setData("template_id", id) + .setData("success", false); + } + return ResponseResult.ok() + .addDataMap(templateService.updateAuditStatus(id, auditStatus)) + .setData("template_id", id); + } + + /** + * 批量审批 + */ + /* + @PostMapping("/auditbatch") + public ResponseResult updateDynamicRuleAuditStatusBatch(@RequestBody Map idsWithAuditStatusMap) { + List errorIds = new ArrayList<>(); + for (Map.Entry entry: idsWithAuditStatusMap.entrySet()) { + Integer id = entry.getKey(); + Integer auditStatus = entry.getValue(); + if (id <= 0 || auditStatus < 0 || auditStatus > 2) { + errorIds.add(id); + } + } + if (!errorIds.isEmpty()){ + return new ResponseResult(400, "id or status is invalid") + .setData("staticRule_id", errorIds) + .setData("success", false); + } + + return ResponseResult.ok(); + +// .setData("success",dynamicRuleService.updateAuditStatusBatch(idsWithAuditStatusMap)); + } +*/ } diff --git a/src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java b/src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java index 7c036ad..0615c4f 100644 --- a/src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java +++ b/src/main/java/com/realtime/protection/server/defense/template/TemplateMapper.java @@ -42,4 +42,8 @@ public interface TemplateMapper { Integer queryUsedTemplateTotalNum(); Integer queryAuditTemplateTotalNum(Integer auditState); + + Integer queryAuditStatusById(Integer id); + + Boolean updateAuditStatusById(Integer id, Integer auditStatus); } diff --git a/src/main/java/com/realtime/protection/server/defense/template/TemplateService.java b/src/main/java/com/realtime/protection/server/defense/template/TemplateService.java index ffdad26..be94578 100644 --- a/src/main/java/com/realtime/protection/server/defense/template/TemplateService.java +++ b/src/main/java/com/realtime/protection/server/defense/template/TemplateService.java @@ -1,11 +1,14 @@ package com.realtime.protection.server.defense.template; import com.realtime.protection.configuration.entity.defense.template.Template; -import lombok.SneakyThrows; +import com.realtime.protection.configuration.utils.enums.audit.AuditStatusValidator; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service public class TemplateService { @@ -87,4 +90,66 @@ public class TemplateService { public Integer queryAuditTemplateTotalNum(Integer auditState) { return templateMapper.queryAuditTemplateTotalNum(auditState); } + + public Map updateAuditStatus(Integer id, Integer auditStatus) { + Integer originalAuditStatus = templateMapper.queryAuditStatusById(id); + if (originalAuditStatus == null) { + throw new IllegalArgumentException("cannot find audit status of static rule " + id + ", maybe static rule doesn't exist?"); + } + if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) { + throw new IllegalArgumentException("invalid audit status"); + } + Boolean success = templateMapper.updateAuditStatusById(id, auditStatus); + + Map resultMap = new HashMap<>(); + resultMap.put("success", success); + resultMap.put("audit_status", auditStatus); + return resultMap; + } +/* + + public Map updateAuditStatus(Integer id, Integer auditStatus) { + Integer originalAuditStatus = templateMapper.queryAuditStatusById(id); + if (originalAuditStatus == null) { + throw new IllegalArgumentException("cannot find audit status of static rule " + id + ", maybe static rule doesn't exist?"); + } + if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) { + throw new IllegalArgumentException("invalid audit status"); + } + Boolean success = templateMapper.updateAuditStatusById(id, auditStatus); + + Map resultMap = new HashMap<>(); + resultMap.put("success", success); + resultMap.put("audit_status", auditStatus); + return resultMap; + } + + public Object updateAuditStatusBatch(Map idsWithAuditStatusMap) { + Function, Boolean>> updateDynamicRuleAuditStatusFunction = + mapper -> map -> { + if (map == null || map.isEmpty()) { + return false; + } + + Map idWithAuditStatusBatch = new HashMap<>(); + for (Map.Entry item : map.entrySet()) { + idWithAuditStatusBatch.put(item.getKey(), item.getValue()); + if (idWithAuditStatusBatch.size() < 100) { + continue; + } + //mapper指的就是外层函数输入的参数,也就是WhiteListMapper + mapper.updateAuditStatusByIdBatch(idWithAuditStatusBatch); + idWithAuditStatusBatch.clear(); + } + if (!idWithAuditStatusBatch.isEmpty()) { + mapper.updateAuditStatusByIdBatch(idWithAuditStatusBatch); + } + return true; + }; + //实现事务操作 + return sqlSessionWrapper.startBatchSession(DynamicRuleMapper.class, updateDynamicRuleAuditStatusFunction, idsWithAuditStatusMap); + + } + */ + } diff --git a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java index 83ef29a..871f08b 100644 --- a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java +++ b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java @@ -130,7 +130,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi { public ResponseResult updateDynamicRuleAuditStatus(@PathVariable Integer id, @PathVariable Integer auditStatus) { if (id <= 0 || auditStatus < 0 || auditStatus > 2) { return new ResponseResult(400, "id or status is invalid") - .setData("staticRule_id", id) + .setData("dynamicRule_id", id) .setData("success", false); } return ResponseResult.ok() diff --git a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java index 7d589fb..8656c39 100644 --- a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java +++ b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleMapper.java @@ -58,4 +58,6 @@ public interface DynamicRuleMapper { Boolean updateAuditStatusById(Integer dynamicRuleId, Integer auditStatus); void updateAuditStatusByIdBatch(@Param("idWithAuditStatusBatch") Map idWithAuditStatusBatch); + + List queryAuditStatusByIds(@Param("idWithAuditStatusBatch") Map idsWithAuditStatusMap); } diff --git a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java index b864643..d56279f 100644 --- a/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java +++ b/src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleService.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -211,6 +212,27 @@ public class DynamicRuleService { } public Object updateAuditStatusBatch(Map idsWithAuditStatusMap) { + //校验id和status是否合法 + List originalAuditStatusList = dynamicRuleMapper.queryAuditStatusByIds(idsWithAuditStatusMap); + int index = 0; + List errorIds = new ArrayList<>(); + for(Map.Entry entry: idsWithAuditStatusMap.entrySet()) { + Integer id = entry.getKey(); + Integer auditStatus = entry.getValue(); + Integer originalAuditStatus = originalAuditStatusList.get(index); + index++; + if (originalAuditStatus == null) { + errorIds.add(id); + } + if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) { + errorIds.add(id); + } + } + if (!errorIds.isEmpty()){ + return new IllegalArgumentException("动态规则id不存在或无法修改为对应审核状态, errorIds: " + errorIds); + } + + Function, Boolean>> updateDynamicRuleAuditStatusFunction = mapper -> map -> { if (map == null || map.isEmpty()) { diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java index 6b6207d..309d091 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleMapper.java @@ -50,4 +50,6 @@ public interface StaticRuleMapper { Integer queryUsedStaticRuleTotalNum(); Integer queryAuditStaticRuleTotalNum(@Param("auditStatus")Integer auditStatus); + + List queryAuditStatusByIds(@Param("idWithAuditStatusBatch") Map idsWithAuditStatusMap); } diff --git a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java index e5dab88..7068ff3 100644 --- a/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java +++ b/src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleService.java @@ -235,6 +235,25 @@ public class StaticRuleService { } public Object updateAuditStatusBatch(Map idsWithAuditStatusMap) { + //校验id和status是否合法 + List originalAuditStatusList = staticRuleMapper.queryAuditStatusByIds(idsWithAuditStatusMap); + int index = 0; + List errorIds = new ArrayList<>(); + for(Map.Entry entry: idsWithAuditStatusMap.entrySet()) { + Integer id = entry.getKey(); + Integer auditStatus = entry.getValue(); + Integer originalAuditStatus = originalAuditStatusList.get(index); + index++; + if (originalAuditStatus == null) { + errorIds.add(id); + } + if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) { + errorIds.add(id); + } + } + if (!errorIds.isEmpty()){ + return new IllegalArgumentException("静态规则id不存在或无法修改为对应审核状态, errorIds: " + errorIds); + } Function, Boolean>> updateStaticRuleAuditStatusFunction = mapper -> map -> { diff --git a/src/main/java/com/realtime/protection/server/task/TaskMapper.java b/src/main/java/com/realtime/protection/server/task/TaskMapper.java index 30e79bb..d4bdb5b 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskMapper.java +++ b/src/main/java/com/realtime/protection/server/task/TaskMapper.java @@ -66,4 +66,6 @@ public interface TaskMapper { void updateAuditStatusByIdBatch(@Param("idWithAuditStatusBatch") Map idWithAuditStatusBatch); Integer queryAuditTaskTotalNum(Integer auditState); + + List queryAuditStatusByIds(@Param("idWithAuditStatusBatch") Map idsWithAuditStatusMap); } diff --git a/src/main/java/com/realtime/protection/server/task/TaskService.java b/src/main/java/com/realtime/protection/server/task/TaskService.java index 0f39b7f..cffd3a9 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskService.java +++ b/src/main/java/com/realtime/protection/server/task/TaskService.java @@ -17,10 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -324,6 +321,26 @@ public class TaskService { } public Object updateAuditStatusBatch(Map idsWithAuditStatusMap) { + //校验id和status是否合法 + List originalAuditStatusList = taskMapper.queryAuditStatusByIds(idsWithAuditStatusMap); + int index = 0; + List errorIds = new ArrayList<>(); + for(Map.Entry entry: idsWithAuditStatusMap.entrySet()) { + Integer id = entry.getKey(); + Integer auditStatus = entry.getValue(); + Integer originalAuditStatus = originalAuditStatusList.get(index); + index++; + if (originalAuditStatus == null) { + errorIds.add(id); + } + if (!AuditStatusValidator.setOriginal(originalAuditStatus).checkValidate(auditStatus)) { + errorIds.add(id); + } + } + if (!errorIds.isEmpty()){ + return new IllegalArgumentException("动态规则id不存在或无法修改为对应审核状态, errorIds: " + errorIds); + } + Function, Boolean>> updateTaskAuditStatusFunction = mapper -> map -> { if (map == null || map.isEmpty()) { diff --git a/src/main/resources/mappers/DynamicRuleMapper.xml b/src/main/resources/mappers/DynamicRuleMapper.xml index a85038b..4c926ee 100644 --- a/src/main/resources/mappers/DynamicRuleMapper.xml +++ b/src/main/resources/mappers/DynamicRuleMapper.xml @@ -283,6 +283,14 @@ from t_dynamic_rule where dynamic_rule_id = #{dynamicRuleId} + \ No newline at end of file diff --git a/src/main/resources/mappers/StaticRuleMapper.xml b/src/main/resources/mappers/StaticRuleMapper.xml index 5270807..e0b1ce5 100644 --- a/src/main/resources/mappers/StaticRuleMapper.xml +++ b/src/main/resources/mappers/StaticRuleMapper.xml @@ -217,4 +217,13 @@ WHERE static_rule_audit_status = #{auditStatus} + + \ No newline at end of file diff --git a/src/main/resources/mappers/TaskMapper.xml b/src/main/resources/mappers/TaskMapper.xml index 2d4e400..32322e5 100644 --- a/src/main/resources/mappers/TaskMapper.xml +++ b/src/main/resources/mappers/TaskMapper.xml @@ -333,4 +333,12 @@ SELECT COUNT(*) FROM t_task WHERE task_audit_status = #{auditStatus} + \ No newline at end of file diff --git a/src/main/resources/mappers/TemplateMapper.xml b/src/main/resources/mappers/TemplateMapper.xml index 68c83b9..4a73691 100644 --- a/src/main/resources/mappers/TemplateMapper.xml +++ b/src/main/resources/mappers/TemplateMapper.xml @@ -36,6 +36,7 @@ + @@ -157,6 +158,12 @@ WHERE audit_state = #{auditState} + + UPDATE t_strategy_template @@ -168,4 +175,10 @@ AND strategy_template_id = #{template.templateId} + + + UPDATE t_strategy_template + SET audit_state = #{auditState} + WHERE strategy_template_id = #{id} + \ No newline at end of file diff --git a/src/test/java/com/realtime/protection/server/defense/template/TemplateServiceTest.java b/src/test/java/com/realtime/protection/server/defense/template/TemplateServiceTest.java index cce2ea4..2e91ee3 100644 --- a/src/test/java/com/realtime/protection/server/defense/template/TemplateServiceTest.java +++ b/src/test/java/com/realtime/protection/server/defense/template/TemplateServiceTest.java @@ -68,7 +68,7 @@ class TemplateServiceTest extends ProtectionApplicationTests { System.out.println(e.getMessage()); } - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 2; i++) { assertThrows(DuplicateKeyException.class, () -> { Integer templateId = templateService.newTemplate(template); assertTrue(templateId > 0); @@ -84,13 +84,14 @@ class TemplateServiceTest extends ProtectionApplicationTests { @Test void testQueryTemplate() { List