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

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

@@ -25,21 +25,26 @@ public class HttpUtil {
     /**
      * 同步 GET 请求
      */
-    public static String get(String url, Map<String, String> headers) throws Exception {
+    public static String get(String url, Map<String, String> headers) {
         Request.Builder builder = new Request.Builder().url(url);
         addHeaders(builder, headers);
 
         Request request = builder.build();
-        try (Response response = client.newCall(request).execute()) {
-            if (response.isSuccessful() && response.body() != null) {
-                String result = response.body().string();
-                log.info("同步 GET 响应结果：{}", result);
-                return result;
-            } else if (!response.isSuccessful()) {
-                throw new BusinessException("同步 GET 请求请求异常: " + response.code());
-            } else {
-                return "";
+        try {
+            try (Response response = client.newCall(request).execute()) {
+                if (response.isSuccessful() && response.body() != null) {
+                    String result = response.body().string();
+                    log.info("同步 GET 响应结果：{}", result);
+                    return result;
+                } else if (!response.isSuccessful()) {
+                    throw new BusinessException("同步 GET 请求请求异常: " + response.code());
+                } else {
+                    return "";
+                }
             }
+        } catch (IOException e) {
+            log.error("同步 GET 响应异常: {}", e.getMessage());
+            return "";
         }
     }
 
@@ -51,13 +56,17 @@ public class HttpUtil {
         addHeaders(builder, headers);
 
         Request request = builder.build();
-        client.newCall(request).enqueue(callback);
+        try {
+            client.newCall(request).enqueue(callback);
+        } catch (Exception e) {
+            throw new BusinessException("异步 GET 请求 异常",e);
+        }
     }
 
     /**
      * 同步 POST - 表单请求
      */
-    public static String postForm(String url, Map<String, String> formData, Map<String, String> headers) throws IOException {
+    public static String postForm(String url, Map<String, String> formData, Map<String, String> headers) {
         FormBody.Builder formBuilder = new FormBody.Builder();
         if (formData != null) {
             for (Map.Entry<String, String> entry : formData.entrySet()) {
@@ -70,38 +79,49 @@ public class HttpUtil {
         addHeaders(builder, headers);
 
         Request request = builder.build();
-        try (Response response = client.newCall(request).execute()) {
-            if (response.isSuccessful() && response.body() != null) {
-                String result = response.body().string();
-                log.info("同步 POST - 表单响应结果：{}", result);
-                return result;
-            } else if (!response.isSuccessful()) {
-                throw new BusinessException("同步 POST - 表单请求异常: " + response.code());
-            } else {
-                return "";
+        try {
+            try (Response response = client.newCall(request).execute()) {
+                if (response.isSuccessful() && response.body() != null) {
+                    String result = response.body().string();
+                    log.info("同步 POST - 表单响应结果：{}", result);
+                    return result;
+                } else if (!response.isSuccessful()) {
+                    throw new BusinessException("同步 POST - 表单请求异常: " + response.code());
+                } else {
+                    return "";
+                }
             }
+        } catch (Exception e) {
+            log.error("同步 POST - 表单异常: {}", e.getMessage());
+            return "";
         }
     }
 
     /**
      * 同步 POST - JSON 请求
      */
-    public static String postJson(String url, String json, Map<String, String> headers) throws IOException {
+    public static String postJson(String url, String json, Map<String, String> headers)  {
         RequestBody body = RequestBody.create(json, JSON);
         Request.Builder builder = new Request.Builder().url(url).post(body);
         addHeaders(builder, headers);
 
         Request request = builder.build();
-        try (Response response = client.newCall(request).execute()) {
-            if (response.isSuccessful() && response.body() != null) {
-                String result =  response.body().string();
-                log.info("同步 POST - JSON响应结果：{}",result );
-                return result;
-            } else if (!response.isSuccessful()) {
-                throw new BusinessException("同步 POST - JSON 请求异常: " + response.code());
-            } else {
-                return "";
+
+        try {
+            try (Response response = client.newCall(request).execute()) {
+                if (response.isSuccessful() && response.body() != null) {
+                    String result =  response.body().string();
+                    log.info("同步 POST - JSON响应结果：{}",result );
+                    return result;
+                } else if (!response.isSuccessful()) {
+                    throw new BusinessException("同步 POST - JSON 请求异常: " + response.code());
+                } else {
+                    return "";
+                }
             }
+        } catch (Exception e) {
+            log.error("同步 POST - JSON 异常: {}", e.getMessage());
+            return "";
         }
     }
 
@@ -114,7 +134,11 @@ public class HttpUtil {
         addHeaders(builder, headers);
 
         Request request = builder.build();
-        client.newCall(request).enqueue(callback);
+        try {
+            client.newCall(request).enqueue(callback);
+        } catch (Exception e) {
+            throw new BusinessException("异步 POST - JSON异常：{}", e.getMessage());
+        }
     }
 
     /**

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckInfoReq.java

@@ -20,4 +20,6 @@ public class TruckInfoReq extends PageReq implements Serializable {
      */
     @Schema(description = "车牌号")
     private String truckNo;
+
+    private Long entId;
 }

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

@@ -1460,7 +1460,7 @@ public class KwfTruckService {
     public PageDataResult<TruckInfoVo> pageTruckInfo(TruckInfoReq req) {
         log.info("分页查询车辆信息,请求参数：{}",JSON.toJSONString(req));
         //查询车辆信息
-        Long entId = null;
+        Long entId = req.getEntId();
         if (StringUtils.isNotBlank(req.getTruckNo())){
             KwfTruck kwfTruck = kwfTruckRepository.queryByTruckNo(req.getTruckNo());
             entId = Optional.ofNullable(kwfTruck).map(KwfTruck::getEntId).orElse(null);
@@ -1478,15 +1478,27 @@ public class KwfTruckService {
                 .collect(Collectors.toList());
         //获取车辆信息
         List<KwfTruck> truckList = kwfTruckRepository.queryByEntIds(entIds);
-
+        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()
-                .filter(x->StringUtils.isNotBlank(req.getTruckNo()) && org.apache.commons.lang3.StringUtils.equals(x.getTruckNo(), req.getTruckNo()) )
                 .collect(Collectors.groupingBy(KwfTruck::getEntId));
 
         //遍历所有企业
         List<TruckInfoVo> ents = enterpriseResDtoList.stream()
                 .map(e -> getTruckInfoVo(e, entIdAndTruckMap))
+                .filter(x->CollectionUtils.isNotEmpty(x.getTruck()))
                 .collect(Collectors.toList());
         return PageDataResult.success(page.getPageNum(),page.getPageSize(),page.getTotal(),ents);
     }
@@ -1523,17 +1535,18 @@ public class KwfTruckService {
     public VehicleReturnData getVehicleReturnData(String truckId) {
         VehicleDataDTO vehicleDataDTO = new VehicleDataDTO();
         vehicleDataDTO.setCarNo(truckId);
-        String s;
+        String res = null;
         try {
-            s = HttpUtil.postJson(urlConfigProperties.getApiBaseUrl()+ UrlConstants.QUERY_REAL_TIME_TRACE_URL, JSON.toJSONString(vehicleDataDTO), null);
+            res = HttpUtil.postJson(urlConfigProperties.getApiBaseUrl()+ UrlConstants.QUERY_REAL_TIME_TRACE_URL, JSON.toJSONString(vehicleDataDTO), null);
         } catch (Exception e) {
             log.error("查询任务轨迹异常",e);
-            throw new BusinessException("查询任务轨迹异常");
+            return null;
+           // throw new BusinessException("查询任务轨迹异常");
         }
-        if (org.apache.commons.lang3.StringUtils.isBlank(s)){
+        if (org.apache.commons.lang3.StringUtils.isBlank(res)){
             return null;
         }
-        JSONObject jsonObject  = JSON.parseObject(s);
+        JSONObject jsonObject  = JSON.parseObject(res);
         return JSON.parseObject(jsonObject.get("data").toString(), VehicleReturnData.class);
     }
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/repository/KwsEnterpriseRepository.java

@@ -20,6 +20,6 @@ public class KwsEnterpriseRepository extends ServiceImpl<KwsEnterpriseDao,KwsEnt
     public IPage<KwsEnterprise> pageEnt(int pageNum, int pageSize, Long entId) {
         return page(new Page<>(pageNum, pageSize), Wrappers.<KwsEnterprise>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
-                .eq(KwsEnterprise::getId, entId));
+                .eq(Objects.nonNull(entId),KwsEnterprise::getId, entId));
     }
 }

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

@@ -2169,12 +2169,12 @@ public class KwtWaybillOrderV1Service {
                 //从中台查询轨迹信息
                 VehicleDataDTO vehicleDataDTO = new VehicleDataDTO();
                 vehicleDataDTO.setWOrderNo(waybillOrder.getWOrderNo());
-                String s;
+                String s = "";
                 try {
                     s = HttpUtil.postJson(urlConfigProperties.getApiBaseUrl()+ UrlConstants.QUERY_TRACE_URL, com.alibaba.fastjson.JSON.toJSONString(vehicleDataDTO), null);
                 } catch (Exception e) {
                     log.error("查询任务轨迹异常",e);
-                    throw new BusinessException("查询任务轨迹异常");
+
                 }
                 if (org.apache.commons.lang3.StringUtils.isNotBlank(s)){
                     List<VehicleRouteData> vehicleReturnData = com.alibaba.fastjson.JSON.parseArray(s, VehicleRouteData.class);

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

@@ -178,7 +178,7 @@ public class kwfTruckTraceService {
     public TruckInfoVo queryTruckInfo(TruckInfoReq req) {
         log.info("查询车辆实时位置信息参数：{}", req);
         //先查缓存 缓存没有 在查询数据中台 数据中台没有 则查询中交
-        if (StringUtils.isNotBlank(req.getTruckId()) && StringUtils.isNotBlank(req.getWOrderNo()) && StringUtils.isNotBlank(req.getTruckNo())){
+        if (StringUtils.isNotBlank(req.getTruckId()) && StringUtils.isNotBlank(req.getTruckNo())){
             return getTruckInfo(req.getTruckNo(),req.getWOrderNo(),req.getTruckNo());
         }
 
@@ -339,12 +339,12 @@ public class kwfTruckTraceService {
     public VehicleReturnData getVehicleReturnData(String truckId) {
         VehicleDataDTO vehicleDataDTO = new VehicleDataDTO();
         vehicleDataDTO.setCarNo(truckId);
-        String s;
+        String s = null;
         try {
             s = HttpUtil.postJson(urlConfigProperties.getApiBaseUrl()+ UrlConstants.QUERY_REAL_TIME_TRACE_URL, JSON.toJSONString(vehicleDataDTO), null);
         } catch (Exception e) {
             log.error("查询任务轨迹异常",e);
-            throw new BusinessException("查询任务轨迹异常");
+
         }
         if (StringUtils.isBlank(s)){
             return null;