|
@@ -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());
|