cac
/
mqtt
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码重构

Browse Source
main
wenhua.zhou 2 years ago
parent 1d2b18c5e9
commit 0431b108f8
1 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File

68
src/main/java/com/xydl/service/impl/MqttServiceImpl.java
Unescape Escape View File

@ -26,31 +26,31 @@ public class MqttServiceImpl {
public void reportRecord() { public void reportRecord() {
List<String> allTableNames = operationDBMapper.getAllTable(); List<String> allTableNames = operationDBMapper.getAllTable();
for (String tableName : allTableNames) { for (String tableName : allTableNames) {
Map<String, String> fieldMap = getTableFieldMap(tableName); send(tableName);
String sqlExecuting = operationDBMapper.getSQL(tableName); // String sqlExecuting = operationDBMapper.getSQL(tableName);
List<Integer> dataEqmids = operationDBMapper.getDataEqmids(tableName); // List<Integer> dataEqmids = operationDBMapper.getDataEqmids(tableName);
Map<Integer, Object> devIDLastTimeMap = new HashMap<>(); // Map<Integer, Object> devIDLastTimeMap = new HashMap<>();
List<Map<String, Object>> devIDLastTimeMaps = operationDBMapper.getDeviceIDAndtime(tableName); // List<Map<String, Object>> devIDLastTimeMaps = operationDBMapper.getDeviceIDAndtime(tableName);
for (Map<String, Object> map : devIDLastTimeMaps) { // for (Map<String, Object> map : devIDLastTimeMaps) {
for (String devId : map.keySet()) { // for (String devId : map.keySet()) {
devIDLastTimeMap.put(Integer.parseInt((String) map.get("devid_val")), map.get("field_val2")); // devIDLastTimeMap.put(Integer.parseInt((String) map.get("devid_val")), map.get("field_val2"));
} // }
} // }
for (int deviceID : dataEqmids) { // for (int deviceID : dataEqmids) {
String time = ""; // String time = "";
if (devIDLastTimeMap.get(deviceID) != null) { // if (devIDLastTimeMap.get(deviceID) != null) {
time = devIDLastTimeMap.get(deviceID).toString(); // time = devIDLastTimeMap.get(deviceID).toString();
} else { // } else {
time = "2000-01-01 01:00:00"; // time = "2000-01-01 01:00:00";
operationDBMapper.addEarliestTime(10, tableName, String.valueOf(deviceID), time); // operationDBMapper.addEarliestTime(10, tableName, String.valueOf(deviceID), time);
} // }
publishData(deviceID, time, sqlExecuting, tableName, fieldMap); // publishData(deviceID, time, sqlExecuting, tableName, fieldMap);
} // }
} }
} }
//单个表的字段映射 //单个表数据发送
public Map<String, String> getTableFieldMap(String tableName) { public void send(String tableName) {
Map<String, String> fieldMap = new HashMap<>(); Map<String, String> fieldMap = new HashMap<>();
List<Map<String, String>> fieldMaps = operationDBMapper.getFieldMap(tableName); List<Map<String, String>> fieldMaps = operationDBMapper.getFieldMap(tableName);
for (Map<String, String> map : fieldMaps) { for (Map<String, String> map : fieldMaps) {
@ -58,7 +58,29 @@ public class MqttServiceImpl {
fieldMap.put(map.get("field_name"), map.get("dest_field_name")); fieldMap.put(map.get("field_name"), map.get("dest_field_name"));
} }
} }
return fieldMap; send(tableName, fieldMap);
}
public void send(String tableName, Map<String, String> fieldMap) {
String sqlExecuting = operationDBMapper.getSQL(tableName);
List<Integer> dataEqmids = operationDBMapper.getDataEqmids(tableName);
Map<Integer, Object> devIDLastTimeMap = new HashMap<>();
List<Map<String, Object>> devIDLastTimeMaps = operationDBMapper.getDeviceIDAndtime(tableName);
for (Map<String, Object> map : devIDLastTimeMaps) {
for (String devId : map.keySet()) {
devIDLastTimeMap.put(Integer.parseInt((String) map.get("devid_val")), map.get("field_val2"));
}
}
for (int deviceID : dataEqmids) {
String time = "";
if (devIDLastTimeMap.get(deviceID) != null) {
time = devIDLastTimeMap.get(deviceID).toString();
} else {
time = "2000-01-01 01:00:00";
operationDBMapper.addEarliestTime(10, tableName, String.valueOf(deviceID), time);
}
publishData(deviceID, time, sqlExecuting, tableName, fieldMap);
}
} }
//推送单个设备数据 //推送单个设备数据

Write Preview
Loading…
Cancel
Save