sz 修改入侵警告内容

src/main/java/com/jpsoft/smart/modules/base/controller/AlarmInfoController.java

@@ -44,7 +44,7 @@ public class AlarmInfoController {
             alarmInfo.setIsRead(false);
             //2019-12-07 11:04:04.322  INFO 11000 --- [nio-8080-exec-5] c.j.s.m.b.c.AlarmInfoController          : 周界入侵，目标ID：13974，区域范围：(0.327,0.698)(0.674,0.936)(0.67,0.985)(0.352,0.973)
 
-            int zjIndex = message.indexOf("周界入侵");
+            /*int zjIndex = message.indexOf("周界入侵");
             int bjIndex = message.indexOf("报警主机CID报告");
             if(zjIndex >= 0){
                 message = message.substring(zjIndex,message.length());
@@ -53,10 +53,7 @@ public class AlarmInfoController {
                 if(index >= 0) {
                     message = "报警主机CID报告，" + message.substring(index, message.length());
                 }
-            }
-
-
-
+            }*/
 
             alarmInfo.setMessage(message);
             alarmInfo.setType("2");
@@ -304,7 +301,7 @@ public class AlarmInfoController {
 
             //报警主机CID报告，sCIDCode：1401，sCIDDescribe：����，报告类型：6，防区号：65535，报警触发时间：2019-12-17 10:21:36
             //周界入侵，目标ID：761，区域范围：(0.327,0.698)(0.674,0.936)(0.67,0.985)(0.352,0.973)
-            int zjIndex = content.indexOf("区域范围");
+            /*int zjIndex = content.indexOf("区域范围");
             int cidIndex = content.indexOf("报警主机CID报告");
             if(zjIndex >= 0){
                 //周界入侵
@@ -320,7 +317,7 @@ public class AlarmInfoController {
                 if(startIndex >= 0){
                     content = content.substring(0,endIndex-1);
                 }
-            }
+            }*/
 
 
 
@@ -332,7 +329,7 @@ public class AlarmInfoController {
                 AccessControl accessControl = accessControlService.findByOwnerId(owner.getId());
                 if(accessControl != null){
                     openId = accessControl.getOpenId();
-                    boolean result = WechatMessageUtil.sendAlarmNoticeMessage("周界入侵警报", content, openId, "","8dpP8XM1XaiiIByXiuAeFIZeNjEow1AleG_h8O2xyVA","wx7e70eb62a8459869","909d17e353268da57c4f18cc09798049");
+                    boolean result = WechatMessageUtil.sendAlarmNoticeMessage("报警警报", content, openId, "","8dpP8XM1XaiiIByXiuAeFIZeNjEow1AleG_h8O2xyVA","wx7e70eb62a8459869","909d17e353268da57c4f18cc09798049");
                     if(result) {
                         //修改阅读状态
                         alarmInfo.setIsRead(true);