update 后管新增站点基本设施配置

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();

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;
+
+
 	/**
 	 * 是否已收藏该站点
 	 */

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;
+
 }

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'

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

@@ -219,6 +219,143 @@
           </el-form-item>
         </el-col>
       </el-row>
+
+      <el-card style="margin-bottom: 10px">
+        <h2>站点基本设施配置</h2>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item
+              prop="supportOrder"
+              label="是否支持预约"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.supportOrder"
+                active-value="1"
+                inactive-value="0"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item
+              prop="toiletFlag"
+              label="是否靠近卫生间"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.toiletFlag"
+                active-value="1"
+                inactive-value="0"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item
+              prop="storeFlag"
+              label="是否靠近便利店"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.storeFlag"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item
+              prop="restaurantFlag"
+              label="是否靠近餐厅"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.restaurantFlag"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item
+              prop="loungeFlag"
+              label="是否靠近休息室"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.loungeFlag"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item
+              prop="canopyFlag"
+              label="是否有雨棚"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.canopyFlag"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item
+              prop="printerFlag"
+              label="是否有小票机"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.printerFlag"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item
+              prop="barrierFlag"
+              label="是否有道闸"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.barrierFlag"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item
+              prop="parkingLockFlag"
+              label="是否有地锁"
+              label-width="170px"
+            >
+              <el-switch
+                v-model="station.parkingLockFlag"
+                active-color="#13ce66"
+                inactive-color="#ff4949">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-card>
+
     </el-form>
     <el-button
       type="primary"
@@ -275,7 +412,16 @@ export default {
         businessHours: "",
         pictures: "",
         deptId: "",
-        aloneApply: "",
+        parkFree: "",
+        supportOrder: "",
+        toiletFlag: "",
+        storeFlag: "",
+        restaurantFlag: "",
+        loungeFlag: "",
+        canopyFlag: "",
+        printerFlag: "",
+        barrierFlag: "",
+        parkingLockFlag: "",
       },
       stationId: this.$route.params.id,
       publicFlagOptions: [

jsowell-ui/src/views/pile/station/detail.vue

@@ -57,16 +57,16 @@
         </el-card>
 
         <el-card style="margin-bottom: 10px">
-          <h2>互联互通配置</h2>
+            <h2>互联互通配置</h2>
-          <!--          <el-button icon="el-icon-edit" size="big" @click="openEdit" v-has-permi="['pile:station:edit']">编辑参数-->
+            <!--          <el-button icon="el-icon-edit" size="big" @click="openEdit" v-has-permi="['pile:station:edit']">编辑参数-->
-          <!--          </el-button>-->
+            <!--          </el-button>-->
-          <el-form
+            <el-form
-            ref="stationSettingForm"
+              ref="stationSettingForm"
-            :model="stationSettingInfo"
+              :model="stationSettingInfo"
-            label-position="right"
+              label-position="right"
-            label-width="200px"
+              label-width="200px"
-            style="margin-top: 10px"
+              style="margin-top: 10px"
-          >
+            >
             <el-row>
               <el-col :span="12">
                 <el-form-item label="对接平台名称:" prop="type">