feat:行车日志

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

@@ -40,6 +40,61 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setNote(logType.workLogTitle + " " + workOrder.getSpotName());
             workLog.setCreaterName("自动上报");
             workLog.setCreateDate(workOrder.getType() == 1? workOrder.getEnterTime() : workOrder.getLeaveTime());
+        } else if (logType.equals(WorkLogTypeEnum.START)) {
+            // 执行装车订单
+            if (workOrder == null) {
+                log.error("记录执行装车订单日志错误：运单不存在");
+                return false;
+            }
+            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setId(null);
+            // 日志内容
+            String content = "里程数：" + workOrder.getStartTrip() + "  < a href='" + workOrder.getStartTripUrl()
+                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>"
+                    + " 运单号：" + workOrder.getOrderNo();
+            workLog.setNote(content);
+            workLog.setCreaterName(workLog.getCreaterName());
+            workLog.setCreateDate(LocalDateTime.now());
+        } else if (logType.equals(WorkLogTypeEnum.FINISH_PRE_CHECK)) {
+            // 完成"出车前检查",开始"出车作业"
+            if (workOrder == null) {
+                log.error("记录执行装车订单日志错误：运单不存在");
+                return false;
+            }
+            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setId(null);
+            // 日志内容
+            String content = "< a href='" + args[0]
+                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>检查表</ a>";
+            workLog.setNote(content);
+            workLog.setCreaterName(workLog.getCreaterName());
+            workLog.setCreateDate(LocalDateTime.now());
+        } else if (logType.equals(WorkLogTypeEnum.LOAD_POINT_ARRIVED)) {
+            // 到达装车点，开始装车等待
+            if (workOrder == null) {
+                log.error("记录执行装车订单日志错误：运单不存在");
+                return false;
+            }
+            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setId(null);
+            // 日志内容
+            String content = "里程数：" + workOrder.getEndTrip() + "  < a href='" + workOrder.getStartTripUrl()
+                    + "' target='_blank' style='color: #409EFF;display: inline-block;padding: 0 5px;'>里程表照片</ a>"
+                    + " 运单号：" + workOrder.getOrderNo();
+            workLog.setNote(content);
+            workLog.setCreaterName(workLog.getCreaterName());
+            workLog.setCreateDate(LocalDateTime.now());
+        } else if (logType.equals(WorkLogTypeEnum.LOAD_START)) {
+            // 开始作业，成功上报
+            if (workOrder == null) {
+                log.error("记录执行装车订单日志错误：运单不存在");
+                return false;
+            }
+            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setId(null);
+            workLog.setCycleId(workOrder.getCycleId());
+            workLog.setNote("开始装车");
+            workLog.setCreateDate(LocalDateTime.now());
         } else if ( 1 == 2) {
             // TODO others
             workLog.setNote("lalallala");
@@ -52,7 +107,7 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             BeanUtils.copyProperties(workOrder, workLog);
             workLog.setId(null);
             // 行车周期cycleId必传
-            workLog.setCycleId(Long.parseLong(args[0]));
+            workLog.setCycleId(workOrder.getCycleId());
             workLog.setNote(logType.workLogTitle);
             workLog.setCreateDate(LocalDateTime.now());
         }

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

@@ -126,7 +126,7 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrder.setGotoSpotTime(LocalDateTime.now());
                 workOrderService.updateById(workOrder);
                 //4 记录日志
-                workLogService.logWorkCycleInfo(WorkLogTypeEnum.FINISH_PRE_CHECK, workOrder);
+                workLogService.logWorkCycleInfo(WorkLogTypeEnum.FINISH_PRE_CHECK, workOrder, truckCheckInfo.getCheckUrl());
             }
         } catch (Exception e) {
             log.error("startOrder:{}", e.getMessage());