suntianwu преди 3 години
родител
ревизия
5f6c079f44
променени са 2 файла, в които са добавени 9 реда и са изтрити 1 реда
  1. 5 1
      src/main/java/com/care/mqtt/service/MqttMsgRedisService.java
  2. 4 0
      src/main/java/com/care/mqtt/service/MqttMsgService.java

+ 5 - 1
src/main/java/com/care/mqtt/service/MqttMsgRedisService.java

@@ -115,13 +115,17 @@ public class MqttMsgRedisService {
      */
 
     private void exe(CareMqttMsg careMqttMsg){
-        String status = this.careMqttMsgService.getById(careMqttMsg).getStatus();
+
+        String status = careMqttMsg.getStatus();
         if(!MqttMsgStatusEnum.NO_HANDLE.getValue().equals(status)){ //不是未处理,不执行。
             return;
         }
 
         CareDevice careDevice = careDeviceService.getById(careMqttMsg.getDevId());
         CareEventOrder order = mqttMsgService.getNewOrder(careDevice);
+        if(order == null){
+            return;
+        }
         order.setCreateTime(careMqttMsg.getCreateTime());
         order.setModifyTime(careMqttMsg.getCreateTime());
         order.setStatus(OrderStatusEnum.TODO.getValue());

+ 4 - 0
src/main/java/com/care/mqtt/service/MqttMsgService.java

@@ -121,6 +121,10 @@ public class MqttMsgService {
             }
 
             CareEventOrder order = getNewOrder(careDevice);
+            if(order == null){
+                logger.error("设备没有配置房屋地址");
+                return;
+            }
             order.setCreateTime(date);
             order.setModifyTime(date);