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

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

@@ -12,23 +12,21 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
- * Author: donglang
- * Time: 2025-10-23
- * Des: 车辆轴数Controller
- * Version: 1.0
- */
+*Author: donglang
+*Time: 2025-10-24
+*Des: 车辆轴数Controller
+*Version: 1.0
+*/
 
 @RestController
-@RequestMapping("/Axle")
-
+@RequestMapping("/kwfAxle")
 public class KwfTruckAxleNumController {
 
     @Autowired
-    private KwfTruckAxleNumService kwfTruckAxleNumService;
-
+    KwfTruckAxleNumService kwfTruckAxleNumService;
 
     @PostMapping("/queryTruckAxleNumList")
-    private BaseResult<List<TruckAxleNumVO>> queryTruckAxleNumList() {
+    public BaseResult<List<TruckAxleNumVO>> queryTruckAxleNumList() {
         List<TruckAxleNumVO> truckAxleNumVOS = kwfTruckAxleNumService.queryTruckAxleNumList();
         return BaseResult.success(truckAxleNumVOS);
     }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/dao/KwTruckAxleNumMapper.java

@@ -1,8 +1,7 @@
 package com.sckw.fleet.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.sckw.fleet.model.KwfDriverCard;
-import com.sckw.fleet.model.TruckAxleNum;
+import com.sckw.fleet.model.TmsTruckAxleNum;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,20 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2023/7/6 0006
  */
 @Mapper
-public interface KwTruckAxleNumMapper extends BaseMapper<TruckAxleNum> {
+public interface KwTruckAxleNumMapper extends BaseMapper<TmsTruckAxleNum> {
 
-    /**
-     * 新增
-     * @param params 新增参数
-     * @return
-     */
-    int insert(KwfDriverCard params);
-
-    /**
-     * 查询
-     * @param driverId 司机id
-     * @return
-     */
-    KwfDriverCard findByDriverId(Long driverId);
 
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/TruckAxleNum.java → sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/TmsTruckAxleNum.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model;
 
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,7 +16,8 @@ import java.time.LocalDateTime;
  */
 
 @Data
-public class TruckAxleNum implements Serializable {
+@TableName("tms_truck_axle_num")
+public class TmsTruckAxleNum implements Serializable {
 
     /**
      * 主键ID

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

@@ -1,9 +1,10 @@
 package com.sckw.fleet.model.vo;
 
 
-import com.sckw.fleet.model.TruckAxleNum;
+import com.sckw.fleet.model.TmsTruckAxleNum;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -18,6 +19,9 @@ import java.time.LocalDateTime;
 @Data
 public class TruckAxleNumVO implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -9020028380990215890L;
+
     /**
      * 主键ID
      */
@@ -52,7 +56,7 @@ public class TruckAxleNumVO implements Serializable {
         return new TruckAxleNumVO();
     }
 
-    public static TruckAxleNumVO toTruckAxleNumVO(TruckAxleNum axleNum){
+    public static TruckAxleNumVO toTruckAxleNumVO(TmsTruckAxleNum axleNum){
         if (axleNum == null) {
             return TruckAxleNumVO.getInstance();
         }

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

@@ -2,7 +2,7 @@ package com.sckw.fleet.repository;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.fleet.dao.KwTruckAxleNumMapper;
-import com.sckw.fleet.model.TruckAxleNum;
+import com.sckw.fleet.model.TmsTruckAxleNum;
 import org.springframework.stereotype.Repository;
 
 
@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
  * 车辆轴数接口
  */
 @Repository
-public class KwfTruckAxleNumRepository extends ServiceImpl<KwTruckAxleNumMapper, TruckAxleNum> {
+public class KwfTruckAxleNumRepository extends ServiceImpl<KwTruckAxleNumMapper, TmsTruckAxleNum> {
 
 }

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

@@ -1,7 +1,9 @@
 package com.sckw.fleet.service;
 
+
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.sckw.fleet.model.TruckAxleNum;
+import com.sckw.core.web.response.HttpResult;
+import com.sckw.fleet.model.TmsTruckAxleNum;
 import com.sckw.fleet.model.vo.TruckAxleNumVO;
 import com.sckw.fleet.repository.KwfTruckAxleNumRepository;
 import lombok.RequiredArgsConstructor;
@@ -11,21 +13,21 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * @author PC
- */
+*Author: donglang
+*Time: 2025-10-24
+*Des: 车辆管理Service
+*Version: 1.0
+*/
+
 @Service
 @RequiredArgsConstructor
 public class KwfTruckAxleNumService {
 
-
     private final KwfTruckAxleNumRepository truckAxleNumRepository;
 
-
     public List<TruckAxleNumVO> queryTruckAxleNumList() {
-
-        List<TruckAxleNum> truckAxleNums = truckAxleNumRepository.list(Wrappers.<TruckAxleNum>lambdaQuery()
-                .eq(TruckAxleNum::getStatus, 1));
+        List<TmsTruckAxleNum> truckAxleNums = truckAxleNumRepository.list(Wrappers.<TmsTruckAxleNum>lambdaQuery()
+                .eq(TmsTruckAxleNum::getStatus, 1));
         return truckAxleNums.stream().map(TruckAxleNumVO::toTruckAxleNumVO).collect(Collectors.toList());
     }
-
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwfTaskController.java

@@ -29,9 +29,9 @@ public class KwfTaskController {
     /**
      * 任务和车辆数据统计
      */
-    @GetMapping("/taskStatistics")
+    @PostMapping("/taskStatistics")
     @Operation(summary = "任务和车辆数据统计", description = "任务和车辆数据统计")
-    public BaseResult<TaskStatisticsVo> getTaskStatistics(TaskStatisticsReq req)  {
+    public BaseResult<TaskStatisticsVo> getTaskStatistics(@RequestBody TaskStatisticsReq req)  {
         TaskStatisticsVo truckInfoVo = kwfTaskService.getTaskStatistics(req);
         return BaseResult.success(truckInfoVo);
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/TaskStatisticsVo.java

@@ -82,4 +82,8 @@ public class TaskStatisticsVo implements Serializable {
      * 上月初到上个月某个时间点的累计卸货吨数
      */
     private String unloadTonBeforeMonth;
+    /**
+     * 卸货吨数增长或者下降占比
+     */
+    private String unloadTonPercentChange;
 }

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

@@ -72,18 +72,22 @@ public class KwfTaskService {
         //计算上月卸货吨数
         double unloadTon = getUnloadTon(waybillOrder);
 
-        //获取本月初到当前时间的数据
+        //获取本月初到当前时间的数据(卸货吨数)
         double unloadTonThisMonth = getUnloadTonThisMonth(waybillOrder);
-        //获取上个月初到某个时间点的数据
+        //获取上个月初到某个时间点的数据(卸货吨数)
         double unloadTonBeforeMonth = getUnloadTonBeforeMonth(waybillOrder);
+        //较上个月同比增长或者下降
+        double unloadGrowthRate = (unloadTonBeforeMonth - unloadTonThisMonth) / unloadTonBeforeMonth * 100;
         // 计算增长率
         double growthRate = (double) (yesterdayTaskCount - taskTotalBeforeYesterday) / taskTotalBeforeYesterday * 100;
         return getTaskStatisticsVo(totalCount, taskingCount, completedCount, yesterdayTaskCount,
-                taskTotalBeforeYesterday, growthRate, unloadTon, unloadTonThisMonth, unloadTonBeforeMonth);
+                taskTotalBeforeYesterday, growthRate, unloadTon, unloadTonThisMonth, unloadTonBeforeMonth,unloadGrowthRate);
     }
 
 
-    private TaskStatisticsVo getTaskStatisticsVo(int totalCount, long taskingCount, long completedCount, long yesterdayTaskCount, long taskTotalBeforeYesterday, double growthRate, double unloadTon, double unloadTonThisMonth, double unloadTonBeforeMonth) {
+    private TaskStatisticsVo getTaskStatisticsVo(int totalCount, long taskingCount, long completedCount
+            , long yesterdayTaskCount, long taskTotalBeforeYesterday, double growthRate, double unloadTon
+            , double unloadTonThisMonth, double unloadTonBeforeMonth,double unloadGrowthRate) {
         TaskStatisticsVo taskStatisticsVo = new TaskStatisticsVo();
         taskStatisticsVo.setTaskTotal(String.valueOf(totalCount));
         taskStatisticsVo.setTaskRunning(String.valueOf(taskingCount));
@@ -100,6 +104,7 @@ public class KwfTaskService {
         taskStatisticsVo.setWaybillTotalYesterday(String.valueOf(yesterdayTaskCount));
         taskStatisticsVo.setWaybillTotalBeforeYesterday(String.valueOf(taskTotalBeforeYesterday));
         taskStatisticsVo.setWaybillPercentChange(String.format("%.2f", growthRate));
+        taskStatisticsVo.setUnloadTonPercentChange(String.format("%.2f", unloadGrowthRate));
         return taskStatisticsVo;
     }