|
|
@@ -2,6 +2,7 @@ package com.ruoyi.data.service.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.json.JSONObject;
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
@@ -14,6 +15,7 @@ import com.ruoyi.data.domain.vo.TblRecordVo;
|
|
|
import com.ruoyi.data.domain.vo.TblSensorRecordVo;
|
|
|
import com.ruoyi.data.mapper.*;
|
|
|
import com.ruoyi.data.service.MqttService;
|
|
|
+import com.ruoyi.data.service.WebsocketService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
|
|
|
@@ -23,6 +25,7 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import sun.management.Sensor;
|
|
|
|
|
|
+import javax.annotation.PostConstruct;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Base64;
|
|
|
import java.util.Date;
|
|
|
@@ -44,6 +47,8 @@ public class MqttServiceImpl implements MqttService {
|
|
|
|
|
|
private final TblSensorRecordMapper tblSensorRecordMapper;
|
|
|
|
|
|
+ private final WebsocketService websocketService;
|
|
|
+
|
|
|
@Value("${mqtt.url}")
|
|
|
private String mqttUrl;
|
|
|
|
|
|
@@ -75,7 +80,6 @@ public class MqttServiceImpl implements MqttService {
|
|
|
List<MqttObj> mqttObjList = tblEquipmentMqttMapper.selectMqttListByDeviceId(mqttObj);
|
|
|
TblRecord tblRecord = new TblRecord();
|
|
|
tblRecord.setEquipmentId(deviceId);
|
|
|
- tblRecord.setSensorId(sensorId);
|
|
|
tblRecord.setJson(mqttStr);
|
|
|
tblRecord.setCreateBy("admin");
|
|
|
tblRecord.setUpdateBy("admin");
|
|
|
@@ -84,10 +88,12 @@ public class MqttServiceImpl implements MqttService {
|
|
|
TblSensorRecordBo tblSensorRecord = new TblSensorRecordBo();
|
|
|
tblSensorRecord.setEquipmentId(deviceId);
|
|
|
tblSensorRecord.setJson(mqttStr);
|
|
|
+ tblSensorRecord.setSensorId(sensorId);
|
|
|
tblSensorRecord.setCreateBy("admin");
|
|
|
tblSensorRecord.setUpdateBy("admin");
|
|
|
- tblSensorRecord.setSensorId(sensorId);
|
|
|
updateNowRecord(tblSensorRecord);
|
|
|
+
|
|
|
+ websocketService.sendMessageAll(mqttStr);
|
|
|
// tblSensorRecordMapper.insert(tblSensorRecord);
|
|
|
for(MqttObj obj:mqttObjList){
|
|
|
if(obj.getStatus() == 1) {
|
|
|
@@ -235,4 +241,5 @@ public class MqttServiceImpl implements MqttService {
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|