diff --git a/tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataUploadSyncThread.java b/tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataUploadSyncThread.java
index f5ec2ae..a1ac760 100644
--- a/tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataUploadSyncThread.java
+++ b/tzipc-server/tzipc-datasyn/src/main/java/com/inspur/datasyn/modbus/IPCDataUploadSyncThread.java
@@ -24,7 +24,7 @@ public class IPCDataUploadSyncThread implements Runnable {
     private String clientId;
     private String topicu;
 
-    public IPCDataUploadSyncThread(String host,String clientId,String topicu) {
+    public IPCDataUploadSyncThread(String host, String clientId, String topicu) {
         this.host = host;
         this.clientId = clientId;
         this.topicu = topicu;
@@ -36,50 +36,55 @@ public class IPCDataUploadSyncThread implements Runnable {
             // 获取service
             InfluxDBService influxDBService = SpringUtils.getBean(InfluxDBService.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> 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<>();
             // 主动上报 flag 字段固定为“rp” ，云端接收后无需回复
             msgMap.put("f", IpcConstant.MQTT_FLAG);
             List<Map<String, String>> dataList = new ArrayList<>();
-            if (plcMaps != null && !plcMaps.isEmpty()) {
-                Map<String, Object> plcMap = plcMaps.get(0);
-                if (plcMap.get("insertTime") != null) {
-                    String insertTime = String.valueOf(plcMap.get("insertTime"));
-                    for (IpcMonitorField ipcMonitorField : plcList) {
-                        Map<String, String> map = new HashMap<>();
-                        map.put("sid", ipcMonitorField.getFieldLabel());
-                        map.put("v", plcMap.get(ipcMonitorField.getFieldValue()) == null ? "0" : String.valueOf(plcMap.get(ipcMonitorField.getFieldValue())));
-                        map.put("s", getSeconds(insertTime));
-                        map.put("ms", getMillis(insertTime));
-                        dataList.add(map);
+            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()) {
+                    Map<String, Object> plcMap = plcMaps.get(0);
+                    if (plcMap.get("insertTime") != null) {
+                        String insertTime = String.valueOf(plcMap.get("insertTime"));
+                        for (IpcMonitorField ipcMonitorField : plcList) {
+                            Map<String, String> map = new HashMap<>();
+                            map.put("sid", partLabel + "-" + ipcMonitorField.getFieldLabel());
+                            map.put("v", plcMap.get(ipcMonitorField.getFieldValue()) == null ? "0" : String.valueOf(plcMap.get(ipcMonitorField.getFieldValue())));
+                            map.put("s", getSeconds(insertTime));
+                            map.put("ms", getMillis(insertTime));
+                            dataList.add(map);
+                        }
                     }
                 }
-            }
-            if (sensorMaps != null && !sensorMaps.isEmpty()) {
-                Map<String, Object> sensorMap = sensorMaps.get(0);
-                if (sensorMap.get("insertTime") != null) {
-                    String insertTime = String.valueOf(sensorMap.get("insertTime"));
-                    for (IpcMonitorField ipcMonitorField : sensorList) {
-                        Map<String, String> map = new HashMap<>();
-                        map.put("sid", ipcMonitorField.getFieldLabel());
-                        map.put("v", sensorMap.get(ipcMonitorField.getFieldValue()) == null ? "0" : String.valueOf(sensorMap.get(ipcMonitorField.getFieldValue())));
-                        map.put("s", getSeconds(insertTime));
-                        map.put("ms", getMillis(insertTime));
-                        dataList.add(map);
+                // 查询最新传感器数据
+                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()) {
+                    Map<String, Object> sensorMap = sensorMaps.get(0);
+                    if (sensorMap.get("insertTime") != null) {
+                        String insertTime = String.valueOf(sensorMap.get("insertTime"));
+                        for (IpcMonitorField ipcMonitorField : sensorList) {
+                            Map<String, String> map = new HashMap<>();
+                            map.put("sid", partLabel + "-" + ipcMonitorField.getFieldLabel());
+                            map.put("v", sensorMap.get(ipcMonitorField.getFieldValue()) == null ? "0" : String.valueOf(sensorMap.get(ipcMonitorField.getFieldValue())));
+                            map.put("s", getSeconds(insertTime));
+                            map.put("ms", getMillis(insertTime));
+                            dataList.add(map);
+                        }
                     }
                 }
             }
             msgMap.put("d", dataList);
             // 进行数据推送
-//            System.out.println(msgMap);
+            System.out.println(msgMap);
 //            System.out.println(changeMapToByte(msgMap));
 //            System.out.println(host + "----------" + clientId+"----------"+topicu);
 //            MqttClient sampleClient = new MqttClient(host, clientId, new MemoryPersistence());