update 高德

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java

@@ -2,12 +2,13 @@ package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.PileBasicInfo;
 import com.jsowell.pile.dto.IndexQueryDTO;
-import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;
-import com.jsowell.pile.vo.web.IndexGeneralSituationVO;
 import com.jsowell.pile.dto.QueryPileDTO;
 import com.jsowell.pile.dto.ReplaceMerchantStationDTO;
-import com.jsowell.pile.vo.web.PileDetailVO;
+import com.jsowell.pile.vo.base.PileInfoVO;
+import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;
 import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO;
+import com.jsowell.pile.vo.web.IndexGeneralSituationVO;
+import com.jsowell.pile.vo.web.PileDetailVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -150,4 +151,6 @@ public interface PileBasicInfoMapper {
 	 * @return
 	 */
 	List<PileBasicInfo> getPileListByStationId(@Param("stationId") String stationId);
+
+    List<PileInfoVO> queryPileDetailList(@Param("stationIdList") List<String> stationIdList);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java

@@ -162,4 +162,6 @@ public interface IPileBasicInfoService {
 	 * @return
 	 */
 	List<PileBasicInfo> getPileListByStationId(String stationId);
+
+    List<PileInfoVO> queryPileDetailList(List<String> stationIdList);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java

@@ -653,4 +653,9 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 		}
 		return pileList;
     }
+
+	@Override
+	public List<PileInfoVO> queryPileDetailList(List<String> stationIdList) {
+		return pileBasicInfoMapper.queryPileDetailList(stationIdList);
+	}
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java

@@ -54,4 +54,14 @@ public class PileInfoVO {
 	 * 设备名称
 	 */
 	private String modelName;
+
+	/**
+	 * 类型
+	 */
+	private String speedType;
+
+	/**
+	 * 枪口编号
+	 */
+	private String pileConnectorCode;
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileInfoVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class PileDetailVO {
+public class PileInfoVO {
 	/**
 	 * 站点id
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileInfoVO.java

@@ -1,17 +0,0 @@
-package com.jsowell.pile.vo.web;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class PileInfoVO {
-    private String pileSn;
-    private String stationId;
-    private String merchantId;
-    private String modelId;
-}

jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml

@@ -373,4 +373,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from pile_basic_info
         where station_id = #{stationId,jdbcType=VARCHAR}
     </select>
+
+    <select id="queryPileDetailList" resultType="com.jsowell.pile.vo.base.PileInfoVO">
+        SELECT
+            t1.id as pileId,
+            t1.sn AS pileSn,
+            t1.merchant_id as merchantId,
+            t1.station_id as stationId,
+            t2.model_name as modelName,
+            t2.rated_power as ratedPower,
+            t2.rated_current as ratedCurrent,
+            t2.rated_voltage as ratedVoltage,
+            t2.speed_type as speedType,
+            t3.pile_connector_code as pileConnectorCode
+        FROM
+            pile_basic_info t1
+            LEFT JOIN pile_model_info t2 on t1.model_id = t2.id
+            LEFT JOIN pile_connector_info t3 on t1.sn = t3.pile_sn
+        WHERE
+            t1.station_id in 
+            <foreach collection="stationIdList" item="item" open="(" separator="," close=")">
+                #{item,jdbcType=VARCHAR}
+            </foreach>
+    </select>
 </mapper>