Merge branch 'master-background-manager' into base-modify

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1491,6 +1491,29 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return count > 0;
     }
 
+    public Boolean checkVinExist(String vin, String id) {
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("vin", vin);
+        criteria.andEqualTo("isDel",0);
+        if (StringUtils.isNotEmpty(id)) {
+            criteria.andNotEqualTo("id", id);
+        }
+        int count = mapper.selectCountByExample(example);
+        return count > 0;
+    }
+
+    public Boolean checkEngineNumExist(String engineNum, String id) {
+        Example example = new Example(Vehicle.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("engineNum", engineNum);
+        criteria.andEqualTo("isDel",0);
+        if (StringUtils.isNotEmpty(id)) {
+            criteria.andNotEqualTo("id", id);
+        }
+        int count = mapper.selectCountByExample(example);
+        return count > 0;
+    }
 
     public List<String> findbyPlateNumberAndVehicleCod(String plateNumber,String vehicleCode) {
         List<String> vehicleIds = Lists.newArrayList();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -561,6 +561,17 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return ObjectRestResponse.succ(exist);
     }
 
+    @GetMapping("/exist_vin/{code}")
+    public ObjectRestResponse<Boolean> checkVinExist(@PathVariable(value = "vin") String vin,@RequestParam(value = "id") String id){
+        Boolean exist = vehicleBiz.checkVinExist(vin,id);
+        return ObjectRestResponse.succ(exist);
+    }
+
+    @GetMapping("/exist_engineNum/{code}")
+    public ObjectRestResponse<Boolean> checkEngineNumExist(@PathVariable(value = "engineNum") String engineNum,@RequestParam(value = "id") String id){
+        Boolean exist = vehicleBiz.checkEngineNumExist(engineNum,id);
+        return ObjectRestResponse.succ(exist);
+    }
 
     @GetMapping("/findVehicleIds")
    public List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber",required = false) String plateNumber,@RequestParam(value = "vehicleCode",required = false) String vehicleCode){