修改车辆轨迹查询

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -310,10 +310,10 @@ public class KwfTruckController {
     /**
      *  获取运力实况
      **/
-    @GetMapping("/queryTotalCapacityStatus")
+    @PostMapping("/queryTotalCapacityStatus")
     @Operation(summary = "获取总运力实况", description = "获取总运力实况")
-    public BaseResult<CapacityTotalStatusVo> queryTotalCapacityStatus() {
-        return BaseResult.success(truckService.queryTotalCapacityStatus());
+    public BaseResult<CapacityTotalStatusVo> queryTotalCapacityStatus(@RequestBody CapacityStatusReq req) {
+        return BaseResult.success(truckService.queryTotalCapacityStatus(req));
     }
 
 

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

@@ -18,4 +18,10 @@ public class CapacityStatusReq implements Serializable {
      */
     @Schema(description = "车队名称")
     private String fleetName;
+
+    /**
+     * 企业ID
+     */
+    @Schema(description = "企业ID")
+    private Long entId;
 }

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

@@ -11,6 +11,7 @@ import com.sckw.fleet.model.KwfFleet;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 
@@ -50,6 +51,6 @@ public class KwfFleetRepository extends ServiceImpl<KwfFleetMapper, KwfFleet> {
     public List<KwfFleet> findFleetByEntId(Long entId) {
         return list(Wrappers.<KwfFleet>lambdaQuery()
                 .eq(BaseModel::getDelFlag,0)
-                .eq(KwfFleet::getEntId,entId));
+                .eq(Objects.nonNull(entId),KwfFleet::getEntId,entId));
     }
 }

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

@@ -1382,9 +1382,9 @@ public class KwfTruckService {
     }
 
 
-    public CapacityTotalStatusVo queryTotalCapacityStatus() {
+    public CapacityTotalStatusVo queryTotalCapacityStatus(CapacityStatusReq req) {
         log.info("获取运力实况总是统计");
-        List<KwfFleet> kwfFleets = kwfFleetRepository.findAll();
+        List<KwfFleet> kwfFleets = kwfFleetRepository.findFleetByEntId(req.getEntId());
         if (CollectionUtils.isEmpty(kwfFleets)){
             //初始化数据
             return initCapacityTotalStatusVo();