diff --git a/src/main/java/com/sa/zentao/controller/CarManageController.java b/src/main/java/com/sa/zentao/controller/CarManageController.java index bb52c53..d11a39e 100644 --- a/src/main/java/com/sa/zentao/controller/CarManageController.java +++ b/src/main/java/com/sa/zentao/controller/CarManageController.java @@ -40,6 +40,12 @@ public class CarManageController { */ @GetMapping("/searchFive") public Result removeFile(@RequestParam(value = "plate",required = true)String plate,@RequestParam(value = "model",required = false)String model){ + if(plate.length()==8&&"02".equals(model)){ + model="52"; + } + if(plate.length()==8&&"01".equals(model)){ + model="51"; + } CarFiveType carFiveType = carManageService.searchFive(plate, model); if(carFiveType!=null){ CarFiveTypeDTO carFiveTypeDTO = new CarFiveTypeDTO(); @@ -57,6 +63,12 @@ public class CarManageController { */ @GetMapping("/drivingLicense") public Result drivingLicense(@RequestParam(value = "plate",required = true)String plate,@RequestParam(value = "model",required = true)String model,@RequestParam(value = "owner",required = false)String owner){ + if(plate.length()==8&&"02".equals(model)){ + model="52"; + } + if(plate.length()==8&&"01".equals(model)){ + model="51"; + } CarDrivingLicense carDrivingLicense = carManageService.drivingLicense(plate, model, owner); if(carDrivingLicense!=null){ @@ -84,6 +96,10 @@ public class CarManageController { List carOperatingVehicleLevels = BeanCopyUtil.copyListProperties(carOperatingVehicleLevel, CarOperatingVehicleLevelDTO::new, new BeanCopyUtilCallBack() { @Override public void callBack(CarOperatingVehicleLevel t, CarOperatingVehicleLevelDTO s) { + if(s.getStatus().equals(3)){ + s.setDescription(t.getMsg()); + return ; + } if (s.getName().equals("疑似营运车辆")) { } else { diff --git a/src/main/java/com/sa/zentao/service/impl/CarManageService.java b/src/main/java/com/sa/zentao/service/impl/CarManageService.java index ac0cbb6..dfb9d71 100644 --- a/src/main/java/com/sa/zentao/service/impl/CarManageService.java +++ b/src/main/java/com/sa/zentao/service/impl/CarManageService.java @@ -108,7 +108,7 @@ public class CarManageService { List list = carDrivingLicenseService.list(eq); if(!CollectionUtils.isEmpty(list)){ CarDrivingLicense carDrivingLicense = list.get(0); - if(!StringUtils.isEmpty(owner)&&carDrivingLicense.getSyr().equals(owner)){ + if(!StringUtils.isEmpty(owner)&&carDrivingLicense.getSyr().equals(owner)&&carDrivingLicense.getSyrFlag()!=null&&carDrivingLicense.getSyrFlag().equals(1)){ return carDrivingLicense; }else if(!StringUtils.isEmpty(owner)){ carDrivingLicense.setOwner("不一致"); @@ -138,8 +138,8 @@ public class CarManageService { carFiveType.setHphm(plate); carFiveType.setCreateTime(new Date()); carFiveType.setCllx(model); - carFiveType.setSyr(owner); - carFiveType.setOwner(owner); + carFiveType.setSyr(null); + carFiveType.setOwner(null); carFiveType.setSyrFlag(0); this.carDrivingLicenseService.save(carFiveType); return carFiveType; @@ -161,6 +161,10 @@ public class CarManageService { carDrivingLicense.setSyr(owner); carDrivingLicense.setOwner(owner); this.carDrivingLicenseService.save(carDrivingLicense); + if(!carDrivingLicense.getSyrFlag().equals(1)){ + carDrivingLicense.setSyr(""); + carDrivingLicense.setOwner(""); + } return carDrivingLicense; } @@ -188,7 +192,7 @@ public class CarManageService { body.add("plateNo", plate); headers.setContentType(MediaType.MULTIPART_FORM_DATA); HttpEntity> entity = new HttpEntity<>(body, headers); - ResponseEntity response = rest.postForEntity("https://api.chequan.cn/?a=queryOnlineVehicleInfo&user=dgkjshdxm&token=eab3335e2ffe15b8410553cedc1f589a&plateNo=" + plate, entity, String.class); + ResponseEntity response = rest.postForEntity("https://api.chequan.cn/?a=queryOnlineVehicleInfo&user=degksfyy&token=80c34e9c728a87a5cb7046194fa2aa0a&plateNo=" + plate, entity, String.class);