站点信息表新增对接高德的 运营商品牌 和 站点名称描述 字段

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

@@ -171,6 +171,18 @@ public class PileStationInfo extends BaseEntity {
 	@Excel(name = "站点引导,用于引导车主找到充电车位")
 	private String siteGuide;
 
+	/**
+	 * 充电站运营商品牌名称
+	 * (用于推送高德地图拼接POI)
+	 */
+	private String operatorName;
+
+	/**
+	 * 充电站名称描述
+	 * (用于推送高德地图拼接POI)
+	 */
+	private String aMapStationName;
+
 	/**
 	 * 建设场所(1：居民区
 	 * 2：公共机构

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

@@ -162,6 +162,12 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
 			if (StringUtils.isNotBlank(String.valueOf(pileStationInfo.getCapacity()))) {
 				vo.setCapacity(pileStationInfo.getCapacity());
 			}
+			if (StringUtils.isNotBlank(pileStationInfo.getOperatorName())) {
+				vo.setOperatorName(pileStationInfo.getOperatorName());
+			}
+			if (StringUtils.isNotBlank(pileStationInfo.getAMapStationName())) {
+				vo.setAMapStationName(pileStationInfo.getAMapStationName());
+			}
 			vo.setMerchantAdminName(pileStationInfo.getStationAdminName());
 			vo.setStationStatus(Integer.parseInt(pileStationInfo.getStationStatus()));
 			vo.setStationType(pileStationInfo.getStationType());

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

@@ -221,4 +221,16 @@ public class PileStationVO {
      */
     private BigDecimal capacity;
 
+    /**
+     * 充电站运营商品牌名称
+     * (用于推送高德地图拼接POI)
+     */
+    private String operatorName;
+
+    /**
+     * 充电站名称描述
+     * (用于推送高德地图拼接POI)
+     */
+    private String aMapStationName;
+
 }

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

@@ -29,6 +29,8 @@
         <result property="stationLng"    column="station_lng"    />
         <result property="stationLat"    column="station_lat"    />
         <result property="siteGuide"    column="site_guide"    />
+        <result property="operatorName"    column="operator_name"    />
+        <result property="aMapStationName"    column="amap_station_name"    />
         <result property="construction"    column="construction"    />
         <result property="pictures"    column="pictures"    />
         <result property="matchCars"    column="match_cars"    />
@@ -62,7 +64,7 @@
     <sql id="Base_Column_List">
         id,merchant_id, station_name, dept_id, parking_id, qrcode_prefix, alone_apply, account_number, capacity, public_parking, parking_number,
         park_fee_describe, 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,
+        station_lng, station_lat, site_guide, operator_name, amap_station_name, construction, pictures, match_cars, park_info, park_owner,
         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,
         parking_lock_flag, create_by, create_time, update_by, update_time, del_flag
@@ -98,6 +100,8 @@
             <if test="stationLng != null  and stationLng != ''"> and station_lng = #{stationLng}</if>
             <if test="stationLat != null  and stationLat != ''"> and station_lat = #{stationLat}</if>
             <if test="siteGuide != null  and siteGuide != ''"> and site_guide = #{siteGuide}</if>
+            <if test="operatorName != null  and operatorName != ''"> and operator_name = #{operatorName}</if>
+            <if test="aMapStationName != null  and aMapStationName != ''"> and amap_station_name = #{aMapStationName}</if>
             <if test="construction != null  and construction != ''"> and construction = #{construction}</if>
             <if test="pictures != null  and pictures != ''"> and pictures = #{pictures}</if>
             <if test="matchCars != null  and matchCars != ''"> and match_cars = #{matchCars}</if>
@@ -156,6 +160,8 @@
             <if test="stationLng != null">station_lng,</if>
             <if test="stationLat != null">station_lat,</if>
             <if test="siteGuide != null">site_guide,</if>
+            <if test="operatorName != null">operator_name,</if>
+            <if test="aMapStationName != null">amap_station_name,</if>
             <if test="construction != null">construction,</if>
             <if test="pictures != null">pictures,</if>
             <if test="matchCars != null">match_cars,</if>
@@ -210,6 +216,8 @@
             <if test="stationLng != null">#{stationLng},</if>
             <if test="stationLat != null">#{stationLat},</if>
             <if test="siteGuide != null">#{siteGuide},</if>
+            <if test="operatorName != null">#{operatorName},</if>
+            <if test="aMapStationName != null">#{aMapStationName},</if>
             <if test="construction != null">#{construction},</if>
             <if test="pictures != null">#{pictures},</if>
             <if test="matchCars != null">#{matchCars},</if>
@@ -267,6 +275,8 @@
             <if test="stationLng != null">station_lng = #{stationLng},</if>
             <if test="stationLat != null">station_lat = #{stationLat},</if>
             <if test="siteGuide != null">site_guide = #{siteGuide},</if>
+            <if test="operatorName != null">operator_name = #{operatorName},</if>
+            <if test="aMapStationName != null">amap_station_name = #{aMapStationName},</if>
             <if test="construction != null">construction = #{construction},</if>
             <if test="pictures != null">pictures = #{pictures},</if>
             <if test="matchCars != null">match_cars = #{matchCars},</if>

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java

@@ -161,7 +161,15 @@ public class AMapServiceImpl implements AMapService {
             aMapInfo.setOperatorID(Constants.OPERATORID_LIANLIAN);
             aMapInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN);
             aMapInfo.setOperatorName(Constants.JSOWELL);
+            if (StringUtils.isNotBlank(stationInfo.getOperatorName())) {
+                // 如果设置的运营商品牌不为空，就用所设置的运营商品牌
+                aMapInfo.setOperatorName(stationInfo.getOperatorName());
+            }
             aMapInfo.setStationName(stationInfo.getStationName());
+            if (StringUtils.isNotBlank(stationInfo.getAMapStationName())) {
+                // 如果设置的推送高德的站点名称描述不为空，就用站点名称描述
+                aMapInfo.setStationName(stationInfo.getAMapStationName());
+            }
             aMapInfo.setCountryCode(stationInfo.getCountryCode());
             if (StringUtils.isNotBlank(stationInfo.getParkFeeDescribe())) {
                 // 停车费率描述

jsowell-ui/src/views/pile/station/components/SiteInfo.vue

@@ -240,6 +240,22 @@
                         ></el-input>
                     </el-form-item>
                 </el-col>
+                <el-col :span="6">
+                    <el-form-item prop="operatorName" label="运营商品牌名称" label-width="130px">
+                        <el-input
+                            v-model="station.operatorName"
+                            required="true"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item prop="amapStationName" label="推送高德充电站名称描述" label-width="170px">
+                        <el-input
+                            v-model="station.amapStationName"
+                            required="true"
+                        ></el-input>
+                    </el-form-item>
+                </el-col>
             </el-row>
         </el-form>
         <el-button
@@ -281,6 +297,8 @@ export default {
                 parkFeeDescribe: "",
                 accountNumber: "",
                 capacity: "",
+                operatorName: "",
+                amapStationName: "",
                 selectMatchCars: [],
                 publicFlag: "",
                 openFlag: "",