feat: 新增设备能耗明细与OEE时序查询接口

@@ -143,4 +143,18 @@ public class HealthController {
     public Map<String, Object> energyStats() {
     public Map<String, Object> energyStats() {
         return energySearchService.queryEnergyStats();
         return energySearchService.queryEnergyStats();
     }
     }
+
+    /**
+     * 根据dtuSn查询指定日期的设备时用电量和OEE时序
+     * 返回时用电量数组、总用电量、OEE时序、总时长、各状态运行时长和占比
+     *
+     * @param dtuSn 设备序列号
+     * @param date  查询日期 yyyy-MM-dd
+     */
+    @GetMapping("/energy/detail")
+    public Map<String, Object> energyDetail(
+            @RequestParam String dtuSn,
+            @RequestParam String date) {
+        return energySearchService.queryEnergyDetailByDate(dtuSn, date);
+    }
 }
 }

 package com.iot.scheduler.service;
 package com.iot.scheduler.service;
 
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -8,6 +11,8 @@ import org.springframework.util.StringUtils;
 
 
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resource;
 
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.*;
 
 
 @Slf4j
 @Slf4j
@@ -18,6 +23,10 @@ public class EnergySearchService {
     private String energyCorpCode;
     private String energyCorpCode;
     @Value("${energy.db.tableName}")
     @Value("${energy.db.tableName}")
     private String energyTableName;
     private String energyTableName;
+    @Value("${energy.db.eqKwhTableName}")
+    private String eqKwhTableName;
+    @Value("${energy.db.eRunDtlTableName}")
+    private String eRunDtlTableName;
 
 
     @Resource
     @Resource
     private JdbcTemplate jdbcTemplate;
     private JdbcTemplate jdbcTemplate;
@@ -120,4 +129,124 @@ public class EnergySearchService {
                 "3", statusMap.get("3")
                 "3", statusMap.get("3")
         );
         );
     }
     }
+
+    /**
+     * 根据dtuSn查询指定日期的设备时用电量和OEE时序
+     * 1. 时用电量：从t_auto_ymk_iot_eq_kwh表获取，并计算当日总用电量
+     * 2. OEE时序：从t_auto_ymk_iot_e_run_dtl表获取，统计总时长、各状态运行时长和占比
+     *
+     * @param dtuSn 设备序列号
+     * @param date  查询日期 yyyy-MM-dd
+     */
+    public Map<String, Object> queryEnergyDetailByDate(String dtuSn, String date) {
+        // 1. 查询时用电量数据 - 原始数据直接返回
+        Object kwhRawData = Collections.emptyList();
+        BigDecimal totalKwh = BigDecimal.ZERO;
+        try {
+            String kwhSql = "SELECT description FROM " + eqKwhTableName
+                    + " WHERE corp_code = ? AND dtuSn = ? AND use_date = ?";
+            Map<String, Object> kwhRow = jdbcTemplate.queryForMap(kwhSql, energyCorpCode, dtuSn, date + " 00:00:00");
+            if (kwhRow != null && kwhRow.get("description") != null) {
+                String description = String.valueOf(kwhRow.get("description"));
+                kwhRawData = JSON.parseArray(description);
+                // 计算总用电量
+                JSONArray dataArray = JSON.parseArray(description);
+                for (int i = 0; i < dataArray.size(); i++) {
+                    JSONObject item = dataArray.getJSONObject(i);
+                    Double value = item.getDouble("value");
+                    if (value != null) {
+                        totalKwh = totalKwh.add(BigDecimal.valueOf(value));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.warn("【能耗明细】查询时用电量数据为空或异常 - dtuSn:{}, date:{}", dtuSn, date);
+        }
+
+        // 2. 查询OEE时序数据 - 原始数据直接返回
+        Object oeeRawData = Collections.emptyList();
+        long totalDuration = 0;
+        // runStatus状态: 0-离线, 1-停机, 2-待机, 3-运行
+        Map<Integer, Long> statusDurationMap = new LinkedHashMap<>();
+        statusDurationMap.put(0, 0L); // 离线
+        statusDurationMap.put(1, 0L); // 停机
+        statusDurationMap.put(2, 0L); // 待机
+        statusDurationMap.put(3, 0L); // 运行
+
+        try {
+            String oeeSql = "SELECT runStatus1, runStatus2 FROM " + eRunDtlTableName
+                    + " WHERE corp_code = ? AND dtuSn = ? AND use_date = ?";
+            Map<String, Object> oeeRow = jdbcTemplate.queryForMap(oeeSql, energyCorpCode, dtuSn, date + " 00:00:00");
+            if (oeeRow != null) {
+                String rs1 = oeeRow.get("runStatus1") != null ? String.valueOf(oeeRow.get("runStatus1")) : "";
+                String rs2 = oeeRow.get("runStatus2") != null ? String.valueOf(oeeRow.get("runStatus2")) : "";
+                String jsonStr = rs1 + rs2;
+                oeeRawData = JSON.parseArray(jsonStr);
+
+                // 统计各状态时长
+                JSONArray dataArray = JSON.parseArray(jsonStr);
+                for (int i = 0; i < dataArray.size(); i++) {
+                    JSONObject item = dataArray.getJSONObject(i);
+                    Long duration = item.getLong("duration");
+                    Integer runStatus = item.getInteger("runStatus");
+
+                    if (duration != null && duration > 0) {
+                        totalDuration += duration;
+                        int statusKey = runStatus != null ? runStatus : 0;
+                        statusDurationMap.merge(statusKey, duration, Long::sum);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.warn("【能耗明细】查询OEE时序数据为空或异常 - dtuSn:{}, date:{}", dtuSn, date);
+        }
+
+        // 3. 构建OEE统计结果（含格式化时长和占比）
+        List<Map<String, Object>> statusStats = new ArrayList<>();
+        for (Map.Entry<Integer, Long> entry : statusDurationMap.entrySet()) {
+            long dur = entry.getValue();
+            double percent = totalDuration > 0 ? BigDecimal.valueOf(dur * 100.0 / totalDuration)
+                    .setScale(2, RoundingMode.HALF_UP).doubleValue() : 0.0;
+
+            Map<String, Object> stat = new LinkedHashMap<>();
+            stat.put("status", entry.getKey());
+            stat.put("durationSeconds", dur);
+            stat.put("durationFormatted", formatDuration(dur));
+            stat.put("percent", percent);
+            statusStats.add(stat);
+        }
+
+        return Map.of(
+                "code", 200,
+                "msg", "请求成功",
+                "dtuSn", dtuSn,
+                "date", date,
+                "kwhData", Map.of(
+                        "list", kwhRawData,
+                        "totalKwh", totalKwh.setScale(2, RoundingMode.HALF_UP)
+                ),
+                "oeeData", Map.of(
+                        "list", oeeRawData,
+                        "totalDurationFormatted", formatDuration(totalDuration),
+                        "totalDurationSeconds", totalDuration,
+                        "statusStats", statusStats
+                )
+        );
+    }
+
+    /**
+     * 格式化时长为 xx时xx分xx秒 格式
+     * 时不为0则展示xx时xx分xx秒
+     * 时和分都为0则只展示xx秒
+     */
+    private static String formatDuration(long totalSeconds) {
+        long h = totalSeconds / 3600;
+        long m = (totalSeconds % 3600) / 60;
+        long s = totalSeconds % 60;
+        StringBuilder sb = new StringBuilder();
+        if (h > 0) sb.append(h).append("时");
+        if (h > 0 || m > 0) sb.append(m).append("分");
+        sb.append(s).append("秒");
+        return sb.toString();
+    }
 }
 }