Selaa lähdekoodia

Merge branch '84-integrate' of http://pms.inspur.com/javaweb/smsb-customer-manager into 84-wb

wangbo 2 vuotta sitten
vanhempi
sitoutus
3cc9fa82d7

+ 7 - 0
smsb-customer-manager-app/src/main/resources/email/CameraSnapPicReleaseWarn.html

@@ -0,0 +1,7 @@
+尊敬的用户,您好!<br>
+<br>
+&nbsp;&nbsp;您的摄像头有一条{MSR_LEVEL}预警,相关信息如下:<br>
+&nbsp;&nbsp;&nbsp;摄像头名称:{MSR_NAME}<br>
+&nbsp;&nbsp;&nbsp;连续检测次数:{MSR_TIMES}<br>
+&nbsp;&nbsp;&nbsp;连续检测时间:{MSR_START_TIME}-{MSR_END_TIME}<br>
+&nbsp;&nbsp;&nbsp;连续检测结果: 设备黑屏恢复<br>

+ 7 - 0
smsb-customer-manager-app/src/main/resources/email/CameraSnapPicWarn.html

@@ -0,0 +1,7 @@
+尊敬的用户,您好!<br>
+<br>
+&nbsp;&nbsp;您的摄像头有一条{MSR_LEVEL}预警,相关信息如下:<br>
+&nbsp;&nbsp;&nbsp;摄像头名称:{MSR_NAME}<br>
+&nbsp;&nbsp;&nbsp;连续检测次数:{MSR_TIMES}<br>
+&nbsp;&nbsp;&nbsp;连续检测时间:{MSR_START_TIME} - {MSR_END_TIME}<br>
+&nbsp;&nbsp;&nbsp;连续检测结果: 设备黑屏<br>

+ 24 - 0
smsb-customer-manager-app/src/main/resources/weChat/CameraSnapPicReleaseWarn.json

@@ -0,0 +1,24 @@
+{
+    "data": {
+        "first": {
+            "value": "【浪潮安播云】您的 AI 机审有一条 {0} 预警,请及时关注,谢谢。",
+            "color": "#173177"
+        },
+        "keyword1": {
+            "value": "摄像头检测黑屏恢复",
+            "color": "#173177"
+        },
+        "keyword2": {
+            "value": "无",
+            "color": "#173177"
+        },
+        "keyword3": {
+            "value": "摄像头名称: {0}, 连续检测次数: {1}",
+            "color": "#173177"
+        },
+        "keyword4": {
+            "value": "{0}-{1}",
+            "color": "#173177"
+        }
+    }
+}

+ 24 - 0
smsb-customer-manager-app/src/main/resources/weChat/CameraSnapPicWarn.json

@@ -0,0 +1,24 @@
+{
+    "data": {
+        "first": {
+            "value": "【浪潮安播云】您的 AI 机审有一条 {0} 预警,请及时关注,谢谢。",
+            "color": "#173177"
+        },
+        "keyword1": {
+            "value": "摄像头检测黑屏",
+            "color": "#173177"
+        },
+        "keyword2": {
+            "value": "无",
+            "color": "#173177"
+        },
+        "keyword3": {
+            "value": "摄像头名称: {0}, 连续检测次数: {1}",
+            "color": "#173177"
+        },
+        "keyword4": {
+            "value": "{0}-{1}",
+            "color": "#173177"
+        }
+    }
+}

+ 9 - 1
smsb-customer-manager-client/src/main/java/com/inspur/customer/context/inform/InformTypeEnum.java

@@ -27,7 +27,15 @@ public enum InformTypeEnum {
     /**
      * 设备视频回采次数库存预警
      */
-    DEVICE_PIC_AUDIT_CREDIT_WARN("设备视频回采次数库存预警", InformLevelEnum.HINT, MessageTemplateEnum.AI_AUDIT_NON_COMPLIANCE)
+    DEVICE_PIC_AUDIT_CREDIT_WARN("设备视频回采次数库存预警", InformLevelEnum.HINT, MessageTemplateEnum.AI_AUDIT_NON_COMPLIANCE),
+    /**
+     * 摄像头检测黑屏预警
+     */
+    CAMERA_SNAP_PIC_WARN("摄像头检测黑屏预警", InformLevelEnum.TENANT, MessageTemplateEnum.CAMERA_SNAP_PIC_WARN),
+    /**
+     * 摄像头检测黑屏恢复预警
+     */
+    CAMERA_SNAP_PIC_RELEASE_WARN("摄像头检测黑屏恢复预警", InformLevelEnum.TENANT, MessageTemplateEnum.CAMERA_SNAP_PIC_RELEASE_WARN),
     ;
 
     /**

+ 11 - 4
smsb-customer-manager-client/src/main/java/com/inspur/customer/context/inform/MessageTemplateEnum.java

@@ -20,16 +20,23 @@ public enum MessageTemplateEnum {
     /**
      * AI 审核库存
      */
-    AI_AUDIT_CREDIT_INSUFFICIENT_WARN("AiAuditCreditInsufficientWarn", 5, "AiAuditCreditInsufficientWarn",  "appletMessage/AiAuditCreditInsufficientWarn.RTF"),
+    AI_AUDIT_CREDIT_INSUFFICIENT_WARN("AiAuditCreditInsufficientWarn", 5, "AiAuditCreditInsufficientWarn", "appletMessage/AiAuditCreditInsufficientWarn.RTF"),
     /**
      * 媒资 AI 不通过异常
      */
-    AI_AUDIT_NON_COMPLIANCE("AiAuditMediaWarn", 4, "AiAuditMediaWarn",  "appletMessage/AiAuditMediaWarn.RTF"),
+    AI_AUDIT_NON_COMPLIANCE("AiAuditMediaWarn", 4, "AiAuditMediaWarn", "appletMessage/AiAuditMediaWarn.RTF"),
     /**
      * 设备视频回传次数不足
      */
-    DEVICE_PIC_AUDIT_CREDIT_WARN("DevicePicAuditCreditWarn", 6, "DevicePicAuditCreditWarn", "appletMessage/DevicePicAuditCreditWarn.RTF")
-    ;
+    DEVICE_PIC_AUDIT_CREDIT_WARN("DevicePicAuditCreditWarn", 6, "DevicePicAuditCreditWarn", "appletMessage/DevicePicAuditCreditWarn.RTF"),
+    /**
+     * 摄像头检测黑屏预警
+     */
+    CAMERA_SNAP_PIC_WARN("CameraSnapPicWarn", 10, "CameraSnapPicWarn", "appletMessage/CameraSnapPicWarn.RTF"),
+    /**
+     * 摄像头检测黑屏恢复预警
+     */
+    CAMERA_SNAP_PIC_RELEASE_WARN("CameraSnapPicReleaseWarn", 11, "CameraSnapPicReleaseWarn", "appletMessage/CameraSnapPicReleaseWarn.RTF");
 
     @Getter
     private final String email;