同池上报水电能源数据

@@ -24,12 +24,12 @@ import java.util.Map;
 @Service
 @Service
 public class KSDeviceReportService {
 public class KSDeviceReportService {
 
 
-    @Value("${ks.third.jdbcUrl:jdbc:postgresql://192.168.0.249:5432/iot}")
+    @Value("${ks.third.jdbcUrl:jdbc:postgresql://106.15.73.210:5433/thingskit}")
     private String jdbcUrl;
     private String jdbcUrl;
     @Value("${ks.third.jdbcUserName:postgres}")
     @Value("${ks.third.jdbcUserName:postgres}")
     private String jdbcUserName;
     private String jdbcUserName;
 
 
-    @Value("${ks.third.jdbcPassword:1qaz@WSX}")
+    @Value("${ks.third.jdbcPassword:thingskit}")
     private String jdbcPassword;
     private String jdbcPassword;
 
 
     @Value("${ks.third.selectSql:SELECT * FROM ts_kv_dictionary;}")
     @Value("${ks.third.selectSql:SELECT * FROM ts_kv_dictionary;}")
@@ -38,7 +38,7 @@ public class KSDeviceReportService {
     @Value("${ks.third.selectSql1:SELECT * FROM ts_kv_dictionary;}")
     @Value("${ks.third.selectSql1:SELECT * FROM ts_kv_dictionary;}")
     private String selectSql1;
     private String selectSql1;
 
 
-    @Value("${ks.third.broker:192.168.0.249:1884}")
+    @Value("${ks.third.broker:117.71.99.102:11883}")
     private String broker;
     private String broker;
     @Value("${ks.third.username:yunpower}")
     @Value("${ks.third.username:yunpower}")
     private String username;
     private String username;
@@ -46,9 +46,9 @@ public class KSDeviceReportService {
     private String password;
     private String password;
     @Value("${ks.third.topic:storage0}")
     @Value("${ks.third.topic:storage0}")
     private String topic;
     private String topic;
-    @Value("${ks.third.clientId:2020672015207559170}")
+    @Value("${ks.third.clientId:tongchikeji}")
     private String clientId;
     private String clientId;
-    @Value("${ks.third.channelSn:8VAUR9H3}")
+    @Value("${ks.third.channelSn:B049Z974}")
     private String channelSn;
     private String channelSn;
 
 
     public void deviceElectricity() {
     public void deviceElectricity() {

-package com.iot.scheduler.zone;
-
-import com.iot.scheduler.task.AbstractZoneScheduler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class ChizhouZoneScheduler extends AbstractZoneScheduler {
-
-    @Override
-    protected String getZoneName() {
-        return "Chizhou (池州经开区)";
-    }
-
-    @Scheduled(cron = "${scheduler.chizhou.pull:0 0/10 * * * ?}")
-    public void pullDevicesFromThirdParty() {
-        String taskName = "Pull Devices (3rd Party -> IoT)";
-        logStart(taskName);
-        try {
-            // TODO: Implement actual logic
-            log.info("[{}] Simulating pulling devices...", getZoneName());
-            Thread.sleep(1000);
-        } catch (Exception e) {
-            logError(taskName, e);
-        } finally {
-            logEnd(taskName);
-        }
-    }
-
-    @Scheduled(cron = "${scheduler.chizhou.push:0 0/15 * * * ?}")
-    public void pushDevicesToThirdParty() {
-        String taskName = "Push Devices (IoT -> 3rd Party)";
-        logStart(taskName);
-        try {
-            // TODO: Implement actual logic
-            log.info("[{}] Simulating pushing devices...", getZoneName());
-            Thread.sleep(1000);
-        } catch (Exception e) {
-            logError(taskName, e);
-        } finally {
-            logEnd(taskName);
-        }
-    }
-}

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 
 @Slf4j
 @Slf4j
 @Component
 @Component
-public class KaiShengZoneScheduler extends AbstractZoneScheduler {
+public class TongChiZoneScheduler extends AbstractZoneScheduler {
     @Resource
     @Resource
     private KSDeviceReportService ksDeviceReportService;
     private KSDeviceReportService ksDeviceReportService;
 
 

@@ -29,9 +29,9 @@ scheduler:
     push: "0 0/5 * * * ?"
     push: "0 0/5 * * * ?"
 ks:
 ks:
   third:
   third:
-    jdbcUrl: "jdbc:postgresql://192.168.0.249:5432/iot"
+    jdbcUrl: "jdbc:postgresql://106.15.73.210:5433/thingskit"
     jdbcUserName: "postgres"
     jdbcUserName: "postgres"
-    jdbcPassword: "1qaz@WSX"
+    jdbcPassword: "thingskit"
     selectSql: "SELECT
     selectSql: "SELECT
                   de.sn AS sn,
                   de.sn AS sn,
                   tkl1.dbl_v AS Ep,
                   tkl1.dbl_v AS Ep,
@@ -85,8 +85,8 @@ ks:
                   LEFT JOIN ts_kv_latest tkl16 ON de.id = tkl16.entity_id
                   LEFT JOIN ts_kv_latest tkl16 ON de.id = tkl16.entity_id
                   AND tkl16.key = 79
                   AND tkl16.key = 79
                   WHERE
                   WHERE
-                  de.organization_id='1697500a-dc11-45cc-88f5-2ad47472a9bb'
-                  AND de.device_profile_id = 'c2401630-ffec-11f0-926f-2f3182abc65f'"
+                  de.organization_id='35bcdb94-31ec-4750-9ee9-cc855aa66e17'
+                  AND de.device_profile_id = '6c1f9650-0298-11f1-9cb8-e3376d1e7978'"
 
 
     selectSql1: "SELECT
     selectSql1: "SELECT
                 de.sn AS sn,
                 de.sn AS sn,
@@ -99,5 +99,5 @@ ks:
                 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 = 84
                 AND tkl2.key = 84
                 WHERE
                 WHERE
-                de.organization_id='1697500a-dc11-45cc-88f5-2ad47472a9bb'
-                AND de.device_profile_id = '4e404b10-ffe7-11f0-926f-2f3182abc65f'"
+                de.organization_id='35bcdb94-31ec-4750-9ee9-cc855aa66e17'
+                AND de.device_profile_id = 'fdf70e30-0272-11f1-9cb8-e3376d1e7978'"