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

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -30,6 +30,7 @@ import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand;
 import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand;
 import com.jsowell.netty.handler.HeartbeatRequestHandler;
 import com.jsowell.netty.service.yunkuaichong.YKCBusinessService;
+import com.jsowell.pile.dto.amap.GetStationInfoDTO;
 import com.jsowell.pile.service.YKCPushCommandService;
 import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.*;
@@ -169,6 +170,13 @@ public class SpringBootTestController {
 	@Autowired
 	private AMapService aMapService;
 
+
+	@Test
+	public void testBillingTemplate() {
+		pileBillingTemplateService.queryStationBillingTemplateListForUniApp("2");
+	}
+
+
 	@Test
 	public void testQueryAdapayMemberInfo() {
 		String adapayMemberId = "AM25703321";
@@ -256,8 +264,10 @@ public class SpringBootTestController {
 	@Test
 	public void testAMap() throws Exception {
 		String pileConnectorCode = "8800000000012601";
-		String s = aMapService.pushChargingDeviceDynamics(pileConnectorCode);
+		// String s = aMapService.pushChargingDeviceDynamics(pileConnectorCode);
-		System.out.println(s);
+		GetStationInfoDTO dto = new GetStationInfoDTO();
+		dto.setType("page");
+		aMapService.getStationInfos(dto);
 	}
 
 	@Test

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java

@@ -257,6 +257,11 @@ public class PileStationInfo extends BaseEntity {
 	 */
 	private String openFlag;
 
+	/**
+	 * 是否对接高德（0-否；1-是）
+	 */
+	private String aMapFlag;
+
 	/**
 	 * 是否靠近卫生间 (0-无；1-有)
 	 */

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

@@ -40,6 +40,7 @@
         <result property="supportOrder"    column="support_order"    />
         <result property="remark"    column="remark"    />
         <result property="publicFlag"    column="public_flag"    />
+        <result property="aMapFlag"    column="amap_flag"    />
         <result property="openFlag"    column="open_flag"    />
         <result property="toiletFlag"    column="toilet_flag"    />
         <result property="storeFlag"    column="store_flag"    />
@@ -60,8 +61,8 @@
         select id,merchant_id, station_name, dept_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number,
                country_code, area_code, address, station_tel, service_tel, station_type, station_status, station_admin_name, park_nums,
                station_lng, station_lat, site_guide, construction, pictures, match_cars, park_info, park_owner,
-               park_manager, open_all_day, business_hours, park_free, payment, support_order, remark, public_flag,
+               park_manager, open_all_day, business_hours, park_free, payment, support_order, remark, public_flag, amap_flag,
-               open_flag,toilet_flag, store_flag, restaurant_flag, lounge_flag, canopy_flag, printer_flag, barrier_flag,
+               open_flag, toilet_flag, store_flag, restaurant_flag, lounge_flag, canopy_flag, printer_flag, barrier_flag,
                parking_lock_flag, create_by, create_time, update_by, update_time, del_flag
         from pile_station_info
     </sql>
@@ -103,6 +104,7 @@
             <if test="payment != null  and payment != ''"> and payment = #{payment}</if>
             <if test="supportOrder != null  and supportOrder != ''"> and support_order = #{supportOrder}</if>
             <if test="publicFlag != null and publicFlag != ''"> and public_flag = #{publicFlag}</if>
+            <if test="aMapFlag != null and aMapFlag != ''"> and amap_flag = #{aMapFlag}</if>
             <if test="openFlag != null and openFlag != ''"> and open_flag = #{openFlag}</if>
             <if test="toiletFlag != null  and toiletFlag != ''"> and toilet_flag = #{toiletFlag}</if>
             <if test="storeFlag != null  and storeFlag != ''"> and store_flag = #{storeFlag}</if>
@@ -157,8 +159,9 @@
             <if test="payment != null">payment,</if>
             <if test="supportOrder != null">support_order,</if>
             <if test="remark != null">remark,</if>
-            <if test="publicFlag != null">publicFlag,</if>
+            <if test="publicFlag != null">public_flag,</if>
-            <if test="openFlag != null">openFlag,</if>
+            <if test="aMapFlag != null">amap_flag,</if>
+            <if test="openFlag != null">open_flag,</if>
             <if test="toiletFlag != null">toilet_flag,</if>
             <if test="storeFlag != null">store_flag,</if>
             <if test="restaurantFlag != null">restaurant_flag,</if>
@@ -209,6 +212,7 @@
             <if test="supportOrder != null">#{supportOrder},</if>
             <if test="remark != null">#{remark},</if>
             <if test="publicFlag != null">#{publicFlag},</if>
+            <if test="aMapFlag != null">#{aMapFlag},</if>
             <if test="openFlag != null">#{openFlag},</if>
             <if test="toiletFlag != null">#{toiletFlag},</if>
             <if test="storeFlag != null">#{storeFlag},</if>
@@ -263,6 +267,7 @@
             <if test="supportOrder != null">support_order = #{supportOrder},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="publicFlag != null">public_flag = #{publicFlag},</if>
+            <if test="aMapFlag != null">amap_flag = #{aMapFlag},</if>
             <if test="openFlag != null">open_flag = #{openFlag},</if>
             <if test="toiletFlag != null">toilet_flag = #{toiletFlag},</if>
             <if test="storeFlag != null">store_flag = #{storeFlag},</if>
@@ -371,7 +376,9 @@
 
     <select id="getStationInfoForLianLian" resultMap="PileStationInfoResult">
         <include refid="selectPileStationInfoVo"/>
-        where del_flag = '0' and public_flag = '1'
+        where del_flag = '0'
+            and public_flag = '1'
+            and amap_flag = '1'
     </select>
 
     <select id="queryByStationDeptIds" resultType="java.lang.String">