qiubinghui
/
zhywpt-issuer
Seguir 1
Destacar 0
Fork 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Actividad
Explorar el Código

~

master
qiubh hace 4 días
padre
3e7c055450
commit
924199217a
Se han modificado 2 ficheros con 78 adiciones y 86 borrados
Dividir vista Mostrar estadísticas de diff
  1. 33
    34
      zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/vehicleInfoChange/VehicleChangeArtificialManager.java
  2. 45
    52
      zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/vehicleInfoChange/VehiclePlateChangeManager.java

+ 33
- 34
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/vehicleInfoChange/VehicleChangeArtificialManager.java Ver fichero

@@ -1,11 +1,5 @@
package cn.com.taiji.ias.manager.vehicleInfoChange;

import java.time.LocalDateTime;

import cn.com.taiji.ias.manager.agencyConfig.AgencyConfigManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import cn.com.taiji.common.manager.net.http.ServiceHandleException;
import cn.com.taiji.core.entity.ass.AssOrderinfo;
import cn.com.taiji.core.entity.ass.AssVehicleInfoChange;
@@ -31,6 +25,11 @@ import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
import cn.com.taiji.core.repo.jpa.user.StaffRepo;
import cn.com.taiji.ias.manager.AbstractCommManager;
import cn.com.taiji.ias.manager.agencyConfig.AgencyConfigManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;

@Service
public class VehicleChangeArtificialManager extends AbstractCommManager
@@ -111,9 +110,9 @@ public class VehicleChangeArtificialManager extends AbstractCommManager
QtkCardInfo cardInfo = qtkCardInfoRepo.findByCardId(newVehicleInfo.getVehicleId());
QtkObuInfo obuInfo = qtkObuInfoRepo.findByObuId(newVehicleInfo.getVehicleId());
// 卡签下黑 todo 后面要放出来
if (infoChange.getType() != infoChange.getOldType()) {
// 下黑
}
// if (infoChange.getType() != infoChange.getOldType()) {
// // 下黑
// }
// 增加设备升级表
infoChangeManager.getEquipUpgradeApply(newVehicleInfo, AssOrderType.VEHICLE_UPDATE, "车辆信息变更成功，可升级卡签",
"","");
@@ -122,36 +121,36 @@ public class VehicleChangeArtificialManager extends AbstractCommManager
}
// 车牌变更改信息
else if (orderinfo.getOrderType().equals(AssOrderType.PLATE_INFO_CHANGE)) {
String vehicleIdNew = infoChange.getVehicleId(); // 拼接的车牌
QtkVehicleInfo vehicleInfoNew = vehicleInfoRepo.findByVehicleId(vehicleIdNew);
if (vehicleInfoNew == null) {
// 新建车辆信息
// 数据缺少
vehicleInfoNew = plateChangeManager.getNewVehicleInfo(infoChange, oldVehicleInfo);
// 上传到 部中心 todo 上传有疑问
// ygzUploader.saveLocalVehicleRequestJson(vehicleInfoNew, Operation.ADD,
// DataSourceEnum.DSI_INTERFACE);
} else {
if (vehicleInfoNew.getCustomerId().equals(oldVehicleInfo.getCustomerId())) {
// 允许变更
// 更新车辆信息数据表
vehicleInfoNew = infoChangeManager.updateVehicleInfo(orderinfo, infoChange, vehicleInfoNew);
// 上传到 部中心
// uploadYgzVehicle(vehicleInfoNew , Operation.UPDATE);
// ygzUploader.saveLocalVehicleRequestJson(vehicleInfoNew, Operation.UPDATE,
// DataSourceEnum.DSI_INTERFACE);
} else {
// 拦截
throw GlyServiceError.RESPONSE_ERROR.toHandleException("更新车牌名下车辆不在就车牌车辆车主名下，不予修改！");
}
}
// String vehicleIdNew = infoChange.getVehicleId(); // 拼接的车牌
// QtkVehicleInfo vehicleInfoNew = vehicleInfoRepo.findByVehicleId(vehicleIdNew);
// if (vehicleInfoNew == null) {
// // 新建车辆信息
// // 数据缺少
// vehicleInfoNew = plateChangeManager.getNewVehicleInfo(infoChange, oldVehicleInfo);
// // 上传到 部中心 todo 上传有疑问
// // ygzUploader.saveLocalVehicleRequestJson(vehicleInfoNew, Operation.ADD,
// // DataSourceEnum.DSI_INTERFACE);
// } else {
// if (vehicleInfoNew.getCustomerId().equals(oldVehicleInfo.getCustomerId())) {
// // 允许变更
// // 更新车辆信息数据表
// vehicleInfoNew = infoChangeManager.updateVehicleInfo(orderinfo, infoChange, vehicleInfoNew);
// // 上传到 部中心
// // uploadYgzVehicle(vehicleInfoNew , Operation.UPDATE);
// // ygzUploader.saveLocalVehicleRequestJson(vehicleInfoNew, Operation.UPDATE,
// // DataSourceEnum.DSI_INTERFACE);
// } else {
// // 拦截
// throw GlyServiceError.RESPONSE_ERROR.toHandleException("更新车牌名下车辆不在就车牌车辆车主名下，不予修改！");
// }
// }
// todo 记账卡通知渠道 一定要成功才能往下走
// if (req.getCardId().substring(9,11) == "23"){
//
// }
// 增加设备升级表
infoChangeManager.getEquipUpgradeApply(vehicleInfoNew, AssOrderType.PLATE_INFO_CHANGE, "车牌信息变更成功，可升级卡签",
"","");
// infoChangeManager.getEquipUpgradeApply(vehicleInfoNew, AssOrderType.PLATE_INFO_CHANGE, "车牌信息变更成功，可升级卡签",
// "","");
vehicleInfoChangeRepo.merge(infoChange);
// 增加日志
} else {

+ 45
- 52
zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/vehicleInfoChange/VehiclePlateChangeManager.java Ver fichero

@@ -1,27 +1,8 @@
package cn.com.taiji.ias.manager.vehicleInfoChange;

import static cn.com.taiji.core.entity.dict.issue.TransactionBizType.ISSUE_VEHICLE_SYNC;

import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;

import cn.com.taiji.core.manager.tools.issue.IssueTools;
import cn.com.taiji.core.model.comm.protocol.ias.ygz.*;
import cn.com.taiji.ias.dict.AgencyConfigType;
import cn.com.taiji.ias.manager.agencyConfig.AgencyConfigManager;
import cn.com.taiji.ias.manager.ygz.YgzCardUploadManager;
import cn.com.taiji.ias.manager.ygz.YgzObuUploadManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;

import cn.com.taiji.common.manager.ManagerException;
import cn.com.taiji.common.manager.net.http.ServiceHandleException;
import cn.com.taiji.common.pub.BeanTools;
import cn.com.taiji.common.pub.LambdaTools;
import cn.com.taiji.core.entity.ass.AssDeviceUpgrade;
import cn.com.taiji.core.entity.ass.AssOrderinfo;
import cn.com.taiji.core.entity.ass.AssVehicleInfoChange;
import cn.com.taiji.core.entity.basic.QtkCardInfo;
@@ -31,17 +12,19 @@ import cn.com.taiji.core.entity.basic.QtkVehicleInfo;
import cn.com.taiji.core.entity.dict.AuditStatus;
import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
import cn.com.taiji.core.entity.dict.ass.AssOrderType;
import cn.com.taiji.core.entity.dict.basic.*;
import cn.com.taiji.core.entity.dict.basic.SourceType;
import cn.com.taiji.core.entity.dict.basic.UserType;
import cn.com.taiji.core.entity.dict.basic.VehicleUseCharacter;
import cn.com.taiji.core.entity.dict.ygz.DataSourceEnum;
import cn.com.taiji.core.entity.dict.ygz.Operation;
import cn.com.taiji.core.entity.issue.TransactionStatus;
import cn.com.taiji.core.entity.log.IasInterfaceLog;
import cn.com.taiji.core.manager.comm.LogManager;
import cn.com.taiji.core.manager.tools.issue.IssueTools;
import cn.com.taiji.core.model.comm.protocol.ias.ass.vehicleInfoChange.VehiclePlateChangeRequest;
import cn.com.taiji.core.model.comm.protocol.ias.ass.vehicleInfoChange.VehiclePlateChangeResponse;
import cn.com.taiji.core.model.comm.protocol.ias.vaild.VehiclePlateCheckRequest;
import cn.com.taiji.core.model.comm.protocol.ias.vaild.VehiclePlateCheckResponse;
import cn.com.taiji.core.model.comm.protocol.ods.ois.issue.OisVehicleSaveRequest;
import cn.com.taiji.core.model.comm.protocol.ias.ygz.*;
import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
import cn.com.taiji.core.repo.jpa.ass.AssDeviceUpgradeRepo;
import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
@@ -51,11 +34,21 @@ import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkObuInfoRepo;
import cn.com.taiji.core.repo.jpa.basic.QtkVehicleInfoRepo;
import cn.com.taiji.core.repo.jpa.log.IasInterfaceLogRepo;
import cn.com.taiji.ias.dict.AgencyConfigType;
import cn.com.taiji.ias.manager.AbstractCommManager;
import cn.com.taiji.ias.manager.GlobalTransactionManager;
import cn.com.taiji.ias.manager.agencyConfig.AgencyConfigManager;
import cn.com.taiji.ias.manager.audit.VerificationRuleManager;
import cn.com.taiji.ias.manager.ygz.YgzCardUploadManager;
import cn.com.taiji.ias.manager.ygz.YgzObuUploadManager;
import cn.com.taiji.ias.manager.ygz.YgzVehicleUploadManager;
import cn.com.taiji.ias.model.issue.CarOcrCheck;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.util.Objects;

@Service
public class VehiclePlateChangeManager extends AbstractCommManager implements LogManager<VehiclePlateChangeRequest, VehiclePlateChangeResponse, IasInterfaceLog>{
@@ -222,7 +215,7 @@ public class VehiclePlateChangeManager extends AbstractCommManager implements Lo

public QtkVehicleInfo getNewVehicleInfo(AssVehicleInfoChange infoChange ,QtkVehicleInfo vehicleInfoOld) {
QtkVehicleInfo vehicleInfo = vehicleInfoOld;
vehicleInfo.setVehicleId(infoChange.getVehicleId());
// vehicleInfo.setVehicleId(infoChange.getVehicleId());
vehicleInfo.setVehiclePlate(infoChange.getVehiclePlate());
vehicleInfo.setVehiclePlateColor(infoChange.getVehiclePlateColor());
vehicleInfo.setVehPosImgUrl(infoChange.getVehPosImgUrl());
@@ -367,35 +360,35 @@ public class VehiclePlateChangeManager extends AbstractCommManager implements Lo
apply.setOrderNo(assOrderinfo.getId());
apply.setChangeType(2);
// 旧车辆数据
apply.setOldVehicleId(oldVehicleInfo.getVehiclePlate() + "_" + oldVehicleInfo.getVehiclePlateColor());
apply.setOldVehiclePlate(oldVehicleInfo.getVehiclePlate());
apply.setOldVehiclePlateColor(oldVehicleInfo.getVehiclePlateColor());
apply.setOldUseCharacter(oldVehicleInfo.getUseCharacter());
apply.setOldEngineNum(oldVehicleInfo.getEngineNum());
apply.setOldRegisterDate(oldVehicleInfo.getRegisterDate());
apply.setOldIssueDate(oldVehicleInfo.getIssueDate());
apply.setOldApprovedCount(oldVehicleInfo.getApprovedCount());
apply.setOldTotalMass(oldVehicleInfo.getTotalMass());
apply.setOldMaintenaceMass(oldVehicleInfo.getMaintenaceMass());
apply.setOldVehicleDimensions(oldVehicleInfo.getVehicleDimensions());
apply.setOldAxleCount(oldVehicleInfo.getAxleCount());
apply.setOldUseUserType(oldVehicleInfo.getUseUserType());
apply.setOldType(oldVehicleInfo.getType());
apply.setOldVehPosImgUrl(oldVehicleInfo.getVehPosImgUrl());
apply.setOldVehNegImgUrl(oldVehicleInfo.getVehNegImgUrl());
apply.setOldOwnerName(oldVehicleInfo.getOwnerName());
apply.setOldOwnerIdType(oldVehicleInfo.getOwnerIdType());
apply.setOldOwnerIdNum(oldVehicleInfo.getOwnerIdNum());
apply.setOldOwnerPosImgUrl(oldVehicleInfo.getOwnerPosImgUrl());
apply.setOldOwnerNegImgUrl(oldVehicleInfo.getOwnerNegImgUrl());
apply.setOldTransportIdNum(oldVehicleInfo.getTransportIdNum());
apply.setOldLicenseIdNum(oldVehicleInfo.getLicenseIdNum());
apply.setOldVehBodyUrl(oldVehicleInfo.getVehBodyUrl());
apply.setOldTractorSign(oldVehicleInfo.getTractorSign());
apply.setOldRoadTransportPermitPicUrl(oldVehicleInfo.getRoadTransportPermitPicUrl());
// 复制新数据内容
BeanTools.copyProperties(req, apply);
apply.setVehicleId(req.getVehiclePlate() + "_" + req.getVehiclePlateColor());
// apply.setOldVehicleId(oldVehicleInfo.getVehiclePlate() + "_" + oldVehicleInfo.getVehiclePlateColor());
// apply.setOldVehiclePlate(oldVehicleInfo.getVehiclePlate());
// apply.setOldVehiclePlateColor(oldVehicleInfo.getVehiclePlateColor());
// apply.setOldUseCharacter(oldVehicleInfo.getUseCharacter());
// apply.setOldEngineNum(oldVehicleInfo.getEngineNum());
// apply.setOldRegisterDate(oldVehicleInfo.getRegisterDate());
// apply.setOldIssueDate(oldVehicleInfo.getIssueDate());
// apply.setOldApprovedCount(oldVehicleInfo.getApprovedCount());
// apply.setOldTotalMass(oldVehicleInfo.getTotalMass());
// apply.setOldMaintenaceMass(oldVehicleInfo.getMaintenaceMass());
// apply.setOldVehicleDimensions(oldVehicleInfo.getVehicleDimensions());
// apply.setOldAxleCount(oldVehicleInfo.getAxleCount());
// apply.setOldUseUserType(oldVehicleInfo.getUseUserType());
// apply.setOldType(oldVehicleInfo.getType());
// apply.setOldVehPosImgUrl(oldVehicleInfo.getVehPosImgUrl());
// apply.setOldVehNegImgUrl(oldVehicleInfo.getVehNegImgUrl());
// apply.setOldOwnerName(oldVehicleInfo.getOwnerName());
// apply.setOldOwnerIdType(oldVehicleInfo.getOwnerIdType());
// apply.setOldOwnerIdNum(oldVehicleInfo.getOwnerIdNum());
// apply.setOldOwnerPosImgUrl(oldVehicleInfo.getOwnerPosImgUrl());
// apply.setOldOwnerNegImgUrl(oldVehicleInfo.getOwnerNegImgUrl());
// apply.setOldTransportIdNum(oldVehicleInfo.getTransportIdNum());
// apply.setOldLicenseIdNum(oldVehicleInfo.getLicenseIdNum());
// apply.setOldVehBodyUrl(oldVehicleInfo.getVehBodyUrl());
// apply.setOldTractorSign(oldVehicleInfo.getTractorSign());
// apply.setOldRoadTransportPermitPicUrl(oldVehicleInfo.getRoadTransportPermitPicUrl());
// // 复制新数据内容
// BeanTools.copyProperties(req, apply);
// apply.setVehicleId(req.getVehiclePlate() + "_" + req.getVehiclePlateColor());
apply.setInsertTime(LocalDateTime.now());
return apply;
}

Escribir Vista previa
Cargando…
Cancelar
Guardar