会员管理，停车场管理增加区域、所属道闸

src/main/java/com/charging/chargingparking/entity/ParkingMemberAPIPO.java

@@ -53,6 +53,9 @@ public class ParkingMemberAPIPO {
 	    private Integer memberType;
 	    
 	    private String parkingName;
+	    
+	    //area为0表示大楼，1表示创客公寓
+	    private String area;  
 
 		public String getId() {
 			return id;
@@ -189,4 +192,12 @@ public class ParkingMemberAPIPO {
 		public void setParkingName(String parkingName) {
 			this.parkingName = parkingName;
 		}
+
+		public String getArea() {
+			return area;
+		}
+
+		public void setArea(String area) {
+			this.area = area;
+		}
 }

src/main/resources/mapper/api/ParkingMemberAPIMapper.xml

@@ -9,7 +9,7 @@
     	select pm.id,pi.parking_name, park_id,member_name,member_phone,member_car_num,
     	date_format(member_start_time,'%Y-%m-%d %H:%i:%s') start_time,
     	date_format(member_end_time,'%Y-%m-%d %H:%i:%s') end_time,
-    	member_type,cloud_del_flag,
+    	member_type,cloud_del_flag,pm.area_,
     	(select real_name from sys_user where id_=pm.create_by limit 1) operator
 		from base_parking_member pm
 		left join base_parking_info pi on pm.park_id=pi.id
@@ -40,7 +40,7 @@
     	select pm.id,pi.parking_name, park_id,member_name,member_phone,member_car_num,member_start_time,member_end_time,
     	<!-- date_format(member_start_time,'%Y-%m-%d %H:%i:%s') start_time,
     	date_format(member_end_time,'%Y-%m-%d %H:%i:%s') end_time, -->
-    	member_type,cloud_del_flag
+    	member_type,cloud_del_flag,area_ area
 		from base_parking_member pm
 		left join base_parking_info pi on pm.park_id=pi.id
 		where pm.del_flag=false and pi.del_flag=false  and pm.id=#{0}
@@ -54,12 +54,13 @@
     
     <update id="update" parameterType="com.charging.chargingparking.entity.ParkingMemberAPIPO">
     	update base_parking_member set member_name=#{memberName},member_phone=#{memberPhone},member_car_num=#{memberCarNum},
-    	member_start_time=#{memberStartTime},member_end_time=#{memberEndTime},park_id=#{parkId},update_time=sysdate(),update_by=#{updateBy}
+    	member_start_time=#{memberStartTime},member_end_time=#{memberEndTime},park_id=#{parkId},update_time=sysdate(),update_by=#{updateBy},
+    	area_=#{area}
     	where id=#{id}
     </update>
     
     <insert id="add" parameterType="com.charging.chargingparking.entity.ParkingMemberAPIPO">
-    	insert into base_parking_member(id,park_id,member_name,member_phone,member_car_num,member_start_time,member_end_time,create_time,create_by,del_flag,cloud_del_flag,member_type) 
-    	values(uuid(),#{parkId},#{memberName},#{memberPhone},#{memberCarNum},#{memberStartTime},#{memberEndTime},sysdate(),#{createBy},false,false,#{memberType})
+    	insert into base_parking_member(id,park_id,member_name,member_phone,member_car_num,member_start_time,member_end_time,create_time,create_by,del_flag,cloud_del_flag,member_type,area_) 
+    	values(uuid(),#{parkId},#{memberName},#{memberPhone},#{memberCarNum},#{memberStartTime},#{memberEndTime},sysdate(),#{createBy},false,false,#{memberType},#{area})
     </insert>
 </mapper>

src/main/resources/mapper/api/ParkingSiteMapper.xml

@@ -108,7 +108,7 @@
     
     <!-- 获取某个停车场的匝道设备情况 -->
     <select id="loadParkSitDevs" resultType="java.util.HashMap">
-    	select id,channel_code,channel_name,channel_type,channel_status
+    	select id,channel_code,channel_name,channel_type,channel_status,area_ area,channel_flag
 		from base_parking_channel
 		where del_flag=false and park_id=#{0}