Merge remote-tracking branch 'origin/master'

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

@@ -4,7 +4,6 @@ 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.WorkOrderPageParam;
 import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.entity.*;
@@ -18,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -61,26 +59,37 @@ public class WorkerController {
         return new Result<>(workerInfo1);
     }
 
-    @ApiOperation(value = "待执行运单列表", notes = "移动端获取司机或押运员的待执行或执行中的运单列表")
+    @ApiOperation(value = "待执行运单列表", notes = "卡车id必传，移动端获取司机或押运员的待执行或执行中的运单列表")
     @PostMapping("/find_work_order_list")
     public Result<List<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
                                                        @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
-        List<WorkOrderVO> records = new ArrayList<WorkOrderVO>();
-        return new Result<>(records);
+        log.info("待执行运单列表,/tms/worker/find_work_order_list，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        List<WorkOrderVO> list = workOrderService.findWorkOrderList(workOrder);
+        return new Result<>(list);
     }
 
-    @ApiOperation(value = "点击待执行运单", notes = "必传参数:truckId,orderId")
+    @ApiOperation(value = "点击待执行运单，变成已读", notes = "必传参数:truckId,orderId")
     @PostMapping("/add_work_order_readinfo")
     public Result work_cycle_page(@RequestHeader(value = "orgId") Long orgId,
-                                  @RequestHeader(value = "userId") Long userId,@RequestBody WorkOrderReadinfo workOrderReadinfo) {
+                                  @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrderReadinfo workOrderReadinfo) {
+        log.info("点击待执行运单,/tms/worker/add_work_order_readinfo，参数:{}", JSON.toJSONString(workOrderReadinfo));
+        if (workOrderReadinfo == null || workOrderReadinfo.getTruckId() == null || workOrderReadinfo.getOrderId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         boolean flag = workOrderReadinfoService.save(workOrderReadinfo);
         return new Result<>(flag);
     }
 
-
     @ApiOperation(value = "历史行车列表", notes = "必传参数:truckId")
     @PostMapping("/work_cycle_page")
     public Result work_cycle_page(@RequestBody PageParam<WorkCycle> pageParam) {
+        log.info("历史行车列表,/tms/worker/add_work_order_readinfo，参数:{}", JSON.toJSONString(pageParam));
+        if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         Page<WorkCycle> page = new Page<>(pageParam.getPage(), pageParam.getSize());
         IPage<WorkCycle> records = workCycleService.page(page, Wrappers.query(pageParam.getParam()));
         return new Result<>(records);
@@ -89,6 +98,10 @@ public class WorkerController {
     @ApiOperation(value = "上报途中休息信息", notes = "必传参数:开始时间、结束时间必传")
     @PostMapping("/add_rest_info")
     public Result add_rest_info(@RequestBody RestInfo restInfo) {
+        log.info("上报途中休息信息,/tms/worker/add_rest_info，参数:{}", JSON.toJSONString(restInfo));
+        if (restInfo == null || restInfo.getTruckId() == null || restInfo.getStartTime() == null || restInfo.getEndTime() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         Boolean flag = restInfoService.save(restInfo);
         return new Result<>(flag);
     }
@@ -96,6 +109,10 @@ public class WorkerController {
     @ApiOperation(value = "上报车辆途中维修信息", notes = "新增或修改都用同一个接口,新增后返回带主键id的实体")
     @PostMapping("/add_truck_repair_info")
     public Result<TruckRepairInfo> add_truck_repair_info(@RequestBody TruckRepairInfo truckRepairInfo) {
+        log.info("上报车辆途中维修信息,/tms/worker/add_rest_info，参数:{}", JSON.toJSONString(truckRepairInfo));
+        if (truckRepairInfo == null || truckRepairInfo.getTruckId() == null || truckRepairInfo.getStartTime() == null || truckRepairInfo.getEndTime() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         //TODO SAVE OR UPDATE
         //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
         return new Result<>(new TruckRepairInfo());
@@ -104,6 +121,10 @@ public class WorkerController {
     @ApiOperation(value = "上报车辆检查信息", notes = "新增或修改车辆检车信息")
     @PostMapping("/add_truck_check_info")
     public Result add_truck_check_info(@RequestBody TruckCheckInfo truckCheckInfo) {
+        log.info("上报车辆检查信息,/tms/worker/add_truck_check_info，参数:{}", JSON.toJSONString(truckCheckInfo));
+        if (truckCheckInfo == null || truckCheckInfo.getType() == null || truckCheckInfo.getTruckId() == null || truckCheckInfo.getStartTime() == null || truckCheckInfo.getEndTime() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         //TODO SAVE OR UPDATE
         //TODO 信息全了，则需要更改车辆状态，待执行到出车作业中
         //不同类型，验证信息不一样
@@ -114,6 +135,10 @@ public class WorkerController {
     @ApiOperation(value = "获取行车日志列表", notes = "卡车id必传")
     @PostMapping("/work_log_list")
     public Result work_log_list(@RequestBody PageParam<WorkLog> pageParam) {
+        log.info("获取行车日志列表,/tms/worker/work_log_list，参数:{}", JSON.toJSONString(pageParam));
+        if (pageParam == null || pageParam.getParam() == null || pageParam.getParam().getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
         Page<WorkLog> page = new Page<>(pageParam.getPage(), pageParam.getSize());
         IPage<WorkLog> records = workLogService.page(page, Wrappers.query(pageParam.getParam()));
         return new Result<>(records);
@@ -122,29 +147,128 @@ public class WorkerController {
     @ApiOperation(value = "装车等待上报", notes = "")
     @PostMapping("/add_zhuangche_wait")
     public Result add_zhuangche_wait(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.save(workOrder);
+        log.info("装车等待上报,/tms/worker/add_zhuangche_wait，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "卸车等待上报", notes = "")
     @PostMapping("/add_xieche_wait")
     public Result add_xieche_wait(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.save(workOrder);
+        log.info("卸车等待上报,/tms/worker/add_xieche_wait，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
         return new Result<>(flag);
     }
 
-
     @ApiOperation(value = "装车成果上报", notes = "")
     @PostMapping("/add_zhuangche_result")
     public Result add_zhuangche_result(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.save(workOrder);
+        log.info("装车成果上报,/tms/worker/add_zhuangche_result，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
         return new Result<>(flag);
     }
 
     @ApiOperation(value = "卸车成果上报", notes = "")
     @PostMapping("/add_xieche_result")
     public Result add_xieche_result(@RequestBody WorkOrder workOrder) {
-        Boolean flag = workOrderService.save(workOrder);
+        log.info("卸车成果上报,/tms/worker/add_xieche_result，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "1.开始执行运单", notes = "点击开始执行运单按钮")
+    @PostMapping("/start_order")
+    public Result start_order(@RequestBody WorkOrder workOrder) {
+        log.info("开始执行运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入出车前检车状态，2.订单进入前往装车点状态，3.并记行车日志，4.创建行程周期
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "2.完成出车前检查，开始装卸车作业", notes = "点击完成出车前检查，开始作业按钮")
+    @PostMapping("/start_work")
+    public Result start_work(@RequestBody WorkOrder workOrder) {
+        log.info("完成出车前检查，开始作业,/tms/worker/start_work，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入作业中状态，2.订单进入前往装车点状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "3.上报已到达装卸车点", notes = "点击上报已到达装卸车点")
+    @PostMapping("/start_wait")
+    public Result start_wait(@RequestBody WorkOrder workOrder) {
+        log.info("上报已到达装卸车点，/tms/worker/start_wait，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入作业中状态，2.订单进入装车等待状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "4.上报成果", notes = "点击上报成果")
+    @PostMapping("/submit_result")
+    public Result submit_result(@RequestBody WorkOrder workOrder) {
+        log.info("上报成果，/tms/worker/submit_result，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入作业中状态，2.订单进入成果报备中状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "4.确认完成运单", notes = "点击确认完成运单")
+    @PostMapping("/finish_order")
+    public Result finish_order(@RequestBody WorkOrder workOrder) {
+        log.info("确认完成运单，/tms/worker/finish_order，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入收车中状态，2.订单完成状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "6.上报已到达收车点", notes = "点击上报已到达收车点")
+    @PostMapping("/arrive_terminal")
+    public Result arrive_shouchedian(@RequestBody WorkOrder workOrder) {
+        log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入收车后检查状态，2.订单完成状态，3.并记行车日志
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
+        return new Result<>(flag);
+    }
+
+    @ApiOperation(value = "7.完成检查，结束此次行程", notes = "点击完成检查，结束此次行程")
+    @PostMapping("/finish_work")
+    public Result finish_work(@RequestBody WorkOrder workOrder) {
+        log.info("上报已到达收车点，/tms/worker/arrive_shouchedian，参数:{}", JSON.toJSONString(workOrder));
+        if (workOrder == null || workOrder.getTruckId() == null || workOrder.getType() == null) {
+            return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        //TODO 1.车辆进入已经收车状态，2.订单完成状态，3.并记行车日志，4.结束当前行程周期（从收车中到出车检查也结束当前行程周期）
+        Boolean flag = workOrderService.saveOrUpdate(workOrder);
         return new Result<>(flag);
     }
 }

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

@@ -39,7 +39,6 @@ public class WorkOrderVO extends WorkOrder implements Serializable {
     @ApiModelProperty(value = "已用时，单位分钟")
     private int time;
 
-
     @ApiModelProperty(value = "装卸车点经度")
     @TableField("longitude")
     private String longitude;

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

@@ -86,6 +86,14 @@ public class TruckCheckInfo implements Serializable {
     @TableField("note")
     private String note;
 
+    @ApiModelProperty(value = "开始时间")
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @TableField("end_time")
+    private LocalDateTime endTime;
+
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

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

@@ -4,6 +4,7 @@ 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.User;
+import com.aoyang.tms.feign.result.Org;
 
 import java.time.LocalDateTime;
 
@@ -15,6 +16,17 @@ import java.time.LocalDateTime;
  */
 public interface CommonService {
 
+
+    /**
+     * @return
+     * @Author guoyong
+     * @Description 获取组织信息
+     * @Date 2022/4/22
+     * @Param
+     **/
+    Org findOrg(Long orgId);
+
+
     /**
      * @return
      * @Author guoyong

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

@@ -7,6 +7,7 @@ import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.entity.*;
 import com.aoyang.tms.feign.StrategyFeignClient;
 import com.aoyang.tms.feign.UserFeignClient;
+import com.aoyang.tms.feign.result.Org;
 import com.aoyang.tms.feign.result.TmsMongoDoc;
 import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -37,7 +38,6 @@ public class CommonServiceImpl implements CommonService {
     @Resource
     private UserFeignClient userFeignClient;
 
-
     @Resource
     private MongoTemplate mongoTemplate;
 
@@ -54,6 +54,17 @@ public class CommonServiceImpl implements CommonService {
     private TruckEscortService truckEscortService;
 
     @Override
+    public Org findOrg(Long orgId) {
+        Org orgParam = new Org();
+        orgParam.setOrgId(orgId);
+        Result<Org> result = userFeignClient.findOrg(orgParam);
+        if (verifyResult(result)) {
+            return result.getData();
+        }
+        return null;
+    }
+
+    @Override
     public WorkerInfo findTruckInfo(Long truckId) {
         WorkerInfo workerInfo = new WorkerInfo();
         workerInfo.setTruckId(truckId);

src/main/resources/mapper/TruckCheckInfoMapper.xml

@@ -17,6 +17,8 @@
         <result column="trip" property="trip" />
         <result column="trip_url" property="tripUrl" />
         <result column="note" property="note" />
+        <result column="start_time" property="startTime" />
+        <result column="end_time" property="endTime" />
         <result column="creater" property="creater" />
         <result column="creater_name" property="createrName" />
         <result column="create_date" property="createDate" />
@@ -24,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, cycle_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, type, check_url, trip, trip_url, note, creater, creater_name, create_date
+        id, cycle_id, org_id, org_name, org_short_name, truck_id, car_number, trailer_number, type, check_url, trip, trip_url, note, start_time, end_time, creater, creater_name, create_date
     </sql>
 
 </mapper>