押运员相关接口

src/main/java/com/aoyang/tms/controller/TruckEscortController.java

@@ -6,6 +6,8 @@ import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.controller.param.TruckEscortAddParam;
 import com.aoyang.tms.controller.param.TruckEscortListParam;
 import com.aoyang.tms.entity.User;
+import com.aoyang.tms.entity.WorkSpot;
+import com.aoyang.tms.service.CommonService;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -18,8 +20,9 @@ import java.net.URLDecoder;
 import java.time.LocalDateTime;
 import java.util.*;
 import javax.annotation.Resource;
-import  com.aoyang.tms.service.TruckEscortService;
-import  com.aoyang.tms.entity.TruckEscort;
+
+import com.aoyang.tms.service.TruckEscortService;
+import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.common.result.Result;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -29,8 +32,8 @@ import com.aoyang.common.param.PageParam;
 
 /**
  * <p>
-    * 车辆押运员表 控制器
-    * </p>
+ * 车辆押运员表 控制器
+ * </p>
  *
  * @author guoyong
  * @since 2022-04-20
@@ -43,23 +46,36 @@ public class TruckEscortController {
 
     @Resource
     private TruckEscortService truckEscortService;
+    @Resource
+    private CommonService commonService;
 
-    @ApiOperation(value = "获取车辆押运员分页列表",notes="")
-    @PostMapping("/list")
+
+    @ApiOperation(value = "获取车辆押运员分页列表", notes = "必传参数:orgId")
+    @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<TruckEscortListParam> pageParam) {
-        log.info("获取运力部门管理分页列表,调用/tms/truck_dept/page_list,参数:{}", JSON.toJSONString(pageParam));
+        log.info("获取车辆押运员分页列表,调用/tms/truck_escort/page_list,参数:{}", JSON.toJSONString(pageParam));
         if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getOrgId() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         return new Result<>(truckEscortService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "添加车辆押运员",notes="新增一条truck_escort")
+    @ApiOperation(value = "根据条件获取车辆押运员列表", notes = "必传参数:orgId;选填参数:truckId,carNumber,keyWord(查escortName,mobile)")
+    @PostMapping("/list")
+    public Result list(@RequestBody TruckEscortListParam param) {
+        log.info("根据条件获取车辆押运员列表,调用/tms/truck_escort/list,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getOrgId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(truckEscortService.list(param));
+    }
+
+    @ApiOperation(value = "添加车辆押运员", notes = "必传参数:orgId,escortName,mobile")
     @PostMapping("/add")
     public Result add(@RequestHeader(value = "userId") Long userId,
                       @RequestHeader(value = "userName") String userName,
                       @RequestBody TruckEscortAddParam param) {
-        log.info("新增运力部门,调用/tms/truck_dept/add,参数:{}", JSON.toJSONString(param));
+        log.info("新增运力部门,调用/tms/truck_escort/add,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getOrgId() == null || param.getEscortName() == null || param.getMobile() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
@@ -76,12 +92,46 @@ public class TruckEscortController {
         return new Result<>(truckEscortService.add(param));
     }
 
-    @ApiOperation(value = "修改truck_escort",notes="根据id修改truck_escort")
+    @ApiOperation(value = "修改车辆押运员", notes = "必传参数:userId")
     @PostMapping("/update")
-    public Result update(@RequestBody TruckEscort truckEscort) {
-        Boolean flag = truckEscortService.updateById(truckEscort);
-        return new Result<>(flag);
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody TruckEscort param) {
+        log.info("修改作业点,调用/tms/truck_escort/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getUserId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        return new Result<>(truckEscortService.edit(param));
+    }
+
+    @ApiOperation(value = "删除车辆押运员", notes = "必传参数：userId")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody TruckEscort param) {
+        log.info("删除车辆押运员,调用/tms/truck_escort/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getUserId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        commonService.deleteUser(param.getUserId());
+        return new Result<>(truckEscortService.removeById(param));
     }
 
+    @ApiOperation(value = "获取单个车辆押运员详情", notes = "必传参数：userId")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody TruckEscort param) {
+        log.info("删除车辆押运员,调用/tms/truck_escort/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getUserId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(truckEscortService.getById(param));
+    }
 
 }

src/main/java/com/aoyang/tms/entity/User.java

@@ -97,6 +97,9 @@ public class User implements Serializable {
     @TableField("org_name")
     private String orgName;
 
+    @ApiModelProperty(value = "组织简称（user.org.org_name）")
+    private String orgShortName;
+
     @ApiModelProperty(value = "创建人Name")
     @TableField("creater_name")
     private String createrName;

src/main/java/com/aoyang/tms/service/TruckEscortService.java

@@ -9,6 +9,8 @@ import com.aoyang.tms.entity.TruckEscort;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 车辆押运员表 服务类
@@ -29,6 +31,15 @@ public interface TruckEscortService extends IService<TruckEscort> {
     IPage<TruckEscort> findPage(PageParam<TruckEscortListParam> pageParam);
 
     /**
+     * @return
+     * @Author chengang
+     * @Description 根据条件获取车辆押运员列表
+     * @Date 2021/11/9
+     * @Param
+     **/
+    List<TruckEscort> list(TruckEscortListParam param);
+
+    /**
      * @Author guoyong
      * @Description 查找押运员
      * @Date  2022/4/22
@@ -46,4 +57,13 @@ public interface TruckEscortService extends IService<TruckEscort> {
      **/
     boolean add(TruckEscortAddParam param);
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 修改押运员信息
+     * @Date 2022/4/22
+     * @Param
+     **/
+    boolean edit(TruckEscort param);
+
 }

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -3,12 +3,10 @@ package com.aoyang.tms.service.impl;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.controller.param.TruckEscortAddParam;
 import com.aoyang.tms.controller.param.TruckEscortListParam;
-import com.aoyang.tms.controller.vo.TruckDeptListVO;
-import com.aoyang.tms.entity.Shipper;
-import com.aoyang.tms.entity.TruckDept;
 import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.tms.entity.User;
 import com.aoyang.tms.mapper.TruckEscortMapper;
+import com.aoyang.tms.service.CommonService;
 import com.aoyang.tms.service.TruckEscortService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,7 +16,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,11 +31,16 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
 
     @Resource
     TruckEscortMapper truckEscortMapper;
+    @Resource
+    private CommonService commonService;
 
     @Override
     public IPage<TruckEscort> findPage(PageParam<TruckEscortListParam> pageParam) {
         Page<TruckEscort> page = new Page<>(pageParam.getPage(), pageParam.getSize());
         QueryWrapper<TruckEscort> queryWrapper = new QueryWrapper<>();
+        if (pageParam.getParam().getOrgId() != null) {
+            queryWrapper.like("org_id", pageParam.getParam().getOrgId());
+        }
         if (pageParam.getParam().getKeyWord() != null) {
             queryWrapper.like("escort_name", pageParam.getParam().getKeyWord()).or().like("mobile", pageParam.getParam().getKeyWord());
         }
@@ -47,6 +49,25 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
     }
 
     @Override
+    public List<TruckEscort> list(TruckEscortListParam param) {
+        QueryWrapper<TruckEscort> queryWrapper = new QueryWrapper<>();
+        if (param.getOrgId() != null) {
+            queryWrapper.eq("org_id", param.getOrgId());
+        }
+        if (param.getTruckId() != null) {
+            queryWrapper.eq("truck_id", param.getTruckId());
+        }
+        if (param.getCarNumber() != null) {
+            queryWrapper.like("car_number", param.getCarNumber());
+        }
+        if (param.getKeyWord() != null) {
+            queryWrapper.like("escort_name", param.getKeyWord()).or().like("mobile", param.getKeyWord());
+        }
+        List<TruckEscort> list = list(queryWrapper.orderByDesc("update_date"));
+        return list;
+    }
+
+    @Override
     public TruckEscort findTruckEscort(TruckEscort truckEscort) {
         QueryWrapper<TruckEscort> queryWrapper = Wrappers.query();
         queryWrapper.eq("truck_id", truckEscort.getTruckId());
@@ -56,10 +77,49 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
 
     @Override
     public boolean add(TruckEscortAddParam param) {
+        boolean flag = false;
         User user = new User();
         user.setBaseRole("driver");
         user.setUserType(2);
         user.setOrgId(param.getOrgId());
-        return false;
+        user.setMobile(param.getMobile());
+        user.setUserName(param.getEscortName());
+        user.setCreater(param.getCreater());
+        user.setCreaterName(param.getCreaterName());
+        user.setCreateDate(param.getCreateDate());
+        User userSave = commonService.addUser(user);
+
+        if (userSave != null) {
+            TruckEscort truckEscort = new TruckEscort();
+            truckEscort.setUserId(userSave.getUserId());
+            truckEscort.setEscortName(userSave.getUserName());
+            truckEscort.setMobile(userSave.getMobile());
+            truckEscort.setCreater(param.getCreater());
+            truckEscort.setCreaterName(param.getCreaterName());
+            truckEscort.setCreateDate(param.getCreateDate());
+            truckEscort.setOrgId(userSave.getOrgId());
+            truckEscort.setOrgName(userSave.getOrgName());
+            truckEscort.setOrgShortName(userSave.getOrgShortName());
+            truckEscort.setUpdater(param.getCreater());
+            truckEscort.setUpdaterName(param.getCreaterName());
+            truckEscort.setUpdateDate(param.getCreateDate());
+            flag = saveOrUpdate(truckEscort);
+        }
+        return flag;
+    }
+
+    @Override
+    public boolean edit(TruckEscort param) {
+        if (param.getMobile() != null || param.getEscortName() != null) {
+            User user = new User();
+            if (param.getMobile() != null) {
+                user.setMobile(param.getMobile());
+            }
+            if (param.getEscortName() != null) {
+                user.setUserName(param.getEscortName());
+            }
+            commonService.updateUser(user);
+        }
+        return updateById(param);
     }
 }