1、AlertMessage删除is_distribute属性

2、修改为total_num
3、StateEnum新增getStateEnumByNum方法

src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/AlertMessage.java

@@ -18,8 +18,8 @@ public class AlertMessage {
     @JsonProperty("five_tuple_with_mask")
     private FiveTupleWithMask fiveTupleWithMask;
 
-    @JsonProperty("is_distribute")
+//    @JsonProperty("is_distribute")
-    private Boolean isDistribute;//待删除
+//    private Boolean isDistribute;//待删除
 
     @JsonProperty("command_uuid")
     private String commandUUID;

src/main/java/com/realtime/protection/configuration/utils/enums/StateEnum.java

@@ -49,4 +49,8 @@ public enum StateEnum {
     public static StateEnum getStateEnumByState(State state) {
         return stateToStateEnumMap.get(state);
     }
+
+    public static StateEnum getStateEnumByNum(Integer stateNum) {
+        return getStateEnumByState(getStateByNum(stateNum));
+    }
 }

src/main/java/com/realtime/protection/server/alertmessage/AlertMessageService.java

@@ -15,6 +15,7 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import java.util.List;
 
 
+
 @Service
 public class AlertMessageService {
     private final CommandService commandService;
@@ -36,12 +37,12 @@ public class AlertMessageService {
         Integer taskType = dynamicTaskCommandInfo.getTaskType();
 
         if (taskType == TaskTypeEnum.DYNAMIC.getTaskType())//动态
-            switch (taskStatus) {
+            switch (StateEnum.getStateEnumByNum(taskStatus)) {
-                case 2://running
+                case RUNNING:
-                    insertCommandAndAlertMessage(dynamicTaskCommandInfo, true, alertMessage, true);
+                    insertCommandAndAlertMessage(dynamicTaskCommandInfo, true, alertMessage);
                     break;
-                case 3://Paused
+                case PAUSED:
-                    insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage, true);
+                    insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage);
                     break;
                 default://主要是stop
                     //command不入库
@@ -50,12 +51,12 @@ public class AlertMessageService {
                     break;
             }
         else if (taskType == TaskTypeEnum.JUDGED.getTaskType())//研判后
-            switch (taskStatus) {
+            switch (StateEnum.getStateEnumByNum(taskStatus)) {
-                case 2://running
+                case RUNNING:
-                    insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage, false);
+                    insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage);
                     break;
-                case 3://Paused
+                case PAUSED:
-                    insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage, false);
+                    insertCommandAndAlertMessage(dynamicTaskCommandInfo, false, alertMessage);
                     break;
                 default://主要是stop
                     //command不入库
@@ -88,21 +89,17 @@ public class AlertMessageService {
 
     @DSTransactional
     private void insertCommandAndAlertMessage(TaskCommandInfo dynamicTaskCommandInfo, Boolean isValid,
-                                                AlertMessage alertMessage, Boolean isDistribute){
+                                                AlertMessage alertMessage){
         //command入库
         dynamicTaskCommandInfo.setIsValid(isValid);
         String commandUUID = commandService.createCommand(dynamicTaskCommandInfo);
-        if (true){
+
-            throw new RuntimeException("test");
-        }
         //alertmessage入库
-        alertMessage.setIsDistribute(isDistribute);
         alertMessage.setCommandUUID(commandUUID);
         alertMessageMapper.insertAlertMessage(alertMessage);
     }
     private void insertAlertMessageOnly(AlertMessage alertMessage, Boolean isDistribute){
         //alertmessage入库
-        alertMessage.setIsDistribute(isDistribute);
         alertMessage.setCommandUUID(null);
         alertMessageMapper.insertAlertMessage(alertMessage);
     }
@@ -141,6 +138,7 @@ public class AlertMessageService {
 
 
     public List<AlertMessage> queryAlarmsByCommandId(String commandId) {
+
         return alertMessageMapper.queryAlermsByCommandId(commandId);
     }
 }

src/main/java/com/realtime/protection/server/rule/dynamicrule/DynamicRuleController.java

@@ -57,7 +57,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
     @Override
     @DeleteMapping("/{ids}")
     public ResponseResult deleteDynamicRuleObjects(@PathVariable List<Integer> ids) {
-        log.info("批量删除动态规则: {}", ids);
+        //log.info("批量删除动态规则: {}", ids);
         //调用service删除
 
         return ResponseResult.ok()
@@ -104,7 +104,7 @@ public class DynamicRuleController implements DynamicRuleControllerApi {
                 .setData("success", true)
                 .setData("dynamic_rule_list", dynamicRuleService.queryDynamicRuleObject(dynamicRuleName, dynamicRuleId,
                         protectObjectSourceSystem, creator, page, pageSize))
-                .setData("dynamic_rule_total_num",dynamicRuleService.queryDynamicRuleTotalNum());
+                .setData("total_num",dynamicRuleService.queryDynamicRuleTotalNum());
     }
 
     //详情查看？？  就是按id查询吧

src/main/java/com/realtime/protection/server/rule/staticrule/StaticRuleController.java

@@ -139,7 +139,7 @@ public class StaticRuleController implements StaticRuleControllerApi {
                 static_rule_creator, static_rule_ip, page, pageSize);
         return ResponseResult.ok()
                 .setData("static_rule_list", pageResult)
-                .setData("static_rule_total_num",staticRuleService.queryStaticRuleTotalNum());
+                .setData("total_num",staticRuleService.queryStaticRuleTotalNum());
     }
 
     /**

src/main/java/com/realtime/protection/server/whitelist/WhiteListController.java

@@ -70,7 +70,7 @@ public class WhiteListController implements WhiteListControllerApi {
         }
         return ResponseResult.ok()
                 .setData("whiteobj_list", whiteListService.queryWhiteListObject(whiteListName, whiteListId, page, pageSize))
-                .setData("whiteobj_total_num", whiteListService.queryWhiteListTotalNum());
+                .setData("total_num", whiteListService.queryWhiteListTotalNum());
     }
 
     @Override

src/main/resources/mappers/AlertMessageMapper.xml

@@ -76,7 +76,6 @@
                             MASK_DST_IP,
                             MASK_DST_PORT,
                             MASK_PROTOCOL,
-                            IS_DISTRIBUTE,
                             COMMAND_UUID,
                             CREATE_TIME,
                             LAST_UPDATE,
@@ -95,7 +94,6 @@
                 #{fiveTupleWithMask.maskDestinationIP},
                 #{fiveTupleWithMask.maskDestinationPort},
                 #{fiveTupleWithMask.maskProtocol},
-                #{isDistribute},
                 #{commandUUID},
                 NOW(),
                 NOW(),