From 9daeb6eac6e46710055e625bbbd56331b8890e21 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:10:20 +0800
Subject: [PATCH] revert(energy): 撤销 energy 模块移植(与新高原有 em 模块重复)

---
 /dev/null |  127 ------------------------------------------
 1 files changed, 0 insertions(+), 127 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyAlertController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyAlertController.java
deleted file mode 100644
index 1a170ec..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyAlertController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.energy;
-
-import cn.iocoder.yudao.framework.common.pojo.*;
-import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.EnergyAlertRuleSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.energy.*;
-import cn.iocoder.yudao.module.mes.service.energy.EnergyAlertService;
-import cn.iocoder.yudao.module.system.service.user.AdminUserService;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import java.time.LocalDate;
-import java.util.*;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@RestController @RequestMapping("/energy/alert") @Validated
-public class EnergyAlertController {
-    @Resource private EnergyAlertService energyAlertService;
-    @Resource private AdminUserService adminUserService;
-    @GetMapping("/page") @PreAuthorize("@ss.hasPermission('energy:alert:query')")
-    public CommonResult<PageResult<EnergyAlertRuleDO>> page(@Valid PageParam page) { return success(energyAlertService.page(page)); }
-    @GetMapping("/logs") @PreAuthorize("@ss.hasPermission('energy:alert:query')")
-    public CommonResult<PageResult<EnergyAlertLogDO>> logs(@Valid PageParam page,
-            @RequestParam(required=false) @DateTimeFormat(iso=DateTimeFormat.ISO.DATE) LocalDate date,
-            @RequestParam(required=false) @Pattern(regexp="SENT|FAILED") String status) {
-        return success(energyAlertService.logs(page, date, status));
-    }
-    @GetMapping("/recipients") @PreAuthorize("@ss.hasPermission('energy:alert:query')")
-    public CommonResult<List<Map<String, Object>>> recipients() {
-        return success(adminUserService.getUserListByStatus(0).stream()
-                .map(user -> Map.<String,Object>of("id", user.getId(), "nickname", user.getNickname())).toList());
-    }
-    @PostMapping("/create") @PreAuthorize("@ss.hasPermission('energy:alert:create')")
-    public CommonResult<Long> create(@Valid @RequestBody EnergyAlertRuleSaveReqVO req) { req.setId(null); return success(energyAlertService.save(req)); }
-    @PutMapping("/update") @PreAuthorize("@ss.hasPermission('energy:alert:update')")
-    public CommonResult<Boolean> update(@Valid @RequestBody EnergyAlertRuleSaveReqVO req) {
-        if (req.getId() == null) throw cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception(
-                new cn.iocoder.yudao.framework.common.exception.ErrorCode(1_040_951_001, "淇敼棰勮瑙勫垯蹇呴』鎻愪緵缂栧彿"));
-        energyAlertService.save(req); return success(true);
-    }
-    @DeleteMapping("/delete") @PreAuthorize("@ss.hasPermission('energy:alert:delete')")
-    public CommonResult<Boolean> delete(@RequestParam Long id) { energyAlertService.delete(id); return success(true); }
-    @PostMapping("/check") @PreAuthorize("@ss.hasPermission('energy:alert:check')")
-    public CommonResult<Map<String,Integer>> check(@RequestParam @NotNull @PastOrPresent
-            @DateTimeFormat(iso=DateTimeFormat.ISO.DATE) LocalDate date) { return success(energyAlertService.check(date)); }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
deleted file mode 100644
index 34b1934..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/EnergyRecordController.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.energy;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.*;
-import cn.iocoder.yudao.module.mes.service.energy.EnergyRecordService;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@Tag(name = "绠$悊鍚庡彴 - 鐙珛鑳借�楃鐞�")
-@RestController
-@RequestMapping("/energy/record")
-@Validated
-public class EnergyRecordController {
-    @Resource private cn.iocoder.yudao.module.mes.service.energy.EnergyExportService energyExportService;
-    @Resource(name = "energyRecordService")
-    private EnergyRecordService energyRecordService;
-
-    @GetMapping("/export-excel")
-    @PreAuthorize("@ss.hasPermission('energy:record:export')")
-    public void export(@Valid EnergyRecordPageReqVO req, jakarta.servlet.http.HttpServletResponse response) throws java.io.IOException {
-        energyExportService.records(req, response);
-    }
-    @GetMapping("/analysis-export")
-    @PreAuthorize("@ss.hasPermission('energy:analysis:export')")
-    public void exportAnalysis(@Valid EnergyAnalysisReqVO req, jakarta.servlet.http.HttpServletResponse response) throws java.io.IOException {
-        energyExportService.analysis(req, response);
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "鎵嬪姩鏂板鑳借�楄褰�")
-    @PreAuthorize("@ss.hasPermission('energy:record:create')")
-    public CommonResult<Long> create(@Valid @RequestBody EnergyRecordSaveReqVO req) {
-        return success(energyRecordService.create(req));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "淇敼鑳借�楄褰�")
-    @PreAuthorize("@ss.hasPermission('energy:record:update')")
-    public CommonResult<Boolean> update(@Valid @RequestBody EnergyRecordSaveReqVO req) {
-        energyRecordService.update(req);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "鍒犻櫎鑳借�楄褰�")
-    @PreAuthorize("@ss.hasPermission('energy:record:delete')")
-    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
-        energyRecordService.delete(id);
-        return success(true);
-    }
-
-    @GetMapping("/get")
-    @Operation(summary = "鏌ョ湅鑳借�楄褰�")
-    @PreAuthorize("@ss.hasPermission('energy:record:query')")
-    public CommonResult<EnergyRecordRespVO> get(@RequestParam("id") Long id) {
-        return success(BeanUtils.toBean(energyRecordService.get(id), EnergyRecordRespVO.class));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "鍒嗛〉鏌ヨ鑳借�楄褰�")
-    @PreAuthorize("@ss.hasPermission('energy:record:query')")
-    public CommonResult<PageResult<EnergyRecordRespVO>> page(@Valid EnergyRecordPageReqVO req) {
-        return success(BeanUtils.toBean(energyRecordService.page(req), EnergyRecordRespVO.class));
-    }
-
-    @GetMapping("/analysis")
-    @Operation(summary = "鑳借�楁暟鎹垎鏋愶紙鎸夎兘婧愬垎鍒眹鎬荤敤閲忥級")
-    @PreAuthorize("@ss.hasPermission('energy:analysis:query')")
-    public CommonResult<EnergyAnalysisRespVO> analysis(@Valid EnergyAnalysisReqVO req) {
-        return success(energyRecordService.analysis(req));
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAlertRuleSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAlertRuleSaveReqVO.java
deleted file mode 100644
index d81a13b..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAlertRuleSaveReqVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
-
-import jakarta.validation.constraints.*;
-import lombok.Data;
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-public class EnergyAlertRuleSaveReqVO {
-    private Long id;
-    @NotBlank @Size(max = 100) private String name;
-    @NotNull @Pattern(regexp = "WATER|ELECTRICITY|STEAM") private String energyType;
-    @Size(max = 100) private String usageArea;
-    @Size(max = 50) private String productCategory;
-    @NotNull @Pattern(regexp = "QUANTITY|AMOUNT|MONTH_QUANTITY|MONTH_AMOUNT") private String metric;
-    @NotNull @DecimalMin(value = "0", inclusive = false) @Digits(integer = 26, fraction = 3)
-    private BigDecimal threshold;
-    @NotNull private Boolean enabled;
-    @NotEmpty @Size(max = 50) private List<@NotNull @Positive Long> recipientIds;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisReqVO.java
deleted file mode 100644
index 66df378..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisReqVO.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
-
-import jakarta.validation.constraints.AssertTrue;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDate;
-
-@Data
-public class EnergyAnalysisReqVO {
-    @NotNull
-    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-    private LocalDate startDate;
-    @NotNull
-    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-    private LocalDate endDate;
-    @Pattern(regexp = "WATER|ELECTRICITY|STEAM")
-    private String energyType;
-    private String usageArea;
-    private String productCategory;
-    @NotNull
-    @Pattern(regexp = "DAY|MONTH")
-    private String groupBy = "DAY";
-
-    @AssertTrue(message = "缁熻鏃ユ湡鑼冨洿蹇呴』鍦ㄤ袱骞翠互鍐咃紝涓斿紑濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�")
-    public boolean isDateRangeValid() {
-        return startDate == null || endDate == null
-                || (!startDate.isAfter(endDate) && !endDate.isAfter(startDate.plusYears(2)));
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisRespVO.java
deleted file mode 100644
index 1606754..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyAnalysisRespVO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
-
-import lombok.Data;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class EnergyAnalysisRespVO {
-    private BigDecimal totalAmount = BigDecimal.ZERO;
-    private long recordCount;
-    private List<Summary> summary = new ArrayList<>();
-    private List<Bucket> trend = new ArrayList<>();
-    private List<Bucket> areas = new ArrayList<>();
-
-    @Data
-    public static class Summary {
-        private String energyType;
-        private BigDecimal quantity = BigDecimal.ZERO;
-        private BigDecimal amount = BigDecimal.ZERO;
-        private long recordCount;
-    }
-
-    @Data
-    public static class Bucket extends Summary {
-        /** 瓒嬪娍涓烘棩鏈�/鏈堬紝鍖哄煙鍒嗗竷涓哄尯鍩熷悕绉般�� */
-        private String label;
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordPageReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordPageReqVO.java
deleted file mode 100644
index 45de23c..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordPageReqVO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import jakarta.validation.constraints.AssertTrue;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDate;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EnergyRecordPageReqVO extends PageParam {
-    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-    private LocalDate startDate;
-    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-    private LocalDate endDate;
-    @Pattern(regexp = "WATER|ELECTRICITY|STEAM")
-    private String energyType;
-    private String usageArea;
-    private String productCategory;
-
-    @AssertTrue(message = "寮�濮嬫棩鏈熶笉鑳芥櫄浜庣粨鏉熸棩鏈�")
-    public boolean isDateRangeValid() {
-        return startDate == null || endDate == null || !startDate.isAfter(endDate);
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordRespVO.java
deleted file mode 100644
index 4c9c526..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordRespVO.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
-
-import lombok.Data;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-@Data
-public class EnergyRecordRespVO {
-    private Long id;
-    private LocalDate recordDate;
-    private String energyType;
-    private String usageArea;
-    private String productCategory;
-    private String usagePurpose;
-    private BigDecimal quantity;
-    private BigDecimal unitPrice;
-    private BigDecimal amount;
-    private String recorder;
-    private String remark;
-    private LocalDateTime createTime;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordSaveReqVO.java
deleted file mode 100644
index a6508d3..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/energy/vo/EnergyRecordSaveReqVO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.iocoder.yudao.module.mes.controller.admin.energy.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.*;
-import lombok.Data;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
-@Data
-@Schema(description = "绠$悊鍚庡彴 - 鑳借�楄褰曟柊澧�/淇敼")
-public class EnergyRecordSaveReqVO {
-    @Positive
-    private Long id;
-    @NotNull(message = "缁熻鏃ユ湡涓嶈兘涓虹┖")
-    @PastOrPresent(message = "缁熻鏃ユ湡涓嶈兘鏅氫簬浠婂ぉ")
-    private LocalDate recordDate;
-    @NotBlank
-    @Pattern(regexp = "WATER|ELECTRICITY|STEAM", message = "鑳芥簮绫诲瀷鍙兘涓烘按銆佺數銆佽捀姹�")
-    private String energyType;
-    @NotBlank(message = "浣跨敤鍖哄煙涓嶈兘涓虹┖")
-    @Size(max = 100)
-    private String usageArea;
-    @NotBlank(message = "浜у搧绫诲埆涓嶈兘涓虹┖")
-    @Size(max = 50)
-    private String productCategory;
-    @NotBlank(message = "鐢ㄩ�斾笉鑳戒负绌�")
-    @Size(max = 100)
-    private String usagePurpose;
-    @NotNull
-    @DecimalMin(value = "0", inclusive = false, message = "鐢ㄩ噺蹇呴』澶т簬闆�")
-    @Digits(integer = 15, fraction = 3, message = "鐢ㄩ噺鏈�澶�15浣嶆暣鏁般��3浣嶅皬鏁�")
-    private BigDecimal quantity;
-    @NotNull
-    @DecimalMin(value = "0", message = "鍗曚环涓嶈兘涓鸿礋鏁�")
-    @Digits(integer = 8, fraction = 4, message = "鍗曚环鏈�澶�8浣嶆暣鏁般��4浣嶅皬鏁�")
-    private BigDecimal unitPrice;
-    @NotBlank(message = "褰曞叆浜轰笉鑳戒负绌�")
-    @Size(max = 50)
-    private String recorder;
-    @Size(max = 500)
-    private String remark;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertLogDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertLogDO.java
deleted file mode 100644
index d58970b..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertLogDO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.energy;
-
-import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.*;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
-@TableName("mes_energy_alert_log") @Data @EqualsAndHashCode(callSuper = true)
-public class EnergyAlertLogDO extends TenantBaseDO {
-    @TableId private Long id;
-    private Long ruleId;
-    private String ruleName;
-    private LocalDate recordDate;
-    private String periodType;
-    private String energyType;
-    private String scope;
-    private String metric;
-    private BigDecimal actualValue;
-    private BigDecimal threshold;
-    private Long recipientId;
-    private String recipientName;
-    private Long messageId;
-    private String status;
-    private String errorMessage;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertRuleDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertRuleDO.java
deleted file mode 100644
index 5b8301f..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyAlertRuleDO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.energy;
-
-import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.*;
-import java.math.BigDecimal;
-
-@TableName("mes_energy_alert_rule") @Data @EqualsAndHashCode(callSuper = true)
-public class EnergyAlertRuleDO extends TenantBaseDO {
-    @TableId private Long id;
-    private String name;
-    private String energyType;
-    private String usageArea;
-    private String productCategory;
-    private String metric;
-    private BigDecimal threshold;
-    private Boolean enabled;
-    /** Comma-separated validated administrator IDs, at most 50. */
-    private String recipientIds;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyRecordDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyRecordDO.java
deleted file mode 100644
index 74860fe..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/energy/EnergyRecordDO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.dataobject.energy;
-
-import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-
-/** 鐙珛鑳借�楀彴璐︼紝涓嶅叧鑱旇澶囥�佸伐鍗曘�佷骇鍝佹垨閮ㄩ棬涓绘暟鎹�� */
-@TableName("mes_energy_record")
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class EnergyRecordDO extends TenantBaseDO {
-    @TableId
-    private Long id;
-    private LocalDate recordDate;
-    /** WATER / ELECTRICITY / STEAM锛屽崟浣嶅垎鍒负 m鲁 / kWh / t銆� */
-    private String energyType;
-    private String usageArea;
-    private String productCategory;
-    private String usagePurpose;
-    private BigDecimal quantity;
-    private BigDecimal unitPrice;
-    private BigDecimal amount;
-    private String recorder;
-    private String remark;
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertLogMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertLogMapper.java
deleted file mode 100644
index 4dcf0e9..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertLogMapper.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.energy;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyAlertLogDO;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface EnergyAlertLogMapper extends BaseMapperX<EnergyAlertLogDO> {}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertRuleMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertRuleMapper.java
deleted file mode 100644
index 7d7d1b9..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyAlertRuleMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.energy;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyAlertRuleDO;
-import org.apache.ibatis.annotations.*;
-
-@Mapper
-public interface EnergyAlertRuleMapper extends BaseMapperX<EnergyAlertRuleDO> {
-    // Serialize checks for one rule, including concurrent record submissions.
-    @Select("SELECT * FROM mes_energy_alert_rule WHERE id=#{id} AND deleted=0 FOR UPDATE")
-    EnergyAlertRuleDO lock(@Param("id") Long id);
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyRecordMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyRecordMapper.java
deleted file mode 100644
index 9bc4d83..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/energy/EnergyRecordMapper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package cn.iocoder.yudao.module.mes.dal.mysql.energy;
-
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.EnergyRecordPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.EnergyAnalysisReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyRecordDO;
-import lombok.Data;
-import org.apache.ibatis.annotations.*;
-import java.math.BigDecimal;
-import java.util.List;
-
-@Mapper
-public interface EnergyRecordMapper extends BaseMapperX<EnergyRecordDO> {
-    @Select("""
-        <script>
-        SELECT COALESCE(SUM(<choose><when test="rule.metric == 'AMOUNT' or rule.metric == 'MONTH_AMOUNT'">amount</when><otherwise>quantity</otherwise></choose>),0)
-        FROM mes_energy_record WHERE deleted=0 AND energy_type=#{rule.energyType}
-        <choose><when test="rule.metric == 'MONTH_QUANTITY' or rule.metric == 'MONTH_AMOUNT'">
-        AND record_date &gt;= #{date} AND record_date &lt; DATE_ADD(#{date}, INTERVAL 1 MONTH)
-        </when><otherwise>AND record_date=#{date}</otherwise></choose>
-        <if test="rule.usageArea != null and rule.usageArea != ''">AND usage_area=#{rule.usageArea}</if>
-        <if test="rule.productCategory != null and rule.productCategory != ''">AND product_category=#{rule.productCategory}</if>
-        </script>
-        """)
-    BigDecimal selectDailyValue(@Param("date") java.time.LocalDate date,
-            @Param("rule") cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyAlertRuleDO rule);
-    default PageResult<EnergyRecordDO> selectPage(EnergyRecordPageReqVO req) {
-        return selectPage(req, new LambdaQueryWrapperX<EnergyRecordDO>()
-                .geIfPresent(EnergyRecordDO::getRecordDate, req.getStartDate())
-                .leIfPresent(EnergyRecordDO::getRecordDate, req.getEndDate())
-                .eqIfPresent(EnergyRecordDO::getEnergyType, req.getEnergyType())
-                .likeIfPresent(EnergyRecordDO::getUsageArea, req.getUsageArea())
-                .eqIfPresent(EnergyRecordDO::getProductCategory, req.getProductCategory())
-                .orderByDesc(EnergyRecordDO::getRecordDate, EnergyRecordDO::getId));
-    }
-
-    // 鎸夋暟鎹簱鍒嗙粍锛岄伩鍏嶅姞杞藉叏閮ㄥ彴璐︼紱绉熸埛鎷︽埅鍣ㄨ嚜鍔ㄦ坊鍔� tenant_id 鏉′欢銆�
-    @Select("""
-        <script>
-        SELECT energy_type AS energyType,
-          <choose><when test="req.groupBy == 'MONTH'">DATE_FORMAT(record_date, '%Y-%m')</when>
-          <otherwise>DATE_FORMAT(record_date, '%Y-%m-%d')</otherwise></choose> AS period,
-          usage_area AS usageArea, SUM(quantity) AS quantity, SUM(amount) AS amount,
-          COUNT(*) AS recordCount
-        FROM mes_energy_record
-        WHERE deleted = 0 AND record_date BETWEEN #{req.startDate} AND #{req.endDate}
-        <if test="req.energyType != null and req.energyType != ''">AND energy_type = #{req.energyType}</if>
-        <if test="req.usageArea != null and req.usageArea != ''">AND usage_area LIKE CONCAT('%', #{req.usageArea}, '%')</if>
-        <if test="req.productCategory != null and req.productCategory != ''">AND product_category = #{req.productCategory}</if>
-        GROUP BY energy_type, period, usage_area
-        ORDER BY period, energy_type, usage_area
-        </script>
-        """)
-    List<Aggregate> selectAnalysis(@Param("req") EnergyAnalysisReqVO req);
-
-    @Data
-    class Aggregate {
-        private String energyType;
-        private String period;
-        private String usageArea;
-        private BigDecimal quantity;
-        private BigDecimal amount;
-        private long recordCount;
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertListener.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertListener.java
deleted file mode 100644
index 3683d77..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertListener.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.energy;
-
-import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.event.*;
-
-@Component @Slf4j
-public class EnergyAlertListener {
-    @Resource private EnergyAlertService energyAlertService;
-
-    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
-    public void onRecordChanged(EnergyRecordChangedEvent event) {
-        TenantUtils.execute(event.tenantId(), () -> {
-            for (var date : event.dates()) {
-                try { energyAlertService.check(date); }
-                catch (Exception e) { log.error("鑳借�楅璀︽鏌ュけ璐� tenant={} date={}", event.tenantId(), date, e); }
-            }
-        });
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertService.java
deleted file mode 100644
index d9e11a0..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyAlertService.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.energy;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.pojo.*;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.EnergyAlertRuleSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.energy.*;
-import cn.iocoder.yudao.module.mes.dal.mysql.energy.*;
-import cn.iocoder.yudao.module.system.api.notify.NotifyMessageSendApi;
-import cn.iocoder.yudao.module.system.api.notify.dto.NotifySendSingleToUserReqDTO;
-import cn.iocoder.yudao.module.system.service.user.AdminUserService;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.*;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.*;
-import java.util.stream.Collectors;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-
-@Service @Slf4j
-public class EnergyAlertService {
-    @Resource private EnergyAlertRuleMapper energyAlertRuleMapper;
-    @Resource private EnergyAlertLogMapper energyAlertLogMapper;
-    @Resource private EnergyRecordMapper energyRecordMapper;
-    @Resource private AdminUserService adminUserService;
-    @Resource private NotifyMessageSendApi notifyMessageSendApi;
-
-    public PageResult<EnergyAlertRuleDO> page(PageParam page) {
-        return energyAlertRuleMapper.selectPage(page, new LambdaQueryWrapperX<EnergyAlertRuleDO>().orderByDesc(EnergyAlertRuleDO::getId));
-    }
-    public PageResult<EnergyAlertLogDO> logs(PageParam page, LocalDate date, String status) {
-        return energyAlertLogMapper.selectPage(page, new LambdaQueryWrapperX<EnergyAlertLogDO>()
-                .eqIfPresent(EnergyAlertLogDO::getStatus, status)
-                .and(date != null, w -> w.and(day -> day.eq(EnergyAlertLogDO::getPeriodType, "DAY").eq(EnergyAlertLogDO::getRecordDate, date))
-                        .or(month -> month.eq(EnergyAlertLogDO::getPeriodType, "MONTH").eq(EnergyAlertLogDO::getRecordDate, date.withDayOfMonth(1))))
-                .orderByDesc(EnergyAlertLogDO::getId));
-    }
-    public Long save(EnergyAlertRuleSaveReqVO req) {
-        if (req.getId() != null) get(req.getId());
-        adminUserService.validateUserList(req.getRecipientIds());
-        EnergyAlertRuleDO rule = BeanUtils.toBean(req, EnergyAlertRuleDO.class);
-        rule.setName(req.getName().trim());
-        rule.setUsageArea(req.getUsageArea() == null ? "" : req.getUsageArea().trim());
-        rule.setProductCategory(req.getProductCategory() == null ? "" : req.getProductCategory().trim());
-        rule.setRecipientIds(req.getRecipientIds().stream().distinct().map(String::valueOf).collect(Collectors.joining(",")));
-        if (rule.getId() == null) energyAlertRuleMapper.insert(rule);
-        else if (energyAlertRuleMapper.updateById(rule) == 0) throw missing();
-        return rule.getId();
-    }
-    public void delete(Long id) {
-        get(id);
-        if (energyAlertRuleMapper.deleteById(id) == 0) throw missing();
-    }
-    private EnergyAlertRuleDO get(Long id) {
-        var rule = energyAlertRuleMapper.selectById(id);
-        if (rule == null) throw missing();
-        return rule;
-    }
-    private RuntimeException missing() { return exception(new ErrorCode(1_040_951_000, "鑳借�楅璀﹁鍒欎笉瀛樺湪")); }
-
-    /** Check the selected day and its calendar month; successful sends commit with their history. */
-    @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED, rollbackFor = Exception.class)
-    public Map<String, Integer> check(LocalDate date) {
-        int sent = 0, failed = 0;
-        var rules = energyAlertRuleMapper.selectList(new LambdaQueryWrapperX<EnergyAlertRuleDO>()
-                .eq(EnergyAlertRuleDO::getEnabled, true).orderByAsc(EnergyAlertRuleDO::getId));
-        for (var candidate : rules) {
-            var rule = energyAlertRuleMapper.lock(candidate.getId());
-            if (rule == null || !Boolean.TRUE.equals(rule.getEnabled())) continue;
-            boolean monthly = rule.getMetric().startsWith("MONTH_");
-            LocalDate periodDate = monthly ? date.withDayOfMonth(1) : date;
-            String periodType = monthly ? "MONTH" : "DAY";
-            boolean amount = rule.getMetric().endsWith("AMOUNT");
-            BigDecimal actual = energyRecordMapper.selectDailyValue(periodDate, rule);
-            if (!exceeds(actual, rule.getThreshold())) continue;
-            for (String id : rule.getRecipientIds().split(",")) {
-                long recipient = Long.parseLong(id);
-                var log = energyAlertLogMapper.selectOne(new LambdaQueryWrapperX<EnergyAlertLogDO>()
-                        .eq(EnergyAlertLogDO::getRuleId, rule.getId()).eq(EnergyAlertLogDO::getRecordDate, periodDate)
-                        .eq(EnergyAlertLogDO::getPeriodType, periodType)
-                        .eq(EnergyAlertLogDO::getRecipientId, recipient));
-                if (log != null && "SENT".equals(log.getStatus())) continue;
-                if (log == null) log = new EnergyAlertLogDO();
-                log.setRuleId(rule.getId()); log.setRuleName(rule.getName()); log.setRecordDate(periodDate); log.setPeriodType(periodType);
-                log.setEnergyType(rule.getEnergyType()); log.setMetric(rule.getMetric());
-                log.setScope((rule.getUsageArea().isEmpty() ? "鍏ㄩ儴鍖哄煙" : rule.getUsageArea()) + " / "
-                        + (rule.getProductCategory().isEmpty() ? "鍏ㄩ儴浜у搧" : rule.getProductCategory()));
-                log.setActualValue(actual); log.setThreshold(rule.getThreshold()); log.setRecipientId(recipient);
-                log.setRecipientName(String.valueOf(recipient));
-                try {
-                    adminUserService.validateUserList(List.of(recipient));
-                    log.setRecipientName(adminUserService.getUser(recipient).getNickname());
-                    NotifySendSingleToUserReqDTO message = new NotifySendSingleToUserReqDTO();
-                    message.setUserId(recipient); message.setTemplateCode(monthly ? "energy_monthly_warning" : "energy_daily_warning");
-                    message.setTemplateParams(Map.of("ruleName", rule.getName(), "date", monthly ? java.time.YearMonth.from(date).toString() : date.toString(),
-                            "energyName", energyName(rule.getEnergyType()), "scope", log.getScope(),
-                            "metricName", amount ? "璐圭敤" : "鐢ㄩ噺",
-                            "actual", actual.toPlainString(), "threshold", rule.getThreshold().toPlainString(),
-                            "unit", amount ? "鍏�" : unit(rule.getEnergyType())));
-                    Long messageId = notifyMessageSendApi.sendSingleMessageToAdmin(message);
-                    if (messageId == null) throw new IllegalStateException("鑳借�楅璀﹂�氱煡妯℃澘宸插仠鐢�");
-                    log.setMessageId(messageId); log.setStatus("SENT"); log.setErrorMessage(""); sent++;
-                } catch (Exception e) {
-                    logFailure(rule.getId(), date, recipient, e);
-                    log.setStatus("FAILED");
-                    log.setErrorMessage("鍙戦�佸け璐ワ紝璇锋鏌ユ帴鏀朵汉鏄惁鍚敤浠ュ強閫氱煡妯℃澘 " + (monthly ? "energy_monthly_warning" : "energy_daily_warning") + " 鏄惁鍙敤锛岀劧鍚庨噸鏂版鏌ヨ鏃ユ湡銆�");
-                    failed++;
-                }
-                if (log.getId() == null) energyAlertLogMapper.insert(log); else energyAlertLogMapper.updateById(log);
-            }
-        }
-        return Map.of("sent", sent, "failed", failed);
-    }
-    private void logFailure(Long ruleId, LocalDate date, long recipient, Exception cause) {
-        log.warn("鑳借�楅璀︾珯鍐呴�氱煡鍙戦�佸け璐� rule={} date={} recipient={}", ruleId, date, recipient, cause);
-    }
-    static boolean exceeds(BigDecimal actual, BigDecimal threshold) { return actual != null && actual.compareTo(threshold) > 0; }
-    public static String energyName(String type) { return switch (type) { case "WATER" -> "姘�"; case "ELECTRICITY" -> "鐢�"; default -> "钂告苯"; }; }
-    public static String unit(String type) { return switch (type) { case "WATER" -> "m鲁"; case "ELECTRICITY" -> "kWh"; default -> "t"; }; }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyExportService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyExportService.java
deleted file mode 100644
index 1f7e840..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyExportService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.energy;
-
-import cn.idev.excel.FastExcelFactory;
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
-import cn.iocoder.yudao.framework.excel.core.handler.ColumnWidthMatchStyleStrategy;
-import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.*;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.stereotype.Service;
-import java.io.IOException;
-import java.util.*;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-
-@Service
-public class EnergyExportService {
-    @Resource private EnergyRecordService energyRecordService;
-    public void records(EnergyRecordPageReqVO req, HttpServletResponse response) throws IOException {
-        req.setPageNo(1); req.setPageSize(50_001);
-        var page = energyRecordService.page(req);
-        if (page.getTotal() > 50_000) throw exception(new ErrorCode(1_040_952_000, "鍗曟鏈�澶氬鍑�50000鏉★紝璇风缉灏忔棩鏈熻寖鍥�"));
-        List<List<Object>> rows = page.getList().stream().map(r -> Arrays.<Object>asList(r.getRecordDate().toString(),
-                EnergyAlertService.energyName(r.getEnergyType()), r.getUsageArea(), r.getProductCategory(), r.getUsagePurpose(),
-                EnergyAlertService.unit(r.getEnergyType()), r.getQuantity(), r.getUnitPrice(), r.getAmount(), r.getRecorder(), r.getRemark())).toList();
-        write(response, "鑳借�楀彴璐�.xlsx", List.of(new Sheet("鑳借�楀彴璐�",
-                List.of("鏃ユ湡", "鑳芥簮", "浣跨敤鍖哄煙", "浜у搧绫诲埆", "鐢ㄩ��", "鐢ㄩ噺鍗曚綅", "鐢ㄩ噺", "鍗曚环锛堝厓/鍗曚綅锛�", "璐圭敤锛堝厓锛�", "褰曞叆浜�", "澶囨敞"), rows)));
-    }
-    public void analysis(EnergyAnalysisReqVO req, HttpServletResponse response) throws IOException {
-        var data = energyRecordService.analysis(req);
-        var head = List.of("缁熻椤�", "鑳芥簮", "鐢ㄩ噺鍗曚綅", "鐢ㄩ噺", "璐圭敤锛堝厓锛�", "褰曞叆鏉℃暟");
-        List<List<Object>> summary = data.getSummary().stream().map(r -> row("鍚堣", r)).toList();
-        List<List<Object>> trend = data.getTrend().stream().map(r -> row(r.getLabel(), r)).toList();
-        List<List<Object>> areas = data.getAreas().stream().map(r -> row(r.getLabel(), r)).toList();
-        List<List<Object>> scope = List.of(Arrays.asList("寮�濮嬫棩鏈�", req.getStartDate().toString()),
-                Arrays.asList("缁撴潫鏃ユ湡", req.getEndDate().toString()), Arrays.asList("姹囨�绘柟寮�", "MONTH".equals(req.getGroupBy()) ? "鎸夋湀" : "鎸夋棩"),
-                Arrays.asList("鑳芥簮", req.getEnergyType() == null || req.getEnergyType().isEmpty() ? "鍏ㄩ儴" : EnergyAlertService.energyName(req.getEnergyType())),
-                Arrays.asList("鍖哄煙鍏抽敭璇�", Objects.toString(req.getUsageArea(), "")), Arrays.asList("浜у搧绫诲埆", Objects.toString(req.getProductCategory(), "")),
-                Arrays.asList("鎬昏垂鐢紙鍏冿級", data.getTotalAmount()), Arrays.asList("褰曞叆鏉℃暟", data.getRecordCount()));
-        write(response, "鑳借�楀垎鏋�.xlsx", List.of(new Sheet("缁熻鍙e緞", List.of("椤圭洰", "鍐呭"), scope),
-                new Sheet("鑳芥簮姹囨��", head, summary), new Sheet("鏃ユ湡瓒嬪娍", head, trend), new Sheet("鍖哄煙姹囨��", head, areas)));
-    }
-    private List<Object> row(String label, EnergyAnalysisRespVO.Summary r) {
-        return Arrays.asList(label, EnergyAlertService.energyName(r.getEnergyType()), EnergyAlertService.unit(r.getEnergyType()), r.getQuantity(), r.getAmount(), r.getRecordCount());
-    }
-    private record Sheet(String name, List<String> headers, List<List<Object>> rows) {}
-    private void write(HttpServletResponse response, String filename, List<Sheet> sheets) throws IOException {
-        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-        response.setHeader("Content-Disposition", "attachment;filename=" + HttpUtils.encodeUtf8(filename));
-        try (var writer = FastExcelFactory.write(response.getOutputStream()).autoCloseStream(false)
-                .registerWriteHandler(new ColumnWidthMatchStyleStrategy()).build()) {
-            for (int i = 0; i < sheets.size(); i++) {
-                var sheet = sheets.get(i);
-                writer.write(sheet.rows(), FastExcelFactory.writerSheet(i, sheet.name())
-                        .head(sheet.headers().stream().map(List::of).toList()).build());
-            }
-        }
-    }
-}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordChangedEvent.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordChangedEvent.java
deleted file mode 100644
index b036132..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordChangedEvent.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.energy;
-
-import java.time.LocalDate;
-import java.util.Set;
-
-public record EnergyRecordChangedEvent(Long tenantId, Set<LocalDate> dates) {}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordService.java
deleted file mode 100644
index f9c6e16..0000000
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/energy/EnergyRecordService.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package cn.iocoder.yudao.module.mes.service.energy;
-
-import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.energy.vo.*;
-import cn.iocoder.yudao.module.mes.dal.dataobject.energy.EnergyRecordDO;
-import cn.iocoder.yudao.module.mes.dal.mysql.energy.EnergyRecordMapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.transaction.annotation.Transactional;
-import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
-import java.util.Set;
-import java.math.RoundingMode;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-
-@Service
-public class EnergyRecordService {
-    private static final ErrorCode NOT_EXISTS = new ErrorCode(1_040_950_000, "鑳借�楄褰曚笉瀛樺湪鎴栧凡鍒犻櫎");
-    private static final ErrorCode ID_REQUIRED = new ErrorCode(1_040_950_001, "淇敼鑳借�楄褰曞繀椤绘彁渚涚紪鍙�");
-    @Resource
-    private EnergyRecordMapper recordMapper;
-    @Resource private ApplicationEventPublisher applicationEventPublisher;
-
-    @Transactional(rollbackFor = Exception.class)
-    public Long create(EnergyRecordSaveReqVO req) {
-        EnergyRecordDO record = toRecord(req);
-        record.setId(null);
-        recordMapper.insert(record);
-        applicationEventPublisher.publishEvent(new EnergyRecordChangedEvent(TenantContextHolder.getTenantId(), Set.of(record.getRecordDate())));
-        return record.getId();
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void update(EnergyRecordSaveReqVO req) {
-        if (req.getId() == null) {
-            throw exception(ID_REQUIRED);
-        }
-        EnergyRecordDO old = get(req.getId());
-        if (recordMapper.updateById(toRecord(req)) == 0) {
-            throw exception(NOT_EXISTS);
-        }
-        var dates = new java.util.HashSet<>(Set.of(old.getRecordDate()));
-        dates.add(req.getRecordDate());
-        applicationEventPublisher.publishEvent(new EnergyRecordChangedEvent(TenantContextHolder.getTenantId(), Set.copyOf(dates)));
-    }
-
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(Long id) {
-        EnergyRecordDO old = get(id);
-        if (recordMapper.deleteById(id) == 0) {
-            throw exception(NOT_EXISTS);
-        }
-        applicationEventPublisher.publishEvent(new EnergyRecordChangedEvent(TenantContextHolder.getTenantId(), Set.of(old.getRecordDate())));
-    }
-
-    public EnergyRecordDO get(Long id) {
-        EnergyRecordDO record = recordMapper.selectById(id);
-        if (record == null) {
-            throw exception(NOT_EXISTS);
-        }
-        return record;
-    }
-
-    public PageResult<EnergyRecordDO> page(EnergyRecordPageReqVO req) {
-        return recordMapper.selectPage(req);
-    }
-
-    static EnergyRecordDO toRecord(EnergyRecordSaveReqVO req) {
-        EnergyRecordDO record = BeanUtils.toBean(req, EnergyRecordDO.class);
-        record.setUsageArea(req.getUsageArea().trim());
-        record.setProductCategory(req.getProductCategory().trim());
-        record.setUsagePurpose(req.getUsagePurpose().trim());
-        record.setRecorder(req.getRecorder().trim());
-        // 绌哄娉ㄤ篃鍙湪淇敼鏃舵竻闄ゃ��
-        record.setRemark(req.getRemark() == null ? "" : req.getRemark().trim());
-        record.setAmount(req.getQuantity().multiply(req.getUnitPrice()).setScale(2, RoundingMode.HALF_UP));
-        return record;
-    }
-
-    public EnergyAnalysisRespVO analysis(EnergyAnalysisReqVO req) {
-        return aggregate(recordMapper.selectAnalysis(req));
-    }
-
-    static EnergyAnalysisRespVO aggregate(List<EnergyRecordMapper.Aggregate> rows) {
-        EnergyAnalysisRespVO result = new EnergyAnalysisRespVO();
-        Map<String, EnergyAnalysisRespVO.Summary> summary = new LinkedHashMap<>();
-        for (String type : List.of("WATER", "ELECTRICITY", "STEAM")) {
-            EnergyAnalysisRespVO.Summary item = new EnergyAnalysisRespVO.Summary();
-            item.setEnergyType(type);
-            summary.put(type, item);
-        }
-        Map<List<String>, EnergyAnalysisRespVO.Bucket> trend = new LinkedHashMap<>();
-        Map<List<String>, EnergyAnalysisRespVO.Bucket> areas = new LinkedHashMap<>();
-        for (EnergyRecordMapper.Aggregate row : rows) {
-            add(summary.get(row.getEnergyType()), row);
-            add(bucket(trend, row.getPeriod(), row.getEnergyType()), row);
-            add(bucket(areas, row.getUsageArea(), row.getEnergyType()), row);
-            result.setTotalAmount(result.getTotalAmount().add(row.getAmount()));
-            result.setRecordCount(result.getRecordCount() + row.getRecordCount());
-        }
-        result.setSummary(List.copyOf(summary.values()));
-        result.setTrend(List.copyOf(trend.values()));
-        result.setAreas(List.copyOf(areas.values()));
-        return result;
-    }
-
-    private static EnergyAnalysisRespVO.Bucket bucket(Map<List<String>, EnergyAnalysisRespVO.Bucket> map,
-                                                       String label, String type) {
-        return map.computeIfAbsent(List.of(label, type), key -> {
-            EnergyAnalysisRespVO.Bucket item = new EnergyAnalysisRespVO.Bucket();
-            item.setLabel(label);
-            item.setEnergyType(type);
-            return item;
-        });
-    }
-
-    private static void add(EnergyAnalysisRespVO.Summary item, EnergyRecordMapper.Aggregate row) {
-        item.setQuantity(item.getQuantity().add(row.getQuantity()));
-        item.setAmount(item.getAmount().add(row.getAmount()));
-        item.setRecordCount(item.getRecordCount() + row.getRecordCount());
-    }
-}

--
Gitblit v1.9.3