feat:行车日志调整

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

@@ -222,8 +222,8 @@ public class WorkOrderManageController {
                 SmsSendLog smsSend = new SmsSendLog();
                 smsSend.setType(30);
                 JSONObject content = new JSONObject();
-                content.put("type", "装");
-                content.put("trans_id", orderNo);
+                content.put("type", "装车");
+                content.put("order_id", orderNo);
                 smsSend.setContent(JSON.toJSONString(content));
                 smsSend.setMobile(monbiles.substring(1));
                 log.info("发送装车运单短信：{}", JSON.toJSONString(smsSend));
@@ -309,8 +309,8 @@ public class WorkOrderManageController {
                 SmsSendLog smsSend = new SmsSendLog();
                 smsSend.setType(30);
                 JSONObject content = new JSONObject();
-                content.put("type", "卸");
-                content.put("trans_id", orderNo);
+                content.put("type", "卸车");
+                content.put("order_id", orderNo);
                 smsSend.setContent(JSON.toJSONString(content));
                 smsSend.setMobile(monbiles.substring(1));
                 log.info("发送卸车运单短信：{}", JSON.toJSONString(smsSend));

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

@@ -186,7 +186,7 @@ public class WorkerController {
         restInfo.setCreaterName(utf8Name);
         restInfo.setCreateDate(LocalDateTime.now());
         Boolean flag = restInfoService.save(restInfo);
-        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null);
+        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, workCycle.getId() + "");
         workLogService.logWorkCycleInfo(WorkLogTypeEnum.REST_START, null, workCycle.getId() + "",
                 DateUtils.betweenTime(restInfo.getStartTime(), restInfo.getEndTime()));
         return new Result<>(flag);
@@ -214,7 +214,7 @@ public class WorkerController {
         truckRepairInfo.setCreaterName(utf8Name);
         truckRepairInfo.setCreateDate(LocalDateTime.now());
         Boolean flag = truckRepairInfoService.save(truckRepairInfo);
-        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null);
+        workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, workCycle.getId() + "");
         workLogService.logWorkCycleInfo(WorkLogTypeEnum.REPAIR_START, null, workCycle.getId() + "",
                 DateUtils.betweenTime(truckRepairInfo.getStartTime(), truckRepairInfo.getEndTime()));
         return new Result<>(flag);

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

@@ -242,29 +242,16 @@ public class WorkLogServiceImpl extends ServiceImpl<WorkLogMapper, WorkLog> impl
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.REPAIR_START) || logType.equals(WorkLogTypeEnum.REST_START)) {
             // 开始"途中维修"
-            workLog.setCycleId(workOrder.getCycleId());
-            if (workOrder == null) {
-                log.error("记录行车日志错误：运单不存在");
-                return false;
-            }
-            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setCycleId(Long.parseLong(args[0]));
             workLog.setId(null);
-            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreateDate(LocalDateTime.now());
         } else if (logType.equals(WorkLogTypeEnum.REPAIR_END) || logType.equals(WorkLogTypeEnum.REST_END)) {
             // 结束"途中维修"
-            workLog.setCycleId(workOrder.getCycleId());
-            if (workOrder == null) {
-                log.error("记录行车日志错误：运单不存在");
-                return false;
-            }
-            BeanUtils.copyProperties(workOrder, workLog);
+            workLog.setCycleId(Long.parseLong(args[0]));
             workLog.setId(null);
             // 日志内容
             String content = "（用时" + args[0] + ")";
-            workLog.setUrl(workOrder.getEndTripUrl());
             workLog.setNote(content);
-            workLog.setOrderId(workOrder.getId()+"");
             workLog.setCreateDate(LocalDateTime.now());
         } else {
             // 通用处理

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

@@ -203,9 +203,6 @@ public class WorkerServiceImpl implements WorkerService {
                 workOrderService.updateById(workOrder);
 
                 //3 记录日志
-                workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_START, workOrder);
-
-                //3 记录日志
                 if (workOrder.getType() == 1) {
                     workLogService.logWorkCycleInfo(WorkLogTypeEnum.LOAD_START, workOrder);
                 } else {