From 10b59a584b7a42711bbe1f207251d92b3aa1d4ca Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Tue, 27 Jul 2021 18:29:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A9=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XhpcChargingPileController.java | 13 +++++++++++-- .../controller/XhpcChargingStationController.java | 2 +- .../station/mapper/XhpcChargingPileMapper.java | 8 ++++++++ .../station/service/IXhpcChargingPileService.java | 9 ++++++++- .../service/XhpcChargingPileServiceImpl.java | 10 +++++++++- .../resources/mapper/XhpcChargingPileMapper.xml | 9 ++++++++- 6 files changed, 45 insertions(+), 6 deletions(-) diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java index f16cb5ee..1df12a6b 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java @@ -39,9 +39,8 @@ public class XhpcChargingPileController extends BaseController { return getDataTable(list); } - //新增终端 /** - * 编辑费率 + * 新增桩 * @return */ @PostMapping(value = "/addXhpcChargingPile") @@ -50,4 +49,14 @@ public class XhpcChargingPileController extends BaseController { return AjaxResult.success(xhpcChargingPileService.addXhpcChargingPile(xhpcChargingPile)); } + /** + * 编辑桩 + * @return + */ + @PostMapping(value = "/updateXhpcChargingPile") + public AjaxResult updateXhpcChargingPile(@RequestBody XhpcChargingPile xhpcChargingPile) + { + return AjaxResult.success(xhpcChargingPileService.updateXhpcChargingPile(xhpcChargingPile)); + } + } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java index 158e0b84..34be851c 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingStationController.java @@ -195,7 +195,7 @@ public class XhpcChargingStationController extends BaseController { * @return */ @GetMapping(value = "/getWXXhpcChargingStationMessage") - public AjaxResult getWXXhpcChargingStationMessage(@Param("chargingStationId") Long chargingStationId,@Param("longitude")String longitude,@Param("latitude")String latitude) + public AjaxResult getWXXhpcChargingStationMessage(@RequestParam("chargingStationId") Long chargingStationId,@RequestParam("longitude")String longitude,@RequestParam("latitude")String latitude) { return AjaxResult.success(xhpcChargingStationService.getWXXhpcChargingStationMessage(chargingStationId,longitude,latitude)); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java index 537698e4..952e8742 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java @@ -39,4 +39,12 @@ public interface XhpcChargingPileMapper { * @return 电站 */ Map selectXhpcChargingStationById(Long chargingStationId); + + /** + * 查询终端 + * + * @param chargingPileId 终端ID + * @return 电站 + */ + XhpcChargingPile selectXhpcChargingPileById(Long chargingPileId); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java index 4ac45a8c..823f117a 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java @@ -23,10 +23,17 @@ public interface IXhpcChargingPileService { /** - * 编辑电站（编辑费率） + * 添加电站（编辑费率） * @param * @return */ AjaxResult addXhpcChargingPile(XhpcChargingPile xhpcChargingPile); + /** + * 编辑电站（编辑费率） + * @param + * @return + */ + AjaxResult updateXhpcChargingPile(XhpcChargingPile xhpcChargingPile); + } diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index ad0fcb36..641fda48 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -39,7 +39,7 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService{ public AjaxResult addXhpcChargingPile(XhpcChargingPile xhpcChargingPile) { Long chargingStationId = xhpcChargingPile.getChargingStationId(); - //获取计费模型 + //获取计费模型id Map stringObjectMap = xhpcChargingPileMapper.selectXhpcChargingStationById(chargingStationId); Long rateModelId = Long.parseLong(stringObjectMap.get("rateModelId").toString()); xhpcChargingPile.setRateModelId(rateModelId); @@ -63,4 +63,12 @@ public class XhpcChargingPileServiceImpl implements IXhpcChargingPileService{ return AjaxResult.success(); } + @Override + public AjaxResult updateXhpcChargingPile(XhpcChargingPile xhpcChargingPile) { + + + + return null; + } + } diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml index a87c70d1..3a5c0da2 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -34,7 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + select charging_pile_id, charging_station_id, name, national_standard, power, auxiliary_power_supply, input_voltage, max_voltage, min_voltage, max_electric_current, min_electric_current, serial_number, type, program_version, network_link_type, gun_number,communication_protocol_version,communication_operator,sim_card,rate_model_id,charging_pile_number,status, del_flag, create_time, create_by, update_time, update_by, remark, rate_model_id from xhpc_charging_pile + + + \ No newline at end of file