1、签下黑调整

2、卡签续期调整

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkVehicleInfoRepo.java

@@ -67,11 +67,11 @@ public interface QtkVehicleInfoRepo extends AbstractJpaRepo<QtkVehicleInfo, Stri
 
     @Query(nativeQuery = true, value = "SELECT v.vehicle_id vehicleId,v.vehicle_plate vehiclePlate, v.vehicle_platecolor vehiclePlateColor," +
             "v.owner_name ownerName,v.owner_idtype ownerIdtype, v.owner_idnum ownerIdnum,type," +
-            "c.card_id cardId, c.card_status cardStatus, c.card_expiretime cardExpireTime," +
+            "c.card_id cardId,c.card_type cardType, c.card_status cardStatus, c.card_expiretime cardExpireTime," +
             "o.obu_id obuId, o.obu_status obuStatus, o.obu_expiretime obuExpireTime " +
             "FROM (select vehicle_id,vehicle_plate,vehicle_platecolor,owner_name,owner_idtype,owner_idnum,type from qtk_vehicleinfo where customer_id = ?1) v " +
             " INNER JOIN " +
-            "(select vehicle_id,card_id,card_status,card_expiretime from qtk_cardinfo where card_status = 'ZC') c " +
+            "(select vehicle_id,card_id,card_type,card_status,card_expiretime from qtk_cardinfo where card_status = 'ZC') c " +
             " on v.vehicle_id = c.vehicle_id " +
             " INNER JOIN " +
             "(select vehicle_id,obu_id,obu_status,obu_expiretime from qtk_obuinfo where obu_status = 'ZC') o " +

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/ass/DeviceRenewalManagerImpl.java

@@ -348,6 +348,7 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
                             (String) map.get("ownerIdnum"),
                             (map.get("type") != null) ? ((BigDecimal) map.get("type")).intValue() : null,
                             (String) map.get("cardId"),
+                            (map.get("cardType") != null) ? ((BigDecimal) map.get("cardType")).intValue() : null,
                             (String) map.get("cardStatus"),
                             (map.get("cardExpireTime") != null) ? ((Timestamp) map.get("cardExpireTime")).toLocalDateTime() : null,
                             (String) map.get("obuId"),

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/model/RenewalQueryModel.java

@@ -18,24 +18,39 @@ import java.time.LocalDateTime;
 @Setter
 public class RenewalQueryModel extends BaseModel {
 
+    /** 车辆id */
     private String vehicleId;
+    /** 车牌 */
     private String vehiclePlate;
+    /** 车牌颜色 */
     private Integer vehiclePlateColor;
+    /** 用户名称 */
     private String ownerName;
+    /** 用户证件类型 */
     private IdType ownerIdtype;
+    /** 用户证件号 */
     private String ownerIdnum;
+    /** 车辆类型 */
     private Integer type;
+    /** 卡号 */
     private String cardId;
+    /** 卡类型 */
+    private Integer cardType;
+    /** 卡状态 */
     private String cardStatus;
+    /** 卡过期时间 */
     private LocalDateTime cardExpireTime;
+    /** 签号 */
     private String obuId;
+    /** 签状态 */
     private String obuStatus;
+    /** 签过期时间 */
     private LocalDateTime obuExpireTime;
 
     public RenewalQueryModel(String vehicleId, String vehiclePlate,
                              Integer vehiclePlateColor, String ownerName,
                              IdType ownerIdtype, String ownerIdnum,
-                             Integer type, String cardId,
+                             Integer type, String cardId, Integer cardType,
                              String cardStatus, LocalDateTime cardExpireTime,
                              String obuId, String obuStatus,
                              LocalDateTime obuExpireTime) {
@@ -47,6 +62,7 @@ public class RenewalQueryModel extends BaseModel {
         this.ownerIdnum = ownerIdnum;
         this.type = type;
         this.cardId = cardId;
+        this.cardType = cardType;
         this.cardStatus = cardStatus;
         this.cardExpireTime = cardExpireTime;
         this.obuId = obuId;

zhywpt-service-bls/src/main/java/cn/com/taiji/bls/manager/blk/BlackObuInManager.java

@@ -188,6 +188,7 @@ public class BlackObuInManager extends AbstractCommManager implements LogManager
             int indexOf5 = json.indexOf("白名单生效时间比黑名单生效时间早");
             int indexOf6 = json.indexOf("贵州已上传超过5000条");
             int indexOf7 = json.indexOf("解除黑名单类型不存在");
+            int indexOf8 = json.indexOf("数据重复上传");
             if (indexOf1 > -1) {
                 response.setUploadStatus(2);
                 return response;
@@ -209,6 +210,9 @@ public class BlackObuInManager extends AbstractCommManager implements LogManager
             } else if (indexOf7 > -1) {
                 response.setUploadStatus(2);
                 return response;
+            } else if (indexOf8 > -1) {
+                response.setUploadStatus(2);
+                return response;
             } else {
                 response.setUploadStatus(0);
             }