添加相关列

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

@@ -84,7 +84,7 @@ public class WorkerController {
         WorkOrderVO vo = new WorkOrderVO();
         WorkOrder workerInfo1 = workOrderService.getById(workOrder.getId());
         if (workerInfo1 != null) {
-            //取ExecuteTime第一条GPS上报时间
+            //取ExecuteTime第一条GPS上报时间作为开始运单时间，累计用时
             LocationVO locationVO = commonService.getLocationByDate(workerInfo1.getTruckId(), workerInfo1.getExecuteTime());
             if (locationVO != null) {
                 vo.setTime(DateUtils.betweenTime(locationVO.getDate(), LocalDateTime.now()));
@@ -287,7 +287,7 @@ public class WorkerController {
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "1.开始执行运单", notes = "点击开始执行运单按钮")
+    @ApiOperation(value = "1.开始执行装卸车运单", notes = "点击-开始执行装卸车运单-按钮")
     @PostMapping("/start_order")
     public Result startOrder(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
         log.info("开始执行运单,/tms/worker/start_order，参数:{}", JSON.toJSONString(workOrder));
@@ -299,26 +299,38 @@ public class WorkerController {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入出车前检车状态，2.订单进入前往装车点状态，3.并记行车日志，4.创建行程周期
+        //1.车辆进入出车前检车状态，2.订单进入前往装车点状态，3.并记行车日志，4.创建行程周期
         workOrder.setExecuteTime(LocalDateTime.now());
         Boolean flag = workerService.startOrder(userId, utf8Name, workOrder);
         return new Result<>(flag);
     }
 
-    @ApiOperation(value = "2.完成出车前检查，开始装卸车作业", notes = "点击完成出车前检查，开始作业按钮")
+    @ApiOperation(value = "2.完成出车前检查，开始装卸车作业", notes = "点击-完成出车前检查，开始出车作业-按钮")
     @PostMapping("/start_work")
-    public Result starWork(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody WorkOrder workOrder) {
-        log.info("完成出车前检查，开始作业,/tms/worker/start_work，参数:{}", JSON.toJSONString(workOrder));
-        if (workOrder == null || workOrder.getId() == null) {
+    public Result starWork(@RequestHeader(value = "userId") Long userId, @RequestHeader(value = "userName") String userName, @RequestBody TruckCheckInfo truckCheckInfo) {
+        log.info("完成出车前检查，开始作业,/tms/worker/start_work，参数:{}", JSON.toJSONString(truckCheckInfo));
+        if (truckCheckInfo == null || truckCheckInfo.getOrderId() == null || truckCheckInfo.getType() == null) {
             return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+        //出车检查
+        if (truckCheckInfo.getType() == 1) {
+            if (StringUtils.isBlank(truckCheckInfo.getCheckUrl())) {
+                return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+            }
+        }
+        //出车检查
+        if (truckCheckInfo.getType() == 2) {
+            if (StringUtils.isBlank(truckCheckInfo.getTrip()) || StringUtils.isBlank(truckCheckInfo.getTripUrl()) || StringUtils.isBlank(truckCheckInfo.getCheckUrl())) {
+                return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+            }
+        }
         String utf8Name = userName;
         try {
             utf8Name = URLDecoder.decode(userName, "UTF-8");
         } catch (UnsupportedEncodingException ignored) {
         }
-        //TODO 1.车辆进入作业中状态，2.订单进入前往装车点状态，3.并记行车日志
-        Boolean flag = workerService.starWork(userId, utf8Name, workOrder);
+        //1.车辆进入作业中状态，2.订单进入前往装车点状态，3.并记行车日志
+        Boolean flag = workerService.starWork(userId, utf8Name, truckCheckInfo);
         return new Result<>(flag);
     }
 

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

@@ -40,6 +40,11 @@ public class TruckCheckInfo implements Serializable {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long cycleId;
 
+    @ApiModelProperty(value = "装卸车订单id")
+    @TableField("order_id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long orderId;
+
     @ApiModelProperty(value = "物流公司id")
     @TableField("org_id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

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

@@ -64,6 +64,14 @@ public class WorkSpot implements Serializable {
     @TableField("location")
     private String location;
 
+    @ApiModelProperty(value = "联系人")
+    @TableField("contact_name")
+    private String contactName;
+
+    @ApiModelProperty(value = "联系人电话")
+    @TableField("contact_phone")
+    private String contactPhone;
+
     @ApiModelProperty(value = "作业点经纬度数据集")
     @TableField("region_data")
     private String regionData;

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

@@ -3,6 +3,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.entity.TruckCheckInfo;
 import com.aoyang.tms.entity.User;
 import com.aoyang.tms.entity.WorkOrder;
 import com.aoyang.tms.feign.result.Org;
@@ -33,7 +34,7 @@ public interface WorkerService {
      * @Param
      * @return
     **/
-    Boolean starWork(Long userId,String userName, WorkOrder workOrder);
+    Boolean starWork(Long userId,String userName, TruckCheckInfo truckCheckInfo);
     /**
      * @Author guoyong
      * @Description 上报已到达装卸车点

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

@@ -3,12 +3,10 @@ package com.aoyang.tms.service.impl;
 import com.aoyang.tms.common.TmsTruckStatus;
 import com.aoyang.tms.common.WorkOrderEnum;
 import com.aoyang.tms.entity.Truck;
+import com.aoyang.tms.entity.TruckCheckInfo;
 import com.aoyang.tms.entity.WorkCycle;
 import com.aoyang.tms.entity.WorkOrder;
-import com.aoyang.tms.service.TruckService;
-import com.aoyang.tms.service.WorkCycleService;
-import com.aoyang.tms.service.WorkOrderService;
-import com.aoyang.tms.service.WorkerService;
+import com.aoyang.tms.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -33,6 +31,8 @@ public class WorkerServiceImpl implements WorkerService {
     private TruckService truckService;
     @Resource
     private WorkOrderService workOrderService;
+    @Resource
+    private TruckCheckInfoService truckCheckInfoService;
 
     @Override
     @Transactional
@@ -71,17 +71,23 @@ public class WorkerServiceImpl implements WorkerService {
     }
 
     @Override
-    public Boolean starWork(Long userId, String userName, WorkOrder workOrderParam) {
+    public Boolean starWork(Long userId, String userName, TruckCheckInfo truckCheckInfo) {
         Boolean flag = true;
-        //TODO 1.车辆进入作业中状态，2.并记行车日志
+        //TODO 1.车辆进入作业中状态，2.插入车辆检查记录，3.并记行车日志
         try {
-            WorkOrder workOrder = workOrderService.getById(workOrderParam.getId());
+            WorkOrder workOrder = workOrderService.getById(truckCheckInfo.getOrderId());
             if (workOrder != null) {
                 //1.车辆进入出车前检车状态
                 Truck truck = truckService.getById(workOrder.getTruckId());
                 truck.setTmsStatus(TmsTruckStatus.WORKING);
                 truckService.updateById(truck);
-                //2 记录日志
+                //2.插入车辆检查数据
+                BeanUtils.copyProperties(workOrder,truckCheckInfo);
+                truckCheckInfo.setCreater(userId);
+                truckCheckInfo.setCreaterName(userName);
+                truckCheckInfo.setCreateDate(LocalDateTime.now());
+                truckCheckInfoService.save(truckCheckInfo);
+                //3 记录日志
                 //TODO
             }
         } catch (Exception e) {

src/main/resources/mapper/TruckCheckInfoMapper.xml

@@ -4,29 +4,49 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.aoyang.tms.entity.TruckCheckInfo">
-        <id column="id" property="id" />
-        <result column="cycle_id" property="cycleId" />
-        <result column="org_id" property="orgId" />
-        <result column="org_name" property="orgName" />
-        <result column="org_short_name" property="orgShortName" />
-        <result column="truck_id" property="truckId" />
-        <result column="car_number" property="carNumber" />
-        <result column="trailer_number" property="trailerNumber" />
-        <result column="type" property="type" />
-        <result column="check_url" property="checkUrl" />
-        <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" />
+        <id column="id" property="id"/>
+        <result column="cycle_id" property="cycleId"/>
+        <result column="order_id" property="orderId"/>
+        <result column="org_id" property="orgId"/>
+        <result column="org_name" property="orgName"/>
+        <result column="org_short_name" property="orgShortName"/>
+        <result column="truck_id" property="truckId"/>
+        <result column="car_number" property="carNumber"/>
+        <result column="trailer_number" property="trailerNumber"/>
+        <result column="type" property="type"/>
+        <result column="check_url" property="checkUrl"/>
+        <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"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <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, start_time, end_time, creater, creater_name, create_date
+        id
+        ,
+        cycle_id,
+        order_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>

src/main/resources/mapper/WorkSpotMapper.xml

@@ -13,6 +13,8 @@
         <result column="type" property="type"/>
         <result column="location" property="location"/>
         <result column="region_data" property="regionData"/>
+        <result column="contact_name" property="contactName"/>
+        <result column="contact_phone" property="contactPhone"/>
         <result column="note" property="note"/>
         <result column="creater" property="creater"/>
         <result column="creater_name" property="createrName"/>
@@ -26,6 +28,9 @@
     <sql id="Base_Column_List">
         spot_id
         ,
+        contact_name,
+        contact_phone
+        ,
         spot_name,
         org_id,
         org_name,