新康达设备查询上报

 package com.iot.scheduler.zone;
 package com.iot.scheduler.zone;
 
 
+import com.iot.scheduler.service.XinkangdaDeviceReportService;
 import com.iot.scheduler.task.AbstractZoneScheduler;
 import com.iot.scheduler.task.AbstractZoneScheduler;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
@@ -9,6 +11,9 @@ import org.springframework.stereotype.Component;
 @Component
 @Component
 public class ChizhouZoneScheduler extends AbstractZoneScheduler {
 public class ChizhouZoneScheduler extends AbstractZoneScheduler {
 
 
+    @Resource
+    private XinkangdaDeviceReportService xinkangdaDeviceReportService;
+
     @Override
     @Override
     protected String getZoneName() {
     protected String getZoneName() {
         return "xkd (新康达)";
         return "xkd (新康达)";
@@ -36,6 +41,7 @@ public class ChizhouZoneScheduler extends AbstractZoneScheduler {
         try {
         try {
             // TODO: Implement actual logic
             // TODO: Implement actual logic
             log.info("[{}] Simulating pushing devices...", getZoneName());
             log.info("[{}] Simulating pushing devices...", getZoneName());
+            xinkangdaDeviceReportService.batchDeviceReport();
             Thread.sleep(1000);
             Thread.sleep(1000);
         } catch (Exception e) {
         } catch (Exception e) {
             logError(taskName, e);
             logError(taskName, e);

@@ -36,12 +36,29 @@ xkd:
     jdbcPassword: "postgres"
     jdbcPassword: "postgres"
     selectSql: "SELECT
     selectSql: "SELECT
   dc.credentials_id AS deviceId,
   dc.credentials_id AS deviceId,
-  de.name AS deviceName 
+  de.name AS deviceName,
+  CASE
+    WHEN attrAt.long_v IS NULL
+      OR (attrA0.bool_v = FALSE AND attrAt.long_v IS NOT NULL) THEN
+      'OFF'
+    WHEN tkl.bool_v = 't' OR tkl.long_v = 1 THEN
+      'RUN'
+    ELSE
+      'STAND'
+  END AS status
 FROM
 FROM
   device de
   device de
-  LEFT JOIN tk_organization tko ON de.organization_id = tko.id
-  LEFT JOIN ts_kv_latest tkl ON de.id = tkl.entity_id AND tkl.KEY = 61
+  LEFT JOIN device_profile dp ON dp.id = de.device_profile_id
+  LEFT JOIN ts_kv_latest tkl ON de.id = tkl.entity_id
+  AND KEY = '65'
+  LEFT JOIN attribute_kv attrA0 ON de.id = attrA0.entity_id
+  AND attrA0.attribute_key = (SELECT key_id FROM key_dictionary WHERE KEY = 'active')
+  LEFT JOIN attribute_kv attrAt ON de.id = attrAt.entity_id
+  AND attrAt.attribute_key = (SELECT key_id FROM key_dictionary WHERE KEY = 'lastActivityTime')
+  AND attrAt.long_v > 0
   LEFT JOIN device_credentials dc ON de.id = dc.device_id
   LEFT JOIN device_credentials dc ON de.id = dc.device_id
 WHERE
 WHERE
-  de.tenant_id = '0414df80-f01d-11f0-9cb8-e3376d1e7978'
-  AND de.device_profile_id = '0418b010-f01d-11f0-9cb8-e3376d1e7978'"
+  de.device_profile_id IN ('a232cf60-2664-11f1-b8c6-b7a06d6a5950'::UUID, 'c4f7b830-2664-11f1-b8c6-b7a06d6a5950'::UUID, 'aaaf8250-2664-11f1-b8c6-b7a06d6a5950'::UUID, 'b950a050-2664-11f1-b8c6-b7a06d6a5950'::UUID, 'bf127900-2664-11f1-b8c6-b7a06d6a5950'::UUID, 'e4d55640-f756-11f0-b8c6-b7a06d6a5950'::UUID)
+  AND de.tenant_id = 'e4c3a300-f756-11f0-b8c6-b7a06d6a5950'::UUID
+ORDER BY
+  de.name"