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

# Conflicts:
#	sckw-common/sckw-common-datasource/pom.xml

pom.xml

@@ -362,6 +362,12 @@
                 <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
                 <version>2.1.0</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+                <version>4.2.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

sckw-common/sckw-common-datasource/pom.xml

@@ -30,11 +30,16 @@
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
 
+        <!--多数据源-->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>-->
+<!--        </dependency>-->
+
         <!--多数据源-->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
-            <version>4.2.0</version>
         </dependency>
 
         <!--ShardingSphere-JDBC-->

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

@@ -20,6 +20,20 @@ public class TruckInfoReq extends PageReq implements Serializable {
      */
     @Schema(description = "车牌号")
     private String truckNo;
-
+    /**
+     * 企业id
+     */
     private Long entId;
+    /**
+     * 是否是外部车辆(0-自有车辆 1-外部车辆)
+     */
+    private String truckMark;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/TruckInfoVo.java

@@ -62,6 +62,9 @@ public class TruckInfoVo implements Serializable {
          */
         @Schema(description = "车辆状态")
         private String businessStatus;
-
+        /**
+         * 车辆类型(0-自有车辆，1-外部车辆)
+         */
+        private String truckMark;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.sckw.fleet.repository;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.core.model.base.BaseModel;
@@ -47,9 +48,12 @@ public class KwfTruckRepository extends ServiceImpl<KwfTruckMapper, KwfTruck> {
 
     }
 
-    public List<KwfTruck> queryByEntIds(List<Long> entIds) {
+    public List<KwfTruck> queryByEntIds(List<Long> entIds, String truckMark,String startTime, String endTime) {
         return list(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
-                .in(KwfTruck::getEntId, entIds));
+                .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));
     }
 }

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

@@ -1487,7 +1487,7 @@ public class KwfTruckService {
                 .map(KwsEnterpriseResDto::getId)
                 .collect(Collectors.toList());
         //获取车辆信息
-        List<KwfTruck> truckList = kwfTruckRepository.queryByEntIds(entIds);
+        List<KwfTruck> truckList = kwfTruckRepository.queryByEntIds(entIds, req.getTruckMark(), req.getStartTime(), req.getEndTime());
         if (CollectionUtils.isEmpty(truckList)){
             return PageDataResult.empty(req.getPageNum(), req.getPageSize());
         }
@@ -1539,6 +1539,7 @@ public class KwfTruckService {
             truck.setLatitude(vehicleReturnData.getLatitude());
             truck.setLongitude(vehicleReturnData.getLongitude());
         }
+        truck.setTruckMark(String.valueOf(t.getTruckMark()));
         return truck;
     }