增加查询多个停车场的区域信息接口；停车记录查询接口增加按区域查询条件

src/main/java/com/charging/chargingparking/mapper/mobile/ParkingSiteMapper.java

@@ -36,4 +36,6 @@ public interface ParkingSiteMapper {
 	List<ParkingAreaAPIPO> loadParkAreaInfo(String parkingId);
 	
 	List<Map<String, Object>> rptParkAllAreaSeat(@Param("parkingIds") String[] parkingIds);
+	
+	List<ParkingAreaAPIPO> loadMultiParkAreaInfo(@Param("parkingIds") String[] parkingIds);
 }

src/main/java/com/charging/chargingparking/modules/mobileController/ParkingLogController.java

@@ -83,6 +83,8 @@ public class ParkingLogController {
 	 * @param carNum
 	 * @param queryStart
 	 * @param queryEnd
+	 * @param outType
+	 * @param area
 	 * @param pageNum
 	 * @param pageSize
 	 * @return
@@ -90,6 +92,7 @@ public class ParkingLogController {
 	@RequestMapping("/query")
 	public RespVO  query(@NotBlank(message = "停车场编号不能为空") String parkId,String status,String carNum,
 			String queryStart,String queryEnd,String outType,
+			String area,
 			@RequestParam(value="pageNum",defaultValue="1") int pageNum,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize) {
 		
@@ -100,6 +103,7 @@ public class ParkingLogController {
 		Map<String,Object> searchParams=new HashMap<String,Object>();
 		searchParams.put("parkingIds", new String[] {parkId});
 		searchParams.put("status", "off".equals(status)?"1":"0");
+		searchParams.put("area",area);
 		
 		if(StringUtils.isNotBlank(carNum)) { //增加多个输入模糊查询的支持
 			String[] carNumAry=carNum.trim().toUpperCase().split("\\s+|[,，;；]+");

src/main/java/com/charging/chargingparking/modules/mobileController/ParkingSiteController.java

@@ -39,6 +39,16 @@ public class ParkingSiteController {
 	@Autowired
 	private ParkingChargeService  chargeService;
 	
+	/**
+	 * 查询多个停车场各区域信息
+	 * @param parkingId
+	 * @return
+	 */
+	@RequestMapping("/loadMultiAreaInfo")
+	public RespVO loadMultiParkAreaInfo(@NotBlank(message = "停车场编号不能为空") String parkingIds) {
+		String[] parkIds=StringUtils.split(parkingIds, ",");
+		return RespVOBuilder.ok(service.loadMultiParkAreaInfo(parkIds));
+	}
 	
 	/**
 	 * 查询停车场各区域信息

src/main/java/com/charging/chargingparking/modules/mobileservice/ParkingSiteService.java

@@ -108,4 +108,11 @@ public interface ParkingSiteService {
 	 * @return
 	 */
 	List<ParkingAreaAPIPO> loadParkAreaInfo(String parkingId);
+	
+	/**
+	   * 查询多停车场的区域信息
+	 * @param parkingIds
+	 * @return
+	 */
+	List<ParkingAreaAPIPO> loadMultiParkAreaInfo(String[] parkingIds);
 }

src/main/java/com/charging/chargingparking/modules/mobileservice/impl/ParkingSiteServiceImp.java

@@ -127,5 +127,11 @@ public class ParkingSiteServiceImp implements ParkingSiteService {
 	public List<ParkingAreaAPIPO> loadParkAreaInfo(String parkingId){
 		return mapper.loadParkAreaInfo(parkingId);
 	}
+	
+	
+	@Override
+	public List<ParkingAreaAPIPO> loadMultiParkAreaInfo(String[] parkingIds){
+		return mapper.loadMultiParkAreaInfo(parkingIds);
+	}
 
 }

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

@@ -55,6 +55,8 @@
     	mark_in,mark_time,out_type
 		from base_parking_record pr
 		left join base_parking_info pi on pr.park_id=pi.id and pi.del_flag=false
+		left join base_parking_channel pc on pr.in_channel_id=pc.id and pc.del_flag=false
+		left join base_parking_area pa on pc.area_=pa.area_ and pr.park_id=pa.park_id and pa.del_flag=false
 		where pr.del_flag=false
 		and pr.release_status=#{searchParams.status}
 		
@@ -76,6 +78,10 @@
 			</foreach>
 		</if>
 		
+		<if test="searchParams.area!=null and searchParams.area.trim().length()>0 ">
+			and pa.area_=#{searchParams.area}
+		</if>
+		
 		<choose>
 			<!-- 1:离场 -->
 			<when test='searchParams.status=="1"'>

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

@@ -155,5 +155,16 @@
     	select id,park_id,area_,area_name,total_parking_number,surplus_parking_number from base_parking_area where park_id=#{0} and del_flag=false
     </select>
     
+    <!-- 查询多停车场的区域信息 -->
+    <select id="loadMultiParkAreaInfo" resultType="com.charging.chargingparking.entity.ParkingAreaAPIPO">
+    	select id,park_id,area_,area_name,total_parking_number,surplus_parking_number
+    	from base_parking_area
+    	where del_flag=false
+    	and park_id in 
+		<foreach collection="parkingIds" item="id" index="index" open="(" close=")" separator=",">
+	           #{id}
+	    </foreach>
+	    order by area_
+    </select>
      
 </mapper>