|
@@ -1,5 +1,6 @@
|
|
package com.xy.service.factory.device.impl.open;
|
|
package com.xy.service.factory.device.impl.open;
|
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.json.JSONObject;
|
|
import cn.hutool.json.JSONObject;
|
|
import cn.hutool.json.JSONUtil;
|
|
import cn.hutool.json.JSONUtil;
|
|
@@ -29,7 +30,6 @@ import com.xy.utils.Enum.AlgorithmTypeEnum;
|
|
import com.xy.utils.enums.DeviceTypeEnum;
|
|
import com.xy.utils.enums.DeviceTypeEnum;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
|
|
|
|
-import javax.validation.constraints.NotEmpty;
|
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
@@ -287,7 +287,9 @@ public class OpenDeviceFactoryImpl implements DeviceFactory {
|
|
sendMsg(deviceEventMsg);
|
|
sendMsg(deviceEventMsg);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if (sysCodeConfigureRedis.getPaterCode().equals(SysCodeConfigureEnum.M01.getCode())) {
|
|
|
|
|
|
+ ArrayList<String> arrayList = CollUtil.newArrayList("APP", "BLT", "DEV", "ERR", "MQTT", "SHJ", "SYS");
|
|
|
|
+ if (sysCodeConfigureRedis.getPaterCode().equals(SysCodeConfigureEnum.M01.getCode())
|
|
|
|
+ || arrayList.contains(sysCodeConfigureRedis.getPaterCode())) {
|
|
//设备消息消息推送
|
|
//设备消息消息推送
|
|
sendMsg(deviceEventMsg);
|
|
sendMsg(deviceEventMsg);
|
|
}
|
|
}
|