feat: 新增OEE时序图分页查询接口

@@ -64,4 +64,22 @@ public class HealthController {
             @RequestParam(required = false) String endDate) {
             @RequestParam(required = false) String endDate) {
         return deviceSearchService.queryOeeStats(dtuSn, type, startDate, endDate);
         return deviceSearchService.queryOeeStats(dtuSn, type, startDate, endDate);
     }
     }
+
+    /**
+     * OEE时序图分页查询（含稼动率）
+     * 查询所有设备在指定日期范围内的OEE时序数据，分页返回（每页最多20条）
+     *
+     * @param startDate 开始日期 yyyy-MM-dd
+     * @param endDate   结束日期 yyyy-MM-dd
+     * @param pageNo    页码，默认1
+     * @param pageSize  每页条数，最大20，默认20
+     */
+    @GetMapping("/device/oeeTimeline")
+    public Map<String, Object> oeeTimeline(
+            @RequestParam String startDate,
+            @RequestParam String endDate,
+            @RequestParam(defaultValue = "1") Integer pageNo,
+            @RequestParam(defaultValue = "20") Integer pageSize) {
+        return deviceSearchService.queryOeeTimeline(startDate, endDate, pageNo, pageSize);
+    }
 }
 }

 package com.iot.scheduler.service;
 package com.iot.scheduler.service;
 
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -550,4 +551,381 @@ public class DeviceSearchService {
 
 
         return jdbcTemplate.queryForList(sql.toString(), params.toArray());
         return jdbcTemplate.queryForList(sql.toString(), params.toArray());
     }
     }
+
+    // ==================== OEE 时序图分页查询（含稼动率计算） ====================
+
+    /**
+     * 按设备分页查询所有设备的OEE时序数据，并计算稼动率
+     *
+     * @param startDate 开始日期 yyyy-MM-dd
+     * @param endDate   结束日期 yyyy-MM-dd
+     * @param pageNo    页码，从1开始
+     * @param pageSize  每页设备数，最大20
+     */
+    public Map<String, Object> queryOeeTimeline(String startDate, String endDate, Integer pageNo, Integer pageSize) {
+        log.info("========== [OEE时序图查询-按设备分页] startDate={}, endDate={}, pageNo={}, pageSize={} ==========",
+                startDate, endDate, pageNo, pageSize);
+
+        // 参数校验与默认值
+        if (!StringUtils.hasText(startDate) || !StringUtils.hasText(endDate)) {
+            return Map.of("total", 0, "pageNo", pageNo, "pageSize", pageSize, "list", List.of());
+        }
+        int ps = Math.min(pageSize != null ? pageSize : 20, 20);
+        int pn = pageNo != null && pageNo > 0 ? pageNo : 1;
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String todayStr = sdf.format(new Date());
+        boolean includeToday = isDateInRange(todayStr, startDate, endDate);
+        log.info("包含今日({}): {}", todayStr, includeToday);
+
+        // 1. 从设备表查询所有 dtuSn 及设备名称
+        Map<String, String> deviceNameMap = queryAllDtuSnWithName();
+        List<String> allDtuSns = new ArrayList<>(deviceNameMap.keySet());
+        int deviceTotal = allDtuSns.size();
+        log.info("设备总数: {}", deviceTotal);
+
+        if (allDtuSns.isEmpty()) {
+            return buildPageResult(0, pn, ps, List.of());
+        }
+
+        // 2. 构建日期范围列表
+        List<String> dateList = buildDayList(startDate, endDate);
+        log.info("日期范围共 {} 天: {} ~ {}", dateList.size(), dateList.get(0), dateList.get(dateList.size() - 1));
+
+        // 3. 批量从数据库查询全部设备的 OEE 数据
+        List<OeeRecord> allRecords = queryOeeBatch(allDtuSns, dateList, includeToday ? todayStr : null);
+
+        // 4. 如果包含今天，补充调用接口获取今天的实时数据
+        if (includeToday) {
+            supplementTodayData(allDtuSns, todayStr, allRecords);
+        }
+
+        // 5. 按 dtuSn 分组，每个设备包含该日期范围内所有天的数据
+        Map<String, List<OeeRecord>> deviceMap = new LinkedHashMap<>();
+        for (OeeRecord r : allRecords) {
+            deviceMap.computeIfAbsent(r.dtuSn, k -> new ArrayList<>()).add(r);
+        }
+        // 确保没有数据的设备也有空列表（保持顺序一致）
+        for (String sn : allDtuSns) {
+            if (!deviceMap.containsKey(sn)) {
+                deviceMap.put(sn, new ArrayList<>());
+            }
+        }
+
+        // 6. 设备维度分页
+        List<Map<String, Object>> pageList;
+        int offset = (pn - 1) * ps;
+        List<String> pagedDevices = new ArrayList<>(deviceMap.keySet()).subList(
+                Math.min(offset, deviceTotal), Math.min(offset + ps, deviceTotal));
+        pageList = convertDeviceGroupToResponse(pagedDevices, deviceMap, dateList, deviceNameMap);
+
+        return buildPageResult(deviceTotal, pn, ps, pageList);
+    }
+
+    /** 查询设备表所有dtuSn及对应设备名称 */
+    private Map<String, String> queryAllDtuSnWithName() {
+        String sql = "SELECT dtuSn, deviceName FROM " + deviceTableName + " WHERE corp_code = ? ORDER BY dtuSn";
+        List<Map<String, Object>> rows = jdbcTemplate.queryForList(sql, deviceCorpCode);
+        Map<String, String> result = new LinkedHashMap<>(rows.size());
+        for (Map<String, Object> row : rows) {
+            result.put((String) row.get("dtuSn"), (String) row.get("deviceName"));
+        }
+        return result;
+    }
+
+    /** 判断某日期是否在范围内 */
+    private boolean isDateInRange(String dateStr, String start, String end) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Date target = sdf.parse(dateStr);
+            Date s = sdf.parse(start);
+            Date e = sdf.parse(end);
+            return !target.before(s) && !target.after(e);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /** 构建连续日期列表 */
+    private List<String> buildDayList(String startDate, String endDate) {
+        List<String> result = new ArrayList<>();
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar cur = Calendar.getInstance();
+            cur.setTime(sdf.parse(startDate));
+            Calendar endCal = Calendar.getInstance();
+            endCal.setTime(sdf.parse(endDate));
+            while (!cur.after(endCal)) {
+                result.add(sdf.format(cur.getTime()));
+                cur.add(Calendar.DAY_OF_MONTH, 1);
+            }
+        } catch (Exception e) {
+            log.error("日期解析失败: {} ~ {}", startDate, endDate, e);
+        }
+        return result;
+    }
+
+    /** OEE内部记录结构 */
+    private static class OeeRecord {
+        String dtuSn;
+        String oeeDate;
+        JSONArray lampData;       // 该日lampData数组
+        double availabilityRate;  // 稼动率 (%)
+
+        OeeRecord(String dtuSn, String oeeDate) {
+            this.dtuSn = dtuSn;
+            this.oeeDate = oeeDate;
+            this.availabilityRate = 0.0;
+        }
+    }
+
+    /** 批量从数据库查询OEE数据 */
+    private List<OeeRecord> queryOeeBatch(List<String> dtuSns, List<String> dateList, String excludeToday) {
+        List<OeeRecord> records = new ArrayList<>();
+
+        if (dateList.isEmpty()) return records;
+
+        StringBuilder sql = new StringBuilder(
+                "SELECT dtuSn, oee_date, triColorLamp1, triColorLamp2 FROM " + oeeTableName +
+                        " WHERE corp_code = ? AND dtuSn IN (");
+        List<Object> params = new ArrayList<>();
+        params.add(deviceCorpCode);
+
+        // dtuSn IN 条件
+        for (String sn : dtuSns) { sql.append("?,"); params.add(sn); }
+        sql.deleteCharAt(sql.length() - 1).append(")");
+
+        // 日期条件（排除今天）
+        sql.append(" AND oee_date IN (");
+        List<Object> dateParams = new ArrayList<>();
+        for (String d : dateList) {
+            if (d.equals(excludeToday)) continue;
+            sql.append("?,"); dateParams.add(d);
+        }
+        if (dateParams.isEmpty()) return records; // 全是今天
+        sql.deleteCharAt(sql.length() - 1).append(")");
+        params.addAll(dateParams);
+
+        List<Map<String, Object>> rows = jdbcTemplate.queryForList(sql.toString(), params.toArray());
+        log.info("DB批量查询返回 {} 行OEE数据", rows.size());
+
+        for (Map<String, Object> row : rows) {
+            String sn = (String) row.get("dtuSn");
+            String oeeDate = String.valueOf(row.get("oee_date"));
+            if (oeeDate.length() > 10) oeeDate = oeeDate.substring(0, 10);
+            String lamp1 = (String) row.get("triColorLamp1");
+            String lamp2 = (String) row.get("triColorLamp2");
+
+            OeeRecord record = new OeeRecord(sn, oeeDate);
+            try {
+                String fullJson = (lamp1 != null ? lamp1 : "") + (lamp2 != null ? lamp2 : "");
+                if (!fullJson.isEmpty()) {
+                    record.lampData = JSONArray.parseArray(fullJson);
+                } else {
+                    record.lampData = new JSONArray();
+                }
+            } catch (Exception e) {
+                log.warn("解析OEE JSON异常 - dtuSn:{}, date:{}", sn, oeeDate, e);
+                record.lampData = new JSONArray();
+            }
+
+            record.availabilityRate = calcAvailabilityRate(record.lampData);
+            records.add(record);
+        }
+
+        return records;
+    }
+
+    /** 补充今天的实时接口数据 */
+    private void supplementTodayData(List<String> dtuSns, String todayStr, List<OeeRecord> records) {
+        log.info("开始补充今日({})实时OEE数据...", todayStr);
+        int apiCount = 0;
+        for (String dtuSn : dtuSns) {
+            // 先检查是否已有该设备今天的数据
+            boolean exists = false;
+            for (OeeRecord r : records) {
+                if (r.dtuSn.equals(dtuSn) && r.oeeDate.equals(todayStr)) {
+                    exists = true; break;
+                }
+            }
+            if (exists) continue;
+
+            try {
+                String apiResult = devicePullService.getLampData(dtuSn, todayStr);
+                if (!StringUtils.hasText(apiResult)) continue;
+
+                Map<String, Object> res = JSON.parseObject(apiResult, new com.alibaba.fastjson.TypeReference<>() {});
+                Integer code = (Integer) res.get("code");
+                if (code == null || code != 200) continue;
+
+                JSONArray dataList = (JSONArray) res.get("data");
+                if (dataList == null || dataList.isEmpty()) continue;
+
+                JSONObject dataObj = (JSONObject) dataList.get(0);
+                OeeRecord record = new OeeRecord(dtuSn, todayStr);
+                record.lampData = dataObj.getJSONArray("lampData");
+                if (record.lampData == null) record.lampData = new JSONArray();
+                record.availabilityRate = calcAvailabilityRate(record.lampData);
+                records.add(record);
+                apiCount++;
+            } catch (Exception e) {
+                log.error("获取今日OEE数据异常 - dtuSn:{}", dtuSn, e);
+            }
+        }
+        log.info("今日实时数据补充完成, 新增 {} 条", apiCount);
+    }
+
+    /**
+     * 计算稼动率
+     * 稼动率 = 绿灯(state=3)时长 / 总时长 * 100%
+     */
+    private double calcAvailabilityRate(JSONArray lampData) {
+        if (lampData == null || lampData.isEmpty()) return 0.0;
+
+        long totalDuration = 0;
+        long greenDuration = 0;
+
+        for (int i = 0; i < lampData.size(); i++) {
+            JSONObject item = lampData.getJSONObject(i);
+            if (item == null) continue;
+            int state = item.getIntValue("lampState");
+            long dur = item.getLongValue("duration");
+            totalDuration += dur;
+            if (state == 3) greenDuration += dur;
+        }
+
+        if (totalDuration == 0) return 0.0;
+        return Math.round(greenDuration * 10000.0 / totalDuration) / 100.0; // 保留2位小数
+    }
+
+    /** 按设备分组转换为响应格式：每个设备一条记录，包含lampData和设备名称 */
+    private List<Map<String, Object>> convertDeviceGroupToResponse(List<String> pagedDevices,
+                                                                     Map<String, List<OeeRecord>> deviceMap,
+                                                                     List<String> dateList,
+                                                                     Map<String, String> deviceNameMap) {
+        List<Map<String, Object>> list = new ArrayList<>(pagedDevices.size());
+
+        for (String dtuSn : pagedDevices) {
+            Map<String, Object> item = new LinkedHashMap<>();
+            item.put("dtuSn", dtuSn);
+            item.put("deviceName", deviceNameMap.getOrDefault(dtuSn, ""));
+
+            List<OeeRecord> dayRecords = deviceMap.getOrDefault(dtuSn, Collections.emptyList());
+            // 构建日期→record的快速查找map
+            Map<String, OeeRecord> recordByDate = new LinkedHashMap<>();
+            for (OeeRecord r : dayRecords) {
+                recordByDate.put(r.oeeDate, r);
+            }
+
+            // 汇总计算综合稼动率
+            long totalDur = 0, greenDur = 0;
+            long offD = 0, redD = 0, yellowD = 0, greenD = 0, blueD = 0;
+            int offC = 0, redC = 0, yellowC = 0, greenC = 0, blueC = 0;
+
+            // 拼接所有天的 lampData 为一个数组（按日期排序）
+            JSONArray allLampData = new JSONArray();
+            List<Map<String, Object>> dailyDetails = new ArrayList<>();
+
+            for (String d : dateList) {
+                OeeRecord rec = recordByDate.get(d);
+                if (rec != null && rec.lampData != null) {
+                    for (int i = 0; i < rec.lampData.size(); i++) {
+                        JSONObject lamp = rec.lampData.getJSONObject(i);
+                        if (lamp == null) continue;
+                        int state = lamp.getIntValue("lampState");
+                        long dur = lamp.getLongValue("duration");
+                        switch (state) {
+                            case 0 -> { offD += dur; offC++; }
+                            case 1 -> { redD += dur; redC++; }
+                            case 2 -> { yellowD += dur; yellowC++; }
+                            case 3 -> { greenD += dur; greenC++; }
+                            case 4 -> { blueD += dur; blueC++; }
+                        }
+                        totalDur += dur;
+                        if (state == 3) greenDur += dur;
+                    }
+                    allLampData.addAll(rec.lampData);
+                }
+                double dayRate = (rec != null) ? rec.availabilityRate : 0.0;
+                dailyDetails.add(Map.of(
+                        "oeeDate", d,
+                        "availabilityRate", dayRate,
+                        "hasData", rec != null
+                ));
+            }
+
+            double overallRate = (totalDur > 0) ? Math.round(greenDur * 10000.0 / totalDur) / 100.0 : 0.0;
+
+            // 扁平化字段，对齐截图格式
+            item.put("availabilityRatio", String.format("%.2f%%", overallRate));
+            item.put("offDuration", formatDuration(offD));
+            item.put("redDuration", formatDuration(redD));
+            item.put("yellowDuration", formatDuration(yellowD));
+            item.put("greenDuration", formatDuration(greenD));
+            item.put("blueDuration", formatDuration(blueD));
+            item.put("dataDays", recordByDate.size());
+            item.put("totalDays", dateList.size());
+            item.put("lampData", allLampData);
+            item.put("dailyDetails", dailyDetails);
+
+            list.add(item);
+        }
+
+        return list;
+    }
+
+    /** 转换为响应格式 */
+    private List<Map<String, Object>> convertToResponse(List<OeeRecord> records) {
+        List<Map<String, Object>> list = new ArrayList<>(records.size());
+
+        for (OeeRecord r : records) {
+            Map<String, Object> item = new LinkedHashMap<>();
+            item.put("dtuSn", r.dtuSn);
+            item.put("oeeDate", r.oeeDate);
+            item.put("availabilityRate", r.availabilityRate); // 稼动率
+            item.put("availabilityRateStr", r.availabilityRate + "%");
+
+            // 各状态时长统计
+            long offDur = 0, redDur = 0, yellowDur = 0, greenDur = 0, blueDur = 0;
+            int offCnt = 0, redCnt = 0, yellowCnt = 0, greenCnt = 0, blueCnt = 0;
+
+            if (r.lampData != null) {
+                for (int i = 0; i < r.lampData.size(); i++) {
+                    JSONObject lamp = r.lampData.getJSONObject(i);
+                    if (lamp == null) continue;
+                    int state = lamp.getIntValue("lampState");
+                    long dur = lamp.getLongValue("duration");
+                    switch (state) {
+                        case 0 -> { offDur += dur; offCnt++; }
+                        case 1 -> { redDur += dur; redCnt++; }
+                        case 2 -> { yellowDur += dur; yellowCnt++; }
+                        case 3 -> { greenDur += dur; greenCnt++; }
+                        case 4 -> { blueDur += dur; blueCnt++; }
+                    }
+                }
+            }
+
+            item.put("off", Map.of("duration", formatDuration(offDur), "seconds", offDur, "count", offCnt));
+            item.put("red", Map.of("duration", formatDuration(redDur), "seconds", redDur, "count", redCnt));
+            item.put("yellow", Map.of("duration", formatDuration(yellowDur), "seconds", yellowDur, "count", yellowCnt));
+            item.put("green", Map.of("duration", formatDuration(greenDur), "seconds", greenDur, "count", greenCnt));
+            item.put("blue", Map.of("duration", formatDuration(blueDur), "seconds", blueDur, "count", blueCnt));
+            item.put("lampData", r.lampData != null ? r.lampData : new JSONArray());
+
+            list.add(item);
+        }
+        return list;
+    }
+
+    /** 构建分页结果（标准分页格式） */
+    private Map<String, Object> buildPageResult(long total, int pageNo, int pageSize, List<Map<String, Object>> list) {
+        return Map.of(
+                "data", Map.of(
+                        "total", total,
+                        "size", pageSize,
+                        "current", pageNo,
+                        "records", list
+                )
+        );
+    }
 }
 }

@@ -39,9 +39,9 @@ scheduler:
     pull: "0 0/5 * * * ?"
     pull: "0 0/5 * * * ?"
     push: "0 0/10 * * * ?"
     push: "0 0/10 * * * ?"
   devUtil:
   devUtil:
-    cron: "0 30 2 * * ?"   # 每日凌晨 2:30 增量同步昨天数据
+    cron: "0 5 11 * * ?"   # 每日凌晨 2:30 增量同步昨天数据
   oee:
   oee:
-    cron: "0 35 2 * * ?"   # 每日凌晨 2:35 增量同步昨天OEE数据
+    cron: "0 5 11 * * ?"   # 每日凌晨 2:35 增量同步昨天OEE数据
 
 
 device:
 device:
   token:
   token: