zhanghan11/tzipc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mqtt上传数据调整

Browse Source
This commit is contained in:
zhanghan11 2024-04-07 18:14:30 +08:00
parent 3b8fbcfd16
commit 2636997d2d
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataUploadSyncThread.java
View File

@ -24,7 +24,7 @@ public class IPCDataUploadSyncThread implements Runnable {
private String clientId; private String clientId;
private String topicu; private String topicu;
public IPCDataUploadSyncThread(String host,String clientId,String topicu) { public IPCDataUploadSyncThread(String host, String clientId, String topicu) {
this.host = host; this.host = host;
this.clientId = clientId; this.clientId = clientId;
this.topicu = topicu; this.topicu = topicu;
@ -36,26 +36,27 @@ public class IPCDataUploadSyncThread implements Runnable {
// 获取service // 获取service
InfluxDBService influxDBService = SpringUtils.getBean(InfluxDBService.class); InfluxDBService influxDBService = SpringUtils.getBean(InfluxDBService.class);
IIpcMonitorFieldService iIpcMonitorFieldService = SpringUtils.getBean(IIpcMonitorFieldService.class); IIpcMonitorFieldService iIpcMonitorFieldService = SpringUtils.getBean(IIpcMonitorFieldService.class);
List<IpcMonitorField> partList = iIpcMonitorFieldService.selectFieldDataByType(CacheConstants.MONITOR_PART_KEY);
List<IpcMonitorField> plcList = iIpcMonitorFieldService.selectFieldDataByType(CacheConstants.PLC_MONITOR_PARAMS_KEY); List<IpcMonitorField> plcList = iIpcMonitorFieldService.selectFieldDataByType(CacheConstants.PLC_MONITOR_PARAMS_KEY);
List<IpcMonitorField> sensorList = iIpcMonitorFieldService.selectFieldDataByType(CacheConstants.SENSOR_MONITOR_PARAMS_KEY); List<IpcMonitorField> sensorList = iIpcMonitorFieldService.selectFieldDataByType(CacheConstants.SENSOR_MONITOR_PARAMS_KEY);
// 查询最新plc数据
QueryResult plcQuery = influxDBService.query("select * from " + IpcConstant.PLC_MEASUREMENT + " order by time desc limit 1");
List<Map<String, Object>> plcMaps = influxDBService.queryResultProcess(plcQuery);
// 查询最新传感器数据
QueryResult sensorQuery = influxDBService.query("select * from " + IpcConstant.SENSOR_MEASUREMENT + " order by time desc limit 1");
List<Map<String, Object>> sensorMaps = influxDBService.queryResultProcess(sensorQuery);
// 数据处理 // 数据处理
Map<String, Object> msgMap = new HashMap<>(); Map<String, Object> msgMap = new HashMap<>();
// 主动上报 flag 字段固定为“rp” ，云端接收后无需回复 // 主动上报 flag 字段固定为“rp” ，云端接收后无需回复
msgMap.put("f", IpcConstant.MQTT_FLAG); msgMap.put("f", IpcConstant.MQTT_FLAG);
List<Map<String, String>> dataList = new ArrayList<>(); List<Map<String, String>> dataList = new ArrayList<>();
for (IpcMonitorField part : partList) {
String partLabel = part.getFieldLabel();
String partValue = part.getFieldValue();
// 查询最新plc数据
QueryResult plcQuery = influxDBService.query("select * from " + IpcConstant.PLC_MEASUREMENT + " where part = '" + partValue + "' order by time desc limit 1");
List<Map<String, Object>> plcMaps = influxDBService.queryResultProcess(plcQuery);
if (plcMaps != null && !plcMaps.isEmpty()) { if (plcMaps != null && !plcMaps.isEmpty()) {
Map<String, Object> plcMap = plcMaps.get(0); Map<String, Object> plcMap = plcMaps.get(0);
if (plcMap.get("insertTime") != null) { if (plcMap.get("insertTime") != null) {
String insertTime = String.valueOf(plcMap.get("insertTime")); String insertTime = String.valueOf(plcMap.get("insertTime"));
for (IpcMonitorField ipcMonitorField : plcList) { for (IpcMonitorField ipcMonitorField : plcList) {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("sid", ipcMonitorField.getFieldLabel()); map.put("sid", partLabel + "-" + ipcMonitorField.getFieldLabel());
map.put("v", plcMap.get(ipcMonitorField.getFieldValue()) == null ? "0" : String.valueOf(plcMap.get(ipcMonitorField.getFieldValue()))); map.put("v", plcMap.get(ipcMonitorField.getFieldValue()) == null ? "0" : String.valueOf(plcMap.get(ipcMonitorField.getFieldValue())));
map.put("s", getSeconds(insertTime)); map.put("s", getSeconds(insertTime));
map.put("ms", getMillis(insertTime)); map.put("ms", getMillis(insertTime));
@ -63,13 +64,16 @@ public class IPCDataUploadSyncThread implements Runnable {
} }
} }
} }
// 查询最新传感器数据
QueryResult sensorQuery = influxDBService.query("select * from " + IpcConstant.SENSOR_MEASUREMENT + " where part = '" + partValue + "' order by time desc limit 1");
List<Map<String, Object>> sensorMaps = influxDBService.queryResultProcess(sensorQuery);
if (sensorMaps != null && !sensorMaps.isEmpty()) { if (sensorMaps != null && !sensorMaps.isEmpty()) {
Map<String, Object> sensorMap = sensorMaps.get(0); Map<String, Object> sensorMap = sensorMaps.get(0);
if (sensorMap.get("insertTime") != null) { if (sensorMap.get("insertTime") != null) {
String insertTime = String.valueOf(sensorMap.get("insertTime")); String insertTime = String.valueOf(sensorMap.get("insertTime"));
for (IpcMonitorField ipcMonitorField : sensorList) { for (IpcMonitorField ipcMonitorField : sensorList) {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("sid", ipcMonitorField.getFieldLabel()); map.put("sid", partLabel + "-" + ipcMonitorField.getFieldLabel());
map.put("v", sensorMap.get(ipcMonitorField.getFieldValue()) == null ? "0" : String.valueOf(sensorMap.get(ipcMonitorField.getFieldValue()))); map.put("v", sensorMap.get(ipcMonitorField.getFieldValue()) == null ? "0" : String.valueOf(sensorMap.get(ipcMonitorField.getFieldValue())));
map.put("s", getSeconds(insertTime)); map.put("s", getSeconds(insertTime));
map.put("ms", getMillis(insertTime)); map.put("ms", getMillis(insertTime));
@ -77,9 +81,10 @@ public class IPCDataUploadSyncThread implements Runnable {
} }
} }
} }
}
msgMap.put("d", dataList); msgMap.put("d", dataList);
// 进行数据推送 // 进行数据推送
// System.out.println(msgMap); System.out.println(msgMap);
// System.out.println(changeMapToByte(msgMap)); // System.out.println(changeMapToByte(msgMap));
// System.out.println(host + "----------" + clientId+"----------"+topicu); // System.out.println(host + "----------" + clientId+"----------"+topicu);
// MqttClient sampleClient = new MqttClient(host, clientId, new MemoryPersistence()); // MqttClient sampleClient = new MqttClient(host, clientId, new MemoryPersistence());