diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java index f15a0506..d678f81c 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java @@ -5,7 +5,6 @@ import com.ruoyi.common.core.domain.R; import com.xhpc.common.api.factory.PowerPileFallbackFactory; import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.redis.CacheRateModel; -import com.xhpc.common.data.up.OrderData; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -19,7 +18,7 @@ import java.util.Set; public interface PowerPileService { @PostMapping(value = "/charging/start") - R startCharging(@Validated @RequestBody StartChargingData startChargingData); + R startCharging(@Validated @RequestBody StartChargingData startChargingData); @PostMapping(value = "/pile/whitelist") R addPileWhitelist(@RequestBody Set whitelist); diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java index 09c42fe3..28dd6d68 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java @@ -4,7 +4,6 @@ import com.ruoyi.common.core.domain.R; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.redis.CacheRateModel; -import com.xhpc.common.data.up.OrderData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -24,7 +23,7 @@ public class PowerPileFallbackFactory implements FallbackFactory startCharging(StartChargingData startChargingData) { + public R startCharging(StartChargingData startChargingData) { return R.fail("启动充电失败:" + cause.getMessage()); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index 0852ff42..67d1ff2f 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.HttpUtils; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.data.down.StartChargingData; -import com.xhpc.common.data.up.OrderData; import com.xhpc.pp.server.ChargingPileServer; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.utils.security.CRCCalculator; @@ -42,7 +41,7 @@ public class ChargingController { @PostMapping("test/pile/charging/order") public Object test(@Validated @RequestBody StartChargingData startChargingData) { - R r = powerPileService.startCharging(startChargingData); + R r = powerPileService.startCharging(startChargingData); return r; }