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 7acc7d948..242cf3af2 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
@@ -217,6 +217,17 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
vo.setPictures(pileStationInfo.getPictures());
vo.setPictureList(Lists.newArrayList(pileStationInfo.getPictures().split(",")));
}
+ // 站点基础设施
+ vo.setParkFree(pileStationInfo.getParkFree());
+ vo.setSupportOrder(pileStationInfo.getSupportOrder());
+ vo.setToiletFlag(pileStationInfo.getToiletFlag());
+ vo.setStoreFlag(pileStationInfo.getStoreFlag());
+ vo.setRestaurantFlag(pileStationInfo.getRestaurantFlag());
+ vo.setLoungeFlag(pileStationInfo.getLoungeFlag());
+ vo.setCanopyFlag(pileStationInfo.getCanopyFlag());
+ vo.setPrinterFlag(pileStationInfo.getPrinterFlag());
+ vo.setBarrierFlag(pileStationInfo.getBarrierFlag());
+ vo.setParkingLockFlag(pileStationInfo.getParkingLockFlag());
}
return vo;
}
@@ -729,6 +740,18 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
stationVO.setVipServicePrice(currentTimePriceDetails.getVipServicePrice());
stationVO.setVipTotalPrice(currentTimePriceDetails.getVipTotalPrice());
}
+ // 站点基础设施
+ stationVO.setParkFree(pileStationVO.getParkFree());
+ stationVO.setSupportOrder(pileStationVO.getSupportOrder());
+ stationVO.setToiletFlag(pileStationVO.getToiletFlag());
+ stationVO.setStoreFlag(pileStationVO.getStoreFlag());
+ stationVO.setRestaurantFlag(pileStationVO.getRestaurantFlag());
+ stationVO.setLoungeFlag(pileStationVO.getLoungeFlag());
+ stationVO.setCanopyFlag(pileStationVO.getCanopyFlag());
+ stationVO.setPrinterFlag(pileStationVO.getPrinterFlag());
+ stationVO.setBarrierFlag(pileStationVO.getBarrierFlag());
+ stationVO.setParkingLockFlag(pileStationVO.getParkingLockFlag());
+
stationVOList.add(stationVO);
}
String sortType = dto.getSortType();
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java
index a110a34f4..6a5d2fb99 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/StationInfoVO.java
@@ -128,6 +128,57 @@ public class StationInfoVO {
*/
private String stationLat;
+ /**
+ * 是否停车免费
+ */
+ private String parkFree;
+
+ /**
+ * 是否支持预约
+ */
+ private String supportOrder;
+
+ /**
+ * 是否靠近卫生间
+ */
+ private String toiletFlag;
+
+ /**
+ * 是否靠近便利店
+ */
+ private String storeFlag;
+
+ /**
+ * 是否靠近餐厅
+ */
+ private String restaurantFlag;
+
+ /**
+ * 是否靠近休息室
+ */
+ private String loungeFlag;
+
+ /**
+ * 是否有雨棚
+ */
+ private String canopyFlag;
+
+ /**
+ * 是否有小票机
+ */
+ private String printerFlag;
+
+ /**
+ * 是否有道闸
+ */
+ private String barrierFlag;
+
+ /**
+ * 是否有地锁
+ */
+ private String parkingLockFlag;
+
+
/**
* 是否已收藏该站点
*/
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 3e7bc64f3..b127602b5 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
@@ -238,4 +238,54 @@ public class PileStationVO {
*/
private String aMapStationName;
+ /**
+ * 是否停车免费
+ */
+ private String parkFree;
+
+ /**
+ * 是否支持预约
+ */
+ private String supportOrder;
+
+ /**
+ * 是否靠近卫生间
+ */
+ private String toiletFlag;
+
+ /**
+ * 是否靠近便利店
+ */
+ private String storeFlag;
+
+ /**
+ * 是否靠近餐厅
+ */
+ private String restaurantFlag;
+
+ /**
+ * 是否靠近休息室
+ */
+ private String loungeFlag;
+
+ /**
+ * 是否有雨棚
+ */
+ private String canopyFlag;
+
+ /**
+ * 是否有小票机
+ */
+ private String printerFlag;
+
+ /**
+ * 是否有道闸
+ */
+ private String barrierFlag;
+
+ /**
+ * 是否有地锁
+ */
+ private String parkingLockFlag;
+
}
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
index 7f75b48a9..9dec0e37c 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
@@ -342,7 +342,17 @@
t3.organization_code as organizationCode,
t1.public_flag as publicFlag,
t1.amap_flag as aMapFlag,
- t1.open_flag as openFlag
+ t1.open_flag as openFlag,
+ t1.park_free as parkFree,
+ t1.support_order as supportOrder,
+ t1.toilet_flag as toiletFlag,
+ t1.store_flag as storeFlag,
+ t1.restaurant_flag as restaurantFlag,
+ t1.lounge_flag as loungeFlag,
+ t1.canopy_flag as canopyFlag,
+ t1.printer_flag as printerFlag,
+ t1.barrier_flag as barrierFlag,
+ t1.parking_lock_flag as parkingLockFlag
FROM
pile_station_info t1
left JOIN pile_basic_info t2 ON t1.id = t2.station_id and t2.del_flag = '0'
diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
index 075f55661..b348aaa8b 100644
--- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
+++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
@@ -219,6 +219,143 @@
+
+
+ 站点基本设施配置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 互联互通配置
-
-
-
+ 互联互通配置
+
+
+