From 1a9712de7073e545e57763b05b09bd454294aa8e Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Tue, 28 Sep 2021 16:05:52 +0800
Subject: [PATCH] add connectorType field to /terminal/updateXhpcTerminalName
 interface

---
 .../station/controller/XhpcTerminalController.java   |  2 +-
 .../station/service/IXhpcTerminalService.java        |  2 +-
 .../station/service/XhpcTerminalServiceImpl.java     |  5 +++--
 .../src/main/resources/mapper/XhpcTerminalMapper.xml |  5 ++++-
 .../java/com/xhpc/common/api/PowerPileService.java   |  2 +-
 .../common/api/factory/PowerPileFallbackFactory.java |  2 +-
 .../java/com/xhpc/common/domain/XhpcTerminal.java    | 12 ++++++++++++
 7 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java
index 72e9177b..5f58fdf3 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java
@@ -71,7 +71,7 @@ public class XhpcTerminalController extends BaseController {
     @PostMapping(value = "/updateXhpcTerminalName")
     public AjaxResult updateXhpcTerminalName(@RequestBody XhpcTerminal xhpcTerminal) {
 
-        return xhpcTerminalService.updateXhpcTerminalName(xhpcTerminal.getTerminalId(), xhpcTerminal.getName(), xhpcTerminal.getSerialNumber());
+        return xhpcTerminalService.updateXhpcTerminalName(xhpcTerminal.getTerminalId(), xhpcTerminal.getName(), xhpcTerminal.getSerialNumber(),xhpcTerminal.getConnectorType());
     }
 
     /**
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java
index a52669d4..2ff8da8a 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java
@@ -41,7 +41,7 @@ public interface IXhpcTerminalService {
      * 修改
      * @return
      */
-    AjaxResult updateXhpcTerminalName(Long terminalId,String name,String serialNumber);
+    AjaxResult updateXhpcTerminalName(Long terminalId,String name,String serialNumber,int connectorType);
 
     /**
      * 终端详情
diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java
index 23dad43b..75b15c52 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java
+++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java
@@ -59,13 +59,14 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService {
     }
 
     @Override
-    public AjaxResult updateXhpcTerminalName(Long terminalId, String name, String serialNumber) {
+    public AjaxResult updateXhpcTerminalName(Long terminalId, String name, String serialNumber,int connectorType) {
 
         XhpcTerminal xhpcTerminal = xhpcTerminalMapper.selectXhpcTerminalById(terminalId);
         xhpcTerminal.setName(name);
         xhpcTerminal.setSerialNumber(serialNumber);
+        xhpcTerminal.setConnectorType(connectorType);
         xhpcTerminalMapper.updateXhpcTerminal(xhpcTerminal);
-        return AjaxResult.success();
+        return AjaxResult.success(null);
     }
 
     @Override
diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
index 516c7826..155cf00e 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
@@ -22,6 +22,7 @@
         <result property="remark" column="remark"/>
         <result property="rateModelId" column="rate_model_id"/>
         <result property="operatorIdEvcs" column="operator_id_evcs"/>
+        <result property="connectorType" column="connector_type" />
 
     </resultMap>
 
@@ -40,7 +41,8 @@
                create_by,
                update_time,
                update_by,
-               remark
+               remark,
+               connector_type
         from xhpc_terminal
     </sql>
 
@@ -127,6 +129,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="operatorIdEvcs != null">operator_id_evcs = #{operatorIdEvcs}</if>
+            <if test="connectorType != null">connector_type = #{connectorType}</if>
         </trim>
         where terminal_id = #{terminalId}
     </update>
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 944b6f5e..65930ad9 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
@@ -25,7 +25,7 @@ public interface PowerPileService {
 
     @PutMapping("charging/stop/{orderNo}/{pileNo}/{gunId}/{version}")
     R stopCharging(@PathVariable("orderNo") String orderNo, @PathVariable("pileNo") String pileNo,
-                   @PathVariable("gunId") String gunId, @PathVariable("version") String version);
+                   @PathVariable("gunId") String gunId);
 
     @PostMapping("/pile/whitelist/add/{stationId}")
     R addPileWhitelist(@PathVariable("stationId") Long stationId, @RequestBody Set<String> pileNoSet);
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 e341ee23..e0fbb506 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
@@ -35,7 +35,7 @@ public class PowerPileFallbackFactory implements FallbackFactory<PowerPileServic
             }
 
             @Override
-            public R stopCharging(String orderNo, String pileNo, String gunId, String version) {
+            public R stopCharging(String orderNo, String pileNo, String gunId) {
 
                 return R.fail("停止充电失败:" + cause.getMessage());
             }
diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
index b7a0d16f..17bd2232 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
@@ -47,12 +47,24 @@ public class XhpcTerminal extends BaseEntity {
 
     private String operatorIdEvcs;
 
+    /** 充电设备类型 */
+    private int connectorType;
 
     /**
      * 电桩统计数量
      */
     private Integer number;
 
+    public int getConnectorType() {
+
+        return connectorType;
+    }
+
+    public void setConnectorType(int connectorType) {
+
+        this.connectorType = connectorType;
+    }
+
     public String getOperatorIdEvcs() {
         return operatorIdEvcs;
     }