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 @@
+
@@ -40,7 +41,8 @@
create_by,
update_time,
update_by,
- remark
+ remark,
+ connector_type
from xhpc_terminal
@@ -127,6 +129,7 @@
update_by = #{updateBy},
remark = #{remark},
operator_id_evcs = #{operatorIdEvcs}
+ connector_type = #{connectorType}
where terminal_id = #{terminalId}
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 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