diff --git a/pom.xml b/pom.xml
index 48c12193..0e4b36ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
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<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);
+//    }
+
+
 
 
 
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<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);
+
 }
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<Map<String, Object>> 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<Map<String, Object>> 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 @@
             </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>