车辆黑名单加入停车场信息

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

@@ -22,6 +22,7 @@ public class CarBlackWhiteDto extends PageDto implements Serializable {
     private String endTime;
     private String communityId;
     private String bwId;
+    private String paId;
 
 
     private Date createTime;
@@ -101,4 +102,12 @@ public class CarBlackWhiteDto extends PageDto implements Serializable {
     public void setBlackWhiteName(String blackWhiteName) {
         this.blackWhiteName = blackWhiteName;
     }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
 }

java110-bean/src/main/java/com/java110/po/car/CarBlackWhitePo.java

@@ -18,6 +18,7 @@ public class CarBlackWhitePo implements Serializable {
     private String carNum;
     private String startTime;
     private String endTime;
+    private String paId;
 
 
     public String getBwId() {
@@ -67,4 +68,12 @@ public class CarBlackWhitePo implements Serializable {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
 }

java110-db/src/main/resources/mapper/common/CarBlackWhiteServiceDaoImplMapper.xml

@@ -7,9 +7,9 @@
     <!-- 保存黑白名单信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessCarBlackWhiteInfo" parameterType="Map">
         insert into business_car_black_white(
-        black_white,operate,car_num,start_time,end_time,community_id,b_id,bw_id
+        black_white,operate,car_num,start_time,end_time,community_id,b_id,bw_id,pa_id
         ) values (
-        #{blackWhite},#{operate},#{carNum},#{startTime},#{endTime},#{communityId},#{bId},#{bwId}
+        #{blackWhite},#{operate},#{carNum},#{startTime},#{endTime},#{communityId},#{bId},#{bwId},#{paId}
         )
     </insert>
 
@@ -18,7 +18,7 @@
     <select id="getBusinessCarBlackWhiteInfo" parameterType="Map" resultType="Map">
         select t.black_white,t.black_white blackWhite,t.operate,t.car_num,t.car_num carNum,t.start_time,t.start_time
         startTime,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.b_id,t.b_id
-        bId,t.bw_id,t.bw_id bwId
+        bId,t.bw_id,t.bw_id bwId,t.pa_id,t.pa_id paId
         from business_car_black_white t
         where 1 =1
         <if test="blackWhite !=null and blackWhite != ''">
@@ -39,6 +39,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
@@ -52,8 +55,9 @@
     <!-- 保存黑白名单信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveCarBlackWhiteInfoInstance" parameterType="Map">
         insert into car_black_white(
-        black_white,car_num,start_time,status_cd,end_time,community_id,b_id,bw_id
-        ) select t.black_white,t.car_num,t.start_time,'0',t.end_time,t.community_id,t.b_id,t.bw_id from
+        black_white,car_num,start_time,status_cd,end_time,community_id,b_id,bw_id,pa_id
+        ) select t.black_white,t.car_num,t.start_time,'0',t.end_time,t.community_id,t.b_id,t.bw_id,t.pa_id
+        from
         business_car_black_white t where 1=1
         <if test="blackWhite !=null and blackWhite != ''">
             and t.black_white= #{blackWhite}
@@ -85,7 +89,7 @@
     <select id="getCarBlackWhiteInfo" parameterType="Map" resultType="Map">
         select t.black_white,t.black_white blackWhite,t.car_num,t.car_num carNum,t.start_time,t.start_time
         startTime,t.status_cd,t.status_cd statusCd,t.end_time,t.end_time endTime,t.community_id,t.community_id
-        communityId,t.b_id,t.b_id bId,t.bw_id,t.bw_id bwId,td1.name blackWhiteName
+        communityId,t.b_id,t.b_id bId,t.bw_id,t.bw_id bwId,td1.name blackWhiteName,t.pa_id,t.pa_id paId
         from car_black_white t,t_dict td1
         where 1 =1
         and t.black_white = td1.status_cd
@@ -115,6 +119,9 @@
         <if test="bwId !=null and bwId != ''">
             and t.bw_id= #{bwId}
         </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -180,6 +187,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>

service-common/src/main/java/com/java110/common/listener/carBlackWhite/AbstractCarBlackWhiteBusinessServiceDataFlowListener.java

@@ -44,6 +44,7 @@ public abstract class AbstractCarBlackWhiteBusinessServiceDataFlowListener exten
         businessCarBlackWhiteInfo.put("endTime", businessCarBlackWhiteInfo.get("end_time"));
         businessCarBlackWhiteInfo.put("communityId", businessCarBlackWhiteInfo.get("community_id"));
         businessCarBlackWhiteInfo.put("bwId", businessCarBlackWhiteInfo.get("bw_id"));
+        businessCarBlackWhiteInfo.put("paId", businessCarBlackWhiteInfo.get("pa_id"));
         businessCarBlackWhiteInfo.remove("bId");
         businessCarBlackWhiteInfo.put("statusCd", statusCd);
     }
@@ -75,6 +76,7 @@ public abstract class AbstractCarBlackWhiteBusinessServiceDataFlowListener exten
         currentCarBlackWhiteInfo.put("endTime", currentCarBlackWhiteInfo.get("end_time"));
         currentCarBlackWhiteInfo.put("communityId", currentCarBlackWhiteInfo.get("community_id"));
         currentCarBlackWhiteInfo.put("bwId", currentCarBlackWhiteInfo.get("bw_id"));
+        currentCarBlackWhiteInfo.put("paId", currentCarBlackWhiteInfo.get("pa_id"));
 
 
         currentCarBlackWhiteInfo.put("operate", StatusConstant.OPERATE_DEL);