押运员接口

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

@@ -1,12 +1,21 @@
 package com.aoyang.tms.controller;
 
 
+import com.alibaba.fastjson.JSON;
+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 org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.time.LocalDateTime;
 import java.util.*;
 import javax.annotation.Resource;
 import  com.aoyang.tms.service.TruckEscortService;
@@ -35,12 +44,36 @@ public class TruckEscortController {
     @Resource
     private TruckEscortService truckEscortService;
 
-    @ApiOperation(value = "获取truck_escort列表",notes="")
+    @ApiOperation(value = "获取车辆押运员分页列表",notes="")
     @PostMapping("/list")
-    public Result list(@RequestBody PageParam<TruckEscort> pageParam) {
-        Page<TruckEscort> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<TruckEscort> records = truckEscortService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
+    public Result list(@RequestBody PageParam<TruckEscortListParam> pageParam) {
+        log.info("获取运力部门管理分页列表,调用/tms/truck_dept/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")
+    @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));
+        if (param == null || param.getOrgId() == null || param.getEscortName() == null || param.getMobile() == 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.setCreater(userId);
+        param.setCreaterName(utf8Name);
+        param.setCreateDate(LocalDateTime.now());
+
+        return new Result<>(truckEscortService.add(param));
     }
 
     @ApiOperation(value = "修改truck_escort",notes="根据id修改truck_escort")
@@ -50,10 +83,5 @@ public class TruckEscortController {
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加truck_escort",notes="新增一条truck_escort")
-    @PostMapping("/add")
-    public Result add(@RequestBody TruckEscort truckEscort) {
-        Boolean flag = truckEscortService.save(truckEscort);
-        return new Result<>(flag);
-    }
+
 }

src/main/java/com/aoyang/tms/controller/param/TruckEscortAddParam.java

@@ -0,0 +1,32 @@
+package com.aoyang.tms.controller.param;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TruckEscortAddParam {
+
+    @ApiModelProperty(value = "组织id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgId;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String escortName;
+
+    @ApiModelProperty(value = "创建人id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long creater;
+
+    @ApiModelProperty(value = "创建人姓名")
+    private String createrName;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+}

src/main/java/com/aoyang/tms/controller/param/TruckEscortListParam.java

@@ -0,0 +1,10 @@
+package com.aoyang.tms.controller.param;
+
+import com.aoyang.tms.entity.TruckEscort;
+import lombok.Data;
+
+@Data
+public class TruckEscortListParam extends TruckEscort {
+
+    private String keyWord;
+}

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

@@ -30,16 +30,20 @@ public class TruckEscort implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "id,自增")
-    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "用户id（tms.driver.user_id）")
+    @TableField("user_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
+    private Long userId;
 
     @ApiModelProperty(value = "卡车id")
     @TableField("truck_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long truckId;
 
+    @ApiModelProperty(value = "车牌号")
+    @TableField("car_number")
+    private String carNumber;
+
     @ApiModelProperty(value = "组织id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -53,10 +57,9 @@ public class TruckEscort implements Serializable {
     @TableField("org_short_name")
     private String orgShortName;
 
-    @ApiModelProperty(value = "用户id（tms.driver.user_id）")
-    @TableField("user_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long userId;
+    @ApiModelProperty(value = "手机号")
+    @TableField("mobile")
+    private String mobile;
 
     @ApiModelProperty(value = "用户姓名")
     @TableField("escort_name")

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

@@ -1,6 +1,12 @@
 package com.aoyang.tms.service;
 
+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.TruckDept;
 import com.aoyang.tms.entity.TruckEscort;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -14,6 +20,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface TruckEscortService extends IService<TruckEscort> {
 
     /**
+     * @return
+     * @Author chengang
+     * @Description 获取运力部门分页列表
+     * @Date 2021/11/9
+     * @Param
+     **/
+    IPage<TruckEscort> findPage(PageParam<TruckEscortListParam> pageParam);
+
+    /**
      * @Author guoyong
      * @Description 查找押运员
      * @Date  2022/4/22
@@ -22,4 +37,13 @@ public interface TruckEscortService extends IService<TruckEscort> {
     **/
     TruckEscort findTruckEscort(TruckEscort truckEscort);
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 新增押运员
+     * @Date 2022/4/22
+     * @Param
+     **/
+    boolean add(TruckEscortAddParam param);
+
 }

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

@@ -1,14 +1,25 @@
 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.TruckEscortService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
 
 /**
  * <p>
@@ -25,10 +36,30 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
     TruckEscortMapper truckEscortMapper;
 
     @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().getKeyWord() != null) {
+            queryWrapper.like("escort_name", pageParam.getParam().getKeyWord()).or().like("mobile", pageParam.getParam().getKeyWord());
+        }
+        IPage<TruckEscort> records = page(page, queryWrapper.orderByDesc("update_date"));
+        return records;
+    }
+
+    @Override
     public TruckEscort findTruckEscort(TruckEscort truckEscort) {
         QueryWrapper<TruckEscort> queryWrapper = Wrappers.query();
         queryWrapper.eq("truck_id", truckEscort.getTruckId());
         TruckEscort truckEscort1 = truckEscortMapper.selectOne(queryWrapper);
         return truckEscort1;
     }
+
+    @Override
+    public boolean add(TruckEscortAddParam param) {
+        User user = new User();
+        user.setBaseRole("driver");
+        user.setUserType(2);
+        user.setOrgId(param.getOrgId());
+        return false;
+    }
 }

src/main/resources/mapper/TruckEscortMapper.xml

@@ -4,12 +4,13 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckEscort">
-        <id column="id" property="id" />
+        <id column="user_id" property="userId" />
         <result column="truck_id" property="truckId" />
+        <result column="car_number" property="carNumber" />
         <result column="org_id" property="orgId" />
         <result column="org_name" property="orgName" />
         <result column="org_short_name" property="orgShortName" />
-        <result column="user_id" property="userId" />
+        <result column="mobile" property="mobile" />
         <result column="escort_name" property="escortName" />
         <result column="note" property="note" />
         <result column="creater" property="creater" />
@@ -22,7 +23,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, truck_id, org_id, org_name, org_short_name, user_id, escort_name, note, creater, creater_name, create_date, updater, updater_name, update_date
+        truck_id, car_number, org_id, org_name, org_short_name, mobile, user_id, escort_name, note, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>