车辆黑白名单中加入 车辆停车场ID

java110-bean/src/main/java/com/java110/dto/machine/CarBlackWhiteDto.java

@@ -23,6 +23,7 @@ public class CarBlackWhiteDto extends PageDto implements Serializable {
     private String communityId;
     private String bwId;
     private String paId;
+    private String paNum;
 
 
     private Date createTime;
@@ -110,4 +111,12 @@ public class CarBlackWhiteDto extends PageDto implements Serializable {
     public void setPaId(String paId) {
         this.paId = paId;
     }
+
+    public String getPaNum() {
+        return paNum;
+    }
+
+    public void setPaNum(String paNum) {
+        this.paNum = paNum;
+    }
 }

java110-bean/src/main/java/com/java110/dto/parking/ParkingAreaDto.java

@@ -18,6 +18,7 @@ public class ParkingAreaDto extends PageDto implements Serializable {
     private String typeCd;
     private String num;
     private String paId;
+    private String[] paIds;
     private String remark;
     private String communityId;
 
@@ -82,4 +83,12 @@ public class ParkingAreaDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getPaIds() {
+        return paIds;
+    }
+
+    public void setPaIds(String[] paIds) {
+        this.paIds = paIds;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/carBlackWhite/ApiCarBlackWhiteDataVo.java

@@ -11,6 +11,8 @@ public class ApiCarBlackWhiteDataVo implements Serializable {
     private String carNum;
     private String startTime;
     private String endTime;
+    private String paId;
+    private String paNum;
 
     public String getBwId() {
         return bwId;
@@ -59,4 +61,20 @@ public class ApiCarBlackWhiteDataVo implements Serializable {
     public void setBlackWhiteName(String blackWhiteName) {
         this.blackWhiteName = blackWhiteName;
     }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
+
+    public String getPaNum() {
+        return paNum;
+    }
+
+    public void setPaNum(String paNum) {
+        this.paNum = paNum;
+    }
 }

java110-db/src/main/resources/mapper/community/ParkingAreaServiceDaoImplMapper.xml

@@ -88,6 +88,12 @@
         <if test="paId !=null and paId != ''">
             and t.pa_id= #{paId}
         </if>
+        <if test="paIds !=null ">
+            and t.pa_id in
+            <foreach collection="paIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>
@@ -150,6 +156,12 @@
         <if test="paId !=null and paId != ''">
             and t.pa_id= #{paId}
         </if>
+        <if test="paIds !=null ">
+            and t.pa_id in
+            <foreach collection="paIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
         </if>

service-common/src/main/java/com/java110/common/smo/impl/CarBlackWhiteInnerServiceSMOImpl.java

@@ -3,15 +3,18 @@ package com.java110.common.smo.impl;
 
 import com.java110.common.dao.ICarBlackWhiteServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.intf.common.ICarBlackWhiteInnerServiceSMO;
-import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.machine.CarBlackWhiteDto;
+import com.java110.dto.parking.ParkingAreaDto;
+import com.java110.intf.common.ICarBlackWhiteInnerServiceSMO;
+import com.java110.intf.community.IParkingAreaInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,6 +34,9 @@ public class CarBlackWhiteInnerServiceSMOImpl extends BaseServiceSMO implements
     @Autowired
     private IUserInnerServiceSMO userInnerServiceSMOImpl;
 
+    @Autowired
+    private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
+
     @Override
     public List<CarBlackWhiteDto> queryCarBlackWhites(@RequestBody CarBlackWhiteDto carBlackWhiteDto) {
 
@@ -45,9 +51,38 @@ public class CarBlackWhiteInnerServiceSMOImpl extends BaseServiceSMO implements
         List<CarBlackWhiteDto> carBlackWhites = BeanConvertUtil.covertBeanList(carBlackWhiteServiceDaoImpl.getCarBlackWhiteInfo(BeanConvertUtil.beanCovertMap(carBlackWhiteDto)), CarBlackWhiteDto.class);
 
 
+        if (carBlackWhiteDto.getRow() > 15) {
+            return carBlackWhites;
+        }
+        freshCarBlackWhites(carBlackWhites);
         return carBlackWhites;
     }
 
+    private void freshCarBlackWhites(List<CarBlackWhiteDto> carBlackWhites) {
+        List<String> paIds = new ArrayList<>();
+        for (CarBlackWhiteDto carBlackWhiteDto : carBlackWhites) {
+            paIds.add(carBlackWhiteDto.getPaId());
+        }
+
+        if (paIds.size() < 1) {
+            return;
+        }
+
+        ParkingAreaDto parkingAreaDto = new ParkingAreaDto();
+        parkingAreaDto.setCommunityId(carBlackWhites.get(0).getCommunityId());
+        parkingAreaDto.setPaIds(paIds.toArray(new String[paIds.size()]));
+        List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
+
+        for (ParkingAreaDto tmpParkingAreaDto : parkingAreaDtos) {
+            for (CarBlackWhiteDto carBlackWhiteDto : carBlackWhites) {
+                if (tmpParkingAreaDto.getPaId().endsWith(carBlackWhiteDto.getPaId())) {
+                    carBlackWhiteDto.setPaNum(tmpParkingAreaDto.getNum());
+                }
+            }
+        }
+
+    }
+
 
     @Override
     public int queryCarBlackWhitesCount(@RequestBody CarBlackWhiteDto carBlackWhiteDto) {