Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/aoyang/tms/service/CommonService.java
#	src/main/java/com/aoyang/tms/service/WorkOrderService.java
#	src/main/java/com/aoyang/tms/service/impl/WorkOrderServiceImpl.java

src/main/java/com/aoyang/tms/common/WorkOrderEnum.java

@@ -34,8 +34,8 @@ public enum WorkOrderEnum {
     //已关闭
     CLOSED(50, "已关闭"),
 
-    //已取消
-    CONCELED(10, "已取消");
+    //已作废
+    CONCELED(60, "已作废");
 
 
     private Integer orderStatus;

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

@@ -1,12 +1,19 @@
 package com.aoyang.tms.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.WorkSpot;
 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.ShipperService;
@@ -35,25 +42,81 @@ public class ShipperController {
     @Resource
     private ShipperService shipperService;
 
-    @ApiOperation(value = "获取shipper列表",notes="")
-    @PostMapping("/list")
+    @ApiOperation(value = "获取托运方分页列表",notes="必传参数:orgId")
+    @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<Shipper> pageParam) {
-        Page<Shipper> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<Shipper> records = shipperService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
+        log.info("获取托运方分页列表,调用/tms/shipper/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<>(shipperService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "修改shipper",notes="根据id修改shipper")
+    @ApiOperation(value = "修改托运方",notes="必传参数:shipperId")
     @PostMapping("/update")
-    public Result update(@RequestBody Shipper shipper) {
-        Boolean flag = shipperService.updateById(shipper);
-        return new Result<>(flag);
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody Shipper param) {
+
+        log.info("修改托运方,调用/tms/shipper/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getShipperId() == 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<>(shipperService.updateById(param));
     }
 
-    @ApiOperation(value = "添加shipper",notes="新增一条shipper")
+    @ApiOperation(value = "添加托运方",notes="必传参数:orgId,orgName,orgShortName,shipperName")
     @PostMapping("/add")
-    public Result add(@RequestBody Shipper shipper) {
-        Boolean flag = shipperService.save(shipper);
-        return new Result<>(flag);
+    public Result add(@RequestHeader(value = "userId") Long userId,
+                      @RequestHeader(value = "userName") String userName,
+                      @RequestBody Shipper param) {
+
+        log.info("添加托运方,调用/tms/shipper/add,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getOrgId() == null || param.getOrgName() == null
+                || param.getOrgShortName() == null || param.getShipperName() == 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());
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        return new Result<>(shipperService.save(param));
+    }
+
+    @ApiOperation(value = "删除托运方", notes = "根据id删除,参数：id")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody Shipper param) {
+        log.info("删除托运方,调用/tms/shipper/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getShipperId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(shipperService.removeById(param));
+    }
+
+    @ApiOperation(value = "根据id获取托运方详情", notes = "必传参数:id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody Shipper param) {
+        log.info("根据id获取托运方详情,调用/tms/shipper/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getShipperId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(shipperService.getById(param));
     }
 }

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

@@ -3,6 +3,7 @@ package com.aoyang.tms.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.tms.service.CommonService;
 import org.springframework.web.bind.annotation.*;
 
@@ -45,7 +46,7 @@ public class TruckDeptController {
     @Resource
     private CommonService commonService;
 
-    @ApiOperation(value = "获取运力部门管理分页列表", notes = "")
+    @ApiOperation(value = "获取运力部门管理分页列表", notes = "必传参数:orgId")
     @PostMapping("/page_list")
     public Result pageList(@RequestBody PageParam<TruckDept> pageParam) {
         log.info("获取运力部门管理分页列表,调用/tms/truck_dept/page_list,参数:{}", JSON.toJSONString(pageParam));
@@ -55,7 +56,7 @@ public class TruckDeptController {
         return new Result<>(truckDeptService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "修改运力部门信息", notes = "根据id修改truck_dept")
+    @ApiOperation(value = "修改运力部门信息", notes = "必传参数:id")
     @PostMapping("/update")
     public Result update(@RequestHeader(value = "userId") Long userId,
                          @RequestHeader(value = "userName") String userName,
@@ -76,7 +77,7 @@ public class TruckDeptController {
         return new Result<>(truckDeptService.updateById(param));
     }
 
-    @ApiOperation(value = "新增运力部门", notes = "新增一条truck_dept")
+    @ApiOperation(value = "新增运力部门", notes = "必传参数:name,orgId,orgName,orgShortName")
     @PostMapping("/add")
     public Result add(@RequestHeader(value = "userId") Long userId,
                       @RequestHeader(value = "userName") String userName,
@@ -101,7 +102,7 @@ public class TruckDeptController {
         return new Result<>(truckDeptService.save(param));
     }
 
-    @ApiOperation(value = "删除运力部门", notes = "根据id删除运力部门,参数：id")
+    @ApiOperation(value = "删除运力部门", notes = "根据id删除运力部门,参数：id,orgId")
     @PostMapping("/delete")
     public Result delete(@RequestBody TruckDept param) {
         log.info("删除运力部门,调用/tms/truck_dept/delete,参数:{}", JSON.toJSONString(param));
@@ -113,4 +114,14 @@ public class TruckDeptController {
         }
         return new Result<>(truckDeptService.removeById(param));
     }
+
+    @ApiOperation(value = "根据id获取运力部门详情", notes = "必传参数:id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody TruckDept param) {
+        log.info("根据id获取运单详情,调用/tms/truck_dept/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(truckDeptService.getById(param));
+    }
 }

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

@@ -28,7 +28,7 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "truck_escortCRUD接口")
+@Api(value = "车辆押运员相关接口")
 @RequestMapping("/tms/truck_escort")
 public class TruckEscortController {
 

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

@@ -1,16 +1,23 @@
 package com.aoyang.tms.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.controller.param.WorkOrderPageParam;
+import com.aoyang.tms.controller.vo.WorkOrderVO;
+import org.springframework.beans.BeanUtils;
 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.util.*;
 import javax.annotation.Resource;
-import  com.aoyang.tms.service.WorkOrderService;
-import  com.aoyang.tms.entity.WorkOrder;
+
+import com.aoyang.tms.service.WorkOrderService;
+import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.common.result.Result;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,8 +27,8 @@ import com.aoyang.common.param.PageParam;
 
 /**
  * <p>
-    * 运单运单表 控制器
-    * </p>
+ * 运单运单表 控制器
+ * </p>
  *
  * @author guoyong
  * @since 2022-04-20
@@ -35,30 +42,58 @@ public class WorkOrderController {
     @Resource
     private WorkOrderService workOrderService;
 
-    @ApiOperation(value = "获取运单列表",notes="")
-    @PostMapping("/list")
-    public Result list(@RequestBody PageParam<WorkOrder> pageParam) {
-        Page<WorkOrder> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<WorkOrder> records = workOrderService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
+    @ApiOperation(value = "运单详情", notes = "获取司机或押运员的运单详情")
+    @PostMapping("/find_work_order_info")
+    public Result<WorkOrderVO> findWorkOrderInfo(@RequestHeader(value = "orgId") Long orgId,
+                                                 @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
+        log.info("运单详情,/tms/work_order/find_work_order_info，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+
+        WorkOrder workOrder1 = workOrderService.getById(workOrder.getId());
+        WorkOrderVO vo = new WorkOrderVO();
+        BeanUtils.copyProperties(workOrder1, vo);
+        return new Result<>(vo);
+    }
+
+    @ApiOperation(value = "获取运单分页列表", notes = "必传参数:orgId")
+    @PostMapping("/page_list")
+    public Result list(@RequestBody PageParam<WorkOrderPageParam> pageParam) {
+        log.info("获取运单分页列表,调用/tms/work_order/page_list,参数:{}", JSON.toJSONString(pageParam));
+        if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getWorkOrder() == null
+                || pageParam.getParam().getWorkOrder().getOrgId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(workOrderService.findPage(pageParam));
+    }
+
+    @ApiOperation(value = "根据id获取运单详情", notes = "必传参数:id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody WorkOrder param) {
+        log.info("根据id获取运单详情,调用/tms/work_order/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(workOrderService.getById(param));
     }
 
 
-    @ApiOperation(value = "派单",notes="调度员派单操作")
+    @ApiOperation(value = "派单", notes = "调度员派单操作")
     @PostMapping("/add")
     public Result add(@RequestBody WorkOrder workOrder) {
         Boolean flag = workOrderService.save(workOrder);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "修改派单",notes="根据id修改派单")
+    @ApiOperation(value = "修改派单", notes = "根据id修改派单")
     @PostMapping("/update")
     public Result update(@RequestBody WorkOrder workOrder) {
         Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "取消派单",notes="取消派单")
+    @ApiOperation(value = "取消派单", notes = "取消派单")
     @PostMapping("/delete")
     public Result delete(@RequestBody WorkOrder workOrder) {
         Boolean flag = workOrderService.updateById(workOrder);

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

@@ -1,59 +0,0 @@
-package com.aoyang.tms.controller;
-
-
-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.util.*;
-import javax.annotation.Resource;
-import  com.aoyang.tms.service.WorkOrderReadinfoService;
-import  com.aoyang.tms.entity.WorkOrderReadinfo;
-import com.aoyang.common.result.Result;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.aoyang.common.param.PageParam;
-
-
-/**
- * <p>
-    * 运单已读信息表 控制器
-    * </p>
- *
- * @author guoyong
- * @since 2022-04-20
- */
-@RestController
-@Slf4j
-@Api(value = "work_order_readinfoCRUD接口")
-@RequestMapping("/tms/work_order_readinfo")
-public class WorkOrderReadinfoController {
-
-    @Resource
-    private WorkOrderReadinfoService workOrderReadinfoService;
-
-    @ApiOperation(value = "获取work_order_readinfo列表",notes="")
-    @PostMapping("/list")
-    public Result list(@RequestBody PageParam<WorkOrderReadinfo> pageParam) {
-        Page<WorkOrderReadinfo> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<WorkOrderReadinfo> records = workOrderReadinfoService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
-    }
-
-    @ApiOperation(value = "修改work_order_readinfo",notes="根据id修改work_order_readinfo")
-    @PostMapping("/update")
-    public Result update(@RequestBody WorkOrderReadinfo workOrderReadinfo) {
-        Boolean flag = workOrderReadinfoService.updateById(workOrderReadinfo);
-        return new Result<>(flag);
-    }
-
-    @ApiOperation(value = "添加work_order_readinfo",notes="新增一条work_order_readinfo")
-    @PostMapping("/add")
-    public Result add(@RequestBody WorkOrderReadinfo workOrderReadinfo) {
-        Boolean flag = workOrderReadinfoService.save(workOrderReadinfo);
-        return new Result<>(flag);
-    }
-}

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

@@ -1,16 +1,24 @@
 package com.aoyang.tms.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.aoyang.tms.common.ErrCodeEnum;
+import com.aoyang.tms.entity.TruckDept;
 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.WorkSpotService;
-import  com.aoyang.tms.entity.WorkSpot;
+
+import com.aoyang.tms.service.WorkSpotService;
+import com.aoyang.tms.entity.WorkSpot;
 import com.aoyang.common.result.Result;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -20,40 +28,96 @@ import com.aoyang.common.param.PageParam;
 
 /**
  * <p>
-    * 运单地点管理表 控制器
-    * </p>
+ * 运单地点管理表 控制器
+ * </p>
  *
  * @author guoyong
  * @since 2022-04-20
  */
 @RestController
 @Slf4j
-@Api(value = "work_spotCRUD接口")
+@Api(value = "作业点相关接口")
 @RequestMapping("/tms/work_spot")
 public class WorkSpotController {
 
     @Resource
     private WorkSpotService workSpotService;
 
-    @ApiOperation(value = "获取work_spot列表",notes="")
-    @PostMapping("/list")
+    @ApiOperation(value = "获取作业点分页列表", notes = "必传参数:orgId")
+    @PostMapping("/page_list")
     public Result list(@RequestBody PageParam<WorkSpot> pageParam) {
-        Page<WorkSpot> page = new Page<>(pageParam.getPage(), pageParam.getSize());
-        IPage<WorkSpot> records = workSpotService.page(page, Wrappers.query(pageParam.getParam()));
-        return new Result<>(records);
+        log.info("获取运力部门管理分页列表,调用/tms/work_spot/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<>(workSpotService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "修改work_spot",notes="根据id修改work_spot")
+    @ApiOperation(value = "修改作业点", notes = "根据id修改work_spot,spotId")
     @PostMapping("/update")
-    public Result update(@RequestBody WorkSpot workSpot) {
-        Boolean flag = workSpotService.updateById(workSpot);
-        return new Result<>(flag);
+    public Result update(@RequestHeader(value = "userId") Long userId,
+                         @RequestHeader(value = "userName") String userName,
+                         @RequestBody WorkSpot param) {
+
+        log.info("修改作业点,调用/tms/work_spot/update,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getSpotId() == 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<>(workSpotService.updateById(param));
     }
 
-    @ApiOperation(value = "添加work_spot",notes="新增一条work_spot")
+    @ApiOperation(value = "添加作业点", notes = "必传参数:orgId,type,orgName,orgShortName,spotName")
     @PostMapping("/add")
-    public Result add(@RequestBody WorkSpot workSpot) {
-        Boolean flag = workSpotService.save(workSpot);
-        return new Result<>(flag);
+    public Result add(@RequestHeader(value = "userId") Long userId,
+                      @RequestHeader(value = "userName") String userName,
+                      @RequestBody WorkSpot param) {
+
+        log.info("添加作业点,调用/tms/work_spot/add,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getOrgId() == null || param.getType() == null || param.getOrgName() == null
+                || param.getOrgShortName() == null || param.getSpotName() == 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());
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        return new Result<>(workSpotService.save(param));
+    }
+
+    @ApiOperation(value = "删除作业点", notes = "根据id删除作业点,参数：id")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody WorkSpot param) {
+        log.info("删除作业点,调用/tms/work_spot/delete,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getSpotId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(workSpotService.removeById(param));
+    }
+
+    @ApiOperation(value = "根据id获取作业点详情", notes = "必传参数:id")
+    @PostMapping("/get_one")
+    public Result getOne(@RequestBody WorkSpot param) {
+        log.info("根据id获取作业点详情,调用/tms/work_spot/get_one,参数:{}", JSON.toJSONString(param));
+        if (param == null || param.getSpotId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(workSpotService.getById(param));
     }
 }

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

@@ -1,53 +1,58 @@
 package com.aoyang.tms.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
-import com.aoyang.tms.controller.param.Truck;
-import com.aoyang.tms.controller.vo.TruckInfo;
+import com.aoyang.tms.common.ErrCodeEnum;
 import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.entity.WorkOrder;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.aoyang.tms.service.CommonService;
+import com.aoyang.tms.service.WorkOrderService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 /**
  * @Description: 作业人员相关接口
  * @Author guoyong
- * @Date 2022/4/20 16:50
+ * @Date 2022/4/22 16:50
  * @Version 1.0
  */
+@RestController
+@Slf4j
+@Api(value = "作业端相关接口汇总")
+@RequestMapping("/tms/worker")
 public class WorkerController {
 
-    @ApiOperation(value = "获取作业人员信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态")
-    @PostMapping("/find_worker_info")
-    public Result<WorkerInfo> find_worker_info(@RequestHeader(value = "orgId") Long orgId,
-                                               @RequestHeader(value = "userId") Long userId) {
-        return new Result<>(new WorkerInfo());
-    }
-
-    @ApiOperation(value = "获取行车详情信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
-    @PostMapping("/find_work_truck_info")
-    public Result<TruckInfo> find_work_truck_info(@RequestHeader(value = "orgId") Long orgId,
-                                                  @RequestHeader(value = "userId") Long userId, @RequestBody Truck truck) {
-        return new Result<>(new TruckInfo());
-    }
+    @Resource
+    private WorkOrderService workOrderService;
 
-    @ApiOperation(value = "获取待执行作业列表信息", notes = "卡车id、必传")
-    @PostMapping("/find_todo_work_list")
-    public Result<Page<WorkOrderVO>> find_todo_work_list(@RequestHeader(value = "orgId") Long orgId,
-                                                          @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
-        return new Result<>(null);
-    }
+    @Resource
+    private CommonService commonService;
 
-    @ApiOperation(value = "获取运力详情信息", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
+    @ApiOperation(value = "运力详情", notes = "卡车id必传，包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
-    public Result<WorkerInfo> find_truck_info(@RequestHeader(value = "orgId") Long orgId,
-                                                  @RequestHeader(value = "userId") Long userId) {
-        return new Result<>(new WorkerInfo());
+    public Result<WorkerInfo> findTruckInfo(@RequestHeader(value = "orgId") Long orgId,
+                                            @RequestHeader(value = "userId") Long userId, @RequestBody WorkerInfo workerInfo) {
+        log.info("运力详情,/tms/worker/find_truck_info，参数:{}", JSON.toJSONString(workerInfo));
+        if (workerInfo == null || workerInfo.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        WorkerInfo workerInfo1 = commonService.findTruckInfo(workerInfo.getTruckId());
+        return new Result<>(workerInfo1);
     }
 
+    @ApiOperation(value = "运单列表", notes = "获取司机或押运员的运单列表")
+    @PostMapping("/find_work_order_page")
+    public Result<IPage<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
+                                                        @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
+        IPage<WorkOrderVO> records = null;
+        return new Result<>(records);
+    }
 
 }

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

@@ -0,0 +1,16 @@
+package com.aoyang.tms.controller.param;
+
+import com.aoyang.tms.entity.WorkOrder;
+import lombok.Data;
+
+@Data
+public class WorkOrderPageParam {
+
+    private WorkOrder workOrder;
+
+    private String createDateFrom;
+    private String createDateTo;
+
+    private String completeDateFrom;
+    private String completeDateTo;
+}

src/main/java/com/aoyang/tms/controller/vo/WorkCycleVO.java

@@ -0,0 +1,19 @@
+package com.aoyang.tms.controller.vo;
+
+import com.aoyang.tms.entity.WorkCycle;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 行程周期实体
+ * @Author guoyong
+ * @Date 2022/4/21 17:29
+ * @Version 1.0
+ */
+public class WorkCycleVO extends WorkCycle {
+
+    @ApiModelProperty(value = "装车订单数量")
+    private int zhuagncheOrderNum;
+
+    @ApiModelProperty(value = "卸车订单数量")
+    private int xiecheOrderNum;
+}

src/main/java/com/aoyang/tms/controller/vo/WorkOrderPageListVO.java

@@ -0,0 +1,48 @@
+package com.aoyang.tms.controller.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class WorkOrderPageListVO {
+
+    @ApiModelProperty(value = "id,自增")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
+    @ApiModelProperty(value = "运单号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "运单类型1装车、2卸车")
+    private Integer type;
+
+    @ApiModelProperty(value = "托运方名称")
+    private String shipperName;
+
+    @ApiModelProperty(value = "运单作业状态")
+    private String workOrderType;
+
+    @ApiModelProperty(value = "作业地点名")
+    private String spotName;
+
+    @ApiModelProperty(value = "执行运力(车牌号-挂车车牌号)")
+    private String carAndTrailerNumber;
+
+    @ApiModelProperty(value = "运力部门名称")
+    private String truckDeptName;
+
+    @ApiModelProperty(value = "派单时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "运单完成时间")
+    private LocalDateTime completeDate;
+
+
+
+}

src/main/java/com/aoyang/tms/controller/vo/WorkOrderVO.java

@@ -1,5 +1,6 @@
 package com.aoyang.tms.controller.vo;
 
+import com.aoyang.tms.entity.WorkOrder;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -25,200 +26,19 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("work_order")
 @ApiModel(value="WorkOrder对象", description="运单运单表")
-public class WorkOrderVO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "id,自增")
-    @TableId(value = "id", type = IdType.AUTO)
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long id;
-
-    @ApiModelProperty(value = "运单号")
-    @TableField("order_no")
-    private String orderNo;
-
-    @ApiModelProperty(value = "组织id")
-    @TableField("org_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long orgId;
-
-    @ApiModelProperty(value = "组织名称")
-    @TableField("org_name")
-    private String orgName;
-
-    @ApiModelProperty(value = "组织简称")
-    @TableField("org_short_name")
-    private String orgShortName;
-
-    @ApiModelProperty(value = "司机1id")
-    @TableField("driver_id_one")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverIdOne;
-
-    @ApiModelProperty(value = "司机1姓名")
-    @TableField("driver_name_one")
-    private String driverNameOne;
-
-    @ApiModelProperty(value = "司机2id")
-    @TableField("driver_id_two")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long driverIdTwo;
-
-    @ApiModelProperty(value = "司机2姓名")
-    @TableField("driver_name_two")
-    private String driverNameTwo;
-
-    @ApiModelProperty(value = "押运员id")
-    @TableField("escort_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long escortId;
-
-    @ApiModelProperty(value = "押运员姓名")
-    @TableField("escort_name")
-    private String escortName;
-
-    @ApiModelProperty(value = "分配卡车id")
-    @TableField("truck_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
-    @ApiModelProperty(value = "车牌号")
-    @TableField("car_number")
-    private String carNumber;
-
-    @ApiModelProperty(value = "挂车车牌号")
-    @TableField("trailer_car_number")
-    private String trailerCarNumber;
-
-    @ApiModelProperty(value = "托运方id")
-    @TableField("shipper_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long shipperId;
-
-    @ApiModelProperty(value = "托运方名称")
-    @TableField("shipper_name")
-    private String shipperName;
-
-    @ApiModelProperty(value = "1装车、2卸车")
-    @TableField("type")
-    private Integer type;
-
-    @ApiModelProperty(value = "运单状态：0-待执行 1-前往 2-等待 3-成果报备 4-已完成 5-已关闭")
-    @TableField("order_status")
-    private Integer orderStatus;
-
-    @ApiModelProperty(value = "作业地点id")
-    @TableField("spot_id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long spotId;
-
-    @ApiModelProperty(value = "作业地点名")
-    @TableField("spot_name")
-    private String spotName;
-
-    @ApiModelProperty(value = "计划到达时间")
-    @TableField("plan_reach_time")
-    private LocalDateTime planReachTime;
-
-    @ApiModelProperty(value = "计划离开时间")
-    @TableField("plan_leave_time")
-    private LocalDateTime planLeaveTime;
-
-    @ApiModelProperty(value = "实际到达时间")
-    @TableField("actual_reach_time")
-    private LocalDateTime actualReachTime;
-
-    @ApiModelProperty(value = "实际离开时间")
-    @TableField("actual_leave_time")
-    private LocalDateTime actualLeaveTime;
-
-    @ApiModelProperty(value = "计划重量")
-    @TableField("plan_weight")
-    private Integer planWeight;
-
-    @ApiModelProperty(value = "装车实际净重")
-    @TableField("actual_weight")
-    private String actualWeight;
-
-    @ApiModelProperty(value = "作业人员备注")
-    @TableField("worker_note")
-    private String workerNote;
-
-    @ApiModelProperty(value = "调度人员备注")
-    @TableField("note")
-    private String note;
-
-    @ApiModelProperty(value = "车辆里程数")
-    @TableField("trip")
-    private String trip;
-
-    @ApiModelProperty(value = "车辆里程数照片url")
-    @TableField("trip_url")
-    private String tripUrl;
-
-    @ApiModelProperty(value = "排队号")
-    @TableField("queue_no")
-    private String queueNo;
-
-    @ApiModelProperty(value = "装卸车开始时间")
-    @TableField("work_start_time")
-    private LocalDateTime workStartTime;
-
-    @ApiModelProperty(value = "装卸车结束时间")
-    @TableField("work_end_time")
-    private LocalDateTime workEndTime;
-
-    @ApiModelProperty(value = "成果报备磅单号")
-    @TableField("weighting_list_no")
-    private String weightingListNo;
-
-    @ApiModelProperty(value = "成果报备磅单url")
-    @TableField("weighting_list_url")
-    private String weightingListUrl;
-
-    @ApiModelProperty(value = "成果报备皮重")
-    @TableField("pi_weight")
-    private String piWeight;
-
-    @ApiModelProperty(value = "成果报备毛重")
-    @TableField("mao_weight")
-    private String maoWeight;
-
-    @ApiModelProperty(value = "成果报备净重")
-    @TableField("jing_weight")
-    private String jingWeight;
-
-    @ApiModelProperty(value = "创建人id")
-    @TableField("creater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long creater;
-
-    @ApiModelProperty(value = "创建人姓名")
-    @TableField("creater_name")
-    private String createrName;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_date")
-    private LocalDateTime createDate;
-
-    @ApiModelProperty(value = "修改人id")
-    @TableField("updater")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long updater;
-
-    @ApiModelProperty(value = "修改人姓名")
-    @TableField("updater_name")
-    private String updaterName;
-
-    @ApiModelProperty(value = "修改日期时间")
-    @TableField("update_date")
-    private LocalDateTime updateDate;
+public class WorkOrderVO extends WorkOrder implements Serializable {
 
     @ApiModelProperty(value = "已读未读状态,0未读，1已读")
     private Integer readFlag;
 
+    @ApiModelProperty(value = "装卸车点经度")
+    @TableField("longitude")
+    private String longitude;
+
+    @ApiModelProperty(value = "装卸车点纬度")
+    @TableField("latitude")
+    private String latitude;
+
 
 }

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -1,6 +1,5 @@
 package com.aoyang.tms.controller.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,6 +13,10 @@ import lombok.Data;
 @Data
 public class WorkerInfo {
 
+    @ApiModelProperty(value = "卡车id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
     @ApiModelProperty(value = "司机1id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long driverIdOne;
@@ -35,18 +38,11 @@ public class WorkerInfo {
     @ApiModelProperty(value = "押运员姓名")
     private String escortName;
 
-    @ApiModelProperty(value = "卡车id")
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long truckId;
-
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
 
-    @ApiModelProperty(value = "挂车车牌号")
-    private String trailerCarNumber;
-
-    @ApiModelProperty(value = "车辆状态")
-    private Integer truckStatus;
+    @ApiModelProperty(value = "挂车牌号")
+    private String trailerNumber;
 
     @ApiModelProperty(value = "位置经度")
     private String longitude;
@@ -57,13 +53,11 @@ public class WorkerInfo {
     @ApiModelProperty(value = "位置时间")
     private String localTime;
 
-    @ApiModelProperty(value = "作业状态")
-    private int workStatus;
+//    @ApiModelProperty(value = "订单状态,待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已作废60")
+//    private int orderStatus;
 
-    @ApiModelProperty(value = "装车订单数量")
-    private int zhuagncheOrderNum;
+    @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
+    private Integer truckStatus;
 
-    @ApiModelProperty(value = "卸车订单数量")
-    private int xiecheOrderNum;
 
 }

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

@@ -46,6 +46,19 @@ public class Shipper implements Serializable {
     @TableField("url")
     private String url;
 
+    @ApiModelProperty(value = "物流公司id")
+    @TableField("org_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgId;
+
+    @ApiModelProperty(value = "物流公司名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "物流公司简称")
+    @TableField("org_short_name")
+    private String orgShortName;
+
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
@@ -59,5 +72,18 @@ public class Shipper implements Serializable {
     @TableField("create_date")
     private LocalDateTime createDate;
 
+    @ApiModelProperty(value = "修改人id")
+    @TableField("updater")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long updater;
+
+    @ApiModelProperty(value = "修改人姓名")
+    @TableField("updater_name")
+    private String updaterName;
+
+    @ApiModelProperty(value = "修改日期时间")
+    @TableField("update_date")
+    private LocalDateTime updateDate;
+
 
 }

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

@@ -39,16 +39,16 @@ public class TruckDept implements Serializable {
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "组织id")
+    @ApiModelProperty(value = "物流公司id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long orgId;
 
-    @ApiModelProperty(value = "组织名称")
+    @ApiModelProperty(value = "物流公司名称")
     @TableField("org_name")
     private String orgName;
 
-    @ApiModelProperty(value = "组织简称")
+    @ApiModelProperty(value = "物流公司简称")
     @TableField("org_short_name")
     private String orgShortName;
 

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

@@ -1,5 +1,7 @@
 package com.aoyang.tms.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -28,6 +30,11 @@ public class TruckEscort implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "id,自增")
+    @TableId(value = "id", type = IdType.AUTO)
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
     @ApiModelProperty(value = "卡车id")
     @TableField("truck_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

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

@@ -40,7 +40,7 @@ public class WorkOrder implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long cycleId;
 
-    @ApiModelProperty(value = "运单状态：0-待执行 1-前往 2-等待 3-成果报备 4-已完成 5-已关闭")
+    @ApiModelProperty(value = "运单状态：待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已报废60")
     @TableField("order_status")
     private Integer orderStatus;
 
@@ -123,6 +123,14 @@ public class WorkOrder implements Serializable {
     @TableField("spot_name")
     private String spotName;
 
+    @ApiModelProperty(value = "所属部门id")
+    @TableField("dept_id")
+    private Long deptId;
+
+    @ApiModelProperty(value = "所属部门名称")
+    @TableField("dept_name")
+    private String deptName;
+
     @ApiModelProperty(value = "计划到达时间")
     @TableField("plan_reach_time")
     private LocalDateTime planReachTime;
@@ -195,6 +203,10 @@ public class WorkOrder implements Serializable {
     @TableField("jing_weight")
     private String jingWeight;
 
+    @ApiModelProperty(value = "运单完成时间")
+    @TableField("complete_date")
+    private LocalDateTime completeDate;
+
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

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

@@ -39,11 +39,24 @@ public class WorkSpot implements Serializable {
     @TableField("spot_name")
     private String spotName;
 
+    @ApiModelProperty(value = "组织id")
+    @TableField("org_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orgId;
+
+    @ApiModelProperty(value = "组织名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "组织简称")
+    @TableField("org_short_name")
+    private String orgShortName;
+
     @ApiModelProperty(value = "具体地址")
     @TableField("adress")
     private String adress;
 
-    @ApiModelProperty(value = "1装车点、2卸车点、3检修点，不能为空")
+    @ApiModelProperty(value = "1装车点、2卸车点、3收车点，不能为空")
     @TableField("type")
     private Integer type;
 

src/main/java/com/aoyang/tms/feign/result/Truck.java

@@ -19,7 +19,7 @@ public class Truck {
     @ApiModelProperty(value = "卡车id")
     private Long truckId;
 
-    @ApiModelProperty(value = "运力系统车辆状态，状态：1出车检查；2.作业中；3.收车中；4.收车后检查；5.已收车")
+    @ApiModelProperty(value = "运力系统车辆状态，已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
     private Integer tmsStatus;
 
     @ApiModelProperty(value = "物流公司id")

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

@@ -2,6 +2,7 @@ package com.aoyang.tms.service;
 
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
+import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.feign.result.Truck;
 import com.aoyang.tms.feign.result.TruckDriver;
 
@@ -19,6 +20,15 @@ import java.util.List;
 public interface CommonService {
 
     /**
+     * @Author guoyong
+     * @Description 获取运力详情
+     * @Date  2022/4/21
+     * @Param
+     * @return
+    **/
+    WorkerInfo findTruckInfo(Long truckId);
+
+    /**
      * 获取卡车司机列表
      *
      * @param truckId

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

@@ -1,6 +1,9 @@
 package com.aoyang.tms.service;
 
+import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.entity.Shipper;
+import com.aoyang.tms.entity.WorkSpot;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +16,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ShipperService extends IService<Shipper> {
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取托运方分页列表
+     * @Date 2022/4/21
+     * @Param
+     **/
+    IPage<Shipper> findPage(PageParam<Shipper> pageParam);
+
 }

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

@@ -5,6 +5,10 @@ import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.param.Truck;
 import com.aoyang.tms.controller.vo.TruckOrderManageVO;
 import com.aoyang.tms.controller.vo.TruckOrderStatisticsVO;
+import com.aoyang.common.param.PageParam;
+import com.aoyang.tms.controller.param.WorkOrderPageParam;
+import com.aoyang.tms.controller.vo.WorkOrderPageListVO;
+import com.aoyang.tms.entity.Shipper;
 import com.aoyang.tms.entity.WorkOrder;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -32,4 +36,12 @@ public interface WorkOrderService extends IService<WorkOrder> {
      */
     Result<IPage<TruckOrderManageVO>> getTruckOrderStatistics(PageParam<Truck> pageParam);
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取运单分页列表
+     * @Date 2022/4/21
+     * @Param
+     **/
+    IPage<WorkOrderPageListVO> findPage(PageParam<WorkOrderPageParam> pageParam);
 }

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

@@ -1,6 +1,10 @@
 package com.aoyang.tms.service;
 
+import com.aoyang.common.param.PageParam;
+import com.aoyang.tms.controller.vo.TruckDeptListVO;
+import com.aoyang.tms.entity.TruckDept;
 import com.aoyang.tms.entity.WorkSpot;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -13,4 +17,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface WorkSpotService extends IService<WorkSpot> {
 
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取运力部门分页列表
+     * @Date 2022/4/21
+     * @Param
+     **/
+    IPage<WorkSpot> findPage(PageParam<WorkSpot> pageParam);
+
 }

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

@@ -2,12 +2,15 @@ package com.aoyang.tms.service.impl;
 
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
+import com.aoyang.tms.controller.vo.WorkerInfo;
+import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.tms.entity.TruckSimCard;
 import com.aoyang.tms.feign.StrategyFeignClient;
 import com.aoyang.tms.feign.result.TmsMongoDoc;
 import com.aoyang.tms.feign.result.Truck;
 import com.aoyang.tms.feign.result.TruckDriver;
 import com.aoyang.tms.service.CommonService;
+import com.aoyang.tms.service.TruckEscortService;
 import com.aoyang.tms.service.TruckSimCardService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -41,6 +44,38 @@ public class CommonServiceImpl implements CommonService {
     @Resource
     private TruckSimCardService truckSimCardService;
 
+    @Resource
+    private TruckEscortService truckEscortService;
+
+    @Override
+    public WorkerInfo findTruckInfo(Long truckId) {
+        WorkerInfo workerInfo = new WorkerInfo();
+        workerInfo.setTruckId(truckId);
+        Truck truck = findTruck(truckId);
+        if (truck != null) {
+            workerInfo.setTruckStatus(truck.getTmsStatus());
+            workerInfo.setCarNumber(truck.getCarNumber());
+            workerInfo.setTrailerNumber(truck.getTrailerNumber());
+        }
+        List<TruckDriver> truckDrivers = findTruckDrivers(truckId);
+        if (truckDrivers != null && truckDrivers.size() > 0) {
+            workerInfo.setDriverIdOne(truckDrivers.get(0).getDriverId());
+            workerInfo.setDriverNameOne(truckDrivers.get(0).getDriverName());
+            if (truckDrivers.size() > 1) {
+                workerInfo.setDriverIdTwo(truckDrivers.get(1).getDriverId());
+                workerInfo.setDriverNameTwo(truckDrivers.get(1).getDriverName());
+            }
+        }
+
+        TruckEscort truckEscort = truckEscortService.getById(truckId);
+        if (truckEscort != null) {
+            workerInfo.setEscortId(truckEscort.getTruckId());
+            workerInfo.setEscortName(truckEscort.getEscortName());
+        }
+
+        return workerInfo;
+    }
+
     @Override
     public List<TruckDriver> findTruckDrivers(Long truckId) {
         TruckDriver truckDriver = new TruckDriver();

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

@@ -1,8 +1,13 @@
 package com.aoyang.tms.service.impl;
 
+import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.entity.Shipper;
+import com.aoyang.tms.entity.WorkSpot;
 import com.aoyang.tms.mapper.ShipperMapper;
 import com.aoyang.tms.service.ShipperService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -17,4 +22,15 @@ import org.springframework.stereotype.Service;
 @Service
 public class ShipperServiceImpl extends ServiceImpl<ShipperMapper, Shipper> implements ShipperService {
 
+
+    @Override
+    public IPage<Shipper> findPage(PageParam<Shipper> pageParam) {
+        Page<Shipper> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        QueryWrapper<Shipper> queryWrapper = new QueryWrapper<>();
+        if (pageParam.getParam().getShipperName() != null) {
+            queryWrapper.like("shipper_name", pageParam.getParam().getShipperName());
+        }
+        IPage<Shipper> records = page(page, queryWrapper.orderByDesc("update_date"));
+        return records;
+    }
 }

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

@@ -8,6 +8,13 @@ import com.aoyang.tms.controller.param.Truck;
 import com.aoyang.tms.controller.vo.LocationVO;
 import com.aoyang.tms.controller.vo.TruckOrderManageVO;
 import com.aoyang.tms.controller.vo.TruckOrderStatisticsVO;
+import com.aoyang.common.param.PageParam;
+import com.aoyang.tms.common.WorkOrderEnum;
+import com.aoyang.tms.controller.param.WorkOrderPageParam;
+import com.aoyang.tms.controller.vo.TruckDeptListVO;
+import com.aoyang.tms.controller.vo.WorkOrderPageListVO;
+import com.aoyang.tms.entity.Shipper;
+import com.aoyang.tms.entity.TruckDept;
 import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.tms.mapper.WorkOrderMapper;
 import com.aoyang.tms.service.CommonService;
@@ -16,6 +23,9 @@ 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.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -24,6 +34,9 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.*;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 运单运单表 服务实现类
@@ -133,4 +146,71 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     }
 
 
+    @Override
+    public IPage<WorkOrderPageListVO> findPage(PageParam<WorkOrderPageParam> pageParam) {
+        WorkOrderPageParam workOrderPageParam = pageParam.getParam();
+        WorkOrder workOrderParam = workOrderPageParam.getWorkOrder();
+        IPage<WorkOrderPageListVO> workOrderPageListVOIPage = new Page<>();
+        Page<WorkOrder> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        QueryWrapper<WorkOrder> queryWrapper = new QueryWrapper<>();
+        if (workOrderPageParam.getCreateDateFrom() != null && workOrderPageParam.getCreateDateTo() != null) {
+            queryWrapper.ge("create_date", workOrderPageParam.getCreateDateFrom());
+            queryWrapper.le("create_date", workOrderPageParam.getCreateDateTo());
+        }
+        if (workOrderPageParam.getCompleteDateFrom() != null && workOrderPageParam.getCompleteDateTo() != null) {
+            queryWrapper.ge("complete_date", workOrderPageParam.getCompleteDateFrom());
+            queryWrapper.le("complete_date", workOrderPageParam.getCompleteDateTo());
+        }
+        if (workOrderParam.getOrderNo() != null) {
+            queryWrapper.eq("order_no", workOrderParam.getOrderNo());
+        }
+        if (workOrderParam.getOrgId() != null) {
+            queryWrapper.eq("org_id", workOrderParam.getOrgId());
+        }
+        if (workOrderParam.getType() != null) {
+            queryWrapper.eq("type", workOrderParam.getType());
+        }
+        if (workOrderParam.getShipperName() != null) {
+            queryWrapper.like("shipper_name", workOrderParam.getShipperName());
+        }
+        if (workOrderParam.getDeptName() != null) {
+            queryWrapper.like("dept_name", workOrderParam.getDeptName());
+        }
+
+        IPage<WorkOrder> records = page(page, queryWrapper.orderByDesc("update_date"));
+        List<WorkOrder> list = records.getRecords();
+        List<WorkOrderPageListVO> listVo = new ArrayList<>();
+
+        for (WorkOrder workOrder : list) {
+            WorkOrderPageListVO workOrderPageListVO = new WorkOrderPageListVO();
+            workOrderPageListVO.setId(workOrder.getId());
+            workOrderPageListVO.setOrderNo(workOrder.getOrderNo());
+            workOrderPageListVO.setType(workOrder.getType());
+            workOrderPageListVO.setShipperName(workOrder.getShipperName());
+            workOrderPageListVO.setSpotName(workOrder.getSpotName());
+            workOrderPageListVO.setCreateDate(workOrder.getCreateDate());
+            workOrderPageListVO.setCompleteDate(workOrder.getCompleteDate());
+            workOrderPageListVO.setCarAndTrailerNumber("[" + workOrder.getCarNumber() + "]");
+            if (workOrder.getTrailerNumber() != null) {
+                workOrderPageListVO.setCarAndTrailerNumber(workOrderPageListVO.getCarAndTrailerNumber() + "-[" + workOrder.getTrailerNumber() + "]");
+            }
+            workOrderPageListVO.setTruckDeptName(workOrder.getDeptName());
+
+            //TODO运单作业状态
+            if (workOrder.getType() == 1) {
+                workOrderPageListVO.setWorkOrderType("装车·"+ WorkOrderEnum.getOrderStatusName(workOrder.getOrderStatus()));
+            }
+            if (workOrder.getType() == 2) {
+                workOrderPageListVO.setWorkOrderType("卸车·"+ WorkOrderEnum.getOrderStatusName(workOrder.getOrderStatus()));
+            }
+
+
+            listVo.add(workOrderPageListVO);
+        }
+        workOrderPageListVOIPage.setRecords(listVo);
+        workOrderPageListVOIPage.setTotal(records.getTotal());
+        workOrderPageListVOIPage.setPages(records.getPages());
+        workOrderPageListVOIPage.setCurrent(records.getCurrent());
+        return workOrderPageListVOIPage;
+    }
 }

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

@@ -1,11 +1,17 @@
 package com.aoyang.tms.service.impl;
 
+import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.entity.WorkSpot;
 import com.aoyang.tms.mapper.WorkSpotMapper;
 import com.aoyang.tms.service.WorkSpotService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 运单地点管理表 服务实现类
@@ -17,4 +23,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class WorkSpotServiceImpl extends ServiceImpl<WorkSpotMapper, WorkSpot> implements WorkSpotService {
 
+    @Override
+    public IPage<WorkSpot> findPage(PageParam<WorkSpot> pageParam) {
+        Page<WorkSpot> page = new Page<>(pageParam.getPage(), pageParam.getSize());
+        QueryWrapper<WorkSpot> queryWrapper = new QueryWrapper<>();
+        if (pageParam.getParam().getOrgId() != null) {
+            queryWrapper.eq("org_id", pageParam.getParam().getOrgId());
+        }
+        if (pageParam.getParam().getType() != null) {
+            queryWrapper.eq("type", pageParam.getParam().getType());
+        }
+        if (pageParam.getParam().getSpotName() != null) {
+            queryWrapper.like("spot_name", pageParam.getParam().getSpotName());
+        }
+        IPage<WorkSpot> records = page(page, queryWrapper.orderByDesc("update_date"));
+        return records;
+    }
 }

src/main/resources/mapper/ShipperMapper.xml

@@ -8,14 +8,20 @@
         <result column="shipper_name" property="shipperName" />
         <result column="short_name" property="shortName" />
         <result column="url" property="url" />
+        <result column="org_id" property="orgId" />
+        <result column="org_name" property="orgName" />
+        <result column="org_short_name" property="orgShortName" />
         <result column="creater" property="creater" />
         <result column="creater_name" property="createrName" />
         <result column="create_date" property="createDate" />
+        <result column="updater" property="updater" />
+        <result column="updater_name" property="updaterName" />
+        <result column="update_date" property="updateDate" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        shipper_id, shipper_name, short_name, url, creater, creater_name, create_date
+        shipper_id, shipper_name, short_name, url, org_id, org_name, org_short_name, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>

src/main/resources/mapper/TruckEscortMapper.xml

@@ -4,6 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckEscort">
+        <id column="id" property="id" />
         <result column="truck_id" property="truckId" />
         <result column="org_id" property="orgId" />
         <result column="org_name" property="orgName" />
@@ -21,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        truck_id, org_id, org_name, org_short_name, user_id, escort_name, note, creater, creater_name, create_date, updater, updater_name, update_date
+        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
     </sql>
 
 </mapper>

src/main/resources/mapper/WorkSpotMapper.xml

@@ -6,6 +6,9 @@
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.WorkSpot">
         <id column="spot_id" property="spotId" />
         <result column="spot_name" property="spotName" />
+        <result column="org_id" property="orgId" />
+        <result column="org_name" property="orgName" />
+        <result column="org_short_name" property="orgShortName" />
         <result column="adress" property="adress" />
         <result column="type" property="type" />
         <result column="longitude" property="longitude" />
@@ -22,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        spot_id, spot_name, adress, type, longitude, latitude, valid_distance, note, creater, creater_name, create_date, updater, updater_name, update_date
+        spot_id, spot_name, org_id, org_name, org_short_name, adress, type, longitude, latitude, valid_distance, note, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>