修改车辆企业关联逻辑

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dubbo/RemoteFleetServiceImpl.java

@@ -64,6 +64,7 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
     private final KwfDriverScoreService driverScoreService;
     private final KwfDriverService driverService;
     private final KwfTruckReportRepository truckReportRepository;
+    private final KwfTruckEntRepository truckEntRepository;
 
 
     /**
@@ -225,8 +226,11 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
 
     @Override
     public RTruckVo findDataFirstTruck(Long entId) {
-        KwfTruck truck = kwfTruckRepository.getOneByEntId(entId);
-        return getTruckVo(truck);
+        List<RTruckVo> dTruckVoList = findTruckByEntIds(entId);
+        if (CollectionUtils.isEmpty(dTruckVoList)) {
+            return new RTruckVo();
+        }
+        return dTruckVoList.get(0);
     }
 
     @Override
@@ -621,7 +625,14 @@ public class RemoteFleetServiceImpl implements RemoteFleetService {
 
     @Override
     public List<RTruckVo> findTruckByEntIds(Long entId) {
-        List<KwfTruck> truckList = kwfTruckRepository.findTruckByEntIds(entId);
+        //先查询车辆企业关联关系
+        List<KwfTruckEnt> truckEntByEntIds = truckEntRepository.findTruckEntByEntIds(entId);
+        if(CollectionUtils.isEmpty(truckEntByEntIds)){
+            return new ArrayList<>();
+        }
+        List<Long> truckIds = truckEntByEntIds.stream().map(KwfTruckEnt::getTruckId).collect(Collectors.toList());
+        //通过车牌id查询车辆
+        List<KwfTruck> truckList = kwfTruckRepository.findTruckByTruckIds(truckIds);
         if(CollectionUtils.isEmpty(truckList)){
             return new ArrayList<>();
         }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruck.java

@@ -17,10 +17,10 @@ import java.math.BigDecimal;
 @Accessors(chain = true)
 public class KwfTruck extends BaseModel {
 
-    /**
-     * 企业id
-     */
-    private Long entId;
+//    /**
+//     * 企业id
+//     */
+//    private Long entId;
 
     /**
      * 车牌号

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/KwfTruckReport.java

@@ -21,7 +21,7 @@ public class KwfTruckReport extends BaseModel {
     private Long entId;
 
     /**
-     * 车牌号
+     * 车牌id
      */
     private Long truckId;
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/repository/KwfTruckEntRepository.java

@@ -1,15 +1,25 @@
 package com.sckw.fleet.repository;
 
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sckw.core.model.base.BaseModel;
 import com.sckw.fleet.dao.KwfTruckEntMapper;
 import com.sckw.fleet.model.KwfTruckEnt;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * @author PC
  * 车辆信息与企业关联信息接口
  */
 @Repository
 public class KwfTruckEntRepository extends ServiceImpl<KwfTruckEntMapper, KwfTruckEnt> {
+    public List<KwfTruckEnt> findTruckEntByEntIds(Long entId) {
+        return list(Wrappers.<KwfTruckEnt>lambdaQuery()
+                .eq(BaseModel::getDelFlag,0)
+                .eq(KwfTruckEnt::getEntId,entId)
+                .orderByDesc(BaseModel::getCreateTime));
+    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/repository/KwfTruckRepository.java

@@ -22,29 +22,16 @@ import java.util.Set;
  */
 @Repository
 public class KwfTruckRepository extends ServiceImpl<KwfTruckMapper, KwfTruck> {
-    public KwfTruck getOneByEntId(Long entId) {
-        return getOne(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(BaseModel::getDelFlag,0)
-                .eq(Objects.nonNull(entId),KwfTruck::getEntId, entId)
-                .orderByDesc(BaseModel::getCreateTime)
-                .last("limit 1"));
-    }
 
-    public List<KwfTruck> getTurkNoList(Long entId, String truckNo) {
+    public List<KwfTruck> getTurkNoList(List<Long> truckIds, String truckNo) {
         return list(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
-                .eq(Objects.nonNull(entId), KwfTruck::getEntId, entId)
+                .in(Objects.nonNull(truckIds), KwfTruck::getId, truckIds)
                 .like(Objects.nonNull(truckNo), KwfTruck::getTruckNo, truckNo)
                 .orderByDesc(BaseModel::getCreateTime));
     }
 
 
-
-    public List<KwfTruck> findAll() {
-        return list(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(BaseModel::getDelFlag,0));
-    }
-
     public List<KwfTruck> queryByTruckIds(Set<Long> truckIds) {
         return list(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
@@ -58,20 +45,11 @@ public class KwfTruckRepository extends ServiceImpl<KwfTruckMapper, KwfTruck> {
 
     }
 
-    public List<KwfTruck> queryByEntIds(List<Long> entIds, String truckMark,String startTime, String endTime) {
-        return list(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(BaseModel::getDelFlag,0)
-                .in(CollectionUtils.isNotEmpty(entIds),KwfTruck::getEntId, entIds)
-                .eq(StringUtils.isNotBlank(truckMark),KwfTruck::getTruckMark, truckMark)
-                .ge(StringUtils.isNotBlank(startTime),KwfTruck::getCreateTime, startTime)
-                .le(StringUtils.isNotBlank(endTime),KwfTruck::getCreateTime, endTime));
-    }
-
-    public IPage<KwfTruck> queryByCondition(Long entId,String truckNo, String truckMark, String startTime, String endTime, int pageNum, int pageSize) {
+    public IPage<KwfTruck> queryByCondition(List<Long> truckIds,String truckNo, String truckMark, String startTime, String endTime, int pageNum, int pageSize) {
         Page<KwfTruck> page = new Page<>(pageNum, pageSize);
         return page(page, Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
-                .eq(Objects.nonNull(entId),KwfTruck::getEntId, entId)
+                .in(Objects.nonNull(truckIds),KwfTruck::getId, truckIds)
                 .eq(StringUtils.isNotBlank(truckNo),KwfTruck::getTruckNo, truckNo)
                 .eq(StringUtils.isNotBlank(truckMark),KwfTruck::getTruckMark, truckMark)
                 .ge(StringUtils.isNotBlank(startTime),KwfTruck::getCreateTime, startTime)
@@ -79,16 +57,16 @@ public class KwfTruckRepository extends ServiceImpl<KwfTruckMapper, KwfTruck> {
     }
 
     public List<KwfTruck> findTruckByTruckIds(List<Long> truckIds) {
-
         return list(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
-                .in(KwfTruck::getId, truckIds));
+                .in(KwfTruck::getId, truckIds)
+                .orderByDesc(BaseModel::getId));
     }
 
-    public IPage<KwfTruck> queryByPage(int pageNum, int pageSize, Long entId,Integer businessStatus, String truckNo) {
+    public IPage<KwfTruck> queryByPage(int pageNum, int pageSize, List<Long> truckIds, Integer businessStatus, String truckNo) {
         return page(new Page<>(pageNum, pageSize), Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
-                .eq(Objects.nonNull(entId),KwfTruck::getEntId, entId)
+                .in(Objects.nonNull(truckIds),KwfTruck::getId, truckIds)
                 .like(StringUtils.isNotBlank(truckNo),KwfTruck::getTruckNo, truckNo)
                 .eq(Objects.nonNull(businessStatus),KwfTruck::getBusinessStatus, businessStatus)
                 .orderByDesc(KwfTruck::getId));
@@ -101,59 +79,10 @@ public class KwfTruckRepository extends ServiceImpl<KwfTruckMapper, KwfTruck> {
                 .last("limit 1"));
     }
 
-    public Boolean updateTruck(KwfTruck updateTruck) {
-       return update(updateTruck, Wrappers.<KwfTruck>lambdaQuery().eq(KwfTruck::getId, updateTruck.getId()));
-    }
-
     public KwfTruck findTruckByTruckNo(String truckNo) {
         return getOne(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
                 .eq(KwfTruck::getTruckNo, truckNo));
     }
 
-    public List<KwfTruck> queryByTruckNosAndEntId(List<String> truckNoList, Long entId) {
-        return list(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(BaseModel::getDelFlag,0)
-                .eq(Objects.nonNull(entId),KwfTruck::getEntId, entId)
-                .in(CollectionUtils.isNotEmpty(truckNoList),KwfTruck::getTruckNo, truckNoList));
-    }
-
-    public List<KwfTruck> queryTruckByEntId(Long entId) {
-        return list(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(BaseModel::getDelFlag, 0)
-                .eq(KwfTruck::getEntId, entId)
-                .orderByDesc(BaseModel::getCreateTime));
-    }
-
-    /**
-     * 统计车辆总数（根据企业ID）
-     * @param entId 企业ID
-     * @return 车辆总数
-     */
-    public List<KwfTruck> countByEntId(Long entId) {
-        return list(Wrappers.<KwfTruck>lambdaQuery()
-                .select(BaseModel::getId,KwfTruck::getBusinessStatus)
-                .eq(BaseModel::getDelFlag, 0)
-                .eq(Objects.nonNull(entId), KwfTruck::getEntId, entId));
-    }
-
-    /**
-     * 统计指定业务状态的车辆数量（根据企业ID）
-     * @param entId 企业ID
-     * @param businessStatus 业务状态（0空闲、1任务）
-     * @return 车辆数量
-     */
-    public Long countByEntIdAndBusinessStatus(Long entId, Integer businessStatus) {
-        return count(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(BaseModel::getDelFlag, 0)
-                .eq(Objects.nonNull(entId), KwfTruck::getEntId, entId)
-                .eq(Objects.nonNull(businessStatus), KwfTruck::getBusinessStatus, businessStatus));
-    }
-
-    public List<KwfTruck> findTruckByEntIds(Long entId) {
-        return list(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(BaseModel::getDelFlag,0)
-                .eq(KwfTruck::getEntId,entId)
-                .orderByDesc(BaseModel::getId));
-    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -110,6 +110,8 @@ public class KwfDriverService {
 
     @Autowired
     private KwfDriverMapper driverMapper;
+    @Autowired
+    KwfTruckService truckService;
 
     /**
      * @param key 逐渐id
@@ -355,11 +357,11 @@ public class KwfDriverService {
         if (truckReport == null) {
             return new KwfTruck();
         }
+
         //查询车辆信息
         KwfTruck truck = truckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
-                .eq(KwfTruck::getId, truckReport.getTruckId())
-                .eq(KwfTruck::getEntId, entId));
+                .eq(KwfTruck::getId, truckReport.getTruckId()));
         if (truck == null) {
             return new KwfTruck();
         }
@@ -1330,7 +1332,7 @@ public class KwfDriverService {
         int systemType = LoginUserHolder.getSystemType();
         if (systemType == SystemTypeEnum.DRIVER.getCode()) {
             //查询企业下的车辆信息
-            List<KwfTruck> kwfTrucks = truckRepository.queryTruckByEntId(request.getEntId());
+            List<KwfTruck> kwfTrucks = truckService.findTruckByEntIds(request.getEntId());
             if (CollectionUtils.isEmpty(kwfTrucks)) {
                 throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_NOT_FOUND, "您所在的企业暂无该车辆，请与企业管理人员联系");
             }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckReportService.java

@@ -236,100 +236,101 @@ public class KwfTruckReportService {
      * @date 2023/07/11
      **/
     public HttpResult importExcel(MultipartFile file) {
-        /**文件存储**/
-        importFileSave(file);
-
-        /**参数校验**/
-        HttpResult result = this.checkParams(file);
-        if (result.getCode() != HttpStatus.SUCCESS_CODE) {
-            return result;
-        }
-
-        List<KwfTruckReportExcelImportDto> truckReportExcels = (List)result.getData();
-        List<String> errorList = checkParams(truckReportExcels);
-        if (!CollectionUtils.isEmpty(errorList)) {
-            return HttpResult.error("导入数据存在已上报，请核对再上传！", errorList);
-        }
-
-        /**数据处理**/
-        int count = 0;
-        for (KwfTruckReportExcelImportDto truckReportExcel:truckReportExcels) {
-            KwfTruckReport truckReport = new KwfTruckReport();
-            truckReport.setEntId(LoginUserHolder.getEntId());
-
-            /**车辆信息**/
-            //校验车辆档案是否存在
-            List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", truckReportExcel.getTruckNo());}});
-            if (CollectionUtils.isEmpty(trucks)) {
-                //车辆信息
-                KwfTruck truckParams = new KwfTruck();
-                truckParams.setTruckNo(truckReportExcel.getTruckNo());
-                truckParams.setActualWeight(new BigDecimal(truckReportExcel.getActualWeight()));
-                truckParams.setAuthStatus(Global.NUMERICAL_TWO);
-                result = truckService.truckEdit(truckParams);
-                if (result.getCode() != HttpStatus.SUCCESS_CODE) {
-                    continue;
-                }
-
-                KwfTruck truck = (KwfTruck) result.getData();
-                truckReport.setTruckId(truck.getId());
-            } else {
-                //校验车辆是否已上报
-                KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("truckId", truck.getId());
-                    put("entId", LoginUserHolder.getEntId());
-                }});
-                if (CollectionUtils.isEmpty(reports)) {
-                    truckReport.setTruckId(truck.getId());
-                } else {
-                    continue;
-                }
-
-                //校验企业是否添加该车辆
-                KwfTruck truckEnt = new KwfTruck();
-                truckEnt.setId(truck.getId());
-                truckService.truckEntEdit(truckEnt);
-            }
-
-            /**档案信息**/
-            //校验司机档案是否存在
-            List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("phone", truckReportExcel.getPhone());}});
-            if (CollectionUtils.isEmpty(drivers)) {
-                KwfDriver driverParams = new KwfDriver();
-                driverParams.setName(truckReportExcel.getName());
-                driverParams.setPhone(truckReportExcel.getPhone());
-                driverParams.setIdcard(truckReportExcel.getIdcard());
-                driverParams.setAuthStatus(Global.NUMERICAL_TWO);
-                result = driverService.driverEdit(driverParams);
-                if (result.getCode() != HttpStatus.SUCCESS_CODE) {
-                    continue;
-                }
-
-                KwfDriver driver = (KwfDriver) result.getData();
-                truckReport.setDriverId(driver.getId());
-            } else {
-                //校验司机是否已上报
-                KwfDriver driver = drivers.get(0);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("driverId", driver.getId());
-                    put("entId", LoginUserHolder.getEntId());
-                }});
-                if (CollectionUtils.isEmpty(reports)) {
-                    truckReport.setDriverId(driver.getId());
-                } else {
-                    continue;
-                }
-
-                //校验企业是否添加该司机
-                KwfDriver driverEnt = new KwfDriver();
-                driverEnt.setId(driver.getId());
-                driverService.driverEntEdit(driverEnt);
-            }
-            count += truckReportDao.insert(truckReport);
-        }
-
-        return HttpResult.ok("成功导入"+count+"行数据！");
+//        /**文件存储**/
+//        importFileSave(file);
+//
+//        /**参数校验**/
+//        HttpResult result = this.checkParams(file);
+//        if (result.getCode() != HttpStatus.SUCCESS_CODE) {
+//            return result;
+//        }
+//
+//        List<KwfTruckReportExcelImportDto> truckReportExcels = (List)result.getData();
+//        List<String> errorList = checkParams(truckReportExcels);
+//        if (!CollectionUtils.isEmpty(errorList)) {
+//            return HttpResult.error("导入数据存在已上报，请核对再上传！", errorList);
+//        }
+//
+//        /**数据处理**/
+//        int count = 0;
+//        for (KwfTruckReportExcelImportDto truckReportExcel:truckReportExcels) {
+//            KwfTruckReport truckReport = new KwfTruckReport();
+//            truckReport.setEntId(LoginUserHolder.getEntId());
+//
+//            /**车辆信息**/
+//            //校验车辆档案是否存在
+//            List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", truckReportExcel.getTruckNo());}});
+//            if (CollectionUtils.isEmpty(trucks)) {
+//                //车辆信息
+//                KwfTruck truckParams = new KwfTruck();
+//                truckParams.setTruckNo(truckReportExcel.getTruckNo());
+//                truckParams.setActualWeight(new BigDecimal(truckReportExcel.getActualWeight()));
+//                truckParams.setAuthStatus(Global.NUMERICAL_TWO);
+//                result = truckService.truckEdit(truckParams);
+//                if (result.getCode() != HttpStatus.SUCCESS_CODE) {
+//                    continue;
+//                }
+//
+//                KwfTruck truck = (KwfTruck) result.getData();
+//                truckReport.setTruckId(truck.getId());
+//            } else {
+//                //校验车辆是否已上报
+//                KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
+//                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+//                    put("truckId", truck.getId());
+//                    put("entId", LoginUserHolder.getEntId());
+//                }});
+//                if (CollectionUtils.isEmpty(reports)) {
+//                    truckReport.setTruckId(truck.getId());
+//                } else {
+//                    continue;
+//                }
+//
+//                //校验企业是否添加该车辆
+//                KwfTruck truckEnt = new KwfTruck();
+//                truckEnt.setId(truck.getId());
+//                truckService.truckEntEdit(truckEnt);
+//            }
+//
+//            /**档案信息**/
+//            //校验司机档案是否存在
+//            List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("phone", truckReportExcel.getPhone());}});
+//            if (CollectionUtils.isEmpty(drivers)) {
+//                KwfDriver driverParams = new KwfDriver();
+//                driverParams.setName(truckReportExcel.getName());
+//                driverParams.setPhone(truckReportExcel.getPhone());
+//                driverParams.setIdcard(truckReportExcel.getIdcard());
+//                driverParams.setAuthStatus(Global.NUMERICAL_TWO);
+//                result = driverService.driverEdit(driverParams);
+//                if (result.getCode() != HttpStatus.SUCCESS_CODE) {
+//                    continue;
+//                }
+//
+//                KwfDriver driver = (KwfDriver) result.getData();
+//                truckReport.setDriverId(driver.getId());
+//            } else {
+//                //校验司机是否已上报
+//                KwfDriver driver = drivers.get(0);
+//                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+//                    put("driverId", driver.getId());
+//                    put("entId", LoginUserHolder.getEntId());
+//                }});
+//                if (CollectionUtils.isEmpty(reports)) {
+//                    truckReport.setDriverId(driver.getId());
+//                } else {
+//                    continue;
+//                }
+//
+//                //校验企业是否添加该司机
+//                KwfDriver driverEnt = new KwfDriver();
+//                driverEnt.setId(driver.getId());
+//                driverService.driverEntEdit(driverEnt);
+//            }
+//            count += truckReportDao.insert(truckReport);
+//        }
+//
+//        return HttpResult.ok("成功导入"+count+"行数据！");
+        return HttpResult.ok("成功导入！");
     }
 
     /**
@@ -344,93 +345,94 @@ public class KwfTruckReportService {
             return HttpResult.error("请选择需要上报的数据！");
         }
 
-        for (KwfTruckReportDto reportDto:params){
-            boolean bool = checkReport(reportDto);
-            if (!bool) {
-                return HttpResult.error("上报数据已存在，请重新识别！");
-            }
-        }
-
-        /**数据更新**/
-        int count = 0;
-        for (KwfTruckReportDto reportDto:params){
-            KwfTruckReport truckReport = new KwfTruckReport();
-            truckReport.setEntId(LoginUserHolder.getEntId());
-
-            /**车辆信息**/
-            //校验车辆档案是否存在
-            List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", reportDto.getTruckNo());}});
-            if (CollectionUtils.isEmpty(trucks)) {
-                //车辆信息
-                KwfTruck truckParams = new KwfTruck();
-                truckParams.setTruckNo(reportDto.getTruckNo());
-                truckParams.setActualWeight(reportDto.getActualWeight());
-                truckParams.setAuthStatus(Global.NUMERICAL_TWO);
-                HttpResult result = truckService.truckEdit(truckParams);
-                if (result.getCode() != HttpStatus.SUCCESS_CODE) {
-                    return result;
-                }
-
-                KwfTruck truck = (KwfTruck) result.getData();
-                truckReport.setTruckId(truck.getId());
-            } else {
-                //校验车辆是否已上报
-                KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("truckId", truck.getId());
-                    put("entId", LoginUserHolder.getEntId());
-                }});
-                if (CollectionUtils.isEmpty(reports)) {
-                    truckReport.setTruckId(truck.getId());
-                } else {
-                    continue;
-                }
-
-                //校验企业是否添加该车辆
-                KwfTruck truckEnt = new KwfTruck();
-                truckEnt.setId(truck.getId());
-                truckService.truckEntEdit(truckEnt);
-            }
-
-            /**档案信息**/
-            //校验司机档案是否存在
-            List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("phone", reportDto.getPhone());}});
-            if (CollectionUtils.isEmpty(drivers)) {
-                KwfDriver driverParams = new KwfDriver();
-                driverParams.setName(reportDto.getName());
-                driverParams.setPhone(reportDto.getPhone());
-                driverParams.setIdcard(reportDto.getIdcard());
-                driverParams.setAuthStatus(Global.NUMERICAL_TWO);
-                HttpResult result = driverService.driverEdit(driverParams);
-                if (result.getCode() != HttpStatus.SUCCESS_CODE) {
-                    return result;
-                }
-
-                KwfDriver driver = (KwfDriver) result.getData();
-                truckReport.setDriverId(driver.getId());
-            } else {
-                //校验司机是否已上报
-                KwfDriver driver = drivers.get(0);
-                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
-                    put("driverId", driver.getId());
-                    put("entId", LoginUserHolder.getEntId());
-                }});
-                if (CollectionUtils.isEmpty(reports)) {
-                    truckReport.setDriverId(driver.getId());
-                } else {
-                    continue;
-                }
-
-                //校验企业是否添加该司机
-                KwfDriver driverEnt = new KwfDriver();
-                driverEnt.setId(driver.getId());
-                driverService.driverEntEdit(driverEnt);
-            }
-
-            count += truckReportDao.insert(truckReport);
-        }
-
-        return HttpResult.ok("车辆上报成功"+count+"条！");
+//        for (KwfTruckReportDto reportDto:params){
+//            boolean bool = checkReport(reportDto);
+//            if (!bool) {
+//                return HttpResult.error("上报数据已存在，请重新识别！");
+//            }
+//        }
+//
+//        /**数据更新**/
+//        int count = 0;
+//        for (KwfTruckReportDto reportDto:params){
+//            KwfTruckReport truckReport = new KwfTruckReport();
+//            truckReport.setEntId(LoginUserHolder.getEntId());
+//
+//            /**车辆信息**/
+//            //校验车辆档案是否存在
+//            List<KwfTruck> trucks = truckDao.findTruck(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{ put("truckNo", reportDto.getTruckNo());}});
+//            if (CollectionUtils.isEmpty(trucks)) {
+//                //车辆信息
+//                KwfTruck truckParams = new KwfTruck();
+//                truckParams.setTruckNo(reportDto.getTruckNo());
+//                truckParams.setActualWeight(reportDto.getActualWeight());
+//                truckParams.setAuthStatus(Global.NUMERICAL_TWO);
+//                HttpResult result = truckService.truckEdit(truckParams);
+//                if (result.getCode() != HttpStatus.SUCCESS_CODE) {
+//                    return result;
+//                }
+//
+//                KwfTruck truck = (KwfTruck) result.getData();
+//                truckReport.setTruckId(truck.getId());
+//            } else {
+//                //校验车辆是否已上报
+//                KwfTruck truck = trucks.get(Global.NUMERICAL_ZERO);
+//                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+//                    put("truckId", truck.getId());
+//                    put("entId", LoginUserHolder.getEntId());
+//                }});
+//                if (CollectionUtils.isEmpty(reports)) {
+//                    truckReport.setTruckId(truck.getId());
+//                } else {
+//                    continue;
+//                }
+//
+//                //校验企业是否添加该车辆
+//                KwfTruck truckEnt = new KwfTruck();
+//                truckEnt.setId(truck.getId());
+//                truckService.truckEntEdit(truckEnt);
+//            }
+//
+//            /**档案信息**/
+//            //校验司机档案是否存在
+//            List<KwfDriver> drivers = driverDao.findDriver(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{put("phone", reportDto.getPhone());}});
+//            if (CollectionUtils.isEmpty(drivers)) {
+//                KwfDriver driverParams = new KwfDriver();
+//                driverParams.setName(reportDto.getName());
+//                driverParams.setPhone(reportDto.getPhone());
+//                driverParams.setIdcard(reportDto.getIdcard());
+//                driverParams.setAuthStatus(Global.NUMERICAL_TWO);
+//                HttpResult result = driverService.driverEdit(driverParams);
+//                if (result.getCode() != HttpStatus.SUCCESS_CODE) {
+//                    return result;
+//                }
+//
+//                KwfDriver driver = (KwfDriver) result.getData();
+//                truckReport.setDriverId(driver.getId());
+//            } else {
+//                //校验司机是否已上报
+//                KwfDriver driver = drivers.get(0);
+//                List<Map<String, Object>> reports = truckReportDao.findList(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
+//                    put("driverId", driver.getId());
+//                    put("entId", LoginUserHolder.getEntId());
+//                }});
+//                if (CollectionUtils.isEmpty(reports)) {
+//                    truckReport.setDriverId(driver.getId());
+//                } else {
+//                    continue;
+//                }
+//
+//                //校验企业是否添加该司机
+//                KwfDriver driverEnt = new KwfDriver();
+//                driverEnt.setId(driver.getId());
+//                driverService.driverEntEdit(driverEnt);
+//            }
+//
+//            count += truckReportDao.insert(truckReport);
+//        }
+//
+//        return HttpResult.ok("车辆上报成功"+count+"条！");
+        return HttpResult.ok("车辆上报成功！");
     }
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -16,11 +16,9 @@ import com.sckw.core.exception.BusinessException;
 import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.base.BaseModel;
 import com.sckw.core.model.constant.Global;
-import com.sckw.core.model.constant.UrlConstants;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.model.enums.SystemTypeEnum;
 import com.sckw.core.model.file.FileInfo;
-
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginEntHolder;
@@ -28,7 +26,6 @@ import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.request.HttpClientUtil;
 import com.sckw.core.web.response.BaseIotResult;
 import com.sckw.core.web.response.HttpResult;
-import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.excel.easyexcel.ExcelImportListener;
 import com.sckw.excel.utils.ExcelUtil;
@@ -36,7 +33,10 @@ import com.sckw.fleet.config.UrlConfigProperties;
 import com.sckw.fleet.dao.*;
 import com.sckw.fleet.model.*;
 import com.sckw.fleet.model.dto.*;
-import com.sckw.fleet.model.request.*;
+import com.sckw.fleet.model.request.BatchTruckValidateReq;
+import com.sckw.fleet.model.request.CapacityStatusReq;
+import com.sckw.fleet.model.request.TruckInfoReq;
+import com.sckw.fleet.model.request.TruckNoReq;
 import com.sckw.fleet.model.vo.*;
 import com.sckw.fleet.repository.*;
 import com.sckw.system.api.RemoteSystemService;
@@ -52,7 +52,6 @@ import com.sckw.transport.api.model.dto.VehicleDataDTO;
 import com.sckw.transport.api.model.dto.VehicleReturnData;
 import com.sckw.transport.api.model.vo.RTruckMonitorVo;
 import com.sckw.transport.api.model.vo.RWaybillOrderVo;
-import com.sckw.transport.api.model.vo.VehicleTraceResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -99,6 +98,7 @@ public class KwfTruckService {
     private final UrlConfigProperties urlConfigProperties;
     private final KwfFleetDriverRepository kwfFleetDriverRepository;
     private final KwfTruckAxleNumRepository truckAxleNumRepository;
+    private final KwfTruckEntRepository truckEntRepository;
 
     private final KwfFleetTruckRepository kwfFleetTruckRepository;
     private final VehicleTraceClient vehicleTraceClient;
@@ -608,8 +608,8 @@ public class KwfTruckService {
             }});
             if (CollectionUtils.isEmpty(trucks)) {
                 /**新增**/
-                params.setEntId(LoginUserHolder.getEntId());
-                params.setEntId(params.getEntId() == null ? 1 : params.getEntId());// 暂时处理---------------zk
+//                params.setEntId(LoginUserHolder.getEntId());
+//                params.setEntId(params.getEntId() == null ? 1 : params.getEntId());// 暂时处理---------------zk
                 params.setBusinessStatus(Global.NO);
                 params.setStatus(Global.NO);
                 int count = truckDao.insert(params);
@@ -624,7 +624,7 @@ public class KwfTruckService {
 
                 /**车辆信息与企业关联信息**/
                 KwfTruck truckEnt = new KwfTruck();
-                truckEnt.setEntId(LoginUserHolder.getEntId());
+//                truckEnt.setEntId(LoginUserHolder.getEntId());
                 truckEnt.setId(truck.getId());
                 truckEntEdit(truckEnt);
                 return count > 0 ? HttpResult.ok("车辆信息修改成功！", truck) : HttpResult.error("车辆信息修改失败！");
@@ -752,7 +752,7 @@ public class KwfTruckService {
     public int truckEntEdit(KwfTruck params) {
         KwfTruckEnt truckEnt = new KwfTruckEnt();
         truckEnt.setTruckId(params.getId());
-        truckEnt.setEntId(params.getEntId() == null ? LoginUserHolder.getEntId() : params.getEntId());
+        truckEnt.setEntId(LoginUserHolder.getEntId());
         KwfTruckEnt ent = truckEntDao.findByTruckEnt(truckEnt);
         if (ent == null) {
             int count = truckEntDao.insert(truckEnt);
@@ -833,6 +833,41 @@ public class KwfTruckService {
         return truckDao.truckStatistics(LoginUserHolder.getEntId());
     }
 
+
+    /**
+     * 通过企业id查询车辆ids
+     * @param entId
+     * @return
+     */
+    public List<Long> findTruckIdListByEntIds(Long entId) {
+        //先查询车辆企业关联关系
+        List<KwfTruckEnt> truckEntByEntIds = truckEntRepository.findTruckEntByEntIds(entId);
+        if(CollectionUtils.isEmpty(truckEntByEntIds)){
+            return new ArrayList<>();
+        }
+        return truckEntByEntIds.stream().map(KwfTruckEnt::getTruckId).collect(Collectors.toList());
+    }
+
+    /**
+     * 通过企业id查询车辆信息
+     * @param entId
+     * @return
+     */
+    public List<KwfTruck> findTruckByEntIds(Long entId) {
+        //先查询车辆企业关联关系
+        List<KwfTruckEnt> truckEntByEntIds = truckEntRepository.findTruckEntByEntIds(entId);
+        if(CollectionUtils.isEmpty(truckEntByEntIds)){
+            return new ArrayList<>();
+        }
+        List<Long> truckIds = truckEntByEntIds.stream().map(KwfTruckEnt::getTruckId).collect(Collectors.toList());
+        //通过车牌id查询车辆
+        List<KwfTruck> truckList = kwfTruckRepository.findTruckByTruckIds(truckIds);
+        if(CollectionUtils.isEmpty(truckList)){
+            return new ArrayList<>();
+        }
+        return truckList;
+    }
+
     /**
      * 统计车辆业务状态数量（全部、空闲、任务中）
      * @return 统计结果
@@ -843,7 +878,7 @@ public class KwfTruckService {
         log.info("统计车辆业务状态数量（全部、空闲、任务中）");
         Long entId = LoginUserHolder.getEntId();
         // 统计全部车辆数量
-        List<KwfTruck> trucks = kwfTruckRepository.countByEntId(entId);
+        List<KwfTruck> trucks = findTruckByEntIds(entId);
         if (org.apache.commons.collections4.CollectionUtils.isEmpty( trucks)){
             return TruckBusinessStatusStatisticsVo.of(0L, 0L, 0L);
         }
@@ -1000,15 +1035,15 @@ public class KwfTruckService {
                 put("truckNo", truckNo);
             }});
             KwfTruck truck = CollectionUtils.isEmpty(trucks) ? null : trucks.get(Global.NUMERICAL_ZERO);
-            if (truck != null) {
-                //企业数据集
-                List<Long> entIds = new ArrayList<>() {{
-                    add(truck.getEntId());
-                }};
-                Map<Long, EntCacheResDto> ents = remoteSystemService.queryEntCacheMapByIds(entIds);
-                EntCacheResDto ent = ents == null ? null : ents.get(truck.getEntId());
-                firmName = ent != null ? ent.getFirmName() : null;
-            }
+//            if (truck != null) {
+//                //企业数据集
+//                List<Long> entIds = new ArrayList<>() {{
+//                    add(truck.getEntId());
+//                }};
+//                Map<Long, EntCacheResDto> ents = remoteSystemService.queryEntCacheMapByIds(entIds);
+//                EntCacheResDto ent = ents == null ? null : ents.get(truck.getEntId());
+//                firmName = ent != null ? ent.getFirmName() : null;
+//            }
         }
         //详细地址
         String detailAddress = truckGps != null
@@ -1566,58 +1601,58 @@ public class KwfTruckService {
      */
     public PageDataResult<TruckInfoVo> pageTruckInfo(TruckInfoReq req) {
         log.info("分页查询车辆信息,请求参数：{}",JSON.toJSONString(req));
-        //查询车辆信息
-        Long entId = req.getEntId();
-        if (StringUtils.isNotBlank(req.getTruckNo())){
-            KwfTruck kwfTruck = kwfTruckRepository.queryByTruckNo(req.getTruckNo());
-            entId = Optional.ofNullable(kwfTruck).map(KwfTruck::getEntId).orElse(null);
-        }
-
-        //分页查询所有企业
-        PageDataResult<KwsEnterpriseResDto> page = remoteSystemService.pageEnt(req.getPageNum(), req.getPageSize(), entId);
-        List<KwsEnterpriseResDto> enterpriseResDtoList = page.getList();
-        if (CollectionUtils.isEmpty(page.getList())){
-            return PageDataResult.empty(req.getPageNum(), req.getPageSize());
-        }
-        //获取企业id
-        List<Long> entIds = enterpriseResDtoList.stream()
-                .map(KwsEnterpriseResDto::getId)
-                .collect(Collectors.toList());
-        //获取车辆信息
-        List<KwfTruck> truckList = kwfTruckRepository.queryByEntIds(entIds, req.getTruckMark(), req.getStartTime(), req.getEndTime());
-        if (CollectionUtils.isEmpty(truckList)){
-            return PageDataResult.empty(req.getPageNum(), req.getPageSize());
-        }
-        if (Objects.nonNull(req.getEntId())){
-            truckList = truckList.stream()
-                    .filter(x->Objects.equals(x.getEntId(), req.getEntId()))
-                    .collect(Collectors.toList());
-        }
-        if (StringUtils.isNotBlank(req.getTruckNo())){
-            truckList = truckList.stream()
-                    .filter(x-> org.apache.commons.lang3.StringUtils.equals(x.getTruckNo(), req.getTruckNo()))
-                    .collect(Collectors.toList()) ;
-        }
-        //将车辆信息按照企业id进行分组
-        Map<Long, List<KwfTruck>> entIdAndTruckMap = truckList.stream()
-                .collect(Collectors.groupingBy(KwfTruck::getEntId));
-
-        //查询订单
-        List<RWaybillOrderVo> rWaybillOrderVos = transportRemoteService.queryWaybillOrderByEntId(req.getEntId());
-        Map<Long, List<RWaybillOrderVo>> truckIdAndOrderMap = Maps.newHashMap() ;
-        if (CollectionUtils.isNotEmpty(rWaybillOrderVos)){
-            truckIdAndOrderMap = rWaybillOrderVos.stream()
-                    .collect(Collectors.groupingBy(RWaybillOrderVo::getTruckId));
-        }
-
-
-        //遍历所有企业
-        Map<Long, List<RWaybillOrderVo>> finalTruckIdAndOrderMap = truckIdAndOrderMap;
-        List<TruckInfoVo> ents = enterpriseResDtoList.stream()
-                .map(e -> getTruckInfoVo(e, entIdAndTruckMap, finalTruckIdAndOrderMap))
-                .filter(x->CollectionUtils.isNotEmpty(x.getTruck()))
-                .collect(Collectors.toList());
-        return PageDataResult.success(page.getPageNum(),page.getPageSize(),page.getTotal(),ents);
+//        //查询车辆信息
+//        Long entId = req.getEntId();
+//        if (StringUtils.isNotBlank(req.getTruckNo())){
+//            KwfTruck kwfTruck = kwfTruckRepository.queryByTruckNo(req.getTruckNo());
+//        }
+//
+//        //分页查询所有企业
+//        PageDataResult<KwsEnterpriseResDto> page = remoteSystemService.pageEnt(req.getPageNum(), req.getPageSize(), entId);
+//        List<KwsEnterpriseResDto> enterpriseResDtoList = page.getList();
+//        if (CollectionUtils.isEmpty(page.getList())){
+//            return PageDataResult.empty(req.getPageNum(), req.getPageSize());
+//        }
+//        //获取企业id
+//        List<Long> entIds = enterpriseResDtoList.stream()
+//                .map(KwsEnterpriseResDto::getId)
+//                .collect(Collectors.toList());
+//        //获取车辆信息
+//        List<KwfTruck> truckList = kwfTruckRepository.queryByEntIds(entIds, req.getTruckMark(), req.getStartTime(), req.getEndTime());
+//        if (CollectionUtils.isEmpty(truckList)){
+//            return PageDataResult.empty(req.getPageNum(), req.getPageSize());
+//        }
+//        if (Objects.nonNull(req.getEntId())){
+//            truckList = truckList.stream()
+//                    .filter(x->Objects.equals(x.getEntId(), req.getEntId()))
+//                    .collect(Collectors.toList());
+//        }
+//        if (StringUtils.isNotBlank(req.getTruckNo())){
+//            truckList = truckList.stream()
+//                    .filter(x-> org.apache.commons.lang3.StringUtils.equals(x.getTruckNo(), req.getTruckNo()))
+//                    .collect(Collectors.toList()) ;
+//        }
+//        //将车辆信息按照企业id进行分组
+//        Map<Long, List<KwfTruck>> entIdAndTruckMap = truckList.stream()
+//                .collect(Collectors.groupingBy(KwfTruck::getEntId));
+//
+//        //查询订单
+//        List<RWaybillOrderVo> rWaybillOrderVos = transportRemoteService.queryWaybillOrderByEntId(req.getEntId());
+//        Map<Long, List<RWaybillOrderVo>> truckIdAndOrderMap = Maps.newHashMap() ;
+//        if (CollectionUtils.isNotEmpty(rWaybillOrderVos)){
+//            truckIdAndOrderMap = rWaybillOrderVos.stream()
+//                    .collect(Collectors.groupingBy(RWaybillOrderVo::getTruckId));
+//        }
+//
+//
+//        //遍历所有企业
+//        Map<Long, List<RWaybillOrderVo>> finalTruckIdAndOrderMap = truckIdAndOrderMap;
+//        List<TruckInfoVo> ents = enterpriseResDtoList.stream()
+//                .map(e -> getTruckInfoVo(e, entIdAndTruckMap, finalTruckIdAndOrderMap))
+//                .filter(x->CollectionUtils.isNotEmpty(x.getTruck()))
+//                .collect(Collectors.toList());
+//        return PageDataResult.success(page.getPageNum(),page.getPageSize(),page.getTotal(),ents);
+        return PageDataResult.empty(req.getPageNum(), req.getPageSize());
     }
 
 
@@ -1695,17 +1730,14 @@ public class KwfTruckService {
         log.info("app端分页查询车辆信息,请求参数：{}",JSON.toJSONString(req));
         //查询车辆信息
         Long entId = req.getEntId();
-        IPage<KwfTruck> page = kwfTruckRepository.queryByCondition(entId,req.getTruckNo(),req.getTruckMark(),req.getStartTime(),req.getEndTime(),req.getPageNum(),req.getPageSize());
+        List<Long> truckIdList = findTruckIdListByEntIds(entId);
+        IPage<KwfTruck> page = kwfTruckRepository.queryByCondition(truckIdList,req.getTruckNo(),req.getTruckMark(),req.getStartTime(),req.getEndTime(),req.getPageNum(),req.getPageSize());
         List<KwfTruck> truckList = page.getRecords();
         if (CollectionUtils.isEmpty(truckList)){
             return PageDataResult.empty(req.getPageNum(), req.getPageSize());
         }
-        List<Long> entIds = truckList.stream()
-                .map(KwfTruck::getEntId)
-                .distinct()
-                .collect(Collectors.toList());
         //entId映射企业信息
-        Map<Long, KwsEnterpriseResDto> entIdKwsEnterpriseResDtoMap = remoteSystemService.queryEnterpriseByEntIds(entIds);
+        Map<Long, KwsEnterpriseResDto> entIdKwsEnterpriseResDtoMap = remoteSystemService.queryEnterpriseByEntIds(Lists.newArrayList(entId));
         //根据车辆车辆id，查询车队
         Set<Long> truckIds = truckList.stream().map(BaseModel::getId).collect(Collectors.toSet());
         List<KwfFleetTruck> kwfFleetTrucks = kwfFleetTruckRepository.queryByTruckIds(truckIds);
@@ -1770,7 +1802,7 @@ public class KwfTruckService {
         Map<Long, List<KwfFleetDriver>> finalFleetIdAndDriverMap = fleetIdAndDriverMap;
         Map<Long, List<RWaybillOrderVo>> finalTruckIdAndWaybillOrderMap = truckIdAndWaybillOrderMap;
         List<AppTruckInfoVo> ents = truckList.stream()
-                .map(t-> getAppTruckInfoVo(t, entIdKwsEnterpriseResDtoMap, finalTruckIdAndFleetTruckMap
+                .map(t-> getAppTruckInfoVo(t, entId, entIdKwsEnterpriseResDtoMap, finalTruckIdAndFleetTruckMap
                         , finalFleetIdAndFleetMap, finalDriverIdAndDriverMap, finalFleetIdAndDriverMap, finalTruckIdAndWaybillOrderMap))
                 .collect(Collectors.toList());
 
@@ -1778,15 +1810,15 @@ public class KwfTruckService {
     }
 
 
-    private AppTruckInfoVo getAppTruckInfoVo(KwfTruck t, Map<Long, KwsEnterpriseResDto> entIdKwsEnterpriseResDtoMap
+    private AppTruckInfoVo getAppTruckInfoVo(KwfTruck t, Long entId, Map<Long, KwsEnterpriseResDto> entIdKwsEnterpriseResDtoMap
             ,Map<Long, List<KwfFleetTruck>> truckIdAndFleetTruckMap
             ,Map<Long, KwfFleet> fleetIdAndFleetMap
             , Map<Long, KwfDriver> driverIdAndDriverMap
             ,Map<Long, List<KwfFleetDriver>> fleetIdAndDriverMap
             ,Map<Long, List<RWaybillOrderVo>> finalTruckIdAndWaybillOrderMap) {
         AppTruckInfoVo truckInfoVo = new AppTruckInfoVo();
-        truckInfoVo.setEntId(String.valueOf(t.getEntId()));
-        KwsEnterpriseResDto enterpriseResDto = entIdKwsEnterpriseResDtoMap.getOrDefault(t.getEntId(), new KwsEnterpriseResDto());
+        truckInfoVo.setEntId(String.valueOf(entId));
+        KwsEnterpriseResDto enterpriseResDto = entIdKwsEnterpriseResDtoMap.getOrDefault(entId, new KwsEnterpriseResDto());
         truckInfoVo.setEntName(enterpriseResDto.getFirmName());
         truckInfoVo.setTruckId(String.valueOf(t.getId()));
         truckInfoVo.setTruckNo(t.getTruckNo());
@@ -1829,7 +1861,8 @@ public class KwfTruckService {
      * @return
      */
     public List<KwfTruckVo> queryTruckNo(TruckNoReq req) {
-        List<KwfTruck> turkNoList = kwfTruckRepository.getTurkNoList(req.getEntId(), req.getTruckNo());
+        List<Long> truckIds = findTruckIdListByEntIds(req.getEntId());
+        List<KwfTruck> turkNoList = kwfTruckRepository.getTurkNoList(truckIds, req.getTruckNo());
         if (CollectionUtils.isEmpty(turkNoList)) {
             return Collections.emptyList();
         }
@@ -1857,7 +1890,9 @@ public class KwfTruckService {
          }
          Integer businessStatus = org.apache.commons.lang3.StringUtils.isBlank(req.getBusinessStatus()) ? null :
                  Integer.parseInt(req.getBusinessStatus());
-        IPage<KwfTruck> kwfTruckIPage = kwfTruckRepository.queryByPage(req.getPageNum(), req.getPageSize(), req.getEntId(), businessStatus,
+
+        List<Long> truckIds = findTruckIdListByEntIds(req.getEntId());
+        IPage<KwfTruck> kwfTruckIPage = kwfTruckRepository.queryByPage(req.getPageNum(), req.getPageSize(), truckIds, businessStatus,
                 req.getTruckNo());
         List<KwfTruck> records = kwfTruckIPage.getRecords();
         if (org.apache.commons.collections4.CollectionUtils.isEmpty( records)){
@@ -1917,23 +1952,20 @@ public class KwfTruckService {
         // 批量查询车辆信息
         Map<String, KwfTruck> truckMap = new HashMap<>();
         if (!truckNoList.isEmpty()) {
-            List<KwfTruck> trucks = kwfTruckRepository.queryByTruckNosAndEntId(truckNoList,entId);
+            List<KwfTruck> kwfTruckList = findTruckByEntIds(entId);
+            List<KwfTruck> trucks = kwfTruckList.stream().filter(Objects::nonNull)
+                    .filter(truck -> truck.getTruckNo() != null && truckNoList.contains(truck.getTruckNo()))
+                    .collect(Collectors.toList());
             truckMap = trucks.stream()
                 .collect(Collectors.toMap(KwfTruck::getTruckNo, Function.identity(), (k1, k2) -> k1));
         }
 
-        // 批量查询企业信息
-        Set<Long> entIds = truckMap.values().stream()
-            .map(KwfTruck::getEntId)
-            .collect(Collectors.toSet());
-        Map<Long, EntCacheResDto> entMap = new HashMap<>();
-        if (!entIds.isEmpty()) {
-            entMap = remoteSystemService.queryEntCacheMapByIds(new ArrayList<>(entIds));
-        }
+        // 查询企业信息
+        EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(entId);
 
         // 处理每个车牌号
         for (String originalTruckNo : truckNoList) {
-            TruckValidateVo vo = validateSingleTruckNo(originalTruckNo, truckMap, entMap);
+            TruckValidateVo vo = validateSingleTruckNo(originalTruckNo, truckMap, entCacheResDto);
             result.add(vo);
         }
         if (CollectionUtils.isNotEmpty( result)){
@@ -1952,7 +1984,7 @@ public class KwfTruckService {
      */
     private TruckValidateVo validateSingleTruckNo(String originalTruckNo, 
                                                   Map<String, KwfTruck> truckMap,
-                                                  Map<Long, EntCacheResDto> entMap) {
+                                                  EntCacheResDto ent) {
         TruckValidateVo.TruckValidateVoBuilder builder = TruckValidateVo.builder()
             .originalTruckNo(originalTruckNo);
 
@@ -1981,10 +2013,9 @@ public class KwfTruckService {
             builder.exists(true)
                    .truckId(truck.getId())
                    .carAxis(axleNum.getName())
-                   .entId(truck.getEntId());
+                   .entId(ent.getId());
 
             // 获取企业名称
-            EntCacheResDto ent = entMap.get(truck.getEntId());
             if (ent != null) {
                 builder.entName(ent.getFirmName());
             }