From 88ff6b37a19e7abd9887a8dc52c1151097703fca Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Tue, 31 Aug 2021 14:40:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B0=86nacos=E6=94=B9=E4=B8=BA=E4=BA=861.10?= =?UTF-8?q?=E7=89=88=E6=9C=AC=202.=E5=9C=A8XhpcTerminalController=E4=B8=8B?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2=E6=A1=A9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E5=9C=BA=E7=AB=99=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E3=80=81=E7=BB=88=E7=AB=AF=E7=BC=96=E5=8F=B7=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=20=20=E6=8E=A5=E5=8F=A3=EF=BC=9A@GetMapping(value?= =?UTF-8?q?=20=3D=20"/selectPileNameAndStationNameAndTerminalNumList")?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../controller/XhpcTerminalController.java | 23 +++++++++++++++++++ .../station/mapper/XhpcTerminalMapper.java | 17 ++++++++++++-- .../station/service/IXhpcTerminalService.java | 10 ++++++++ .../service/XhpcTerminalServiceImpl.java | 5 ++++ .../resources/mapper/XhpcTerminalMapper.xml | 23 +++++++++++++++++++ 6 files changed, 77 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 48c12193..0e4b36ad 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 2.5.1 2020.0.3 2021.1 - 2.0.2 + 1.1.0 2.4.1 2.1.4 3.0.0 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 7e122352..72e9177b 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 @@ -83,6 +83,29 @@ public class XhpcTerminalController extends BaseController { return xhpcTerminalService.selectXhpcTerminalPileMessage(terminalId); } + /** + * 查询桩名称、场站名称、终端编号 + * @param terminalSerialNumber 搜索参数：终端 + * @param pileName 搜索参数：桩名 + * @param stationName 搜索参数：站名 + * @return list + */ + @GetMapping(value = "/selectPileNameAndStationNameAndTerminalNumList") + public TableDataInfo selectPileNameAndStationNameAndTerminalNumList(String terminalSerialNumber,String pileName,String stationName) { + startPage(); + List> list = xhpcTerminalService.getXhpcPileNameAndStationNameAndTerminalNumList(terminalSerialNumber,pileName,stationName); + return getDataTable(list); + } + +// @GetMapping("/list") +// public TableDataInfo list(String serialNumber, Integer type, Integer status, String workStatus, Long chargingStationId) { +// +// startPage(); +// List> list = xhpcTerminalService.getXhpcTerminalList(serialNumber, type, status, workStatus, chargingStationId); +// return getDataTable(list); +// } + + diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java index 30ea9253..00134f09 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java @@ -1,7 +1,5 @@ package com.xhpc.charging.station.mapper; -import com.xhpc.common.core.web.domain.AjaxResult; -import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.domain.XhpcTerminal; import org.apache.ibatis.annotations.Param; @@ -95,4 +93,19 @@ public interface XhpcTerminalMapper { */ List> getImageList(@Param("imgIds") List imgIds); + /** + * 查询所有桩名称、场站名称、终端编号 + * @return + */ + List> selectPileNameAndStationNameAndTerminalNum(); + + /** + * 查询桩名称、场站名称、终端编号 + * @param terminalSerialNumber 搜索参数：终端名称 + * @param pileName 搜索参数：桩名 + * @param stationName 搜索参数：站名 + * @return list + */ + List> getXhpcPileNameAndStationNameAndTerminalNumList(@Param("terminalSerialNumber") String terminalSerialNumber, @Param("pileName") String pileName, @Param("stationName") String stationName); + } 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 5839f07f..a52669d4 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 @@ -55,4 +55,14 @@ public interface IXhpcTerminalService { * @return */ AjaxResult getWXpNumMessage(String pNum); + + /** + * 查询桩名称、场站名称、终端编号 + * @param terminalSerialNumber 搜索参数：终端名称 + * @param pileName 搜索参数：桩名 + * @param stationName 搜索参数：站名 + * @return list + */ + List> getXhpcPileNameAndStationNameAndTerminalNumList(String terminalSerialNumber, String pileName, String stationName); + } 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 75e15a2e..23dad43b 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 @@ -117,4 +117,9 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService { return AjaxResult.success(map); } + @Override + public List> getXhpcPileNameAndStationNameAndTerminalNumList(String terminalSerialNumber, String pileName, String stationName) { + + return xhpcTerminalMapper.getXhpcPileNameAndStationNameAndTerminalNumList(terminalSerialNumber, pileName, stationName); + } } 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 06844f5a..7a76282b 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 @@ -330,4 +330,27 @@ + +