From 8ac066fb13723c4bfbca5cb590d98bc1f6b5d530 Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 5 Aug 2021 19:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=85=85=E7=94=B5=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/common/api/PowerPileService.java | 3 +-- .../src/main/java/com/xhpc/pp/controller/PileController.java | 1 + .../src/main/java/com/xhpc/pp/controller/TestController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 f6bf7dbe..fe3be3bf 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.xhpc.common.core.constant.ServiceNameConstants; import com.xhpc.common.core.domain.R; import com.xhpc.common.data.down.StartChargingData; import com.xhpc.common.data.redis.CacheRateModel; -import com.xhpc.common.security.annotation.PreAuthorize; import org.apache.ibatis.annotations.Param; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; @@ -16,7 +15,7 @@ import java.util.Set; @FeignClient(contextId = "powerPileService", value = ServiceNameConstants.PILE_SERVICE, fallbackFactory = PowerPileFallbackFactory.class) public interface PowerPileService { - @PreAuthorize(hasPermi = "user:privilege:add") +// @PreAuthorize(hasPermi = "user:privilege:add") todo @PostMapping("/charging/start") R startCharging(@Validated @RequestBody StartChargingData startChargingData); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java index 7255c671..06f7f9b5 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java @@ -64,6 +64,7 @@ public class PileController { @GetMapping("terminal/{terminalSn}/status") public Object terminalStatus(@PathVariable("terminalSn")String terminalSn) { + // todo return R.ok(); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/TestController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/TestController.java index f58d008b..66c443a2 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/TestController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/TestController.java @@ -27,8 +27,8 @@ public class TestController { // String ipAndPort = GetIpAndPort.getIpAndPort(); StartChargingData d = new StartChargingData(); - d.setBalance(b); //300 d.setOrderNo(ono); //00000000000000000000000123456789 + d.setBalance(b); //300 d.setGunId(gid); //02 return powerPileService.startCharging(d); }