Merge remote-tracking branch 'origin/master'

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

@@ -71,14 +71,14 @@ public class WorkOrderController {
         return new Result<>(workOrderService.findPage(pageParam));
     }
 
-    @ApiOperation(value = "根据id获取运单详情", notes = "必传参数:id")
+    @ApiOperation(value = "根据id获取运单详情，PC端", notes = "必传参数:id")
     @PostMapping("/get_one")
     public Result getOne(@RequestBody WorkOrder param) {
-        log.info("根据id获取运单详情,调用/tms/work_order/get_one,参数:{}", JSON.toJSONString(param));
+        log.info("根据id获取运单详情，PC端,调用/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));
+        return new Result<>(workOrderService.getOne(param));
     }
 
     @ApiOperation(value = "根据id中止运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=60")
@@ -90,9 +90,6 @@ public class WorkOrderController {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
 
-        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");
@@ -120,9 +117,6 @@ public class WorkOrderController {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
 
-        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");
@@ -150,9 +144,6 @@ public class WorkOrderController {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
 
-        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");

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

@@ -89,6 +89,8 @@ public class WorkerController {
             if (locationVO != null) {
                 vo.setTime(DateUtils.betweenTime(locationVO.getDate(), LocalDateTime.now()));
             }
+            List<String> routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getGotoSpotTime(), LocalDateTime.now());
+            vo.setRouteGps(routeGps);
         }
         BeanUtils.copyProperties(workerInfo1, vo);
 
@@ -106,7 +108,7 @@ public class WorkerController {
         return new Result(flag);
     }
 
-    @ApiOperation(value = "运单列表", notes = "卡车id必传，未完成的（待执行、前往、等待、成果报备中）运单")
+    @ApiOperation(value = "运单列表", notes = "装车运单，只展示当前行车周期未完成的；除非当前已收车，则按排序展示第1个未完成的装车运单；卸车运单，重车时，才展示 ")
     @PostMapping("/find_work_order_list")
     public Result<List<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
                                                        @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {

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

@@ -0,0 +1,17 @@
+package com.aoyang.tms.controller.vo;
+
+import com.aoyang.tms.entity.WorkOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WorkOrderDetail{
+
+    @ApiModelProperty(value = "运单")
+    private WorkOrder workOrder;
+
+    @ApiModelProperty(value = "线路GPS数据")
+    private List<String> routeGps;
+}

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

@@ -14,6 +14,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -39,12 +40,13 @@ public class WorkOrderVO extends WorkOrder implements Serializable {
     private String time;
 
     @ApiModelProperty(value = "装卸车点经度")
-    @TableField("longitude")
     private String longitude;
 
     @ApiModelProperty(value = "装卸车点纬度")
-    @TableField("latitude")
     private String latitude;
 
+    @ApiModelProperty(value = "线路GPS数据")
+    private List<String> routeGps;
+
 
 }

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

@@ -70,7 +70,7 @@ public class TmsGasFee implements Serializable {
     @TableField("gas_qty_fee")
     private BigDecimal gasQtyFee;
 
-    @ApiModelProperty(value = "加气方式（1现金2大象加气）")
+    @ApiModelProperty(value = "加气方式（1现金2大象加气3固定加气站）")
     @TableField("type")
     private Integer type;
 

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

@@ -220,7 +220,11 @@ public class WorkOrder implements Serializable {
     @TableField("jing_weight")
     private String jingWeight;
 
-    @ApiModelProperty(value = "开始执行时间")
+    @ApiModelProperty(value = "开始前往装卸车点的时间")
+    @TableField("goto_spot_time")
+    private LocalDateTime gotoSpotTime;
+
+    @ApiModelProperty(value = "开始执行运单时间")
     @TableField("execute_time")
     private LocalDateTime executeTime;
 

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

@@ -3,12 +3,9 @@ package com.aoyang.tms.service;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.param.WorkManagePageParam;
-import com.aoyang.tms.controller.vo.TruckOrderManageVO;
-import com.aoyang.tms.controller.vo.TruckOrderStatisticsVO;
+import com.aoyang.tms.controller.vo.*;
 import com.aoyang.common.param.PageParam;
 import com.aoyang.tms.controller.param.WorkOrderPageParam;
-import com.aoyang.tms.controller.vo.WorkOrderPageListVO;
-import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.entity.Shipper;
 import com.aoyang.tms.entity.Truck;
 import com.aoyang.tms.entity.WorkOrder;
@@ -75,4 +72,13 @@ public interface WorkOrderService extends IService<WorkOrder> {
      * @Param
      **/
     IPage<WorkOrderPageListVO> findPage(PageParam<WorkOrderPageParam> pageParam);
+
+    /**
+     * @return
+     * @Author chengang
+     * @Description 获取运单详情，PC端
+     * @Date 2022/4/25
+     * @Param
+     **/
+    WorkOrderDetail getOne(WorkOrder param);
 }

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

@@ -1,6 +1,7 @@
 package com.aoyang.tms.service.impl;
 
 
+import com.aoyang.tms.controller.vo.WorkLogTplVO;
 import com.aoyang.tms.entity.TmsGasFee;
 import com.aoyang.tms.service.CommonService;
 import com.aoyang.tms.service.JxlsExportTestService;
@@ -29,7 +30,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
     @Override
     public StreamingResponseBody download(TmsGasFee param, HttpServletResponse response) throws IOException {
 
-
+        WorkLogTplVO workLogTplVO = new WorkLogTplVO();
         TmsGasFee tmsGasFee = tmsGasFeeService.getById(param);
         byte imageBytes[] = getImageBytes("/cn/chendd/examples/images/splash.jpg");
 
@@ -44,7 +45,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
         log.info("tplfileName :{}", tplfileName);
         if (os != null && inputStream != null) {
             Map<String, Object> model = new HashMap<String, Object>();
-            model.put("tmsGasFee", tmsGasFee);
+            model.put("workLogTplVO", workLogTplVO);
             JxlsUtils.exportExcel(inputStream, os, model);
             os.close();
         }

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

@@ -13,6 +13,7 @@ import com.aoyang.tms.mapper.WorkOrderMapper;
 import com.aoyang.tms.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
@@ -330,4 +331,23 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         workOrderPageListVOIPage.setCurrent(records.getCurrent());
         return workOrderPageListVOIPage;
     }
+
+    @Override
+    public WorkOrderDetail getOne(WorkOrder param) {
+        WorkOrderDetail workOrderDetail = new WorkOrderDetail();
+        WorkOrder workOrder = getById(param);
+        if (workOrder != null) {
+            workOrderDetail.setWorkOrder(workOrder);
+            List<String> routeGps = new ArrayList<>();
+            if (workOrder.getCompleteTime() != null) {
+                routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getExecuteTime(), workOrder.getCompleteTime());
+            } else {
+                routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getExecuteTime(), LocalDateTime.now());
+            }
+            if (routeGps != null) {
+                workOrderDetail.setRouteGps(routeGps);
+            }
+        }
+        return workOrderDetail;
+    }
 }

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

@@ -71,6 +71,7 @@ public class WorkerServiceImpl implements WorkerService {
     }
 
     @Override
+    @Transactional
     public Boolean starWork(Long userId, String userName, TruckCheckInfo truckCheckInfo) {
         Boolean flag = true;
         //TODO 1.车辆进入作业中状态，2.插入车辆检查记录，3.并记行车日志
@@ -99,6 +100,7 @@ public class WorkerServiceImpl implements WorkerService {
     }
 
     @Override
+    @Transactional
     public Boolean startWait(Long userId, String userName, WorkOrder workOrderParam) {
         Boolean flag = true;
         try {
@@ -128,6 +130,7 @@ public class WorkerServiceImpl implements WorkerService {
     }
 
     @Override
+    @Transactional
     public Boolean submitResult(Long userId, String userName, WorkOrder workOrderParam) {
         Boolean flag = true;
         try {
@@ -163,6 +166,7 @@ public class WorkerServiceImpl implements WorkerService {
     }
 
     @Override
+    @Transactional
     public Boolean finishOrder(Long userId, String userName, WorkOrder workOrderParam) {
         Boolean flag = true;
         try {
@@ -195,6 +199,7 @@ public class WorkerServiceImpl implements WorkerService {
     }
 
     @Override
+    @Transactional
     public Boolean arriveTerminal(Long userId, String userName, WorkOrder workOrderParam) {
         Boolean flag = true;
         try {
@@ -216,6 +221,7 @@ public class WorkerServiceImpl implements WorkerService {
     }
 
     @Override
+    @Transactional
     public Boolean finishWork(Long userId, String userName, WorkOrder workOrderParam) {
         Boolean flag = true;
         try {