refactor(infrared-reading-meter-service): 重构日用电量和总电量统计方法

- 优化了时间范围确定逻辑，使用系统默认时区避免跨时区问题- 移除了不必要的分组和排序操作，简化了代码结构

infrared-reading-meter-service/src/main/java/com/zksy/infrared/service/impl/InfraredReadingMeterServiceImpl.java

@@ -408,89 +408,82 @@ public class InfraredReadingMeterServiceImpl extends ServiceImpl<InfraredReading
     }
     @Override
     public List<Map<String, Object>> getDailyAndTotalElectricityAsMap() {
-        // 确定当日时间范围
+        //确定当日时间范围（避免跨时区问题，统一用系统默认时区）
         LocalDate today = LocalDate.now();
         Date startOfDay = Date.from(today.atStartOfDay(ZoneId.systemDefault()).toInstant());
         Date endOfDay = Date.from(today.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());
 
-        // 获取所有有效的电表号（非空且有总电量记录）
-        LambdaQueryWrapper<InfraredReadingMeter> allMeterQuery = new LambdaQueryWrapper<>();
-        allMeterQuery.select(InfraredReadingMeter::getElectricNumber) // 只查电表号
-                .isNotNull(InfraredReadingMeter::getElectricNumber)
-                .isNotNull(InfraredReadingMeter::getElectricEnergy)
-                .groupBy(InfraredReadingMeter::getElectricNumber);
-        List<String> allValidMeterNumbers = list(allMeterQuery).stream()
-                .map(InfraredReadingMeter::getElectricNumber)
-                .filter(Objects::nonNull)
-                .filter(num -> !num.trim().isEmpty())
-                .collect(Collectors.toList());
-
-        // 查询当日所有有效记录（用于计算当日用电量）
-        LambdaQueryWrapper<InfraredReadingMeter> todayQuery = new LambdaQueryWrapper<>();
-        todayQuery.between(InfraredReadingMeter::getCreateTime, startOfDay, endOfDay)
-                .isNotNull(InfraredReadingMeter::getElectricNumber)
+
+        LambdaQueryWrapper<InfraredReadingMeter> baseQuery = Wrappers.lambdaQuery();
+        baseQuery.isNotNull(InfraredReadingMeter::getElectricNumber)
                 .isNotNull(InfraredReadingMeter::getElectricEnergy)
-                .orderByAsc(InfraredReadingMeter::getCreateTime);
-        List<InfraredReadingMeter> todayRecords = list(todayQuery);
+                .ge(InfraredReadingMeter::getElectricEnergy, 0);
+        List<InfraredReadingMeter> allValidRecords = list(baseQuery);
 
-        // 按电表号分组存储当日记录
-        Map<String, List<InfraredReadingMeter>> todayRecordsByMeter = todayRecords.stream()
+        // 按电表号分组
+        Map<String, List<InfraredReadingMeter>> recordsByMeter = allValidRecords.stream()
                 .collect(Collectors.groupingBy(InfraredReadingMeter::getElectricNumber));
 
-        // 查询所有电表的最新总电量记录
-        LambdaQueryWrapper<InfraredReadingMeter> latestQuery = new LambdaQueryWrapper<>();
-        latestQuery.isNotNull(InfraredReadingMeter::getElectricNumber)
-                .isNotNull(InfraredReadingMeter::getElectricEnergy);
-        List<InfraredReadingMeter> allRecords = list(latestQuery);
-
-        // 按电表号分组，取最新记录（创建时间最晚）
-        Map<String, InfraredReadingMeter> latestRecordsByMeter = allRecords.stream()
-                .collect(Collectors.groupingBy(InfraredReadingMeter::getElectricNumber,
-                        Collectors.collectingAndThen(
-                                Collectors.maxBy(Comparator.comparing(InfraredReadingMeter::getCreateTime)),
-                                Optional::get)));
+        // 批量查询公司信息
+        Set<String> allMeterNumbers = recordsByMeter.keySet();
+        LambdaQueryWrapper<CompanyElectric> companyQuery = Wrappers.lambdaQuery();
+        companyQuery.in(CompanyElectric::getElectricNumber, allMeterNumbers);
+        Map<String, String> meterToCompany = companyElectricService.list(companyQuery).stream()
+                .filter(company -> company.getElectricNumber() != null)
+                .collect(Collectors.toMap(
+                        CompanyElectric::getElectricNumber,
+                        CompanyElectric::getCompanyName,
+                        (oldVal, newVal) -> newVal // 电表号重复时取最新值
+                ));
 
-        // 组装结果（保留两位小数）
+        // 组装最终结果
         List<Map<String, Object>> result = new ArrayList<>();
-        for (String electricNumber : allValidMeterNumbers) {
+        for (Map.Entry<String, List<InfraredReadingMeter>> entry : recordsByMeter.entrySet()) {
+            String electricNumber = entry.getKey();
+            List<InfraredReadingMeter> meterRecords = entry.getValue();
+
             Map<String, Object> meterMap = new HashMap<>(4);
             meterMap.put("electricNumber", electricNumber);
 
-            LambdaQueryWrapper<CompanyElectric> companyElectricQuery = new LambdaQueryWrapper<>();
-            companyElectricQuery.eq(CompanyElectric::getElectricNumber, electricNumber);
-            CompanyElectric companyElectric = companyElectricService.getOne(companyElectricQuery);
-            meterMap.put("companyName", companyElectric == null ? "" : companyElectric.getCompanyName());
+            // 关联公司名称
+            String companyName = meterToCompany.getOrDefault(electricNumber, "");
+            meterMap.put("companyName", companyName);
 
-            // 获取该电表的最新总电量（保留两位小数）
-            InfraredReadingMeter latestRecord = latestRecordsByMeter.get(electricNumber);
-            if (latestRecord == null || latestRecord.getElectricEnergy() == null) {
-                continue; // 排除总电量为空的电表
+            // 计算累计总电量（取该电表最新一条记录的电量）
+            InfraredReadingMeter latestRecord = meterRecords.stream()
+                    .max(Comparator.comparing(InfraredReadingMeter::getCreateTime)) // 按时间取最新
+                    .orElse(null);
+            BigDecimal totalElectricity = BigDecimal.ZERO.setScale(2);
+            if (latestRecord != null) {
+                totalElectricity = BigDecimal.valueOf(latestRecord.getElectricEnergy())
+                        .setScale(2, RoundingMode.HALF_UP); // 四舍五入保留两位小数
             }
-            BigDecimal totalElectricity = BigDecimal.valueOf(latestRecord.getElectricEnergy())
-                    .setScale(2, RoundingMode.HALF_UP); // 四舍五入保留两位小数
             meterMap.put("totalElectricity", totalElectricity);
 
-            // 计算当日用电量（无数据则为0，保留两位小数）
-            List<InfraredReadingMeter> todayMeterRecords = todayRecordsByMeter.getOrDefault(electricNumber, Collections.emptyList());
-            BigDecimal dailyElectricity;
-            if (todayMeterRecords.size() >= 2) {
-                InfraredReadingMeter first = todayMeterRecords.get(0);
-                InfraredReadingMeter last = todayMeterRecords.get(todayMeterRecords.size() - 1);
-                if (first.getElectricEnergy() != null && last.getElectricEnergy() != null) {
-                    double diff = last.getElectricEnergy() - first.getElectricEnergy();
-                    dailyElectricity = BigDecimal.valueOf(diff)
+            // 计算当日用电量（处理异常场景：记录数不足、电量倒序）
+            List<InfraredReadingMeter> todayRecords = meterRecords.stream()
+                    .filter(record -> record.getCreateTime().after(startOfDay)
+                            && record.getCreateTime().before(endOfDay)) // 筛选当日记录
+                    .sorted(Comparator.comparing(InfraredReadingMeter::getCreateTime)) // 按时间排序
+                    .collect(Collectors.toList());
+
+            BigDecimal dailyElectricity = BigDecimal.ZERO.setScale(2);
+            if (todayRecords.size() >= 2) {
+                InfraredReadingMeter firstRecord = todayRecords.get(0); // 当日第一条记录
+                InfraredReadingMeter lastRecord = todayRecords.get(todayRecords.size() - 1); // 当日最后一条
+                double firstEnergy = firstRecord.getElectricEnergy();
+                double lastEnergy = lastRecord.getElectricEnergy();
+
+                // 排除异常：若首次电量＞末次电量（如电表复位），当日用电量设为0
+                if (lastEnergy >= firstEnergy) {
+                    dailyElectricity = BigDecimal.valueOf(lastEnergy - firstEnergy)
                             .setScale(2, RoundingMode.HALF_UP);
-                } else {
-                    dailyElectricity = BigDecimal.ZERO.setScale(2); // 数据异常时设为0.00
                 }
-            } else {
-                dailyElectricity = BigDecimal.ZERO.setScale(2); // 当日无数据或记录不足，设为0.00
             }
             meterMap.put("dailyElectricity", dailyElectricity);
 
             result.add(meterMap);
         }
-
         return result;
     }
 }