From 16792b4b98513a6d0b63c96d277c2887e773ad76 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Thu, 29 Jul 2021 15:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E5=85=85=E7=94=B5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=94=B5=E5=8E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/XhpcChargingPileMapper.xml         |  7 +++---
 .../mapper/XhpcChargingStationMapper.xml      | 24 +++++++++----------
 2 files changed, 16 insertions(+), 15 deletions(-)

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 216e74b7..f4119cde 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
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectXhpcChargingPileVo">
         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
     </sql>
-    <select id="selectXhpcChargingPileList" resultType="map">
+    <select id="selectXhpcChargingPileList" resultType="java.util.Map">
         select
             cp.charging_pile_id as chargingPileId,
             cp.charging_station_id as chargingStationId,
@@ -236,7 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-    <select id="selectXhpcChargingStationById" resultType="map">
+    <select id="selectXhpcChargingStationById" resultType="java.util.Map">
         select
             charging_station_id as chargingStationId,
             rate_model_id as rateModelId
@@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where charging_pile_id = #{chargingPileId}
     </update>
 
-    <select id="selectXhpcTerminalList" resultType="map">
+    <select id="selectXhpcTerminalList" resultType="java.util.Map">
         select
         te.terminal_id as terminalId,
         te.name as terminalName,
@@ -291,6 +291,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         te.pile_serial_number as pileSerialNumber,
         cp.power as power,
         cp.serial_number as serialNumber,
+        cp.max_voltage as maxVoltage,
         te.status as status,
         te.work_status as workStatus
         from xhpc_terminal as te
diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
index d4bdfcf7..0e1009ab 100644
--- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
+++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
 
-    <select id="selectXhpcChargingStationList" resultType="map">
+    <select id="selectXhpcChargingStationList" resultType="java.util.Map">
         select
             cs.charging_station_id as chargingStationId,
             cs.name as name,
@@ -156,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update xhpc_charging_station set del_flag =1 where charging_station_id = #{chargingStationId}
     </update>
 
-    <update id="updateXhpcChargingStationByIds" parameterType="String">
+    <update id="updateXhpcChargingStationByIds" parameterType="java.long.String">
         update  xhpc_charging_station set del_flag =1 where charging_station_id in
         <foreach item="chargingStationId" collection="array" open="(" separator="," close=")">
             #{chargingStationId}
@@ -171,11 +171,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update xhpc_charging_station set client_visible =#{clientVisible} where charging_station_id = #{chargingStationId} and del_flag =0
     </update>
 
-    <select id="stationInternetBlackList" resultType="map">
+    <select id="stationInternetBlackList" resultType="java.util.Map">
         select name from xhpc_internet_user where del_flag=0 and internet_user_id not in (select internet_user_id from xhpc_station_internet_blacklist where charging_station_id=#{chargingStationId})
     </select>
 
-    <select id="getXhpcChargingStationMessage" resultType="map">
+    <select id="getXhpcChargingStationMessage" resultType="java.util.Map">
         select
             ct.charging_station_id as chargingStationId,
             ct.name as name,
@@ -230,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY distance asc
     </select>
 
-    <select id="getCode" resultType="map">
+    <select id="getCode" resultType="java.util.Map">
         select code, dict_key, dict_value
         from xhpc_dict_biz
         where code = #{code} and parent_id > 0 and del_flag = 0
@@ -242,7 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="getWXXhpcChargingStationMessage" resultType="map">
+    <select id="getWXXhpcChargingStationMessage" resultType="java.util.Map">
         select
             charging_station_id as chargingStationId,
             (select type from xhpc_charging_pile where charging_station_id = charging_station_id and del_flag=0 and status=0) as type,
@@ -262,7 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where charging_station_id=#{chargingStationId} and del_flag=0 and status=0
     </select>
 
-    <select id="getImageList" resultType="map">
+    <select id="getImageList" resultType="java.util.Map">
         select
             img_id as imgId,
             url as url
@@ -275,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="getWXXhpcRateTimeMassage" resultType="map">
+    <select id="getWXXhpcRateTimeMassage" resultType="java.util.Map">
         select
             xrt.start_time as startTime,
             xrt.end_time as endTime,
@@ -288,7 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="getWXXhpcTerminalMassage" resultType="map">
+    <select id="getWXXhpcTerminalMassage" resultType="java.util.Map">
         select
             te.name as name,
             cp.power as power,
@@ -675,7 +675,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
     </insert>
 
-    <select id="getXhpcRateList" resultType="map">
+    <select id="getXhpcRateList" resultType="java.util.Map">
         select
             power_fee as powerFee,
             service_fee as serviceFee,
@@ -684,7 +684,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where charging_station_id=#{chargingStationId} and del_flag =0
     </select>
 
-    <select id="getXhpcRateTimeTypeList" resultType="map">
+    <select id="getXhpcRateTimeTypeList" resultType="java.util.Map">
         <if test="type ==1">
             select
             rt.start_time as startTime,
@@ -708,7 +708,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
-    <select id="getXhpcRateTimeOrderStatistics" resultType="map">
+    <select id="getXhpcRateTimeOrderStatistics" resultType="java.util.Map">
         select
             sum(charging_degree) as chargingDegreeSum,
             COUNT(real_time_order_id) as realTimeOrderIdCount,