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

sckw-auth/src/main/resources/bootstrap-dev.yml

@@ -3,21 +3,26 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.10.10.230:8848
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-ng-service-platform-dev
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-ng-service-platform
       config:
         # 配置中心地址
-        server-addr: 10.10.10.230:8848
-        # 配置文件格式
-        file-extension: yaml
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-ng-service-platform-dev
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-ng-service-platform
-        #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
+
+        #可以读多个配置文件 需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml
             group: sckw-ng-service-platform

sckw-gateway/src/main/resources/bootstrap-dev.yml

@@ -3,18 +3,26 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 10.10.10.230:8848
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-ng-service-platform-dev
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-ng-service-platform
       config:
         # 配置中心地址
-        server-addr: 10.10.10.230:8848
-        # 配置文件格式
-        file-extension: yaml
+        server-addr: @nacos.server@
         # 命名空间
-        namespace: sckw-ng-service-platform-dev
+        namespace: @nacos.namespace@
         # 共享配置
         group: sckw-ng-service-platform
-
+        # 配置文件格式
+        file-extension: yaml
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-common
+            refresh: true
+        #可以读多个配置文件 需要在同一个命名空间下面可以是不同的组
+        extension-configs:
+          - dataId: sckw-common.yml
+            group: sckw-ng-service-platform
+            refresh: true

sckw-modules/sckw-contract/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-file/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

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

@@ -1418,13 +1418,37 @@ public class KwfTruckService {
         //按照车辆id进行分组
         Map<Long, List<KwfTruck>> truckIdAndTruckListMap = kwfTrucks.stream().collect(Collectors.groupingBy(KwfTruck::getId));
         //获取要返回的车辆信息
-        List<CapacityStatusVo.Truck> trucks = kwfFleetTrucks.stream().map(x -> getTruck(x, fleetMap, truckIdAndTruckListMap)).collect(Collectors.toList());
+        List<CapacityStatusVo.Truck> trucks = Lists.newArrayList();
+        fleetIdAndFleetTruckListMap.forEach((fleetId, fleetTruckList) -> {
+            buildTruck(fleetId, fleetTruckList, fleetMap,trucks);
+        });
 
         CapacityStatusVo capacityStatusVo = new CapacityStatusVo();
         capacityStatusVo.setTruck(trucks);
         return capacityStatusVo;
     }
 
+    private static void buildTruck(Long fleetId, List<KwfFleetTruck> fleetTruckList, Map<Long, KwfFleet> fleetMap,List<CapacityStatusVo.Truck> trucks) {
+        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))
+                    .count();
+            truck.setIdleNum(String.valueOf(idleNum));
+            long runningNum = fleetTruckList.stream()
+                    .filter(ft -> Objects.equals(ft.getStatus(), 1))
+                    .count();
+            truck.setRunningNum(String.valueOf(runningNum));
+        }
+        truck.setAbnormalNum("0");
+        trucks.add(truck);
+    }
+
 
     public CapacityTotalStatusVo queryTotalCapacityStatus(CapacityStatusReq req) {
         log.info("获取运力实况总是统计");

sckw-modules/sckw-fleet/src/main/resources/bootstrap-dev.yml

@@ -18,6 +18,13 @@ spring:
         # 共享配置
         group: sckw-ng-service-platform
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
+          - data-id: amap-config.yml
+            group: sckw-ng-service-platform
+            refresh: true
         extension-configs:
           - dataId: sckw-common.yml
             group: sckw-ng-service-platform

sckw-modules/sckw-manage/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-message/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-operation/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-order/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-payment/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-product/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-report/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-system/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/CurrentTaskTraceReqVo.java

@@ -23,6 +23,7 @@ public class CurrentTaskTraceReqVo implements Serializable {
     private List<CurrentTaskTrace> currentTaskTraceList;
 
     //点位信息
+    @Schema(description = "点位信息")
     private List<CurrentAddress> currentAddressList;
 
     @Data

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

@@ -382,39 +382,46 @@ public class kwfTruckTraceService {
         }
         //查询数据中台获取轨迹
         List<VehicleReturnData> vehicleReturnDataList = getVehicleReturnDataList(wOrderNo);
-        if (CollectionUtils.isEmpty(vehicleReturnDataList)){
-            return new CurrentTaskTraceReqVo();
-        }
-        //组织返回数据
-        List<CurrentTaskTraceReqVo.CurrentTaskTrace> currentTaskTraceList = vehicleReturnDataList.stream()
-                .map(kwfTruckTraceService::getCurrentTaskTrace)
-                .sorted(Comparator.comparing(CurrentTaskTraceReqVo.CurrentTaskTrace::getLocationTime))
-                .collect(Collectors.toList());
+
         CurrentTaskTraceReqVo currentTaskTraceReqVo = new CurrentTaskTraceReqVo();
-        currentTaskTraceReqVo.setOrderNo(vehicleReturnDataList.get(0).getWOrderNo());
-
-        for (int i = 1; i < currentTaskTraceList.size(); i++) {
-            CurrentTaskTraceReqVo.CurrentTaskTrace current = currentTaskTraceList.get(i);
-            CurrentTaskTraceReqVo.CurrentTaskTrace previous = currentTaskTraceList.get(i - 1);
-            LocalDateTime currentTime = LocalDateTime.parse(current.getLocationTime());
-            LocalDateTime previousTime = LocalDateTime.parse(previous.getLocationTime());
-            Duration duration = Duration.between(previousTime, currentTime);
-            current.setDuration(String.valueOf(duration.toMinutes()));
-        }
-        CurrentTaskTraceReqVo.CurrentTaskTrace first = currentTaskTraceList.get(0);
-        CurrentTaskTraceReqVo.CurrentTaskTrace last = currentTaskTraceList.get(currentTaskTraceList.size() - 1);
+        if (CollectionUtils.isNotEmpty(vehicleReturnDataList)){
+            //组织返回数据
+            List<CurrentTaskTraceReqVo.CurrentTaskTrace> currentTaskTraceList = vehicleReturnDataList.stream()
+                    .map(kwfTruckTraceService::getCurrentTaskTrace)
+                    .sorted(Comparator.comparing(CurrentTaskTraceReqVo.CurrentTaskTrace::getLocationTime))
+                    .collect(Collectors.toList());
+
+            currentTaskTraceReqVo.setOrderNo(vehicleReturnDataList.get(0).getWOrderNo());
+
+            for (int i = 1; i < currentTaskTraceList.size(); i++) {
+                CurrentTaskTraceReqVo.CurrentTaskTrace current = currentTaskTraceList.get(i);
+                CurrentTaskTraceReqVo.CurrentTaskTrace previous = currentTaskTraceList.get(i - 1);
+                LocalDateTime currentTime = LocalDateTime.parse(current.getLocationTime());
+                LocalDateTime previousTime = LocalDateTime.parse(previous.getLocationTime());
+                Duration duration = Duration.between(previousTime, currentTime);
+                current.setDuration(String.valueOf(duration.toMinutes()));
+            }
+            CurrentTaskTraceReqVo.CurrentTaskTrace first = currentTaskTraceList.get(0);
+            CurrentTaskTraceReqVo.CurrentTaskTrace last = currentTaskTraceList.get(currentTaskTraceList.size() - 1);
+
+            LocalDateTime firstTime = LocalDateTime.parse(first.getLocationTime());
+            LocalDateTime lastTime = LocalDateTime.parse(last.getLocationTime());
 
-        LocalDateTime firstTime = LocalDateTime.parse(first.getLocationTime());
-        LocalDateTime lastTime = LocalDateTime.parse(last.getLocationTime());
+            Duration totalDuration = Duration.between(firstTime, lastTime);
+            long durationInMinutes = totalDuration.toMinutes();
+            currentTaskTraceReqVo.setTotalDuration(String.valueOf(durationInMinutes));
+            currentTaskTraceReqVo.setCurrentTaskTraceList(currentTaskTraceList);
+        }
 
-        Duration totalDuration = Duration.between(firstTime, lastTime);
-        long durationInMinutes = totalDuration.toMinutes();
-        currentTaskTraceReqVo.setTotalDuration(String.valueOf(durationInMinutes));
-        currentTaskTraceReqVo.setCurrentTaskTraceList(currentTaskTraceList);
         //构造点位假数据
         List<CurrentTaskTraceReqVo.CurrentAddress> addressList = getCurrentAddresses();
         // 将地址列表设置到 CurrentTaskTraceReqVo 对象中
         currentTaskTraceReqVo.setCurrentAddressList(addressList);
+        int sum = addressList.stream()
+                .filter(a -> StringUtils.isNotBlank(a.getDuration()))
+                .mapToInt(x -> Integer.parseInt(x.getDuration()))
+                .sum();
+        currentTaskTraceReqVo.setTotalDuration(String.valueOf(sum));
         return currentTaskTraceReqVo;
     }
 

sckw-modules/sckw-transport/src/main/resources/bootstrap-dev.yml

@@ -17,6 +17,10 @@ spring:
         namespace: sckw-ng-service-platform-dev
         # 共享配置
         group: sckw-ng-service-platform
+        shared-configs:
+          - data-id: sckw-common.yml
+            group: sckw-ng-common
+            refresh: true
         #可以读多个配置文件  需要在同一个命名空间下面可以是不同的组
         extension-configs:
           - dataId: sckw-common.yml