From a2d836b13732eac26fd5c372d9d27cca92136f82 Mon Sep 17 00:00:00 2001
From: PushM <584406942@qq.com>
Date: Wed, 26 Jun 2024 00:35:29 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9D=99=E6=80=81=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=80=A7=E6=A3=80=E6=9F=A5=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=88=A4=E6=96=AD=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=AF=E5=90=A6=E4=B9=9F=E6=98=AF=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/task/status/StateHandler.java      |  4 +--
 .../resources/mappers/StaticRuleMapper.xml    | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/realtime/protection/server/task/status/StateHandler.java b/src/main/java/com/realtime/protection/server/task/status/StateHandler.java
index 510ae2c..cbbdad9 100644
--- a/src/main/java/com/realtime/protection/server/task/status/StateHandler.java
+++ b/src/main/java/com/realtime/protection/server/task/status/StateHandler.java
@@ -170,7 +170,7 @@ public class StateHandler {
 
         List<String> commandUUIDs= commandService.createCommands(staticTaskCommandInfos);
 
-/*        // 将command新建信号发送到c3下发程序
+        // 将command新建信号发送到c3下发程序
         try {
             sendCommandDistributeSignal(commandUUIDs);
         } catch (Exception e) {
@@ -194,7 +194,7 @@ public class StateHandler {
             return true;
         }
 
- */
+
         return true;
     }
     public Boolean sendCommandDistributeSignal(List<String> commandUUIDs) {
diff --git a/src/main/resources/mappers/StaticRuleMapper.xml b/src/main/resources/mappers/StaticRuleMapper.xml
index 0010fe3..72e2d87 100644
--- a/src/main/resources/mappers/StaticRuleMapper.xml
+++ b/src/main/resources/mappers/StaticRuleMapper.xml
@@ -560,6 +560,42 @@
             AND static_rule_mprotocol = #{staticRuleMprotocol}
         </if>
         </where>
+        <if test="staticRuleSip == null or staticRuleSip == ''">
+            AND static_rule_sip IS NULL
+        </if>
+        <if test="staticRuleDip == null or staticRuleDip == ''">
+            AND static_rule_dip IS NULL
+        </if>
+        <if test="staticRuleSport == null or staticRuleSport == ''">
+            AND static_rule_sport IS NULL
+        </if>
+        <if test="staticRuleDport == null or staticRuleDport == ''">
+            AND static_rule_dport IS NULL
+        </if>
+        <if test="staticRuleProtocol == null or staticRuleProtocol == ''">
+            AND static_rule_protocol IS NULL
+        </if>
+        <if test="staticRuleDns == null or staticRuleDns == ''">
+            AND static_rule_dns IS NULL
+        </if>
+        <if test="staticRuleURL == null or staticRuleURL == ''">
+            AND static_rule_url IS NULL
+        </if>
+        <if test="staticRuleMsip == null or staticRuleMsip == ''">
+            AND static_rule_msip IS NULL
+        </if>
+        <if test="staticRuleMdip == null or staticRuleMdip == ''">
+            AND static_rule_mdip IS NULL
+        </if>
+        <if test="staticRuleMsport == null or staticRuleMsport == ''">
+            AND static_rule_msport IS NULL
+        </if>
+        <if test="staticRuleMdport == null or staticRuleMdport == ''">
+            AND static_rule_mdport IS NULL
+        </if>
+        <if test="staticRuleMprotocol == null or staticRuleMprotocol == ''">
+            AND static_rule_mprotocol IS NULL
+        </if>
 
     </select>