司机管理优化、新增轴数查询接口

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

@@ -0,0 +1,42 @@
+package com.sckw.fleet.controller;
+
+
+import com.sckw.core.web.response.BaseResult;
+import com.sckw.fleet.model.vo.TruckAxleNumVO;
+import com.sckw.fleet.service.KwfTruckAxleNumService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * Author: donglang
+ * Time: 2025-10-23
+ * Des: 车辆轴数Controller
+ * Version: 1.0
+ */
+
+@RestController
+@RequestMapping("/Axle")
+
+public class KwfTruckAxleNumController {
+
+    @Autowired
+    private KwfTruckAxleNumService kwfTruckAxleNumService;
+
+
+    @PostMapping("/queryTruckAxleNumList")
+    private 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

@@ -0,0 +1,30 @@
+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 org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @desc 司机身份证信息 Mapper 接口
+ * @author zk
+ * @date 2023/7/6 0006
+ */
+@Mapper
+public interface KwTruckAxleNumMapper extends BaseMapper<TruckAxleNum> {
+
+    /**
+     * 新增
+     * @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/KwfTruck.java

@@ -138,7 +138,7 @@ public class KwfTruck extends BaseModel {
     private Integer driveMode;
 
     /**
-     * 车牌
+     * 品牌
      */
     @TableField("brand")
     private String brand;

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

@@ -0,0 +1,80 @@
+package com.sckw.fleet.model;
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * Author: donglang
+ * Time: 2025-10-23
+ * Des: 车辆轴数
+ * Version: 1.0
+ */
+
+@Data
+public class TruckAxleNum implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    private Integer id;
+
+    /**
+     * 分组ID
+     */
+    private Integer groupId;
+
+    /**
+     * 车辆轴数名称
+     */
+    private String name;
+
+    /**
+     * 轴数（如：2轴、3轴）
+     */
+    private String num;
+
+    /**
+     * 默认准载量
+     */
+    private BigDecimal standardLoad;
+
+    /**
+     * 法定载重
+     */
+    private BigDecimal legalLoad;
+
+    /**
+     * 创建人ID
+     */
+    private String uuid;
+
+    /**
+     * 创建人姓名
+     */
+    private String uuidName;
+
+    /**
+     * 状态（1正常，2禁用）
+     */
+    private Integer status;
+
+    /**
+     * 数据添加时间（自动更新）
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 数据修改时间（自动更新）
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 数据删除时间（逻辑删除标识）
+     */
+    private LocalDateTime deleteTime;
+
+}

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfTruckDto.java

@@ -53,7 +53,7 @@ public class KwfTruckDto {
      * 标准荷载（净重）
      */
     //@Pattern(regexp = "^1[3456789]\\d{9}$", message = "标准荷载格式不正确！")
-    @NotNull(message = "标准荷载不能为空!")
+//    @NotNull(message = "标准荷载不能为空!")
     private Double actualWeight;
 
     /**
@@ -97,7 +97,7 @@ public class KwfTruckDto {
     private String remark;
 
     /**
-     * 车牌
+     * 品牌
      */
     private String brand;
 
@@ -106,6 +106,11 @@ public class KwfTruckDto {
      */
     private String vin;
 
+    /**
+     * 轴数
+     */
+    private String carAxis;
+
     /**
      * 车辆行驶证信息
      */

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

@@ -123,7 +123,7 @@ public class KwfTruckDetailVo implements Serializable {
     private String driverName;
 
     /**
-     * 车牌
+     * 品牌
      */
     private String brand;
 

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

@@ -222,6 +222,16 @@ public class KwfTruckVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 品牌
+     */
+    private String brand;
+
+    /**
+     * 轴数
+     */
+    private String carAxis;
+
     /**
      * 司机
      */

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

@@ -0,0 +1,67 @@
+package com.sckw.fleet.model.vo;
+
+
+import com.sckw.fleet.model.TruckAxleNum;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * Author: donglang
+ * Time: 2025-10-23
+ * Des: 车辆轴数
+ * Version: 1.0
+ */
+
+@Data
+public class TruckAxleNumVO implements Serializable {
+
+    /**
+     * 主键ID
+     */
+    private Integer id;
+
+    /**
+     * 车辆轴数名称
+     */
+    private String name;
+
+    /**
+     * 轴数（如：2轴、3轴）
+     */
+    private String num;
+
+    /**
+     * 默认准载量
+     */
+    private BigDecimal standardLoad;
+
+    /**
+     * 法定载重
+     */
+    private BigDecimal legalLoad;
+
+    /**
+     * 状态（1正常，2禁用）
+     */
+    private Integer status;
+
+    private static TruckAxleNumVO getInstance(){
+        return new TruckAxleNumVO();
+    }
+
+    public static TruckAxleNumVO toTruckAxleNumVO(TruckAxleNum axleNum){
+        if (axleNum == null) {
+            return TruckAxleNumVO.getInstance();
+        }
+        TruckAxleNumVO devicePageResp = TruckAxleNumVO.getInstance();
+        devicePageResp.setId(axleNum.getId());
+        devicePageResp.setName(axleNum.getName());
+
+        return devicePageResp;
+    }
+
+
+}

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

@@ -0,0 +1,16 @@
+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 org.springframework.stereotype.Repository;
+
+
+/**
+ * @author PC
+ * 车辆轴数接口
+ */
+@Repository
+public class KwfTruckAxleNumRepository extends ServiceImpl<KwTruckAxleNumMapper, TruckAxleNum> {
+
+}

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

@@ -0,0 +1,31 @@
+package com.sckw.fleet.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sckw.fleet.model.TruckAxleNum;
+import com.sckw.fleet.model.vo.TruckAxleNumVO;
+import com.sckw.fleet.repository.KwfTruckAxleNumRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author PC
+ */
+@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));
+        return truckAxleNums.stream().map(TruckAxleNumVO::toTruckAxleNumVO).collect(Collectors.toList());
+    }
+
+}

sckw-modules/sckw-fleet/src/main/resources/mapper/KwfTruckMapper.xml

@@ -115,7 +115,7 @@
             tr.spec, tr.actual_weight actualWeight, tr.gross_weight grossWeight, tr.tare_weight tareWeight,
             tr.color, tr.eev, tr.trailer_no trailerNo, tr.total_complete totalComplete, tr.total_take totalTake,
             tr.total_weight totalWeight, tr.business_status businessStatus, tr.remark, tr.status, tr.auth_status authStatus,
-            tr.create_by createBy, tr.create_time createTime, tr.update_by updateBy, tr.update_time updateTime,
+            tr.create_by createBy, tr.create_time createTime, tr.update_by updateBy, tr.update_time updateTime,tr.car_axis,tr.vin,tr.brand,
             trl.owner, trl.vin, trl.reg_time regTime, trl.grant_time grantTime, trl.grant_unit grantUnit,
             trl.driving_no drivingNo, tranl.road_tran_no roadTranNo, tranl.firm_name tranFirmName,
             tranl.business_license_no businessLicenseNo