|
@@ -11,7 +11,6 @@ import cn.hutool.json.JSONUtil;
|
|
|
import com.xy.consumer.MqttConsumer;
|
|
|
import com.xy.dto.MsgConfigTestDto;
|
|
|
import com.xy.dto.MsgSysMonitorNoticeDto;
|
|
|
-import com.xy.dto.MsgUserMessageDto;
|
|
|
import com.xy.dto.UserInfoDto;
|
|
|
import com.xy.dto.be.MercDto;
|
|
|
import com.xy.dto.be.MercUserDeviceDto;
|
|
@@ -29,7 +28,10 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
@@ -107,18 +109,13 @@ public class DevicePushMsgConsumer implements MqttConsumer {
|
|
|
String name = u.getName();
|
|
|
//系统消息
|
|
|
MsgSysMonitorNoticeDto.Save msgSys = new MsgSysMonitorNoticeDto.Save();
|
|
|
+ msgSys.setUserId(u.getAuthorizeUserId());
|
|
|
msgSys.setMsgType(MsgType.TYPE6.getCode()).setContent(sbMsg.toString())
|
|
|
.setPubTime(LocalDateTime.now()).setPubState(2)
|
|
|
.setSendTargets(name)
|
|
|
.setPriority(1)
|
|
|
.setPubUserId(-1).setTitle(MsgType.TYPE6.getDescription());
|
|
|
msgSysMonitorNoticeService.save(msgSys);
|
|
|
- MsgUserMessageDto.Save mum = new MsgUserMessageDto.Save();
|
|
|
- mum.setMsgId(msgSys.getMsgId());
|
|
|
- mum.setMsgType(msgSys.getMsgType());
|
|
|
- mum.setPriority(msgSys.getPriority());
|
|
|
- mum.setUserId(u.getAuthorizeUserId());
|
|
|
- msgUserMessageService.save(mum);
|
|
|
});
|
|
|
|
|
|
for (MsgConfigTestDto.BizData b : bizDataList) {
|