yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除不必要的返回值泛型

Browse Source
This commit is contained in:
ZZ 2021-07-28 12:11:34 +08:00
parent a01c480dc4
commit c3a7b5f7c5
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java
View File

@ -5,7 +5,6 @@ import com.ruoyi.common.core.domain.R;
import com.xhpc.common.api.factory.PowerPileFallbackFactory; import com.xhpc.common.api.factory.PowerPileFallbackFactory;
import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.down.StartChargingData;
import com.xhpc.common.data.redis.CacheRateModel; import com.xhpc.common.data.redis.CacheRateModel;
import com.xhpc.common.data.up.OrderData;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
@ -19,7 +18,7 @@ import java.util.Set;
public interface PowerPileService { public interface PowerPileService {
@PostMapping(value = "/charging/start") @PostMapping(value = "/charging/start")
R<OrderData> startCharging(@Validated @RequestBody StartChargingData startChargingData); R startCharging(@Validated @RequestBody StartChargingData startChargingData);
@PostMapping(value = "/pile/whitelist") @PostMapping(value = "/pile/whitelist")
R addPileWhitelist(@RequestBody Set<String> whitelist); R addPileWhitelist(@RequestBody Set<String> whitelist);

3
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java
View File

@ -4,7 +4,6 @@ import com.ruoyi.common.core.domain.R;
import com.xhpc.common.api.PowerPileService; import com.xhpc.common.api.PowerPileService;
import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.down.StartChargingData;
import com.xhpc.common.data.redis.CacheRateModel; import com.xhpc.common.data.redis.CacheRateModel;
import com.xhpc.common.data.up.OrderData;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
@ -24,7 +23,7 @@ public class PowerPileFallbackFactory implements FallbackFactory<PowerPileServic
logger.error("充电订单服务调用失败:{} //fallback", cause.getMessage()); logger.error("充电订单服务调用失败:{} //fallback", cause.getMessage());
return new PowerPileService() { return new PowerPileService() {
@Override @Override
public R<OrderData> startCharging(StartChargingData startChargingData) { public R startCharging(StartChargingData startChargingData) {
return R.fail("启动充电失败:" + cause.getMessage()); return R.fail("启动充电失败:" + cause.getMessage());
} }

3
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
View File

@ -6,7 +6,6 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.HttpUtils; import com.ruoyi.common.core.utils.HttpUtils;
import com.xhpc.common.api.PowerPileService; import com.xhpc.common.api.PowerPileService;
import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.down.StartChargingData;
import com.xhpc.common.data.up.OrderData;
import com.xhpc.pp.server.ChargingPileServer; import com.xhpc.pp.server.ChargingPileServer;
import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.ServiceResult;
import com.xhpc.pp.utils.security.CRCCalculator; import com.xhpc.pp.utils.security.CRCCalculator;
@ -42,7 +41,7 @@ public class ChargingController {
@PostMapping("test/pile/charging/order") @PostMapping("test/pile/charging/order")
public Object test(@Validated @RequestBody StartChargingData startChargingData) { public Object test(@Validated @RequestBody StartChargingData startChargingData) {
R<OrderData> r = powerPileService.startCharging(startChargingData); R r = powerPileService.startCharging(startChargingData);
return r; return r;
} }