yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.将nacos改为了1.10版本

Browse Source 
2.在XhpcTerminalController下添加了一个可以根据条件查询桩名称、场站名称、终端编号的接口
  接口：@GetMapping(value = "/selectPileNameAndStationNameAndTerminalNumList")
This commit is contained in:
wen 2021-08-31 14:40:36 +08:00
parent 08cb4db090
commit 88ff6b37a1
6 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -20,7 +20,7 @@
<spring-boot.version>2.5.1</spring-boot.version>
<spring-cloud.version>2020.0.3</spring-cloud.version>
<spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
<alibaba.nacos.version>2.0.2</alibaba.nacos.version>
<alibaba.nacos.version>1.1.0</alibaba.nacos.version>
<spring-boot-admin.version>2.4.1</spring-boot-admin.version>
<spring-boot.mybatis>2.1.4</spring-boot.mybatis>
<swagger.fox.version>3.0.0</swagger.fox.version>

23
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java
View File

@ -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<Map<String,Object>> 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<Map<String, Object>> list = xhpcTerminalService.getXhpcTerminalList(serialNumber, type, status, workStatus, chargingStationId);
// return getDataTable(list);
// }

17
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java
View File

@ -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<Map<String, Object>> getImageList(@Param("imgIds") List<String> imgIds);
/**
* 查询所有桩名称、场站名称、终端编号
* @return
*/
List<Map<String, Object>> selectPileNameAndStationNameAndTerminalNum();
/**
* 查询桩名称、场站名称、终端编号
* @param terminalSerialNumber 搜索参数：终端名称
* @param pileName 搜索参数：桩名
* @param stationName 搜索参数：站名
* @return list
*/
List<Map<String, Object>> getXhpcPileNameAndStationNameAndTerminalNumList(@Param("terminalSerialNumber") String terminalSerialNumber, @Param("pileName") String pileName, @Param("stationName") String stationName);
}

10
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java
View File

@ -55,4 +55,14 @@ public interface IXhpcTerminalService {
* @return
*/
AjaxResult getWXpNumMessage(String pNum);
/**
* 查询桩名称、场站名称、终端编号
* @param terminalSerialNumber 搜索参数：终端名称
* @param pileName 搜索参数：桩名
* @param stationName 搜索参数：站名
* @return list
*/
List<Map<String, Object>> getXhpcPileNameAndStationNameAndTerminalNumList(String terminalSerialNumber, String pileName, String stationName);
}

5
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java
View File

@ -117,4 +117,9 @@ public class XhpcTerminalServiceImpl implements IXhpcTerminalService {
return AjaxResult.success(map);
}
@Override
public List<Map<String, Object>> getXhpcPileNameAndStationNameAndTerminalNumList(String terminalSerialNumber, String pileName, String stationName) {
return xhpcTerminalMapper.getXhpcPileNameAndStationNameAndTerminalNumList(terminalSerialNumber, pileName, stationName);
}
}

23
xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml
View File

@ -330,4 +330,27 @@
</foreach>
</if>
</select>
<select id="getXhpcPileNameAndStationNameAndTerminalNumList" resultType="map">
SELECT
terminal.serial_number AS terminal_serial_number,
pile.name AS pile_name,
station.name AS station_name
FROM
xhpc_terminal AS terminal,
xhpc_charging_pile AS pile,
xhpc_charging_station AS station
WHERE
terminal.charging_pile_id = pile.charging_pile_id
AND terminal.charging_station_id = station.charging_station_id
<if test="terminalSerialNumber!=null">
And terminal.serial_number like CONCAT('%',#{terminalSerialNumber},'%')
</if>
<if test="pileName!=null and pileName.size()>0">
And terminal.serial_number like CONCAT('%',#{pileName},'%')
</if>
<if test="stationName!=null and stationName.size()>0">
And terminal.serial_number like CONCAT('%',#{stationName},'%')
</if>
</select>
</mapper>