优化pc端司机管理功能

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/base/BaseModel.java

@@ -31,7 +31,7 @@ public class BaseModel implements Serializable {
 	private String remark;
 
 	/**
-	 * 状态:0正常/1锁定
+	 * 状态:0正常（未绑定）/1锁定（绑定）
 	 */
 	private Integer status;
 

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

@@ -278,7 +278,7 @@ public class KwfDriverController {
      * @date 2023/6/14
      */
     @PostMapping("/bindTruck")
-    public HttpResult bindTruck(@Valid @RequestBody KwfBindTruckDto params) throws SystemException{
+    public HttpResult bindTruck(@RequestBody @Valid KwfBindTruckDto params) {
         return driverService.bindTruck(params);
     }
 
@@ -343,7 +343,7 @@ public class KwfDriverController {
      */
     @Operation(summary = "解绑车辆", description = "解绑车辆")
     @PostMapping("/unbindTruck")
-    public BaseResult unbindTruck(@RequestParam KwfBindTruckDto param){
+    public BaseResult unbindTruck(@RequestBody @Valid KwfBindTruckDto param){
         driverService.unbindTruck(param);
         return BaseResult.success();
     }

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

@@ -19,9 +19,8 @@ public class KwfBindTruckDto {
     private Long id;
 
     /**
-     * 车牌号
+     * 车牌号id
      */
-    @NotNull(message = "车牌号不能为空!")
     private Long truckId;
 
 

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

@@ -1,5 +1,6 @@
 package com.sckw.fleet.model.request;
 
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -16,6 +17,13 @@ public class TruckNoReq  implements Serializable {
     /**
      * 企业id
      */
+    @NotNull(message = "企业id不能为空！")
     private Long entId;
 
+
+    /**
+     * 车牌号
+     */
+    private String truckNo;
+
 }

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

@@ -1,5 +1,6 @@
 package com.sckw.fleet.repository;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sckw.fleet.dao.KwTruckAxleNumMapper;
 import com.sckw.fleet.model.TmsTruckAxleNum;
@@ -13,4 +14,11 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class KwfTruckAxleNumRepository extends ServiceImpl<KwTruckAxleNumMapper, TmsTruckAxleNum> {
 
+    public TmsTruckAxleNum getOneById(Integer id) {
+        return getOne(Wrappers.<TmsTruckAxleNum>lambdaQuery()
+                .eq(TmsTruckAxleNum::getStatus,1)
+                .eq(TmsTruckAxleNum::getId, id)
+                .last("limit 1"));
+    }
+
 }

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

@@ -31,10 +31,11 @@ public class KwfTruckRepository extends ServiceImpl<KwfTruckMapper, KwfTruck> {
                 .last("limit 1"));
     }
 
-    public List<KwfTruck> getTurkNoList(Long entId) {
+    public List<KwfTruck> getTurkNoList(Long entId, String truckNo) {
         return list(Wrappers.<KwfTruck>lambdaQuery()
                 .eq(BaseModel::getDelFlag, 0)
                 .eq(Objects.nonNull(entId), KwfTruck::getEntId, entId)
+                .like(Objects.nonNull(truckNo), KwfTruck::getTruckNo, truckNo)
                 .orderByDesc(BaseModel::getCreateTime));
     }
 

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

@@ -1133,18 +1133,15 @@ public class KwfDriverService {
      * @date 2023/7/6
      **/
     public HttpResult bindTruck(KwfBindTruckDto params) {
-        /**数据校验**/
-        if (params.getId() == null) {
-            return HttpResult.error(HttpStatus.PARAMETERS_PATTERN_ERROR_CODE,"司机主键id不能为空！");
-        }
         if (StringUtils.isBlank(params.getTruckId())) {
             return HttpResult.ok("未选择需要绑定的车辆！");
         }
-        //查询是否存在已有车辆司机关系数据
+        //查询司机是否存在已绑定的车辆
         KwfTruckReport truckReport = truckReportRepository.getOne(Wrappers.<KwfTruckReport>lambdaQuery()
                 .eq(KwfTruckReport::getEntId, LoginUserHolder.getEntId())
                 .eq(KwfTruckReport::getDriverId, params.getId())
-                .eq(KwfTruckReport::getDelFlag, Global.NO));
+                .eq(KwfTruckReport::getDelFlag, Global.NO)
+                .eq(KwfTruckReport::getStatus, Global.YES));
         if(truckReport == null) {
             KwfTruckReport newTruckReport = new KwfTruckReport();
             newTruckReport.setTruckId(params.getTruckId());
@@ -1369,18 +1366,18 @@ public class KwfDriverService {
      * @date 2023/7/6
      **/
     public HttpResult unbindTruck(KwfBindTruckDto params) {
-        //查询是否存在已有车辆司机关系数据
+        //查询司机是否存在已绑定的车辆
         KwfTruckReport truckReport = truckReportRepository.getOne(Wrappers.<KwfTruckReport>lambdaQuery()
                 .eq(KwfTruckReport::getEntId, LoginUserHolder.getEntId())
                 .eq(KwfTruckReport::getDriverId, params.getId())
                 .eq(KwfTruckReport::getDelFlag, Global.NO)
-                .eq(KwfTruckReport::getStatus, Global.NO));
+                .eq(KwfTruckReport::getStatus, Global.YES));
         if(truckReport == null) {
-            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "此司机无车辆绑定信息！");
+            throw new BusinessPlatfromException(ErrorCodeEnum.WAYBILL_ORDER_STATUS_ERROR, "此司机无车辆解绑信息！");
         }
-        truckReport.setStatus(Global.YES);
+        truckReport.setStatus(Global.NO);
         boolean saveResult = truckReportRepository.updateById(truckReport);
-        return saveResult ? HttpResult.ok("车辆绑定成功！") : HttpResult.error("车辆绑定失败！");
+        return saveResult ? HttpResult.ok("车辆解绑成功！") : HttpResult.error("车辆解绑失败！");
 
     }
 

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

@@ -1801,11 +1801,7 @@ public class KwfTruckService {
      * @return
      */
     public List<KwfTruckVo> queryTruckNo(TruckNoReq req) {
-        if (req.getEntId() == null) {
-            throw new RuntimeException("企业id不能为空");
-        }
-
-        List<KwfTruck> turkNoList = kwfTruckRepository.getTurkNoList(req.getEntId());
+        List<KwfTruck> turkNoList = kwfTruckRepository.getTurkNoList(req.getEntId(), req.getTruckNo());
         if (CollectionUtils.isEmpty(turkNoList)) {
             return Collections.emptyList();
         }
@@ -1814,6 +1810,12 @@ public class KwfTruckService {
             KwfTruckVo truckVo = new KwfTruckVo();
             truckVo.setId(String.valueOf(truck.getId()));
             truckVo.setTruckNo(truck.getTruckNo());
+            truckVo.setActualWeight(truck.getActualWeight() != null ? String.valueOf(truck.getActualWeight()) : null);
+            if (StringUtils.isNotBlank(truck.getCarAxis())) {
+                TmsTruckAxleNum axleNum = truckAxleNumRepository.getOneById(Integer.valueOf(truck.getCarAxis()));
+                truckVo.setCarAxisId(truck.getCarAxis());
+                truckVo.setCarAxis(axleNum.getName());
+            }
             truckVoList.add(truckVo);
         }
         return truckVoList;