diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java
index 949e4050f..dcaabe829 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java
+++ b/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：公共机构
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
index 527ef556e..75f8b149f 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
+++ b/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());
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
index 6c9c39afd..70741dc49 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
+++ b/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;
+
}
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
index 4c9aea98b..c163d55a0 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
@@ -29,6 +29,8 @@
+
+
@@ -62,7 +64,7 @@
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 @@
and station_lng = #{stationLng}
and station_lat = #{stationLat}
and site_guide = #{siteGuide}
+ and operator_name = #{operatorName}
+ and amap_station_name = #{aMapStationName}
and construction = #{construction}
and pictures = #{pictures}
and match_cars = #{matchCars}
@@ -156,6 +160,8 @@
station_lng,
station_lat,
site_guide,
+ operator_name,
+ amap_station_name,
construction,
pictures,
match_cars,
@@ -210,6 +216,8 @@
#{stationLng},
#{stationLat},
#{siteGuide},
+ #{operatorName},
+ #{aMapStationName},
#{construction},
#{pictures},
#{matchCars},
@@ -267,6 +275,8 @@
station_lng = #{stationLng},
station_lat = #{stationLat},
site_guide = #{siteGuide},
+ operator_name = #{operatorName},
+ amap_station_name = #{aMapStationName},
construction = #{construction},
pictures = #{pictures},
match_cars = #{matchCars},
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
index 3e67aba83..072e29009 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
+++ b/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())) {
// 停车费率描述
diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
index ddf1a7ab4..83f11642a 100644
--- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
+++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
@@ -240,6 +240,22 @@
>
+
+
+
+
+
+
+
+
+
+