feat: 添加开机率查询接口并启用定时同步任务

@@ -96,4 +96,18 @@ public class HealthController {
             @RequestParam(required = false) String endDate) {
             @RequestParam(required = false) String endDate) {
         return deviceSearchService.queryLampStatistics(startDate, endDate);
         return deviceSearchService.queryLampStatistics(startDate, endDate);
     }
     }
+
+    /**
+     * 开机率查询（基于 dev_util 表）
+     * 灭灯(state=0)=未开机，其他灯=开机，每台设备单独计算，不分页
+     *
+     * @param startDate 开始日期 yyyy-MM-dd
+     * @param endDate   结束日期 yyyy-MM-dd
+     */
+    @GetMapping("/device/bootRate")
+    public Map<String, Object> bootRate(
+            @RequestParam String startDate,
+            @RequestParam String endDate) {
+        return deviceSearchService.queryBootRate(startDate, endDate);
+    }
 }
 }

@@ -297,7 +297,7 @@ public class DevicePullService {
     /**
     /**
      * 每日增量同步：仅同步昨天的数据（定时任务自动触发）
      * 每日增量同步：仅同步昨天的数据（定时任务自动触发）
      */
      */
-//    @Scheduled(cron = "${scheduler.devUtil.cron:0 30 2 * * ?}")
+    @Scheduled(cron = "${scheduler.devUtil.cron:0 30 2 * * ?}")
     public void pullDevUtilDaily() {
     public void pullDevUtilDaily() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Calendar cal = Calendar.getInstance();
         Calendar cal = Calendar.getInstance();
@@ -456,7 +456,7 @@ public class DevicePullService {
     /**
     /**
      * 每日增量同步 OEE：仅同步昨天（定时任务自动触发）
      * 每日增量同步 OEE：仅同步昨天（定时任务自动触发）
      */
      */
-//    @Scheduled(cron = "${scheduler.oee.cron:0 35 2 * * ?}")
+    @Scheduled(cron = "${scheduler.oee.cron:0 35 2 * * ?}")
     public void pullOeeDaily() {
     public void pullOeeDaily() {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Calendar cal = Calendar.getInstance();
         Calendar cal = Calendar.getInstance();

@@ -24,6 +24,8 @@ public class DeviceSearchService {
     private String deviceTableName;
     private String deviceTableName;
     @Value("${device.db.oeeTableName}")
     @Value("${device.db.oeeTableName}")
     private String oeeTableName;
     private String oeeTableName;
+    @Value("${device.db.devUtilTableName}")
+    private String devUtilTableName;
 
 
     @Resource
     @Resource
     private JdbcTemplate jdbcTemplate;
     private JdbcTemplate jdbcTemplate;
@@ -1121,4 +1123,233 @@ public class DeviceSearchService {
         }
         }
         return Map.of("off", off, "red", red, "yellow", yellow, "green", green, "blue", blue);
         return Map.of("off", off, "red", red, "yellow", yellow, "green", green, "blue", blue);
     }
     }
+
+    // ==================== 开机率查询 ====================
+
+    /**
+     * 查询每台设备的开机率（基于 dev_util 表）
+     * 规则：灭灯(state=0)=未开机，其他灯(state=1/2/3/4)=开机
+     * 开机率 = 非灭灯时长 / 总时长 * 100%
+     *
+     * @param startDate 开始日期 yyyy-MM-dd
+     * @param endDate   结束日期 yyyy-MM-dd
+     */
+    public Map<String, Object> queryBootRate(String startDate, String endDate) {
+        log.info("========== [开机率查询] startDate={}, endDate={} ==========", startDate, endDate);
+
+        if (!StringUtils.hasText(startDate) || !StringUtils.hasText(endDate)) {
+            return Map.of("list", List.of(), "startDate", startDate, "endDate", endDate);
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String todayStr = sdf.format(new Date());
+        boolean includeToday = isDateInRange(todayStr, startDate, endDate);
+        log.info("设备总数: {}, 包含今日({}): {}", includeToday);
+
+        // 1. 获取所有设备列表
+        Map<String, String> deviceNameMap = queryAllDtuSnWithName();
+        List<String> allDtuSns = new ArrayList<>(deviceNameMap.keySet());
+        if (allDtuSns.isEmpty()) {
+            return Map.of("list", List.of(), "startDate", startDate, "endDate", endDate);
+        }
+        log.info("设备总数: {}", allDtuSns.size());
+
+        // 2. 从 dev_util 表按 dtuSn 和日期范围汇总各状态时长（排除今天）
+        String dbStartDate = includeToday && startDate.equals(todayStr) ? getNextDay(todayStr) : startDate;
+        List<Map<String, Object>> rows;
+        if (includeToday) {
+            // 排除今天，今天走接口
+            rows = queryDevUtilBatch(deviceCorpCode, allDtuSns, startDate, endDate, todayStr);
+        } else {
+            String sql = "SELECT dtuSn, SUM(`0`) as s0, SUM(`1`) as s1, SUM(`2`) as s2, SUM(`3`) as s3, SUM(`4`) as s4, COUNT(*) as days " +
+                    "FROM " + devUtilTableName +
+                    " WHERE corp_code = ? AND date_util BETWEEN ? AND ? GROUP BY dtuSn";
+            rows = jdbcTemplate.queryForList(sql, deviceCorpCode, startDate, endDate);
+        }
+        log.info("dev_util 查询返回 {} 条记录", rows.size());
+
+        // 3. 按 dtuSn 构建查询结果 map
+        Map<String, double[]> rawMap = new LinkedHashMap<>();  // [s0, s1, s2, s3, s4, dataDays]
+        for (Map<String, Object> row : rows) {
+            String sn = (String) row.get("dtuSn");
+            double s0 = ((Number) row.get("s0")).doubleValue();
+            double s1 = ((Number) row.get("s1")).doubleValue();
+            double s2 = ((Number) row.get("s2")).doubleValue();
+            double s3 = ((Number) row.get("s3")).doubleValue();
+            double s4 = ((Number) row.get("s4")).doubleValue();
+            int dataDays = ((Number) row.get("days")).intValue();
+            rawMap.put(sn, new double[]{s0, s1, s2, s3, s4, dataDays});
+        }
+
+        // 4. 如果包含今天，补充调用稼动率接口获取今天的实时数据
+        if (includeToday) {
+            supplementTodayDevUtil(allDtuSns, todayStr, rawMap);
+        }
+
+        // 5. 构建最终结果
+        Map<String, Map<String, Object>> rateMap = new LinkedHashMap<>();
+        for (Map.Entry<String, double[]> entry : rawMap.entrySet()) {
+            String sn = entry.getKey();
+            double[] vals = entry.getValue();
+            double totalDur = vals[0] + vals[1] + vals[2] + vals[3] + vals[4];
+            double onDur = vals[1] + vals[2] + vals[3] + vals[4]; // 非灭灯时长 = 开机时长
+            double bootRate = totalDur > 0 ? Math.round(onDur * 10000.0 / totalDur) / 100.0 : 0.0;
+
+            Map<String, Object> item = new LinkedHashMap<>();
+            item.put("dtuSn", sn);
+            item.put("deviceName", deviceNameMap.getOrDefault(sn, ""));
+            item.put("totalDuration", formatDuration((long) totalDur));
+            item.put("totalSeconds", Math.round(totalDur));
+            item.put("onDuration", formatDuration((long) onDur));
+            item.put("onSeconds", Math.round(onDur));
+            item.put("offDuration", formatDuration((long) vals[0]));
+            item.put("offSeconds", Math.round(vals[0]));
+            item.put("bootRate", String.format("%.2f%%", bootRate));
+            item.put("bootRateValue", bootRate);
+            item.put("dataDays", (int) vals[5]);
+
+            rateMap.put(sn, item);
+        }
+
+        // 6. 确保所有设备都在返回列表中（没有数据的设备开机率为0）
+        List<Map<String, Object>> resultList = new ArrayList<>(allDtuSns.size());
+        for (String sn : allDtuSns) {
+            if (rateMap.containsKey(sn)) {
+                resultList.add(rateMap.get(sn));
+            } else {
+                Map<String, Object> emptyItem = new LinkedHashMap<>();
+                emptyItem.put("dtuSn", sn);
+                emptyItem.put("deviceName", deviceNameMap.getOrDefault(sn, ""));
+                emptyItem.put("totalDuration", "0时0分0秒");
+                emptyItem.put("totalSeconds", 0);
+                emptyItem.put("onDuration", "0时0分0秒");
+                emptyItem.put("onSeconds", 0);
+                emptyItem.put("offDuration", "0时0分0秒");
+                emptyItem.put("offSeconds", 0);
+                emptyItem.put("bootRate", "0.00%");
+                emptyItem.put("bootRateValue", 0.0);
+                emptyItem.put("dataDays", 0);
+                resultList.add(emptyItem);
+            }
+        }
+
+        // 计算整体汇总
+        double sumTotal = 0, sumOn = 0, sumOff = 0;
+        for (Map<String, Object> r : rateMap.values()) {
+            sumTotal += ((Number) r.get("totalSeconds")).doubleValue();
+            sumOn += ((Number) r.get("onSeconds")).doubleValue();
+            sumOff += ((Number) r.get("offSeconds")).doubleValue();
+        }
+        double overallBootRate = sumTotal > 0 ? Math.round(sumOn * 10000.0 / sumTotal) / 100.0 : 0.0;
+
+        return Map.of(
+                "summary", Map.of(
+                        "totalDevices", allDtuSns.size(),
+                        "totalDuration", formatDuration((long) sumTotal),
+                        "totalSeconds", Math.round(sumTotal),
+                        "onDuration", formatDuration((long) sumOn),
+                        "onSeconds", Math.round(sumOn),
+                        "offDuration", formatDuration((long) sumOff),
+                        "offSeconds", Math.round(sumOff),
+                        "overallBootRate", String.format("%.2f%%", overallBootRate),
+                        "overallBootRateValue", overallBootRate
+                ),
+                "list", resultList,
+                "startDate", startDate,
+                "endDate", endDate
+        );
+    }
+
+    /** 批量从 dev_util 表查询（排除指定日期） */
+    private List<Map<String, Object>> queryDevUtilBatch(String corpCode, List<String> dtuSns,
+                                                         String startDate, String endDate, String excludeToday) {
+        StringBuilder sql = new StringBuilder(
+                "SELECT dtuSn, SUM(`0`) as s0, SUM(`1`) as s1, SUM(`2`) as s2, SUM(`3`) as s3, SUM(`4`) as s4, COUNT(*) as days " +
+                        "FROM " + devUtilTableName +
+                        " WHERE corp_code = ? AND dtuSn IN (");
+        List<Object> params = new ArrayList<>();
+        params.add(corpCode);
+
+        for (String sn : dtuSns) { sql.append("?,"); params.add(sn); }
+        sql.deleteCharAt(sql.length() - 1).append(")");
+
+        // 日期范围：如果开始日期=excludeToday，则从明天开始查
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String actualStart = startDate.equals(excludeToday) ? getNextDay(excludeToday) : startDate;
+
+        try {
+            Date startD = sdf.parse(actualStart);
+            Date endD = sdf.parse(endDate);
+            Date excD = sdf.parse(excludeToday);
+            if (!startD.before(excD) || endD.before(startD)) {
+                return Collections.emptyList(); // 只有今天一天或无效范围
+            }
+        } catch (Exception e) {
+            log.error("日期解析失败: {} ~ {}, 排除: {}", actualStart, endDate, excludeToday, e);
+            return Collections.emptyList();
+        }
+
+        sql.append(" AND date_util BETWEEN ? AND ?");
+        params.add(actualStart);
+        params.add(endDate);
+        sql.append(" GROUP BY dtuSn");
+
+        return jdbcTemplate.queryForList(sql.toString(), params.toArray());
+    }
+
+    /** 补充今天的稼动率接口实时数据 */
+    private void supplementTodayDevUtil(List<String> dtuSns, String todayStr, Map<String, double[]> rawMap) {
+        log.info("开机率查询 - 开始补充今日({})实时dev_util数据...", todayStr);
+        int apiCount = 0;
+        for (String dtuSn : dtuSns) {
+            try {
+                String rateResult = devicePullService.getDtuSnRateOfAction(dtuSn, todayStr, todayStr);
+                if (StringUtils.hasText(rateResult)) {
+                    Map<String, Object> res = JSON.parseObject(rateResult, 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 dayData = (JSONObject) dataList.get(0);
+                    JSONArray realRateList = dayData.getJSONArray("realRate");
+                    if (realRateList == null || realRateList.isEmpty()) continue;
+
+                    JSONObject rateObj = (JSONObject) realRateList.get(0);
+                    double s0 = rateObj.getDoubleValue("0");
+                    double s1 = rateObj.getDoubleValue("1");
+                    double s2 = rateObj.getDoubleValue("2");
+                    double s3 = rateObj.getDoubleValue("3");
+                    double s4 = rateObj.getDoubleValue("4");
+
+                    // 累加到已有数据上（DB已有历史数据 + 今天实时数据）
+                    double[] existing = rawMap.get(dtuSn);
+                    if (existing != null) {
+                        existing[0] += s0; existing[1] += s1; existing[2] += s2;
+                        existing[3] += s3; existing[4] += s4; existing[5] += 1;
+                    } else {
+                        rawMap.put(dtuSn, new double[]{s0, s1, s2, s3, s4, 1});
+                    }
+                    apiCount++;
+                }
+            } catch (Exception e) {
+                log.error("获取今日稼动率数据异常 - dtuSn:{}", dtuSn, e);
+            }
+        }
+        log.info("开机率查询 - 今日实时数据补充完成, 新增 {} 条", apiCount);
+    }
+
+    /** 获取下一天的日期字符串 */
+    private static String getNextDay(String dateStr) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar cal = Calendar.getInstance();
+            cal.setTime(sdf.parse(dateStr));
+            cal.add(Calendar.DAY_OF_MONTH, 1);
+            return sdf.format(cal.getTime());
+        } catch (Exception e) {
+            return dateStr;
+        }
+    }
 }
 }

@@ -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 5 11 * * ?"   # 每日凌晨 2:30 增量同步昨天数据
+    cron: "0 30 9 * * ?"   # 每日凌晨 2:30 增量同步昨天数据
   oee:
   oee:
-    cron: "0 5 11 * * ?"   # 每日凌晨 2:35 增量同步昨天OEE数据
+    cron: "0 30 9 * * ?"   # 每日凌晨 2:35 增量同步昨天OEE数据
 
 
 device:
 device:
   token:
   token: