feat: 添加设备用电量和用水量计算功能

@@ -43,7 +43,9 @@ public class CzDeviceReportService {
             "          'OFF'\n" +
             "      END AS 设备状态,\n" +
             "      dc.credentials_id AS sn,\n" +
-            "      de.organization_id\n" +
+            "      de.organization_id, \n" +
+            "      de.device_profile_id, \n" +
+            "      de.id \n" +
             "    FROM\n" +
             "      device de\n" +
             "      LEFT JOIN ts_kv_latest tkl ON de.id = tkl.entity_id\n" +
@@ -71,7 +73,9 @@ public class CzDeviceReportService {
             "          'RUN'\n" +
             "      END AS 设备状态,\n" +
             "      dc.credentials_id AS sn,\n" +
-            "      de.organization_id\n" +
+            "      de.organization_id, \n" +
+            "      de.device_profile_id, \n" +
+            "      de.id \n" +
             "    FROM\n" +
             "      device de\n" +
             "      LEFT JOIN attribute_kv ak ON de.id = ak.entity_id\n" +
@@ -93,7 +97,9 @@ public class CzDeviceReportService {
             "          'RUN'\n" +
             "      END AS 设备状态,\n" +
             "      dc.credentials_id AS sn,\n" +
-            "      de.organization_id\n" +
+            "      de.organization_id, \n" +
+            "      de.device_profile_id, \n" +
+            "      de.id \n" +
             "    FROM\n" +
             "      device de\n" +
             "      LEFT JOIN attribute_kv ak ON de.id = ak.entity_id\n" +
@@ -157,6 +163,8 @@ public class CzDeviceReportService {
             String deviceId = dataList.get(2).toString();
             String status = dataList.get(1).toString();
             String organizeId = dataList.get(3).toString();
+            String deviceProfileId = dataList.get(4).toString();
+            String id = dataList.get(5).toString();
 
             // 根据index确定clientId
             String clientId = organizeIdAndClientIdMap.get(organizeId);
@@ -165,12 +173,18 @@ public class CzDeviceReportService {
             // 获取设备状态
             int deviceState = getDeviceState(status);
 
+            // 计算当日用电量和用水量
+            double electricity = calculateDailyElectricity(id, deviceProfileId);
+            double water = calculateDailyWater(id, deviceProfileId);
+
             Map<String, Object> properties = new HashMap<>(5);
             properties.put("type", 1);
             properties.put("state", deviceState);
             properties.put("time", formattedDate);
             properties.put("output", 0); // 当日产量，还未确定，暂定为0
             properties.put("energy", 0); // 当日能耗，还未确定，暂定为0
+            properties.put("electricity", electricity); // 当日用电量
+            properties.put("water", water); // 当日用水量
 
             Map<String, Object> deviceMap = new HashMap<>(2);
             deviceMap.put("deviceId", deviceId);
@@ -237,6 +251,135 @@ public class CzDeviceReportService {
         return deviceState;
     }
 
+    /**
+     * 计算当日用电量
+     * deviceProfileId = c2401630-ffec-11f0-926f-2f3182abc65f，key=64，读取dbl_v
+     * @param deviceId 设备ID（entity_id）
+     * @param deviceProfileId 设备配置ID
+     * @return 当日用电量
+     */
+    private double calculateDailyElectricity(String deviceId, String deviceProfileId) {
+        // 非用电设备类型，返回0
+        if (!"c2401630-ffec-11f0-926f-2f3182abc65f".equals(deviceProfileId)) {
+            return 0;
+        }
+
+        String sql = "SELECT " +
+                "  (SELECT COALESCE(dbl_v, 0) FROM ts_kv " +
+                "   WHERE entity_id = ? AND key = 64 AND ts >= ? AND ts <= ? AND dbl_v IS NOT NULL " +
+                "   ORDER BY ts ASC LIMIT 1) AS first_value, " +
+                "  (SELECT COALESCE(dbl_v, 0) FROM ts_kv " +
+                "   WHERE entity_id = ? AND key = 64 AND ts >= ? AND ts <= ? AND dbl_v IS NOT NULL " +
+                "   ORDER BY ts DESC LIMIT 1) AS last_value";
+
+        return calculateDailyConsumption(deviceId, sql, "用电量");
+    }
+
+    /**
+     * 计算当日用水量
+     * deviceProfileId = 4e404b10-ffe7-11f0-926f-2f3182abc65f，key=83，读取dbl_v或long_v
+     * @param deviceId 设备ID（entity_id）
+     * @param deviceProfileId 设备配置ID
+     * @return 当日用水量
+     */
+    private double calculateDailyWater(String deviceId, String deviceProfileId) {
+        // 非用水设备类型，返回0
+        if (!"4e404b10-ffe7-11f0-926f-2f3182abc65f".equals(deviceProfileId)) {
+            return 0;
+        }
+
+        String sql = "SELECT " +
+                "  (SELECT COALESCE(dbl_v, long_v, 0) FROM ts_kv " +
+                "   WHERE entity_id = ? AND key = 83 AND ts >= ? AND ts <= ? " +
+                "   AND (dbl_v IS NOT NULL OR long_v IS NOT NULL) " +
+                "   ORDER BY ts ASC LIMIT 1) AS first_value, " +
+                "  (SELECT COALESCE(dbl_v, long_v, 0) FROM ts_kv " +
+                "   WHERE entity_id = ? AND key = 83 AND ts >= ? AND ts <= ? " +
+                "   AND (dbl_v IS NOT NULL OR long_v IS NOT NULL) " +
+                "   ORDER BY ts DESC LIMIT 1) AS last_value";
+
+        return calculateDailyConsumption(deviceId, sql, "用水量");
+    }
+
+    /**
+     * 执行能耗计算查询
+     * @param deviceId 设备ID
+     * @param sql 查询SQL
+     * @param logName 日志名称
+     * @return 当日消耗量
+     */
+    private double calculateDailyConsumption(String deviceId, String sql, String logName) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet resultSet = null;
+        HikariDataSource dataSource = null;
+
+        try {
+            HikariConfig config = new HikariConfig();
+            config.setJdbcUrl(jdbcUrl);
+            config.setUsername(jdbcUserName);
+            config.setPassword(jdbcPassword);
+            config.setDriverClassName("org.postgresql.Driver");
+            config.setMaximumPoolSize(5);
+            config.setMinimumIdle(5);
+            config.setConnectionTimeout(60000);
+            config.setConnectionTestQuery("SELECT 1");
+
+            dataSource = new HikariDataSource(config);
+            connection = dataSource.getConnection();
+
+            // 获取当天开始和结束时间戳（毫秒）
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            long startOfDay = calendar.getTimeInMillis();
+            calendar.set(Calendar.HOUR_OF_DAY, 23);
+            calendar.set(Calendar.MINUTE, 59);
+            calendar.set(Calendar.SECOND, 59);
+            calendar.set(Calendar.MILLISECOND, 999);
+            long endOfDay = calendar.getTimeInMillis();
+
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, deviceId);
+            statement.setLong(2, startOfDay);
+            statement.setLong(3, endOfDay);
+            statement.setString(4, deviceId);
+            statement.setLong(5, startOfDay);
+            statement.setLong(6, endOfDay);
+
+            resultSet = statement.executeQuery();
+            if (resultSet.next()) {
+                double firstValue = resultSet.getDouble("first_value");
+                double lastValue = resultSet.getDouble("last_value");
+                double consumption = lastValue - firstValue;
+                log.debug("设备 {} 当日{}计算: 首值={}, 末值={}, 消耗={}", deviceId, logName, firstValue, lastValue, consumption);
+                return Math.max(consumption, 0); // 确保非负
+            }
+        } catch (SQLException e) {
+            log.error("查询设备 {} 当日{}失败: {}", deviceId, logName, e.getMessage(), e);
+        } catch (Exception e) {
+            log.error("计算设备 {} 当日{}时发生异常", deviceId, logName, e);
+        } finally {
+            try {
+                if (resultSet != null) resultSet.close();
+                if (statement != null) statement.close();
+                if (connection != null) connection.close();
+            } catch (SQLException e) {
+                log.error("关闭数据库资源时发生异常", e);
+            }
+            if (dataSource != null) {
+                try {
+                    dataSource.close();
+                } catch (Exception e) {
+                    log.error("关闭HikariDataSource连接池时发生异常", e);
+                }
+            }
+        }
+        return 0;
+    }
+
     private List<Object> initConnectAndSelectData() {
         Connection connection = null;
         PreparedStatement statement = null;