ias\iaw解除车牌占用调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssVehicleRelieve.java

@@ -1,6 +1,6 @@
 package cn.com.taiji.core.entity.ass;
 
-import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
 import cn.com.taiji.core.entity.dict.basic.IdType;
 import lombok.Getter;
 import lombok.Setter;
@@ -19,7 +19,7 @@ import java.time.LocalDateTime;
 @Setter
 @Entity
 @Table(name = "ASS_VEHICLE_RELIEVE")
-public class AssVehicleRelieve extends AbstractStringPropertyUUIDEntity {
+public class AssVehicleRelieve extends StringPropertyUUIDEntity {
 
 	@Size(max = 32)
 	@Column(name = "ORDER_NO")

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/model/CallbackModel.java

@@ -82,4 +82,20 @@ public class CallbackModel extends BaseModel {
         return jsonReq;
     }
 
+    public static void main(String[] args) {
+        CallbackModel callbackModel = new CallbackModel();
+        callbackModel.setOrderNo("20250829155644520101889036717761");
+        callbackModel.setOrderStatus(0);
+        callbackModel.setOrderStep(4);
+        callbackModel.setPlateColor(1);
+        callbackModel.setPlateNum("贵KQT001");
+
+        SignJsonRequest jsonReq = callbackModel.getJsonReq("52188903",
+                "7276d8f84851aeaf3c46f8f78e404ec10d4e466b937482aeb2bb14b5cbe094e54fdfa776b00274b79dde6604d00c423f99bc5513a38723d8",
+                "TlRJeE9EZzVNRE5mTWpBeU5UQXhNVEV4TVRJek5UTT0=");
+
+        System.out.println(jsonReq.toJson(true));
+
+    }
+
 }

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

@@ -44,7 +44,7 @@ public class ReleasePlateManagerImpl extends AbstractIawManager implements Relea
     public RealsePlateResponseDTO apply(RealsePlateRequestDTO req) throws ManagerException {
         req.validate();
         RealsePlateResponseDTO responseDTO = new RealsePlateResponseDTO();
-        if (!req.getOwnerName().equals(req.getName()) && req.getOwnerIdType() == null){
+        if (!req.getVehicleOwnerName().equals(req.getName()) && req.getOwnerIdType() == null){
             responseDTO.setFlag(1);
             return responseDTO;
         }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/releasePlate/ReleasePlateApplyManager.java

@@ -112,19 +112,19 @@ public class ReleasePlateApplyManager extends AbstractAssManager<ReleasePlateApp
         //双系统查询ETC用户信息
         QtkCustomerInfo customerInfo = queryCustomerInfo(qtkVehicleInfo.getCustomerId());
         dataStream.put(CUSTOMER, customerInfo);
-        //占用用户和申请用户一致
-        String idnum = "";
-        if (req.getOwnerIdType() == null) {
-            idnum = req.getUserIdNum();
-        }else {
-            idnum = req.getOwnerIdNum();
-        }
-        if(idnum.equals(customerInfo.getCustomerIdNum())){
-            //校验卡
-            validCard(dataStream);
-            //校验签
-            validObu(dataStream);
-        }
+//        //占用用户和申请用户一致
+//        String idnum = "";
+//        if (req.getOwnerIdType() == null) {
+//            idnum = req.getUserIdNum();
+//        }else {
+//            idnum = req.getOwnerIdNum();
+//        }
+//        if(idnum.equals(customerInfo.getCustomerIdNum())){
+//            //校验卡
+//            validCard(dataStream);
+//            //校验签
+//            validObu(dataStream);
+//        }
     }
 
     private void validCard(Map<String, Object> dataStream) throws ServiceHandleException {

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/releasePlate/ReleasePlateViewManager.java

@@ -94,7 +94,7 @@ public class ReleasePlateViewManager extends AbstractAssManager<ReleasePlateView
             if (!idCardOcrResponse.getName().equals(assOrderinfo.getCustomerName())) {
                 taps.add("ocr姓名与身份证识别不一致");
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             taps.add("OCR识别结果异常，注意核对证件信息");
         }
         // todo 获取欠费信息