Ver código fonte

代码优化

qingchunxiao 3 semanas atrás
pai
commit
dfdef3a3cf

+ 4 - 0
taphole-iron/src/main/java/com/sckj/iron/dto/WarnData.java

@@ -27,6 +27,10 @@ public class WarnData {
 
     private String alarmUrl;
 
+    public WarnData(String type) {
+        this.type = type;
+    }
+
     //开口告警
     public static WarnData warnOpen(String desc, String alarmUrl) {
         WarnData warnData = new WarnData();

+ 4 - 2
taphole-iron/src/main/java/com/sckj/iron/socketio/DeviceEventListener.java

@@ -399,7 +399,7 @@ public class DeviceEventListener extends AbstractEventListener { //
      */
     @Subscribe
     public void onMessageEvent(OPCData opcData) {
-        log.info("subscribe info:{}", opcData);
+       // log.info("subscribe info:{}", opcData);
 
         if (ObjectUtils.isNotEmpty(opcData) && ObjectUtils.isNotEmpty(opcData.getIdentifier())) {
             //将每一个opc配置的唯一编号添加到环境变量中,方便在表达式中使用
@@ -2086,6 +2086,7 @@ public class DeviceEventListener extends AbstractEventListener { //
             } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_SZB_STATUS(opcData.getServerType()))
                     || opcData.getPointName().contains(SubscribeTagConstants.TAG_CZF_STATUS(opcData.getServerType()))
             ) {
+                log.info("开始处理冲渣状态数据 - 点位名称: {}", opcData.getPointName());
                 try {
                     RealtimeData realtimeData = new RealtimeData();
                     Boolean value = mParser.parseExpression("#subszb41 > 0 and #subczf41 > 0").getValue(mContext, Boolean.class);
@@ -2093,8 +2094,9 @@ public class DeviceEventListener extends AbstractEventListener { //
                     realtimeData.setDesc("冲渣状态");
                     realtimeData.setExtra(opcData.getData());
                     mRealtimeStatus.put(CHONGZ_STATUS, realtimeData);
+                    log.info("冲渣状态更新 - 表达式结果: {}, 状态值: {}, 附加信息: {}", value, realtimeData.getValue(), opcData.getData());
                 } catch (Exception e) {
-
+                    log.error("处理冲渣状态数据时发生异常 - 点位名称: {}, 异常信息: ", opcData.getPointName(), e);
                 }
             } else if (opcData.getPointName().contains(SubscribeTagConstants.TAG_KKJ_STATUS(opcData.getServerType()))) {
                 //开口机状态