From 2bd7a84f9e2c998e50ff231afb524f1443fd28fb Mon Sep 17 00:00:00 2001 From: ZZ Date: Wed, 28 Jul 2021 18:27:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcChargingStationController.java | 2 +- .../service/IXhpcChargingStationService.java | 2 +- .../XhpcChargingStationServiceImpl.java | 6 ++-- .../com/xhpc/common/api/PowerPileService.java | 8 +++-- .../api/dto/ChargingPileWhitelistDto.java | 34 +++++++++++++++++++ .../api}/dto/XhpcChargingStationDto.java | 2 +- .../com/xhpc/common/api}/dto/XhpcRateDto.java | 2 +- .../xhpc/common/api}/dto/XhpcRateTimeDto.java | 2 +- .../api/factory/PowerPileFallbackFactory.java | 5 +-- 9 files changed, 50 insertions(+), 13 deletions(-) create mode 100644 xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingPileWhitelistDto.java rename xhpc-modules/{xhpc-charging-station/src/main/java/com/xhpc/charging/station => xhpc-common/src/main/java/com/xhpc/common/api}/dto/XhpcChargingStationDto.java (96%) rename xhpc-modules/{xhpc-charging-station/src/main/java/com/xhpc/charging/station => xhpc-common/src/main/java/com/xhpc/common/api}/dto/XhpcRateDto.java (95%) rename xhpc-modules/{xhpc-charging-station/src/main/java/com/xhpc/charging/station => xhpc-common/src/main/java/com/xhpc/common/api}/dto/XhpcRateTimeDto.java (94%) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java index eec7fb8e..3c471849 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java @@ -7,7 +7,7 @@ import com.xhpc.common.log.annotation.Log; import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.security.annotation.PreAuthorize; import com.xhpc.common.domain.XhpcChargingStation; -import com.xhpc.charging.station.dto.XhpcChargingStationDto; +import com.xhpc.common.api.dto.XhpcChargingStationDto; import com.xhpc.charging.station.service.IXhpcChargingStationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java index efec445e..fc3c79b7 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingStationService.java @@ -2,7 +2,7 @@ package com.xhpc.charging.station.service; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.domain.XhpcChargingStation; -import com.xhpc.charging.station.dto.XhpcChargingStationDto; +import com.xhpc.common.api.dto.XhpcChargingStationDto; import java.util.List; import java.util.Map; diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index 46b5be19..def26981 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -7,9 +7,9 @@ import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.domain.XhpcRate; import com.xhpc.common.domain.XhpcRateModel; import com.xhpc.common.domain.XhpcRateTime; -import com.xhpc.charging.station.dto.XhpcChargingStationDto; -import com.xhpc.charging.station.dto.XhpcRateDto; -import com.xhpc.charging.station.dto.XhpcRateTimeDto; +import com.xhpc.common.api.dto.XhpcChargingStationDto; +import com.xhpc.common.api.dto.XhpcRateDto; +import com.xhpc.common.api.dto.XhpcRateTimeDto; import com.xhpc.charging.station.mapper.XhpcChargingStationMapper; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; 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 46dcb47d..e3b83870 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 @@ -1,10 +1,12 @@ package com.xhpc.common.api; +import com.xhpc.common.api.dto.ChargingPileWhitelistDto; import com.xhpc.common.core.constant.ServiceNameConstants; import com.xhpc.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.domain.XhpcChargingStation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; @@ -21,10 +23,10 @@ public interface PowerPileService { R startCharging(@Validated @RequestBody StartChargingData startChargingData); @PostMapping(value = "/pile/whitelist") - R addPileWhitelist(@RequestBody Set whitelist); + R addPileWhitelist(@RequestBody ChargingPileWhitelistDto chargingPileWhitelist); - @DeleteMapping(value = "/pile/whitelist/{pileNo}") - R deletePileWhitelist(@PathVariable("pileNo") String pileNo); + @DeleteMapping(value = "/pile/whitelist/{stationId}/{pileNo}") + R deletePileWhitelist(@PathVariable("stationId") Long stationId, @PathVariable("pileNo") String pileNo); @PostMapping(value = "/station/rateModel/{stationId}/{rateModelId}") R setStationRateModelId(@PathVariable("stationId") Long stationId, @PathVariable("rateModelId") Long rateModelId, @RequestBody CacheRateModel rateModel); diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingPileWhitelistDto.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingPileWhitelistDto.java new file mode 100644 index 00000000..c3a5fa52 --- /dev/null +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingPileWhitelistDto.java @@ -0,0 +1,34 @@ +package com.xhpc.common.api.dto; + +import java.math.BigDecimal; +import java.util.List; + +/** + * 费率 + */ +public class ChargingPileWhitelistDto { + + private Long stationId; + private List pileNoWhitelist; + + public Long getStationId() { + + return stationId; + } + + public void setStationId(Long stationId) { + + this.stationId = stationId; + } + + public List getPileNoWhitelist() { + + return pileNoWhitelist; + } + + public void setPileNoWhitelist(List pileNoWhitelist) { + + this.pileNoWhitelist = pileNoWhitelist; + } + +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcChargingStationDto.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcChargingStationDto.java similarity index 96% rename from xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcChargingStationDto.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcChargingStationDto.java index 5ab9acd1..108199cc 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcChargingStationDto.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcChargingStationDto.java @@ -1,4 +1,4 @@ -package com.xhpc.charging.station.dto; +package com.xhpc.common.api.dto; import com.xhpc.common.domain.XhpcChargingStation; diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcRateDto.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcRateDto.java similarity index 95% rename from xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcRateDto.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcRateDto.java index 8c6e0d93..3deb967d 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcRateDto.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcRateDto.java @@ -1,4 +1,4 @@ -package com.xhpc.charging.station.dto; +package com.xhpc.common.api.dto; import java.math.BigDecimal; diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcRateTimeDto.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcRateTimeDto.java similarity index 94% rename from xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcRateTimeDto.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcRateTimeDto.java index 6d1fb3f7..ecece69e 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/dto/XhpcRateTimeDto.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/XhpcRateTimeDto.java @@ -1,4 +1,4 @@ -package com.xhpc.charging.station.dto; +package com.xhpc.common.api.dto; import java.util.Date; 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 964c3d40..77a1aa47 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 @@ -1,5 +1,6 @@ package com.xhpc.common.api.factory; +import com.xhpc.common.api.dto.ChargingPileWhitelistDto; import com.xhpc.common.core.domain.R; import com.xhpc.common.api.PowerPileService; import com.xhpc.common.data.down.StartChargingData; @@ -29,13 +30,13 @@ public class PowerPileFallbackFactory implements FallbackFactory whitelist) { + public R addPileWhitelist(ChargingPileWhitelistDto chargingPileWhitelist) { return R.fail("增加充电桩白名单失败:" + cause.getMessage()); } @Override - public R deletePileWhitelist(String pileNo) { + public R deletePileWhitelist(Long stationId, String pileNo) { return R.fail("删除充电桩白名单失败:" + cause.getMessage()); }