司机管理

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -23,6 +23,10 @@ public enum StatusEnum {
     TEMPORARILY_STORED("1", "已暂存", "Temporarily stored"),
     SUBMITTED("3", "已提交", "Submitted"),
 
+    //司机禁用标识
+    DISABLED("1","已禁用","disabled"),
+    NOT_DISABLE("0","未禁用","not_disable"),
+
     ;
     @Getter
     private String flag;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverViewInfoController.java

@@ -8,8 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
+
 
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -49,9 +50,32 @@ public class DriverViewInfoController {
      * @param id
      */
     @PostMapping("/api/deleteDriver")
-    public void deleteDriver(String id){
+    public void deleteDriver(String id) {
         driverViewInfoService.deleteDriver(id);
     }
+        /**
+        * 添加信息
+         */
+    @PostMapping("/api/addInfo")
+    public String addInfo(@RequestBody DriverViewInfo driverViewInfo){
+        return driverViewInfoService.addInfo(driverViewInfo);
+    }
+
+    /**
+     * 编辑信息
+     */
+    @PostMapping("/api/editInfo")
+    public String editInfo(@RequestBody DriverViewInfo driverViewInfo) {
+        return driverViewInfoService.editInfo(driverViewInfo);
+    }
+
+    /**
+     * 禁用
+     */
+    @PostMapping("/api/editDisableInfo")
+    public String editDisableInfo(@RequestBody DriverViewInfo driverViewInfo){
+        return driverViewInfoService.editDisableInfo(driverViewInfo);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverViewInfo.java

@@ -1,14 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
+
 import java.io.Serializable;
 import java.util.List;
-
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
-
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverViewInfoService.java

@@ -12,6 +12,12 @@ import com.baomidou.mybatisplus.plugins.Page;
  * @since 2021-05-29
  */
 public interface IDriverViewInfoService extends IService<DriverViewInfo> {
+    /**
+    * 添加信息
+    *
+    * @param driverViewInfo
+    */
+    String addInfo(DriverViewInfo driverViewInfo);
 
     /**
      *司机管理页面列表
@@ -27,4 +33,18 @@ public interface IDriverViewInfoService extends IService<DriverViewInfo> {
      *删除司机信息
      */
     void deleteDriver(String id);
+
+    /**
+     *  编辑信息
+     *
+     * @param driverViewInfo
+     */
+    String editInfo(DriverViewInfo driverViewInfo);
+
+    /**
+     * 禁用
+     *
+     * @param driverViewInfo
+     */
+    String editDisableInfo(DriverViewInfo driverViewInfo);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverViewInfoServiceImpl.java

@@ -10,6 +10,8 @@ import com.yh.saas.plugin.yiliangyiyun.mapper.DriverViewInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverPayeeInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverViewInfoService;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+
 /**
  * <p>
  * 记录司机信息 服务实现类
@@ -29,12 +32,70 @@ import java.util.Map;
  */
 @Service
 public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper, DriverViewInfo> implements IDriverViewInfoService {
-
     @Autowired
     private IDriverCarInfoService driverCarInfoService;
     @Autowired
     private IDriverPayeeInfoService driverPayeeInfoService;
 
+    /**
+     * 添加信息
+     *
+     * @param
+     * @return
+     */
+    @Override
+    public String addInfo(DriverViewInfo driverViewInfo) {
+        //新增主键id
+        driverViewInfo.setId(IdGenerator.generateUUID());
+        //货车信息新增
+        List<DriverCarInfo> driverCarInfoList = driverViewInfo.getDriverCarInfoList();
+        if (!CollectionUtils.isEmpty(driverCarInfoList)) {
+            for (DriverCarInfo driverCarInfo : driverCarInfoList) {
+                driverCarInfo.setId(IdGenerator.generateUUID());
+                driverCarInfo.setDriverId(driverViewInfo.getId());
+            }
+        }
+        //收款人账户信息新增
+        List<DriverPayeeInfo> driverPayeeInfoList = driverViewInfo.getDriverPayeeInfoList();
+        if (!CollectionUtils.isEmpty(driverPayeeInfoList)) {
+            for (DriverPayeeInfo driverPayeeInfo : driverPayeeInfoList) {
+                driverPayeeInfo.setId(IdGenerator.generateUUID());
+                driverPayeeInfo.setDriverId(driverViewInfo.getId());
+            }
+        }
+        boolean one = this.insert(driverViewInfo);
+        boolean two = driverCarInfoService.insertBatch(driverCarInfoList);
+        boolean three = driverPayeeInfoService.insertBatch(driverPayeeInfoList);
+
+        // 假如 都成功返回ok
+        if (one && two && three) {
+            return "OK";
+        } else {
+            return "NG";
+        }
+    }
+
+    /**
+     * 编辑信息
+     */
+    @Override
+    public String editInfo(DriverViewInfo driverViewInfo) {
+        //主表信息编辑
+
+        this.updateById(driverViewInfo);
+        //货车信息编辑
+        List<DriverCarInfo> driverCarInfoList = driverViewInfo.getDriverCarInfoList();
+        this.updateById(driverViewInfo);
+        driverCarInfoService.updateBatchById(driverCarInfoList);
+        //收款人账户信息编辑
+        List<DriverPayeeInfo> driverPayeeInfoList = driverViewInfo.getDriverPayeeInfoList();
+        this.updateById(driverViewInfo);
+        driverPayeeInfoService.updateBatchById(driverPayeeInfoList);
+
+        return driverViewInfo.getId();
+    }
+
+
     /**
      * 司机管理页面列表
      * @param driverViewInfo
@@ -88,25 +149,48 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
      * @param id
      */
     @Override
-    public void deleteDriver(String id){
+    public void deleteDriver(String id) {
         //删除司机信息
         DriverViewInfo driverViewInfo = this.selectById(id);
         this.deleteById(driverViewInfo.getId());
         //删除货车信息
         List<DriverCarInfo> driverCarInfoList = driverCarInfoService.selectList(new EntityWrapper<DriverCarInfo>()
-                .eq("driver_id",id));
-        if (!CollectionUtils.isEmpty(driverCarInfoList)){
-            for (DriverCarInfo driverCarInfo : driverCarInfoList){
+                .eq("driver_id", id));
+        if (!CollectionUtils.isEmpty(driverCarInfoList)) {
+            for (DriverCarInfo driverCarInfo : driverCarInfoList) {
                 driverCarInfoService.deleteById(driverCarInfo.getId());
             }
         }
         //删除收款账户信息
         List<DriverPayeeInfo> driverPayeeInfoList = driverPayeeInfoService.selectList(new EntityWrapper<DriverPayeeInfo>()
-                .eq("driver_id",id));
-        if (!CollectionUtils.isEmpty(driverPayeeInfoList)){
-            for (DriverPayeeInfo driverPayeeInfo : driverPayeeInfoList){
+                .eq("driver_id", id));
+        if (!CollectionUtils.isEmpty(driverPayeeInfoList)) {
+            for (DriverPayeeInfo driverPayeeInfo : driverPayeeInfoList) {
                 driverPayeeInfoService.deleteById(driverPayeeInfo.getId());
             }
         }
     }
+    /**
+     * 更改状态
+     */
+    @Override
+    public String editDisableInfo(DriverViewInfo driverViewInfo) {
+        DriverViewInfo driverViewInfos = this.selectById(driverViewInfo.getId());
+        //查询司机信息
+        if (driverViewInfos != null) {
+            //已禁用状态
+            if (StatusEnum.DISABLED.getFlag().equals(driverViewInfo.getDisableStatusFlag())) {
+                driverViewInfos.setDisableStatusFlag(StatusEnum.NOT_DISABLE.getFlag());
+            }
+            //未禁用状态
+            else {
+                driverViewInfos.setDisableStatusFlag(StatusEnum.DISABLED.getFlag());
+                driverViewInfos.setDisableReasons(driverViewInfo.getDisableReasons());
+            }
+            //更改司机信息
+            this.updateById(driverViewInfos);
+            return "OK";
+        }
+        return "NG";
+    }
 }