卡签下黑反白调整

续期调整

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

@@ -61,4 +61,14 @@ public interface QtkVehicleInfoRepo extends AbstractJpaRepo<QtkVehicleInfo, Stri
             "and c.card_status = 'ZC' and o.obu_status = 'ZC' " +
             "order by c.card_expiretime,o.obu_expiretime desc")
     List<RenewalQueryModel> queryByVehicleIdAndCustomerId(String vehicleId, String customerId);
+
+    @Query(nativeQuery = true, value = "SELECT v.vehicle_plate vehiclePlate, v.vehicle_platecolor vehiclePlateColor, " +
+            "c.card_id cardId, c.card_status cardStatus, c.card_expiretime cardExpireTime, " +
+            "o.obu_id obuId, o.obu_status obuStatus, o.obu_expiretime obuExpireTime " +
+            "FROM qtk_vehicleinfo v, qtk_cardinfo c, qtk_obuinfo o " +
+            "WHERE v.vehicle_id = c.vehicle_id and v.vehicle_id = o.vehicle_id " +
+            "and v.customer_id = ?2 " +
+            "and c.card_status = 'ZC' and o.obu_status = 'ZC' " +
+            "order by c.card_expiretime,o.obu_expiretime desc")
+    List<RenewalQueryModel> queryByCustomerId(String customerId);
 }

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

@@ -75,7 +75,12 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
             if (StringUtils.isEmpty(dto.getCustomerId())){
                 throw new ManagerException("卡签延期，用户id必填！");
             }
-            modelList = vehicleInfoRepo.queryByVehicleIdAndCustomerId(dto.getVehicleId(), dto.getCustomerId());
+            if(StringUtils.isEmpty(dto.getVehicleId())){
+                modelList = vehicleInfoRepo.queryByCustomerId(dto.getCustomerId());
+            }else {
+                modelList = vehicleInfoRepo.queryByVehicleIdAndCustomerId(dto.getVehicleId(), dto.getCustomerId());
+            }
+
         }
         if(CollectionTools.isEmpty(modelList)){
             throw new ManagerException("未查询到车辆信息！");
@@ -164,7 +169,8 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
                 YgzCardUploadResponse uploadResponse = jsonPostRepeat(uploadRequest);
                 //todo response返回处理需超哥那边先调整
             } catch (ManagerException e) {
-                throw new RuntimeException(e);
+                logger.error("同步数据到部中心异常，"+e.getMessage());
+                throw new ManagerException("同步数据到部中心异常，"+e.getMessage());
             }
 
         }else if (AssOrderType.OBU_RENEWAL.equals(orderinfo.getOrderType())){
@@ -177,7 +183,8 @@ public class DeviceRenewalManagerImpl extends AbstractIawManager implements Devi
                 YgzObuUploadResponse uploadResponse = jsonPostRepeat(uploadRequest);
                 //todo response返回处理需超哥那边先调整
             } catch (ManagerException e) {
-                throw new RuntimeException(e);
+                logger.error("同步数据到部中心异常，"+e.getMessage());
+                throw new ManagerException("同步数据到部中心异常，"+e.getMessage());
             }
 
         }else {

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/bls/BlackCardImportErrorModel.java

@@ -1,9 +1,5 @@
 package cn.com.taiji.managew.model.bls;
 
-import cn.com.taiji.core.entity.dict.basic.CardType;
-import cn.com.taiji.core.entity.dict.basic.DeviceVersion;
-import cn.com.taiji.core.entity.dict.invw.InvDeviceStatus;
-import cn.com.taiji.core.manager.tools.easyExcel.EasyExcelEnumConverter;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.*;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/bls/BlackObuImportErrorModel.java

@@ -21,7 +21,7 @@ import lombok.Setter;
 @ExcelIgnoreUnannotated
 @Getter
 @Setter
-public class BlackObuImportErrorModel extends BlackObuImportModel{
+public class BlackObuImportErrorModel{
 
     @ColumnWidth(10)
     @ExcelProperty(index = 0, value = "状态（1-下黑，2-反白）")