diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/EnergyAccountController.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/EnergyAccountController.java index 59985a2..b191c0f 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/EnergyAccountController.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/EnergyAccountController.java @@ -92,6 +92,20 @@ public class EnergyAccountController { return success(cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList(list, EnergyAccountConvert.INSTANCE::convert)); } + @GetMapping("/simple-list") + @Operation(summary = "获得账户简单列表") + public CommonResult> getSimpleList() { + List list = accountService.getAccountList(); + return success(EnergyAccountConvert.INSTANCE.convertSimpleList(list)); + } + + @GetMapping("/summary") + @Operation(summary = "获得账户汇总统计") + @PreAuthorize("@ss.hasPermission('energy:account:query')") + public CommonResult getAccountSummary() { + return success(accountService.getAccountSummary()); + } + // ===== 流水查询 ===== @GetMapping("/flow/page") diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/vo/EnergyAccountSimpleVO.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/vo/EnergyAccountSimpleVO.java new file mode 100644 index 0000000..6164ff0 --- /dev/null +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/vo/EnergyAccountSimpleVO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.energy.controller.admin.account.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 能源账户简单 Response VO") +@Data +public class EnergyAccountSimpleVO { + @Schema(description = "账户ID") + private Long id; + @Schema(description = "客户ID") + private Long customerId; + @Schema(description = "客户名称") + private String customerName; +} diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/vo/EnergyAccountSummaryVO.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/vo/EnergyAccountSummaryVO.java new file mode 100644 index 0000000..159a982 --- /dev/null +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/account/vo/EnergyAccountSummaryVO.java @@ -0,0 +1,18 @@ +package cn.iocoder.yudao.module.energy.controller.admin.account.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.math.BigDecimal; + +@Schema(description = "管理后台 - 能源账户汇总 Response VO") +@Data +public class EnergyAccountSummaryVO { + @Schema(description = "账户总数") + private Integer totalCount; + @Schema(description = "总余额") + private BigDecimal totalBalance; + @Schema(description = "累计充值") + private BigDecimal totalRecharge; + @Schema(description = "预警账户数") + private Integer warningCount; +} diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/bill/EnergyBillController.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/bill/EnergyBillController.java index 09fa885..48a2545 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/bill/EnergyBillController.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/bill/EnergyBillController.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.energy.controller.admin.bill.vo.*; +import cn.iocoder.yudao.module.energy.controller.admin.detail.vo.HydrogenDetailRespVO; import cn.iocoder.yudao.module.energy.convert.bill.EnergyBillConvert; import cn.iocoder.yudao.module.energy.dal.dataobject.bill.EnergyBillDO; import cn.iocoder.yudao.module.energy.service.bill.EnergyBillService; @@ -115,4 +116,20 @@ public class EnergyBillController { billService.deleteAdjustment(id); return success(true); } + + @GetMapping("/detail-list") + @Operation(summary = "获得账单关联明细列表") + @Parameter(name = "billId", description = "账单ID", required = true) + @PreAuthorize("@ss.hasPermission('energy:bill:query')") + public CommonResult> getBillDetailList(@RequestParam("billId") Long billId) { + return success(billService.getBillDetailList(billId)); + } + + @GetMapping("/adjustment/list") + @Operation(summary = "获得账单调整记录列表") + @Parameter(name = "billId", description = "账单ID", required = true) + @PreAuthorize("@ss.hasPermission('energy:bill:query')") + public CommonResult> getAdjustmentList(@RequestParam("billId") Long billId) { + return success(billService.getAdjustmentList(billId)); + } } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/bill/vo/EnergyBillAdjustmentRespVO.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/bill/vo/EnergyBillAdjustmentRespVO.java new file mode 100644 index 0000000..01cc1a7 --- /dev/null +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/bill/vo/EnergyBillAdjustmentRespVO.java @@ -0,0 +1,33 @@ +package cn.iocoder.yudao.module.energy.controller.admin.bill.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 账单调整记录 Response VO") +@Data +public class EnergyBillAdjustmentRespVO { + @Schema(description = "调整ID") + private Long id; + @Schema(description = "账单ID") + private Long billId; + @Schema(description = "关联明细ID") + private Long detailId; + @Schema(description = "调整类型") + private Integer adjustmentType; + @Schema(description = "调整金额") + private BigDecimal amount; + @Schema(description = "调整原因") + private String reason; + @Schema(description = "附件") + private String attachmentUrls; + @Schema(description = "操作人ID") + private Long operatorId; + @Schema(description = "操作人名称") + private String operatorName; + @Schema(description = "操作时间") + private LocalDateTime operateTime; + @Schema(description = "创建时间") + private LocalDateTime createTime; +} diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/config/EnergyStationConfigController.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/config/EnergyStationConfigController.java index 97ec796..ff5c9a8 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/config/EnergyStationConfigController.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/config/EnergyStationConfigController.java @@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationConfigPageReqVO; import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationConfigRespVO; import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationConfigSaveReqVO; +import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationConfigSimpleVO; import cn.iocoder.yudao.module.energy.convert.config.EnergyStationConfigConvert; import cn.iocoder.yudao.module.energy.dal.dataobject.config.EnergyStationConfigDO; import cn.iocoder.yudao.module.energy.service.config.EnergyStationConfigService; @@ -17,6 +18,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.List; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 加氢站配置") @@ -59,4 +62,11 @@ public class EnergyStationConfigController { PageResult pageResult = stationConfigService.getConfigPage(pageReqVO); return success(EnergyStationConfigConvert.INSTANCE.convertPage(pageResult)); } + + @GetMapping("/simple-list") + @Operation(summary = "获得站点配置简单列表") + public CommonResult> getSimpleList() { + List list = stationConfigService.getConfigList(); + return success(EnergyStationConfigConvert.INSTANCE.convertSimpleList(list)); + } } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/config/vo/EnergyStationConfigSimpleVO.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/config/vo/EnergyStationConfigSimpleVO.java new file mode 100644 index 0000000..c8f327d --- /dev/null +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/controller/admin/config/vo/EnergyStationConfigSimpleVO.java @@ -0,0 +1,15 @@ +package cn.iocoder.yudao.module.energy.controller.admin.config.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 加氢站配置简单 Response VO") +@Data +public class EnergyStationConfigSimpleVO { + @Schema(description = "配置ID") + private Long id; + @Schema(description = "站点ID") + private Long stationId; + @Schema(description = "站点名称") + private String stationName; +} diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/account/EnergyAccountConvert.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/account/EnergyAccountConvert.java index 0c02c73..8feec17 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/account/EnergyAccountConvert.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/account/EnergyAccountConvert.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.energy.convert.account; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountExcelVO; import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountRespVO; +import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountSimpleVO; import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyProjectAccountRespVO; import cn.iocoder.yudao.module.energy.dal.dataobject.account.EnergyAccountDO; import cn.iocoder.yudao.module.energy.dal.dataobject.account.EnergyProjectAccountDO; @@ -19,4 +20,5 @@ public interface EnergyAccountConvert { EnergyProjectAccountRespVO convert(EnergyProjectAccountDO bean); PageResult convertProjectPage(PageResult page); List convertExcelList(List list); + List convertSimpleList(List list); } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/bill/EnergyBillConvert.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/bill/EnergyBillConvert.java index 493acc1..491afba 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/bill/EnergyBillConvert.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/bill/EnergyBillConvert.java @@ -1,8 +1,10 @@ package cn.iocoder.yudao.module.energy.convert.bill; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.energy.controller.admin.bill.vo.EnergyBillAdjustmentRespVO; import cn.iocoder.yudao.module.energy.controller.admin.bill.vo.EnergyBillExcelVO; import cn.iocoder.yudao.module.energy.controller.admin.bill.vo.EnergyBillRespVO; +import cn.iocoder.yudao.module.energy.dal.dataobject.bill.EnergyBillAdjustmentDO; import cn.iocoder.yudao.module.energy.dal.dataobject.bill.EnergyBillDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -15,4 +17,5 @@ public interface EnergyBillConvert { EnergyBillRespVO convert(EnergyBillDO bean); PageResult convertPage(PageResult page); List convertExcelList(List list); + List convertAdjustmentList(List list); } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/config/EnergyStationConfigConvert.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/config/EnergyStationConfigConvert.java index 9730f38..1cf4362 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/config/EnergyStationConfigConvert.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/config/EnergyStationConfigConvert.java @@ -3,14 +3,18 @@ package cn.iocoder.yudao.module.energy.convert.config; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationConfigRespVO; import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationConfigSaveReqVO; +import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationConfigSimpleVO; import cn.iocoder.yudao.module.energy.dal.dataobject.config.EnergyStationConfigDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import java.util.List; + @Mapper public interface EnergyStationConfigConvert { EnergyStationConfigConvert INSTANCE = Mappers.getMapper(EnergyStationConfigConvert.class); EnergyStationConfigDO convert(EnergyStationConfigSaveReqVO bean); EnergyStationConfigRespVO convert(EnergyStationConfigDO bean); PageResult convertPage(PageResult page); + List convertSimpleList(List list); } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/detail/HydrogenDetailConvert.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/detail/HydrogenDetailConvert.java index e76dd1e..99be256 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/detail/HydrogenDetailConvert.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/convert/detail/HydrogenDetailConvert.java @@ -13,6 +13,7 @@ import java.util.List; public interface HydrogenDetailConvert { HydrogenDetailConvert INSTANCE = Mappers.getMapper(HydrogenDetailConvert.class); HydrogenDetailRespVO convert(EnergyHydrogenDetailDO bean); + List convertList(List list); PageResult convertPage(PageResult page); List convertExcelList(List list); } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/account/EnergyAccountService.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/account/EnergyAccountService.java index 44f3740..be0e5d6 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/account/EnergyAccountService.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/account/EnergyAccountService.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.energy.service.account; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountFlowPageReqVO; import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountPageReqVO; +import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountSummaryVO; import cn.iocoder.yudao.module.energy.dal.dataobject.account.EnergyAccountDO; import cn.iocoder.yudao.module.energy.dal.dataobject.account.EnergyAccountFlowDO; import cn.iocoder.yudao.module.energy.dal.dataobject.account.EnergyProjectAccountDO; @@ -19,4 +20,6 @@ public interface EnergyAccountService { void recharge(Long customerId, BigDecimal amount, Long bizId, String bizCode, String remark); void updateThreshold(Long id, BigDecimal threshold); PageResult getFlowPage(EnergyAccountFlowPageReqVO reqVO); + List getAccountList(); + EnergyAccountSummaryVO getAccountSummary(); } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/account/EnergyAccountServiceImpl.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/account/EnergyAccountServiceImpl.java index 778d841..f451e5d 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/account/EnergyAccountServiceImpl.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/account/EnergyAccountServiceImpl.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.energy.service.account; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountFlowPageReqVO; import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountPageReqVO; +import cn.iocoder.yudao.module.energy.controller.admin.account.vo.EnergyAccountSummaryVO; import cn.iocoder.yudao.module.energy.dal.dataobject.account.EnergyAccountDO; import cn.iocoder.yudao.module.energy.dal.dataobject.account.EnergyAccountFlowDO; import cn.iocoder.yudao.module.energy.dal.dataobject.account.EnergyProjectAccountDO; @@ -211,6 +212,29 @@ public class EnergyAccountServiceImpl implements EnergyAccountService { return accountFlowMapper.selectPage(reqVO); } + @Override + public List getAccountList() { + return accountMapper.selectList(); + } + + @Override + public EnergyAccountSummaryVO getAccountSummary() { + List accounts = accountMapper.selectList(); + EnergyAccountSummaryVO vo = new EnergyAccountSummaryVO(); + vo.setTotalCount(accounts.size()); + vo.setTotalBalance(accounts.stream() + .map(EnergyAccountDO::getBalance) + .reduce(BigDecimal.ZERO, BigDecimal::add)); + vo.setTotalRecharge(accounts.stream() + .map(EnergyAccountDO::getAccumulatedRecharge) + .reduce(BigDecimal.ZERO, BigDecimal::add)); + vo.setWarningCount((int) accounts.stream() + .filter(a -> a.getReminderThreshold() != null + && a.getBalance().compareTo(a.getReminderThreshold()) <= 0) + .count()); + return vo; + } + // ===== Private helpers ===== private boolean updateAccountWithRetry(EnergyAccountDO account, BigDecimal balanceAfter, BigDecimal amount, boolean isDeduction) { diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/bill/EnergyBillService.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/bill/EnergyBillService.java index da06d1b..68a5c2c 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/bill/EnergyBillService.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/bill/EnergyBillService.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.energy.service.bill; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.energy.controller.admin.bill.vo.*; +import cn.iocoder.yudao.module.energy.controller.admin.detail.vo.HydrogenDetailRespVO; import cn.iocoder.yudao.module.energy.dal.dataobject.bill.EnergyBillDO; import java.util.List; @@ -15,4 +16,6 @@ public interface EnergyBillService { void auditBill(Long id, Boolean approved, String remark); Long createAdjustment(EnergyBillAdjustmentSaveReqVO reqVO); void deleteAdjustment(Long adjustmentId); + List getBillDetailList(Long billId); + List getAdjustmentList(Long billId); } 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 60683ec..a9c57b4 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 @@ -2,6 +2,9 @@ package cn.iocoder.yudao.module.energy.service.bill; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.energy.controller.admin.bill.vo.*; +import cn.iocoder.yudao.module.energy.controller.admin.detail.vo.HydrogenDetailRespVO; +import cn.iocoder.yudao.module.energy.convert.bill.EnergyBillConvert; +import cn.iocoder.yudao.module.energy.convert.detail.HydrogenDetailConvert; import cn.iocoder.yudao.module.energy.dal.dataobject.bill.EnergyBillAdjustmentDO; import cn.iocoder.yudao.module.energy.dal.dataobject.bill.EnergyBillDO; import cn.iocoder.yudao.module.energy.dal.dataobject.detail.EnergyHydrogenDetailDO; @@ -200,6 +203,18 @@ public class EnergyBillServiceImpl implements EnergyBillService { adjustmentMapper.deleteById(adjustmentId); } + @Override + public List getBillDetailList(Long billId) { + List details = detailMapper.selectListByBillId(billId); + return HydrogenDetailConvert.INSTANCE.convertList(details); + } + + @Override + public List getAdjustmentList(Long billId) { + List adjustments = adjustmentMapper.selectListByBillId(billId); + return EnergyBillConvert.INSTANCE.convertAdjustmentList(adjustments); + } + private EnergyBillDO validateBillExists(Long id) { EnergyBillDO bill = billMapper.selectById(id); if (bill == null) { diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/config/EnergyStationConfigService.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/config/EnergyStationConfigService.java index 16cbd83..067250d 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/config/EnergyStationConfigService.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/config/EnergyStationConfigService.java @@ -5,10 +5,13 @@ import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationCo import cn.iocoder.yudao.module.energy.controller.admin.config.vo.EnergyStationConfigSaveReqVO; import cn.iocoder.yudao.module.energy.dal.dataobject.config.EnergyStationConfigDO; +import java.util.List; + public interface EnergyStationConfigService { Long createConfig(EnergyStationConfigSaveReqVO createReqVO); void updateConfig(EnergyStationConfigSaveReqVO updateReqVO); EnergyStationConfigDO getConfig(Long id); PageResult getConfigPage(EnergyStationConfigPageReqVO pageReqVO); EnergyStationConfigDO getByStationId(Long stationId); + List getConfigList(); } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/config/EnergyStationConfigServiceImpl.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/config/EnergyStationConfigServiceImpl.java index 71e25b0..5832e1b 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/config/EnergyStationConfigServiceImpl.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/config/EnergyStationConfigServiceImpl.java @@ -10,6 +10,8 @@ import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; +import java.util.List; + import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.energy.enums.ErrorCodeConstants.*; @@ -54,6 +56,11 @@ public class EnergyStationConfigServiceImpl implements EnergyStationConfigServic return stationConfigMapper.selectByStationId(stationId); } + @Override + public List getConfigList() { + return stationConfigMapper.selectList(); + } + private void validateConfigExists(Long id) { if (stationConfigMapper.selectById(id) == null) { throw exception(STATION_CONFIG_NOT_EXISTS);