18339543638 1 год назад
Родитель
Сommit
1f89b90a8e

+ 1 - 1
nb-admin/src/main/resources/application-prod.yml

@@ -142,7 +142,7 @@ iot:
         productKey: he1f6YdSWHW
     - enable: true
       consumer: com.nb.aliyun.service.consumer.NBAndFourGConsumerGroupService
-      name: NB
+      name: 4G
       config:
         accessKey: "LTAI4G7FA9ytMc76oNkJ45YJ"
         accessSecret: "R7hOvMfiHb0PYroDqUDXAYgB9htQss"

+ 1 - 1
nb-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
   application:
     name: nb
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
 

+ 3 - 0
nb-service-api/web-service-api/src/main/java/com/nb/web/api/utils/WarnFlowUtils.java

@@ -10,6 +10,9 @@ import com.nb.web.api.enums.FlowStatusEnum;
  */
 public class WarnFlowUtils {
     public static FlowStatusEnum getAlarm(Integer i){
+        if(i== null){
+            return FlowStatusEnum.None;
+        }
         if (i == 0){
             // 正常
             return FlowStatusEnum.None;

+ 3 - 0
nb-service/web-service/src/main/java/com/nb/web/service/bus/listener/DeviceInfoListener.java

@@ -93,6 +93,9 @@ public class DeviceInfoListener implements IIotMsgHandler {
     public BusDeviceRunningEntity sync(BusDeviceRunningEntity device, String deviceId) {
         //保证统一设备数据顺序处理,若数据发送过快,为防止冲突,请在此加锁处理
         synchronized (deviceId){
+            if (deviceId.equals("0230827A0D3001B9")) {
+                System.out.println("123");
+            }
             String classification = device.getClassification();
             if(StrUtil.isBlank(classification)){
                 log.error("消息【{}】,设备号:【{}】分包标识号为空,无法更新开始时间",device.getMsgId(),device.getDeviceId());