凯盛数据推送能源管理

@@ -166,9 +166,8 @@ public class KSDeviceReportService {
             int failCount = 0;
             int failCount = 0;
             List<String> failedDevices = new ArrayList<>();
             List<String> failedDevices = new ArrayList<>();
             Map<Object, String> map = new HashMap<>();
             Map<Object, String> map = new HashMap<>();
-            map.put(1,"devid");
-            map.put(2,"zll");
-            map.put(3,"ssll");
+            map.put(1,"zll");
+            map.put(2,"ssll");
 
 
 
 
             for (int i = 0; i < needSyncDataList.size(); i++) {
             for (int i = 0; i < needSyncDataList.size(); i++) {
@@ -193,7 +192,7 @@ public class KSDeviceReportService {
 
 
                     for (int j = 1; j < dataList.size(); j++) {
                     for (int j = 1; j < dataList.size(); j++) {
                         Map<String, Object> properties = new HashMap<>(5);
                         Map<String, Object> properties = new HashMap<>(5);
-                        Object o = dataList.get(j).toString();
+                        Object o = dataList.get(j);
                         if (o == null) {
                         if (o == null) {
                             continue;
                             continue;
                         }
                         }

@@ -90,17 +90,14 @@ ks:
 
 
     selectSql1: "SELECT
     selectSql1: "SELECT
                 de.sn AS sn,
                 de.sn AS sn,
-                tkl1.dbl_v AS devid,
-                tkl2.dbl_v AS zll,
-                tkl3.dbl_v AS ssll
+                tkl1.dbl_v AS zll,
+                tkl2.dbl_v AS ssll
               FROM
               FROM
                 device de
                 device de
                 LEFT JOIN ts_kv_latest tkl1 ON de.id = tkl1.entity_id
                 LEFT JOIN ts_kv_latest tkl1 ON de.id = tkl1.entity_id
-                AND tkl1.key = 58
+                AND tkl1.key = 83
                 LEFT JOIN ts_kv_latest tkl2 ON de.id = tkl2.entity_id
                 LEFT JOIN ts_kv_latest tkl2 ON de.id = tkl2.entity_id
-                AND tkl2.key = 83
-                LEFT JOIN ts_kv_latest tkl3 ON de.id = tkl3.entity_id
-                AND tkl3.key = 84
+                AND tkl2.key = 84
                 WHERE
                 WHERE
                 de.organization_id='1697500a-dc11-45cc-88f5-2ad47472a9bb'
                 de.organization_id='1697500a-dc11-45cc-88f5-2ad47472a9bb'
                 AND de.device_profile_id = '4e404b10-ffe7-11f0-926f-2f3182abc65f'"
                 AND de.device_profile_id = '4e404b10-ffe7-11f0-926f-2f3182abc65f'"