From 673a4f560429a8d12f3ccba46be617845dcdc3bb Mon Sep 17 00:00:00 2001
From: wangyiyun <wangyiyun@cmhi.chinamobile.com>
Date: Sat, 20 Feb 2021 18:01:32 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=AE=8C=E5=96=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=BC=93=E5=AD=98=E6=97=B6=E6=89=93=E5=8D=B0=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E6=97=A5=E5=BF=97=E3=80=82?=
 =?UTF-8?q?=202.=20=E6=B7=BB=E5=8A=A0=E5=A4=84=E7=BD=AE=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dispose/common/DisposeCapacityType.java  | 12 ++++++++++++
 .../java/com/dispose/task/DeviceManagerTask.java | 16 ++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/dispose/common/DisposeCapacityType.java b/src/main/java/com/dispose/common/DisposeCapacityType.java
index 04909da3..2fafd5b7 100644
--- a/src/main/java/com/dispose/common/DisposeCapacityType.java
+++ b/src/main/java/com/dispose/common/DisposeCapacityType.java
@@ -22,6 +22,18 @@ public enum DisposeCapacityType implements BaseEnum {
      * The Detective.
      */
     DETECTIVE(3, "检测能力"),
+    /**
+     * The WAF_BLOCK.
+     */
+    WAF_BLOCK(4, "WAF封堵"),
+    /**
+     * DNS_REFRESH.
+     */
+    DNS_REFRESH(5, "域名刷新服务器"),
+    /**
+     * MANUAL_HANDLING.
+     */
+    MANUAL_HANDLING(6, "人工处理"),
     ;
 
     /**
diff --git a/src/main/java/com/dispose/task/DeviceManagerTask.java b/src/main/java/com/dispose/task/DeviceManagerTask.java
index 960fdae2..829c267d 100644
--- a/src/main/java/com/dispose/task/DeviceManagerTask.java
+++ b/src/main/java/com/dispose/task/DeviceManagerTask.java
@@ -33,10 +33,10 @@ public class DeviceManagerTask {
     public void updateDeviceLinkStatusTask() {
         disposeAbilityRouterService.getAllAbilityDevices().forEach(v -> {
             v.setLinkStatus(v.getDb().getDeviceLinkStatus());
-            log.debug("{}{} get link status {}", v.getDev().getIpAddr(),
-                      ((v.getDev().getIpPort() == null || v.getDev().getIpPort().length() == 0) ? "" :
-                          ":" + v.getDev().getIpPort()),
-                      v.getLinkStatus());
+            log.debug("{}{} {} get link status {}", v.getDev().getIpAddr(),
+                    ((v.getDev().getIpPort() == null || v.getDev().getIpPort().length() == 0) ? "" :
+                            ":" + v.getDev().getIpPort()), v.getDev().getDeviceType(),
+                    v.getLinkStatus());
         });
     }
 
@@ -53,10 +53,10 @@ public class DeviceManagerTask {
                 v.setFirewareInfo(ret.getSecondParam());
             }
 
-            log.debug("{}{} get fireware status {}", v.getDev().getIpAddr(),
-                      ((v.getDev().getIpPort() == null || v.getDev().getIpPort().length() == 0) ? "" :
-                          ":" + v.getDev().getIpPort()),
-                      ret.getFirstParam());
+            log.debug("{}{} {} get fireware status {}", v.getDev().getIpAddr(),
+                    ((v.getDev().getIpPort() == null || v.getDev().getIpPort().length() == 0) ? "" :
+                            ":" + v.getDev().getIpPort()), v.getDev().getDeviceType(),
+                    ret.getFirstParam());
         });
     }
 }