Merge remote-tracking branch 'origin/dev_20251030' into dev_20251030

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/HttpUtil.java

@@ -15,7 +15,7 @@ public class HttpUtil {
 
     // 单例 OkHttpClient（推荐这样做，避免重复创建）
     private static final OkHttpClient client = new OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)
+            .connectTimeout(60, TimeUnit.SECONDS)
             .readTimeout(60, TimeUnit.SECONDS)
             .writeTimeout(60, TimeUnit.SECONDS)
             .build();

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

@@ -400,21 +400,23 @@ public class KwfTruckService {
             return counts;
         } else {
             Object keywords = params.get("keywords");
-            if (StringUtils.isNotBlank(keywords)) {
+            String newKeywords = keywords == null ? null : StringUtils.objectStr(keywords).trim();
+            if (StringUtils.isNotBlank(newKeywords)) {
                 //查询企业
                 List<Integer> entTypes = new ArrayList<>() {{
                     add(EntTypeEnum.LOGISTICS3.getCode());
                     add(EntTypeEnum.LOGISTICS4.getCode());
                 }};
-                List<Long> entIds = remoteUserService.findEntIds(entTypes, StringUtils.objectStr(keywords));
+                List<Long> entIds = remoteUserService.findEntIds(entTypes,newKeywords);
                 params.put("entIds", entIds);
                 //查询用户
                 List<Long> userIds = remoteUserService.findUserIds(new ArrayList<>() {{
                     add(LoginUserHolder.getEntId());
-                }}, StringUtils.objectStr(keywords));
+                }}, newKeywords);
                 params.put("createBys", userIds);
             }
             params.put("entId", LoginUserHolder.getEntId());
+            params.put("keywords", newKeywords);
             List<KwfTruckVo> counts = truckDao.findPage(params);
             return counts;
         }
@@ -493,7 +495,7 @@ public class KwfTruckService {
             truckLicenseEdit(truckLicenseDto);
         }
 
-        /**车辆行驶证信息**/
+        /**车辆道路运输许可证**/
         KwfTransportLicenseDto transportLicenseDto = params.getTransportLicense();
         if (transportLicenseDto != null) {
             transportLicenseDto.setTruckId(truck.getId());
@@ -1418,12 +1420,10 @@ public class KwfTruckService {
 
         //根据车辆id查询车辆信息
         List<KwfTruck> kwfTrucks = kwfTruckRepository.queryByTruckIds(truckIds);
-        //按照车辆id进行分组
-        Map<Long, List<KwfTruck>> truckIdAndTruckListMap = kwfTrucks.stream().collect(Collectors.groupingBy(KwfTruck::getId));
         //获取要返回的车辆信息
         List<CapacityStatusVo.Truck> trucks = Lists.newArrayList();
         fleetIdAndFleetTruckListMap.forEach((fleetId, fleetTruckList) -> {
-            buildTruck(fleetId, fleetTruckList, fleetMap,trucks);
+            buildTruck(fleetId, fleetTruckList, fleetMap,trucks,kwfTrucks);
         });
 
         CapacityStatusVo capacityStatusVo = new CapacityStatusVo();
@@ -1431,20 +1431,23 @@ public class KwfTruckService {
         return capacityStatusVo;
     }
 
-    private static void buildTruck(Long fleetId, List<KwfFleetTruck> fleetTruckList, Map<Long, KwfFleet> fleetMap,List<CapacityStatusVo.Truck> trucks) {
+    private static void buildTruck(Long fleetId, List<KwfFleetTruck> fleetTruckList, Map<Long, KwfFleet> fleetMap,List<CapacityStatusVo.Truck> trucks,List<KwfTruck> kwfTrucks) {
         CapacityStatusVo.Truck truck = new CapacityStatusVo.Truck();
         truck.setFleetId(String.valueOf(fleetId));
         truck.setFleetName(fleetMap.getOrDefault(fleetId, new KwfFleet()).getName());
         //获取空闲车辆数
         truck.setIdleNum("0");
         truck.setRunningNum("0");
-        if (CollectionUtils.isNotEmpty(fleetTruckList)) {
-            long idleNum = fleetTruckList.stream()
-                    .filter(ft -> Objects.equals(ft.getStatus(), 0))
+        if (CollectionUtils.isNotEmpty(fleetTruckList) ) {
+            Set<Long> truckIds = fleetTruckList.stream()
+                    .map(KwfFleetTruck::getTruckId)
+                    .collect(Collectors.toSet());
+            long idleNum = kwfTrucks.stream()
+                    .filter(x -> truckIds.contains(x.getId()) && Objects.equals(x.getBusinessStatus(), 0))
                     .count();
             truck.setIdleNum(String.valueOf(idleNum));
-            long runningNum = fleetTruckList.stream()
-                    .filter(ft -> Objects.equals(ft.getStatus(), 1))
+            long runningNum = kwfTrucks.stream()
+                    .filter(x -> truckIds.contains(x.getId()) && Objects.equals(x.getBusinessStatus(), 1))
                     .count();
             truck.setRunningNum(String.valueOf(runningNum));
         }
@@ -1507,7 +1510,7 @@ public class KwfTruckService {
                 .filter(x -> Objects.equals(x.getBusinessStatus(), 1))
                 .count()));
         capacityTotalStatusVo.setIdleTotalTruckNum(CollectionUtils.isEmpty(kwfTrucks) ? "0" : String.valueOf(kwfTrucks.stream()
-                .filter(x -> Objects.equals(x.getStatus(), 0))
+                .filter(x -> Objects.equals(x.getBusinessStatus(), 0))
                 .count()));
         capacityTotalStatusVo.setAbnormalTotalTruckNum("0");
         return capacityTotalStatusVo;

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfDriverMapper.xml

@@ -221,8 +221,8 @@
         </choose>
         <if test="keywords != null and keywords != ''">
             and (
-            dr.name like concat('%',#{keywords},'%')
-            or dr.phone like concat('%',#{keywords},'%')
+            dr.name like concat('%',trim(#{keywords}),'%')
+            or dr.phone like concat('%',trim(#{keywords}),'%')
             )
         </if>
         ORDER BY dr.create_time desc

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfFleetMapper.xml

@@ -39,9 +39,9 @@
         </choose>
         <if test="keywords != null and keywords != ''">
             and (
-                fl.name like concat('%',#{keywords},'%')
-                or fl.contacts like concat('%',#{keywords},'%')
-                or fl.phone like concat('%',#{keywords},'%')
+                fl.name like concat('%',trim(#{keywords}),'%')
+                or fl.contacts like concat('%',trim(#{keywords}),'%')
+                or fl.phone like concat('%',trim(#{keywords}),'%')
             )
         </if>
         ORDER BY fl.create_time desc

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/kwfTruckTraceService.java

@@ -243,7 +243,9 @@ public class kwfTruckTraceService {
             return buildTruckInfo(truckId, vehicleReturnData, truckNo);
         }
         //todo 查询中交 如果数据中台没有数据则查询中交
-        return getTruckInfoVoByZj(truckNo, wOrderNo,truckId);
+       // return getTruckInfoVoByZj(truckNo, wOrderNo,truckId);
+        return new TruckInfoVo();
+
     }