From 06101aac023a2d558814bbd991e4d8df3b06509a Mon Sep 17 00:00:00 2001
From: kkfluous <kkfluous@kdemacbook-air.local>
Date: Mon, 16 Mar 2026 00:56:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(energy):=20=E4=BF=AE=E5=A4=8D=20batchGenera?=
 =?UTF-8?q?teByPeriod=20=E4=B8=AD=20energyType=20=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=80=BC=E5=92=8C=20batchMatch=20=E4=B8=AD=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E9=AD=94=E6=B3=95=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- HYDROGEN 枚举值为 0 而非 1，使用 EnergyTypeEnum.HYDROGEN.getType()
- batchMatch 使用 MatchStatusEnum.UNMATCHABLE.getStatus() 替代硬编码 2

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../yudao/module/energy/service/bill/EnergyBillServiceImpl.java | 2 +-
 .../module/energy/service/record/HydrogenRecordServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/bill/EnergyBillServiceImpl.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/bill/EnergyBillServiceImpl.java
index 33cdd04..8b3ca14 100644
--- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/bill/EnergyBillServiceImpl.java
+++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/bill/EnergyBillServiceImpl.java
@@ -246,7 +246,7 @@ public class EnergyBillServiceImpl implements EnergyBillService {
                 reqVO.setStationId(first.getStationId());
                 reqVO.setBillPeriodStart(start);
                 reqVO.setBillPeriodEnd(end);
-                reqVO.setEnergyType(1); // HYDROGEN = 1
+                reqVO.setEnergyType(EnergyTypeEnum.HYDROGEN.getType());
                 generateBill(reqVO);
                 generatedCount++;
             } catch (Exception e) {
diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/record/HydrogenRecordServiceImpl.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/record/HydrogenRecordServiceImpl.java
index f1bccba..4af1397 100644
--- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/record/HydrogenRecordServiceImpl.java
+++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/record/HydrogenRecordServiceImpl.java
@@ -126,7 +126,7 @@ public class HydrogenRecordServiceImpl implements HydrogenRecordService {
         // Query all match-failed records (matchStatus = 2)
         List<EnergyHydrogenRecordDO> failedRecords = hydrogenRecordMapper.selectList(
                 new LambdaQueryWrapperX<EnergyHydrogenRecordDO>()
-                        .eq(EnergyHydrogenRecordDO::getMatchStatus, 2)); // MATCH_FAILED
+                        .eq(EnergyHydrogenRecordDO::getMatchStatus, MatchStatusEnum.UNMATCHABLE.getStatus()));
         int successCount = 0;
         int failCount = 0;
         for (EnergyHydrogenRecordDO record : failedRecords) {