Merge remote-tracking branch 'origin/master'

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));
+
+    }
+
 }

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

@@ -28,7 +28,7 @@ public class WxMpSendMessageRequest extends AbstractAtsRequest<WxMpSendMessageRe
     public WxMpSendMessageRequest() {
         super(WeiXinServiceCmd.MPSENDMESSAGE);
     }
-    private String clientId;
+    private String clientId = "bfc4040bda90473d8ceab246555361a3";;
 
     private LocalDateTime sendTime;
     private String title;

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/ass/AssOrderinfoPageRequest.java

@@ -3,13 +3,11 @@ package cn.com.taiji.core.repo.request.ass;
 import cn.com.taiji.common.pub.dao.HqlBuilder;
 import cn.com.taiji.common.repo.request.jpa.JpaDateTimePageableDataRequest;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
+import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.validation.constraints.Size;
-
 /**
  * @Auther: humh
  * @Description:
@@ -30,6 +28,9 @@ public class AssOrderinfoPageRequest extends JpaDateTimePageableDataRequest<AssO
     private String customerTel;//客户手机号
 
     private String customerName;//客户名称
+    private AuditStatus auditStatus;// 订单审核状态
+    private String customerId;
+    private String customerIdNum;//客户证件号
 
     public AssOrderinfoPageRequest() {
         this.orderBy="updateTime";
@@ -43,7 +44,10 @@ public class AssOrderinfoPageRequest extends JpaDateTimePageableDataRequest<AssO
         hql.append(" and agencyId = :agencyId", agencyId);
         hql.append(" and orderType = :orderType", orderType);
         hql.append(" and customerTel = :customerTel", customerTel);
-        hql.append(" and customerName like :customerName", like(customerName));
+        hql.append(" and customerName = :customerName", customerName);
+        hql.append(" and auditStatus = :auditStatus", auditStatus);
+        hql.append(" and customerId = :customerId", customerId);
+        hql.append(" and customerIdNum = :customerIdNum", customerIdNum);
         return hql;
     }
 }

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-app-managew/src/main/java/cn/com/taiji/managew/api/ass/AssDeviceLossController.java

@@ -4,10 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.managew.api.MyValidController;
-import cn.com.taiji.managew.dto.ass.AssBaseInfoQueryRequestDTO;
-import cn.com.taiji.managew.dto.ass.AssBaseInfoQueryResponseDTO;
-import cn.com.taiji.managew.dto.ass.AssDeviceLossPageReqDTO;
-import cn.com.taiji.managew.dto.ass.AssDeviceLossReqDTO;
+import cn.com.taiji.managew.dto.ass.*;
 import cn.com.taiji.managew.manager.ass.AssDeviceLossManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,4 +42,10 @@ public class AssDeviceLossController extends MyValidController {
     public ApiResponse<AssBaseInfoQueryResponseDTO> query(@Valid @RequestBody AssBaseInfoQueryRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.query(dto));
     }
+
+    @ApiOperation("04-详情")
+    @PostMapping("/detail")
+    public ApiResponse<AssDeviceLossDetailsResDTO> detail(@Valid @RequestBody AssDeviceLossDetailsReqDTO dto) throws ManagerException {
+        return ApiResponse.of(manager.detail(dto));
+    }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/AssDeviceLossDetailsReqDTO.java

@@ -0,0 +1,15 @@
+package cn.com.taiji.managew.dto.ass;
+
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@ApiModel(description = "卡签挂失解挂详情")
+@Getter
+@Setter
+public class AssDeviceLossDetailsReqDTO extends AbstractStaffBizRequestDTO{
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/AssDeviceLossDetailsResDTO.java

@@ -0,0 +1,15 @@
+package cn.com.taiji.managew.dto.ass;
+
+import cn.com.taiji.managew.model.ass.AssDeviceLossModel;
+import cn.com.taiji.managew.model.ass.AssOrderInfoModel;
+import io.swagger.annotations.ApiModel;
+import lombok.Getter;
+import lombok.Setter;
+
+@ApiModel(description = "卡签挂失解挂详情响应")
+@Getter
+@Setter
+public class AssDeviceLossDetailsResDTO {
+    private AssOrderInfoModel orderInfo;
+    private AssDeviceLossModel lossInfo;
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/AssOrderinfoPageRequestDTO.java

@@ -1,15 +1,13 @@
 package cn.com.taiji.managew.dto.ass;
 
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
+import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.Column;
-import javax.validation.constraints.Size;
-
 /**
  * @Auther: humh
  * @Description:
@@ -34,6 +32,11 @@ public class AssOrderinfoPageRequestDTO extends AbstractStaffBizPageRequestDTO {
     @ApiModelProperty(value = "客户名称")
     private String customerName;
 
+    @ApiModelProperty(value = "客户ID")
+    private String customerId;
+
+    @ApiModelProperty(value = "审核状态")
+    private AuditStatus auditStatus;// 订单审核状态
 
 
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssDeviceLossManager.java

@@ -2,10 +2,7 @@ package cn.com.taiji.managew.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
-import cn.com.taiji.managew.dto.ass.AssBaseInfoQueryRequestDTO;
-import cn.com.taiji.managew.dto.ass.AssBaseInfoQueryResponseDTO;
-import cn.com.taiji.managew.dto.ass.AssDeviceLossPageReqDTO;
-import cn.com.taiji.managew.dto.ass.AssDeviceLossReqDTO;
+import cn.com.taiji.managew.dto.ass.*;
 
 public interface AssDeviceLossManager {
     void loss(AssDeviceLossReqDTO reqDto) throws ManagerException;
@@ -13,4 +10,6 @@ public interface AssDeviceLossManager {
     Pagination lossPage(AssDeviceLossPageReqDTO reqDto) throws ManagerException;
 
     AssBaseInfoQueryResponseDTO query(AssBaseInfoQueryRequestDTO dto) throws ManagerException;
+
+    AssDeviceLossDetailsResDTO detail(AssDeviceLossDetailsReqDTO dto) throws ManagerException;
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssDeviceLossManagerImpl.java

@@ -24,6 +24,8 @@ import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.managew.dto.ass.*;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
+import cn.com.taiji.managew.model.ass.AssDeviceLossModel;
+import cn.com.taiji.managew.model.ass.AssOrderInfoModel;
 import cn.com.taiji.managew.repo.jpa.request.ass.AssOrderInfoPageRequest;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.beans.BeanUtils;
@@ -240,4 +242,35 @@ public class AssDeviceLossManagerImpl extends AbstractManagewManager implements
         }
         return response;
     }
+
+    @Override
+    public AssDeviceLossDetailsResDTO detail(AssDeviceLossDetailsReqDTO dto) throws ManagerException {
+        AssOrderinfo assOrder = orderInfoRepo.findByOrderNo(dto.getOrderNo());
+        if(assOrder == null){
+            throw new ManagerException("此订单不存在");
+        }
+        AssDeviceLoss deviceLossOrder = deviceLossRepo.findByOrderNo(dto.getOrderNo());
+        if(deviceLossOrder == null){
+            throw new ManagerException("挂失解挂信息不存在");
+        }
+        AssDeviceLossDetailsResDTO response = new AssDeviceLossDetailsResDTO();
+        AssOrderInfoModel orderInfo = copyProperties(assOrder, new AssOrderInfoModel());
+        AssDeviceLossModel lossInfo = copyProperties(deviceLossOrder, new AssDeviceLossModel());
+        if(hasText(orderInfo.getVehicleId())) {
+            String[] split = orderInfo.getVehicleId().split("_");
+            if (split.length > 1) {
+                orderInfo.setVehiclePlate(split[0]);
+                orderInfo.setVehiclePlateColor(split[1]);
+            }
+            QtkVehicleInfo vehicleInfo = vehicleInfoRepo.findByVehicleId(orderInfo.getVehicleId());
+            if (vehicleInfo != null) {
+                lossInfo.setVehicleType(vehicleInfo.getVehicleType());
+            }
+        }
+        lossInfo.setAgencyId(orderInfo.getAgencyId());
+        lossInfo.setApplyTime(orderInfo.getApplyTime());
+        response.setOrderInfo(orderInfo);
+        response.setLossInfo(lossInfo);
+        return response;
+    }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManagerImpl.java

@@ -1,17 +1,15 @@
 package cn.com.taiji.managew.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.ass.AssOrderinfoPageRequest;
-import cn.com.taiji.managew.dto.ass.AssCustomerInfoChangePageResDTO;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
-import cn.com.taiji.managew.model.MyFinals;
+import cn.com.taiji.managew.model.ass.AssOrderInfoModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -41,15 +39,12 @@ public class AssOrderinfoManagerImpl extends AbstractManagewManager implements A
         if (isManager(findOpenIdByToken(dto.getAccessToken()), findAgencyIdByToken(dto.getAccessToken()))){
             pageRequest.setAgencyId(null);
         }
-        pageRequest.setAgencyId(findAgencyIdByToken(dto.getAccessToken()));
         return repo.page(pageRequest).convertResult(this::toModel);
     }
 
-    private AssCustomerInfoChangePageResDTO toModel(AssOrderinfo orderInfo) {
-        AssCustomerInfoChangePageResDTO model = new AssCustomerInfoChangePageResDTO();
+    private AssOrderInfoModel toModel(AssOrderinfo orderInfo) {
+        AssOrderInfoModel model = new AssOrderInfoModel();
         copyProperties(orderInfo, model);
-        //处理业务类型
-        model.setOrderType(orderInfo.getOrderType().getDesc());
         //处理审核人
         String openId = orderInfo.getAuditOpenId();
         if(hasText(openId)){

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/ass/AssDeviceLossModel.java

@@ -0,0 +1,40 @@
+package cn.com.taiji.managew.model.ass;
+
+import cn.com.taiji.core.entity.dict.ass.AssDeviceLossType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel(description = "挂失解挂信息")
+public class AssDeviceLossModel {
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;//订单编号
+    @ApiModelProperty(value = "业务类型")
+    private AssDeviceLossType lossType;// 挂失解挂类型
+    @ApiModelProperty(value = "客户编号")
+    private String customerId;//客户编号
+    @ApiModelProperty(value = "车辆编号")
+    private String vehicleId;//车辆ID;
+    @ApiModelProperty(value = "卡编号")
+    private String cardId;//卡编号
+    @ApiModelProperty(value = "OBU编号")
+    private String obuId;//OBU编号
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime insertTime;//创建时间
+    @ApiModelProperty(value = "行驶证正面图片地址")
+    private String vehPosImgUrl;//行驶证正面图片地址
+    @ApiModelProperty(value = "行驶证反面图片地址")
+    private String vehNegImgUrl;//行驶证反面图片地址
+    @ApiModelProperty(value = "挂失订单编号")
+    private String lossOrderNo;//挂失订单编号 解挂的订单才有，挂失时订单号
+
+    @ApiModelProperty(value = "收费车型")
+    private String vehicleType;
+    @ApiModelProperty(value = "挂失解挂时间")
+    private LocalDateTime applyTime;//挂失解挂时间
+    @ApiModelProperty(value = "渠道编号")
+    private String agencyId;//订单渠道编号
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/ass/AssOrderInfoModel.java

@@ -97,9 +97,18 @@ public class AssOrderInfoModel {
     @ApiModelProperty(value = "车辆ID")
     private String vehicleId;//车辆ID
 
+    @ApiModelProperty(value = "车牌号")
+    private String vehiclePlate;
+
+    @ApiModelProperty(value = "车牌颜色")
+    private String vehiclePlateColor;
+
     @ApiModelProperty(value = "卡编号")
     private String cardId;//卡编号
 
     @ApiModelProperty(value = "OBU编号")
     private String obuId;//OBU编号
+
+    @ApiModelProperty(value = "审核人")
+    private String auditName;
 }

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/dto/HomeStatisticsRequestDto.java

@@ -20,10 +20,10 @@ public class HomeStatisticsRequestDto extends BaseEntity {
     /***
      * 统计开始日期
      */
-    private LocalDateTime startDate;
+    private LocalDateTime startTime;
     /***
      * 统计结束日期
      */
-    private LocalDateTime endDate;
+    private LocalDateTime endTime;
 
 }

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/importSend/WxMiniImportSendHandler.java

@@ -65,7 +65,7 @@ public class WxMiniImportSendHandler{
         if (!apply.getReceiverIdList().isEmpty()) {
 //            try {
 //                receiverIdList = JsonTools.json2List(apply.getReceiverIdList(), SendDetailModel.class);
-            List<String> result = List.of(apply.getReceiverIdList().replace("[", "").replace("]", "").split(","));
+            List<String> result = List.of(apply.getReceiverIdList().replaceAll("[\"'“”]", "").replace("[", "").replace("]", "").split(","));
             SendDetailModel model = new SendDetailModel();
             for (String mobile : result){
                 model.setReceiverId(mobile);

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/importSend/WxMpImportSendHandler.java

@@ -67,10 +67,11 @@ public class WxMpImportSendHandler {
         // 循环发送人id创建子表信息
         List<SendDetailModel> receiverIdList = new ArrayList<>();
         if (!apply.getReceiverIdList().isEmpty()) {
-            try {
-                receiverIdList = JsonTools.json2List(apply.getReceiverIdList(), SendDetailModel.class);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
+            List<String> result = List.of(apply.getReceiverIdList().replaceAll("[\"'“”]", "").replace("[", "").replace("]", "").split(","));
+            SendDetailModel model = new SendDetailModel();
+            for (String mobile : result){
+                model.setReceiverId(mobile);
+                receiverIdList.add(model);
             }
         } else {
             File file = minioUtil.getFileByUrl(request.getExcelUrl());

zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/messageWaitSend/MessageWaitSendManagerImpl.java

@@ -176,7 +176,12 @@ public class MessageWaitSendManagerImpl extends AbstractCommManager implements M
             //六、《公众号》 端消息推送
             else if (MessageType.OFFICIAL_ACCOUNTS.equals(messageType)) {
                 // 微信公众号
-                WxMpSendMessageRequest messageRequest = JsonTools.json2Object(sendDetails.getRequestDataJson(), WxMpSendMessageRequest.class);
+                WxMpSendMessageRequest messageRequest = new WxMpSendMessageRequest();
+                messageRequest.setTitle(sendDetails.getTitle());
+                messageRequest.setTemplateId(sendDetails.getModelId());
+                messageRequest.setMpOpenId(sendDetails.getReceiverId());
+                messageRequest.setData(sendDetails.getRequestDataJson());
+//                        JsonTools.json2Object(sendDetails.getRequestDataJson(), WxMpSendMessageRequest.class);
                 jsonPostRepeat(messageRequest);
             }
             sendDetails.setSendResult(MessageResult.SEND);
@@ -244,8 +249,8 @@ public class MessageWaitSendManagerImpl extends AbstractCommManager implements M
     public HomeStatisticsResponseDto homeStatistics(HomeStatisticsRequestDto request) {
         HomeStatisticsResponseDto response = new HomeStatisticsResponseDto();
         // 获取开始时间与结束时间
-        LocalDateTime startDateTime = request.getStartDate();
-        LocalDateTime endDateTime = request.getEndDate();
+        LocalDateTime startDateTime = request.getStartTime();
+        LocalDateTime endDateTime = request.getEndTime();
         // 循环从开始日期到结束日期的前一天
         List<HomeStatisticsModel> list = new ArrayList<>();
         LocalDateTime currentDate = startDateTime;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/config/AppConfig.java

@@ -2,6 +2,7 @@ package cn.com.taiji.ats.config;
 
 import javax.annotation.PostConstruct;
 
+import com.esms.PostMsg;
 import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.MessageSource;
@@ -71,4 +72,15 @@ public class AppConfig extends AbstractManager {
                 .callTimeout(4000, TimeUnit.SECONDS)// 整个调用过程超时
                 .build();
     }
+
+    @Bean
+    public PostMsg postMsg() {
+        PostMsg postMsg = new PostMsg();
+        // 内网地址
+        // 设置发送短信的网关
+        postMsg.getCmHost().setHost("192.168.100.112", 8090);
+        // 设置用户获取账号信息、上行、状态报告等的网关
+        postMsg.getWsHost().setHost("192.168.100.112", 8088);
+        return postMsg;
+    }
 }

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/hltSendShort/SendShortManager.java

@@ -14,6 +14,7 @@ import cn.com.taiji.core.model.comm.protocol.ats.sendShort.*;
 import com.esms.MOMsg;
 import com.esms.PostMsg;
 import com.esms.common.entity.Account;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import cn.com.taiji.ats.manager.request.HltSmsSendRequest;
@@ -92,21 +93,14 @@ public class SendShortManager {
         return response;
     }
 
-//    private static PostMsg pm;
-//    static {
-//        pm = new PostMsg();
-//        // 内网地址
-//        // 设置发送短信的网关
-//         pm.getCmHost().setHost("192.168.100.112", 8090);
-//        // 设置用户获取账号信息、上行、状态报告等的网关
-//         pm.getWsHost().setHost("192.168.100.112", 8088);
-//    }
+    @Autowired
+    private PostMsg pm;
     public List<MTReport> getUpward(int fetchSize) {
         System.out.println("-----------------------------------开始初始化------------------------------------");
-        Account account = new Account("QTZL20240529", "ATuwRFkX"); // 账号
-        PostMsg pm = new PostMsg();
-        pm.getCmHost().setHost("192.168.100.112", 9080);
-        pm.getWsHost().setHost("192.168.100.112", 8088);
+        Account account = new Account("chexingzhushou", "TYOIsakY"); // 账号
+//        PostMsg pm = new PostMsg();
+//        pm.getCmHost().setHost("192.168.100.112", 8090);
+//        pm.getWsHost().setHost("192.168.100.112", 8088);
         MOMsg[] mos = new MOMsg[0];
         List<MTReport> mtReportList = new ArrayList<>();
         System.out.println("-----------------------------------开始访问------------------------------------");

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 获取欠费信息

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ygz/nio/AbstractCommNioManager.java

@@ -78,6 +78,7 @@ public class AbstractCommNioManager extends AbstractManager {
                 oldLog.setSendStatus(log.getStatus() == InterfaceStatus.SUCCESS ? YgzSendStatus.SEND_SUCCESS : YgzSendStatus.SEND_FAILED);
             else
                 oldLog.setSendStatus(log.getStatus() == InterfaceStatus.SUCCESS ? YgzSendStatus.SEND_SUCCESS : YgzSendStatus.WAIT_SEND);
+            oldLog.setRequestJson(log.getRequestJson());
             oldLog.setResponseJson(log.getResponseJson());
             oldLog.setStatus(log.getStatus());
             oldLog.setErrorMsg(log.getErrorMsg());