From 02a6c2e5cb9f78ad977ac94ed0f3b37e5c3539a2 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Mon, 16 Mar 2026 14:05:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Energy=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20Feign=20=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/api/station/HydrogenStationApi.java | 16 +++++++++++++++- .../module/asset/api/HydrogenStationApiImpl.java | 11 +++++++---- .../energy/listener/DetailEventListener.java | 2 +- .../detail/HydrogenDetailServiceImpl.java | 2 +- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/api/station/HydrogenStationApi.java b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/api/station/HydrogenStationApi.java index aabc034..13f44f3 100644 --- a/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/api/station/HydrogenStationApi.java +++ b/yudao-module-asset/yudao-module-asset-api/src/main/java/cn/iocoder/yudao/module/asset/api/station/HydrogenStationApi.java @@ -1,19 +1,33 @@ package cn.iocoder.yudao.module.asset.api.station; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.asset.api.station.dto.HydrogenStationRespDTO; +import cn.iocoder.yudao.module.asset.enums.ApiConstants; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; /** * 加氢站 API 接口 * * @author 芋道源码 */ +@FeignClient(name = ApiConstants.NAME) +@Tag(name = "RPC 服务 - 加氢站") public interface HydrogenStationApi { + String PREFIX = ApiConstants.PREFIX + "/hydrogen-station"; + /** * 获取加氢站信息 * * @param id 加氢站ID * @return 加氢站信息 */ - HydrogenStationRespDTO getStation(Long id); + @GetMapping(PREFIX + "/get") + @Operation(summary = "获取加氢站信息") + CommonResult getStation(@RequestParam("id") @Parameter(description = "加氢站ID") Long id); } diff --git a/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/api/HydrogenStationApiImpl.java b/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/api/HydrogenStationApiImpl.java index 29d2376..777845b 100644 --- a/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/api/HydrogenStationApiImpl.java +++ b/yudao-module-asset/yudao-module-asset-server/src/main/java/cn/iocoder/yudao/module/asset/api/HydrogenStationApiImpl.java @@ -1,27 +1,30 @@ package cn.iocoder.yudao.module.asset.api; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.module.asset.api.station.HydrogenStationApi; import cn.iocoder.yudao.module.asset.api.station.dto.HydrogenStationRespDTO; import cn.iocoder.yudao.module.asset.convert.station.HydrogenStationConvert; import cn.iocoder.yudao.module.asset.dal.dataobject.station.HydrogenStationDO; import cn.iocoder.yudao.module.asset.service.station.HydrogenStationService; import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RestController; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; /** * 加氢站 API 实现类 * * @author 芋道源码 */ -@Service +@RestController public class HydrogenStationApiImpl implements HydrogenStationApi { @Resource private HydrogenStationService hydrogenStationService; @Override - public HydrogenStationRespDTO getStation(Long id) { + public CommonResult getStation(Long id) { HydrogenStationDO station = hydrogenStationService.getHydrogenStation(id); - return HydrogenStationConvert.INSTANCE.convertToApi(station); + return success(HydrogenStationConvert.INSTANCE.convertToApi(station)); } } diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/listener/DetailEventListener.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/listener/DetailEventListener.java index 80ce2bf..732a86f 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/listener/DetailEventListener.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/listener/DetailEventListener.java @@ -86,7 +86,7 @@ public class DetailEventListener { log.info("[onRecordImported] 生成明细完成，count={}", details.size()); // 3. 检查站点配置，决定是否自动扣款 - HydrogenStationRespDTO station = hydrogenStationApi.getStation(event.getStationId()); + HydrogenStationRespDTO station = hydrogenStationApi.getStation(event.getStationId()).getData(); if (station != null && Boolean.TRUE.equals(station.getAutoDeduct())) { log.info("[onRecordImported] 站点配置自动扣款，开始扣款流程"); for (EnergyHydrogenDetailDO detail : details) { diff --git a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/detail/HydrogenDetailServiceImpl.java b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/detail/HydrogenDetailServiceImpl.java index 0dda346..c9bb67e 100644 --- a/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/detail/HydrogenDetailServiceImpl.java +++ b/yudao-module-energy/yudao-module-energy-server/src/main/java/cn/iocoder/yudao/module/energy/service/detail/HydrogenDetailServiceImpl.java @@ -97,7 +97,7 @@ public class HydrogenDetailServiceImpl implements HydrogenDetailService { // 3. 审核通过 → 检查是否需要扣款 if (approved) { // 获取站点配置 - HydrogenStationRespDTO station = hydrogenStationApi.getStation(detail.getStationId()); + HydrogenStationRespDTO station = hydrogenStationApi.getStation(detail.getStationId()).getData(); // 如果配置为审核后扣款（autoDeduct=false），则执行扣款 if (station != null && !Boolean.TRUE.equals(station.getAutoDeduct())) {