Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

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

@@ -78,6 +78,9 @@ public interface PileStationInfoMapper {
 	 */
 	List<PileStationInfo> getStationInfoForLianLian();
 
+
+	List<PileStationInfo> getStationInfoForAmap();
+
 	List<String> queryByStationDeptIds(@Param("stationDeptIds") List<String> stationDeptIds);
 
 	int updateAmapFlag(@Param("stationId") String stationId, @Param("amapFlag") String amapFlag);

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

@@ -94,6 +94,8 @@ public interface IPileStationInfoService {
 
 	List<PileStationInfo> getStationInfosByThirdParty();
 
+	List<PileStationInfo> getStationInfosByAmap();
+
 	List<String> queryByStationDeptIds(List<String> stationIds);
 
     String selectAdapayMemberId(String stationId);

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

@@ -190,6 +190,11 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 		return pileStationInfoMapper.getStationInfoForLianLian();
 	}
 
+	@Override
+	public List<PileStationInfo> getStationInfosByAmap() {
+		return pileStationInfoMapper.getStationInfoForAmap();
+	}
+
 	@Override
 	public List<String> queryByStationDeptIds(List<String> stationIds) {
 		return pileStationInfoMapper.queryByStationDeptIds(stationIds);

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

@@ -409,7 +409,6 @@
         <include refid="selectPileStationInfoVo"/>
         where del_flag = '0'
             and public_flag = '1'
-            and amap_flag = '1'
     </select>
 
     <select id="queryByStationDeptIds" resultType="java.lang.String">
@@ -470,4 +469,11 @@
             </foreach>
         </if>
     </select>
+
+    <select id="getStationInfoForAmap" resultMap="PileStationInfoResult">
+        <include refid="selectPileStationInfoVo"/>
+        where del_flag = '0'
+        and public_flag = '1'
+        and amap_flag = '1'
+    </select>
 </mapper>