|
@@ -20,8 +20,10 @@ import com.xy.entity.DeviceInfo;
|
|
|
import com.xy.entity.SysCodeConfigureRedis;
|
|
|
import com.xy.enums.ChannelType;
|
|
|
import com.xy.enums.MsgType;
|
|
|
-import com.xy.enums.SysCodeConfigureEnum;
|
|
|
-import com.xy.service.*;
|
|
|
+import com.xy.service.DeviceInfoServiceImpl;
|
|
|
+import com.xy.service.MsgSendApiService;
|
|
|
+import com.xy.service.MsgSysMonitorNoticeService;
|
|
|
+import com.xy.service.UserInfoService;
|
|
|
import com.xy.service.be.MercFeignService;
|
|
|
import com.xy.utils.R;
|
|
|
import com.xy.utils.SysCodeConfigureUtils;
|
|
@@ -71,8 +73,8 @@ public class DevicePushMsgConsumer implements MqttConsumer {
|
|
|
return true;
|
|
|
}
|
|
|
String paterCode = sysCodeConfigureRedis.getPaterCode();
|
|
|
- SysCodeConfigureEnum sysCodeConfigureEnum = SysCodeConfigureEnum.valueOf(paterCode);
|
|
|
- String eventType = sysCodeConfigureEnum.getMsg();
|
|
|
+ SysCodeConfigureRedis parentCodeConfig = SysCodeConfigureUtils.get(paterCode);
|
|
|
+ String eventType = parentCodeConfig.getMsg();
|
|
|
String title = sysCodeConfigureRedis.getTitle();
|
|
|
//是否展示给商户
|
|
|
boolean expShow2Merc = SysCodeConfigureUtils.getExpShow2Merc(expand);
|