From bd654c03d468ff3575f805fec97ed962f5d58d25 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Wed, 4 Aug 2021 16:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E7=8A=B6=E6=80=81=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/common/api/PowerPileService.java    | 11 +++++------
 .../common/api/factory/PowerPileFallbackFactory.java  |  9 +++++++--
 .../java/com/xhpc/pp/controller/PileController.java   | 11 +++++++----
 3 files changed, 19 insertions(+), 12 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 83e05df7..076626ce 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,18 +1,14 @@
 package com.xhpc.common.api;
 
-import com.xhpc.common.api.dto.ChargingPileDto;
+import com.xhpc.common.api.factory.PowerPileFallbackFactory;
 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 org.apache.ibatis.annotations.Param;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Set;
 
@@ -28,6 +24,9 @@ public interface PowerPileService {
     @DeleteMapping("/pile/whitelist/delete/{stationId}")
     R deletePileWhitelist(@PathVariable("stationId") Long stationId, @RequestBody Set<String> pileNoSet);
 
+    @GetMapping("terminal/{terminalSn}/status")
+    R terminalStatus(@PathVariable("terminalSn")String terminalSn);
+
     @PostMapping("/station/rateModel/{stationId}/{rateModelId}")
     R setStationRateModel(@PathVariable("stationId") @Param("stationId") Long stationId, @PathVariable("rateModelId") @Param("rateModelId") Long rateModelId, @RequestBody @Param("rateModel") CacheRateModel rateModel);
 
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 147c6328..74bbdea8 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,8 +1,7 @@
 package com.xhpc.common.api.factory;
 
-import com.xhpc.common.api.dto.ChargingPileDto;
-import com.xhpc.common.core.domain.R;
 import com.xhpc.common.api.PowerPileService;
+import com.xhpc.common.core.domain.R;
 import com.xhpc.common.data.down.StartChargingData;
 import com.xhpc.common.data.redis.CacheRateModel;
 import org.slf4j.Logger;
@@ -41,6 +40,12 @@ public class PowerPileFallbackFactory implements FallbackFactory<PowerPileServic
                 return R.fail("删除充电桩白名单失败:" + cause.getMessage());
             }
 
+            @Override
+            public R terminalStatus(String terminalSn) {
+
+                return R.fail("查询终端状态失败:" + cause.getMessage());
+            }
+
             @Override
             public R setStationRateModel(Long stationId, Long rateModelId, CacheRateModel rateModel) {
 
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 60a4bffd..7255c671 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
@@ -2,10 +2,7 @@ package com.xhpc.pp.controller;
 
 import com.xhpc.common.api.dto.ChargingStationDto;
 import com.xhpc.common.core.domain.R;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 import java.util.Set;
@@ -64,4 +61,10 @@ public class PileController {
         return R.ok();
     }
 
+    @GetMapping("terminal/{terminalSn}/status")
+    public Object terminalStatus(@PathVariable("terminalSn")String terminalSn) {
+
+        return R.ok();
+    }
+
 }