添加二进制报警判定

alarm-scanner/src/main/java/com/gyee/alarm/model/vo/AlarmTag.java

@@ -1,6 +1,7 @@
 package com.gyee.alarm.model.vo;
 
 import com.gyee.common.model.PointData;
+import com.gyee.common.model.StringUtils;
 import lombok.Data;
 
 @Data
@@ -90,6 +91,10 @@ public class AlarmTag {
 
     private String wpId;
     /**
+     * 统一识别码(如果通过uniformCode配置，则设备类型，场站，机型不能为空)
+     */
+    private String uniformCode;
+    /**
      * 更新并检测是否触发报警
      */
     public synchronized Boolean updateAndCheck(PointData pointData) {
@@ -130,18 +135,26 @@ public class AlarmTag {
                 val=0.0;
 
             }
+        }else if(StringUtils.notEmp(uniformCode) && uniformCode.startsWith("BI")){
+
+            int decimal = oval.intValue(); // 十进制报警数
+            String binary = Integer.toString(decimal, 2); // 转换为二进制报警字符串
+
+            String reverse = new StringBuffer(binary).reverse().toString();//翻转字符串，便于报警分析
+            int value = Integer.valueOf(reverse.charAt(triggerType));
+            if (value == 1) {
+                val=1.0;
+            }else {
+                val=0.0;
+            }
+
         }else {
             if (oval.intValue() == triggerType) {
                 val=1.0;
             }else {
                 val=2.0;
             }
-//            else if (oval == 0) {
-//                val=0.0;
-//            }
-//            else {
-//                return false;
-//            }
+
         }
 
         return true;

alarm-service/src/main/java/com/gyee/alarm/model/vo/AlarmTag.java

@@ -94,6 +94,11 @@ public class AlarmTag {
     private String wpId;
 
     /**
+     * 统一识别码(如果通过uniformCode配置，则设备类型，场站，机型不能为空)
+     */
+    private String uniformCode;
+
+    /**
      * 更新并检测是否触发报警
      */
     public Boolean updateAndCheck(PointData pointData) {

alarm-service/src/main/java/com/gyee/alarm/service/AlarmWtService.java

@@ -273,6 +273,7 @@ public class AlarmWtService {
                     po.setVal(null);
                     po.setRank(vo.getRank());
                     po.setAlarmType(vo.getAlarmtype());
+                    po.setUniformCode(vo.getUniformcode());
                     ls.add(po);
                 }
             }

log/ota.log

@@ -860,3 +860,15 @@
 2023-09-28 14:59:34.113  INFO 21024 --- [Thread-5] com.xxl.job.core.server.EmbedServer      : >>>>>>>>>>> xxl-job remoting server start success, nettype = class com.xxl.job.core.server.EmbedServer, port = 9118
 2023-09-28 14:59:34.738  INFO 21024 --- [main] com.gyee.alarm.init.CacheContext         : 121
 2023-09-28 14:59:36.425  INFO 21024 --- [main] com.gyee.alarm.init.CacheContext         : 缓存结束------------------------------------------------------------
+2023-09-28 15:49:18.697  INFO 21024 --- [SpringContextShutdownHook] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
+2023-09-28 15:49:18.698  INFO 21024 --- [Thread-5] com.xxl.job.core.server.EmbedServer      : >>>>>>>>>>> xxl-job remoting server stop.
+2023-09-28 15:49:18.704  INFO 21024 --- [xxl-job, executor ExecutorRegistryThread] c.x.j.c.thread.ExecutorRegistryThread    : >>>>>>>>>>> xxl-job registry-remove success, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='alarmStat-job-new', registryValue='http://192.168.56.1:9118/'}, registryResult:ReturnT [code=200, msg=null, content=null]
+2023-09-28 15:49:18.704  INFO 21024 --- [xxl-job, executor ExecutorRegistryThread] c.x.j.c.thread.ExecutorRegistryThread    : >>>>>>>>>>> xxl-job, executor registry thread destroy.
+2023-09-28 15:49:18.704  INFO 21024 --- [SpringContextShutdownHook] com.xxl.job.core.server.EmbedServer      : >>>>>>>>>>> xxl-job remoting server destroy success.
+2023-09-28 15:49:18.705  INFO 21024 --- [xxl-job, executor JobLogFileCleanThread] c.x.j.core.thread.JobLogFileCleanThread  : >>>>>>>>>>> xxl-job, executor JobLogFileCleanThread thread destroy.
+2023-09-28 15:49:18.705  INFO 21024 --- [xxl-job, executor TriggerCallbackThread] c.x.j.core.thread.TriggerCallbackThread  : >>>>>>>>>>> xxl-job, executor callback thread destroy.
+2023-09-28 15:49:18.706  INFO 21024 --- [Thread-4] c.x.j.core.thread.TriggerCallbackThread  : >>>>>>>>>>> xxl-job, executor retry callback thread destroy.
+2023-09-28 15:49:18.933  INFO 21024 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource start closing ....
+2023-09-28 15:49:18.939  INFO 21024 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-2} closed
+2023-09-28 15:49:18.940  INFO 21024 --- [SpringContextShutdownHook] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
+2023-09-28 15:49:18.941  INFO 21024 --- [SpringContextShutdownHook] c.b.d.d.DynamicRoutingDataSource         : dynamic-datasource all closed success,bye