白名单接口修改

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.*;

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;

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.common.api.dto.XhpcChargingStationDto;
-import com.xhpc.charging.station.dto.XhpcRateDto;
+import com.xhpc.common.api.dto.XhpcRateDto;
-import com.xhpc.charging.station.dto.XhpcRateTimeDto;
+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;

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<String> whitelist);
+    R addPileWhitelist(@RequestBody ChargingPileWhitelistDto chargingPileWhitelist);
 
-    @DeleteMapping(value = "/pile/whitelist/{pileNo}")
+    @DeleteMapping(value = "/pile/whitelist/{stationId}/{pileNo}")
-    R deletePileWhitelist(@PathVariable("pileNo") String 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);

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<String> pileNoWhitelist;
+
+    public Long getStationId() {
+
+        return stationId;
+    }
+
+    public void setStationId(Long stationId) {
+
+        this.stationId = stationId;
+    }
+
+    public List<String> getPileNoWhitelist() {
+
+        return pileNoWhitelist;
+    }
+
+    public void setPileNoWhitelist(List<String> pileNoWhitelist) {
+
+        this.pileNoWhitelist = pileNoWhitelist;
+    }
+
+}

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;
 

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;
 

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;
 

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<PowerPileServic
             }
 
             @Override
-            public R addPileWhitelist(Set<String> 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());
             }