Merge remote-tracking branch 'origin/master'

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

@@ -28,14 +28,21 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "rest_infoCRUD接口")
+@Api(value = "途中休息相关接口")
 @RequestMapping("/tms/rest_info")
 public class RestInfoController {
 
     @Resource
     private RestInfoService restInfoService;
 
-    @ApiOperation(value = "获取rest_info列表",notes="")
+    @ApiOperation(value = "上报途中休息信息",notes="开始时间、结束时间必传")
+    @PostMapping("/add")
+    public Result add(@RequestBody RestInfo restInfo) {
+        Boolean flag = restInfoService.save(restInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "获取途中休息信息列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<RestInfo> pageParam) {
         Page<RestInfo> page = new Page<>(pageParam.getPage(), pageParam.getSize());
@@ -43,17 +50,11 @@ public class RestInfoController {
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "修改rest_info",notes="根据id修改rest_info")
+    @ApiOperation(value = "修改途中休息信息",notes="根据id修改途中休息信息")
     @PostMapping("/update")
     public Result update(@RequestBody RestInfo restInfo) {
         Boolean flag = restInfoService.updateById(restInfo);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加rest_info",notes="新增一条rest_info")
-    @PostMapping("/add")
-    public Result add(@RequestBody RestInfo restInfo) {
-        Boolean flag = restInfoService.save(restInfo);
-        return new Result<>(flag);
-    }
 }

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

@@ -1,6 +1,7 @@
 package com.aoyang.tms.controller;
 
 
+import com.aoyang.tms.entity.TruckRepairInfo;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.RestController;
@@ -35,6 +36,22 @@ public class TruckCheckInfoController {
     @Resource
     private TruckCheckInfoService truckCheckInfoService;
 
+    @ApiOperation(value = "上报出车前车辆检查信息",notes="新增或修改车辆检车信息")
+    @PostMapping("/add")
+    public Result add(@RequestBody TruckCheckInfo truckCheckInfo) {
+        //TODO SAVE OR UPDATE
+        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
+        //不同类型，验证信息不一样
+        Boolean flag = truckCheckInfoService.save(truckCheckInfo);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "查找车辆检查信息",notes="")
+    @PostMapping("/find")
+    public Result<TruckCheckInfo> find(@RequestBody TruckCheckInfo truckRepairInfo) {
+        return new Result<>(new TruckCheckInfo());
+    }
+
     @ApiOperation(value = "获取truck_check_info列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<TruckCheckInfo> pageParam) {
@@ -50,10 +67,5 @@ public class TruckCheckInfoController {
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加truck_check_info",notes="新增一条truck_check_info")
-    @PostMapping("/add")
-    public Result add(@RequestBody TruckCheckInfo truckCheckInfo) {
-        Boolean flag = truckCheckInfoService.save(truckCheckInfo);
-        return new Result<>(flag);
-    }
+
 }

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

@@ -28,23 +28,24 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "truck_repair_infoCRUD接口")
+@Api(value = "途中车辆维修相关接口")
 @RequestMapping("/tms/truck_repair_info")
 public class TruckRepairInfoController {
 
     @Resource
     private TruckRepairInfoService truckRepairInfoService;
 
-    @ApiOperation(value = "查找车辆检查信息",notes="")
+    @ApiOperation(value = "查找车辆途中维修信息",notes="")
     @PostMapping("/find")
     public Result<TruckRepairInfo> find(@RequestBody TruckRepairInfo truckRepairInfo) {
         return new Result<>(new TruckRepairInfo());
     }
 
-    @ApiOperation(value = "上报车辆检车信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
-    @PostMapping("/submit")
-    public Result<TruckRepairInfo> submit(@RequestBody TruckRepairInfo truckRepairInfo) {
+    @ApiOperation(value = "上报车辆途中维修信息",notes="新增或修改都用同一个接口,新增后返回带主键id的实体")
+    @PostMapping("/add")
+    public Result<TruckRepairInfo> add(@RequestBody TruckRepairInfo truckRepairInfo) {
         //TODO SAVE OR UPDATE
+        //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
         return new Result<>(new TruckRepairInfo());
     }
 

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

@@ -28,14 +28,14 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "work_logCRUD接口")
+@Api(value = "行车日志相关接口")
 @RequestMapping("/tms/work_log")
 public class WorkLogController {
 
     @Resource
     private WorkLogService workLogService;
 
-    @ApiOperation(value = "获取work_log列表",notes="")
+    @ApiOperation(value = "获取行车日志列表",notes="卡车id必传")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<WorkLog> pageParam) {
         Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());
@@ -50,10 +50,4 @@ public class WorkLogController {
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加work_log",notes="新增一条work_log")
-    @PostMapping("/add")
-    public Result add(@RequestBody WorkLog workLog) {
-        Boolean flag = workLogService.save(workLog);
-        return new Result<>(flag);
-    }
 }

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

@@ -28,14 +28,14 @@ import com.aoyang.common.param.PageParam;
  */
 @RestController
 @Slf4j
-@Api(value = "work_orderCRUD接口")
+@Api(value = "运单相关接口")
 @RequestMapping("/tms/work_order")
 public class WorkOrderController {
 
     @Resource
     private WorkOrderService workOrderService;
 
-    @ApiOperation(value = "获取work_order列表",notes="")
+    @ApiOperation(value = "获取运单列表",notes="")
     @PostMapping("/list")
     public Result list(@RequestBody PageParam<WorkOrder> pageParam) {
         Page<WorkOrder> page = new Page<>(pageParam.getPage(), pageParam.getSize());
@@ -43,17 +43,25 @@ public class WorkOrderController {
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "修改work_order",notes="根据id修改work_order")
+
+    @ApiOperation(value = "派单",notes="调度员派单操作")
+    @PostMapping("/add")
+    public Result add(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.save(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "修改派单",notes="根据id修改派单")
     @PostMapping("/update")
     public Result update(@RequestBody WorkOrder workOrder) {
         Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "添加work_order",notes="新增一条work_order")
-    @PostMapping("/add")
-    public Result add(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.save(workOrder);
+    @ApiOperation(value = "取消派单",notes="取消派单")
+    @PostMapping("/delete")
+    public Result delete(@RequestBody WorkOrder workOrder) {
+        Boolean flag = workOrderService.updateById(workOrder);
         return new Result<>(flag);
     }
 }

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

@@ -0,0 +1,108 @@
+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.common.ErrCodeEnum;
+import com.aoyang.tms.controller.param.Truck;
+import com.aoyang.tms.controller.vo.WorkOrderVO;
+import com.aoyang.tms.controller.vo.WorkerInfo;
+import com.aoyang.tms.entity.RestInfo;
+import com.aoyang.tms.entity.TruckCheckInfo;
+import com.aoyang.tms.entity.TruckRepairInfo;
+import com.aoyang.tms.entity.WorkOrder;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.time.LocalDateTime;
+
+/**
+ * @Description: 作业人员相关接口
+ * @Author guoyong
+ * @Date 2022/4/20 16:50
+ * @Version 1.0
+ */
+@RestController
+@Slf4j
+@Api(value = "circleCRUD接口")
+@RequestMapping("/tms/worker")
+public class WorkerController1 {
+
+    @ApiOperation(value = "获取运单详情", notes = "")
+    @PostMapping("/get_worker_order_info")
+    public Result<WorkOrder> getWorkerOrderInfo(@RequestBody WorkOrder param) {
+        return new Result<>(new WorkOrder());
+    }
+
+    @ApiOperation(value = "获取运单分页列表", notes = "根据司机id获取运单分页列表")
+    @PostMapping("/worker_order_page_list")
+    public Result<Page<WorkOrder>> workerOrderPageList(@RequestHeader(value = "userId") Long userId,
+                                                       @RequestBody PageParam<WorkOrder> pageParam) {
+        log.info("获取圈子分页列表,调用/tms/worker/worker_order_page_list,参数:{}", JSON.toJSONString(pageParam));
+        if (pageParam == null || pageParam.getParam() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        return new Result<>(null);
+    }
+
+    @ApiOperation(value = "途中上报-途中休息", notes = "根据司机id获取运单分页列表")
+    @PostMapping("/add_rest_info")
+    public Result<RestInfo> addRestInfo(@RequestHeader(value = "userId") Long userId,
+                                        @RequestHeader(value = "userName") String userName,
+                                        @RequestBody RestInfo param) {
+        if (param.getOrgId() == null || param.getOrgName() == null || param.getTruckId() == null
+                || param.getCarNumber() == null || param.getStartTime() == null || param.getEndTime() == 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<>(new RestInfo());
+    }
+
+    @ApiOperation(value = "途中上报-途中检查", notes = "根据司机id获取运单分页列表")
+    @PostMapping("/add_truck_check_info")
+    public Result<TruckCheckInfo> addTruckCheckInfo(@RequestHeader(value = "userId") Long userId,
+                                                    @RequestHeader(value = "userName") String userName,
+                                                    @RequestBody TruckCheckInfo param) {
+        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<>(new TruckCheckInfo());
+    }
+
+    @ApiOperation(value = "途中上报-途中维修", notes = "根据司机id获取运单分页列表")
+    @PostMapping("/add_truck_repair_info")
+    public Result<TruckRepairInfo> addTruckRepairInfo(@RequestHeader(value = "userId") Long userId,
+                                                      @RequestHeader(value = "userName") String userName,
+                                                      @RequestBody TruckRepairInfo param) {
+        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<>(new TruckRepairInfo());
+    }
+
+}

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

@@ -57,4 +57,13 @@ public class WorkerInfo {
     @ApiModelProperty(value = "位置时间")
     private String localTime;
 
+    @ApiModelProperty(value = "作业状态")
+    private int workStatus;
+
+    @ApiModelProperty(value = "装车订单数量")
+    private int zhuagncheOrderNum;
+
+    @ApiModelProperty(value = "卸车订单数量")
+    private int xiecheOrderNum;
+
 }

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

@@ -75,8 +75,8 @@ public class WorkOrderReadinfo implements Serializable {
     private String userName;
 
     @ApiModelProperty(value = "备注")
-    @TableField("worker_note")
-    private String workerNote;
+    @TableField("note")
+    private String note;
 
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")

src/main/resources/mapper/WorkOrderReadinfoMapper.xml

@@ -14,7 +14,7 @@
         <result column="truck_id" property="truckId" />
         <result column="user_id" property="userId" />
         <result column="user_name" property="userName" />
-        <result column="worker_note" property="workerNote" />
+        <result column="note" property="note" />
         <result column="creater" property="creater" />
         <result column="creater_name" property="createrName" />
         <result column="create_date" property="createDate" />
@@ -22,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, order_id, org_id, org_name, org_short_name, car_number, trailer_car_number, truck_id, user_id, user_name, worker_note, creater, creater_name, create_date
+        id, order_id, org_id, org_name, org_short_name, car_number, trailer_car_number, truck_id, user_id, user_name, note, creater, creater_name, create_date
     </sql>
 
 </mapper>