From 4ea1b25e03df026bbd1e1e21827a04ece6075cd7 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Sat, 11 May 2024 22:33:01 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=82=B9=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-system/pom.xml | 7 ++----- .../java/org/nl/agv/service/impl/HomeServiceImpl.java | 11 ++++++++--- .../nl/agv/service/impl/TaskServiceServiceImpl.java | 3 +++ .../org/nl/agv/websocket/SendHomeWebSocketServer.java | 2 +- .../src/main/java/org/nl/utils/QueryInfoSchedule.java | 7 +------ nladmin-system/src/main/resources/logback-spring.xml | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nladmin-system/pom.xml b/nladmin-system/pom.xml index c588a50..653d3f6 100644 --- a/nladmin-system/pom.xml +++ b/nladmin-system/pom.xml @@ -174,16 +174,13 @@ commons-io 2.8.0 - - - - - + org.springframework.boot spring-boot-starter-websocket + io.jsonwebtoken diff --git a/nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java b/nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java index e72f91d..efdaa74 100644 --- a/nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/agv/service/impl/HomeServiceImpl.java @@ -590,7 +590,9 @@ public class HomeServiceImpl implements HomeService { String resultflag = resjo.getString("result"); if (StrUtil.equals("0", resultflag)) { //返程指令已下发 - taskjo.put("step", "1"); + if (TaskTypeEnum.TAKE.getCode().equals(taskjo.getString("task_type")) || TaskTypeEnum.PUT.getCode().equals(taskjo.getString("task_type"))) { + taskjo.put("step", "1"); + } taskjo.put("is_manualfinished", "1"); updateTaskStatus(taskjo, TaskStatusEnum.END); } else { @@ -689,10 +691,13 @@ public class HomeServiceImpl implements HomeService { //stopWatch.start(); JSONObject taskjo = WQLObject.getWQLObject("ST_TASK_INFO").query("is_delete='0'and task_status='01'").uniqueResult(0); //小车停止，且已到达目标点位 - if (ObjectUtil.isNotEmpty(taskjo) && StrUtil.equals("0", debugInfoJson.getString("PathFollow_Enable")) && debugInfoJson.getString("CurNodeID").equals(taskjo.getString("next_point_code"))) { + if (ObjectUtil.isNotEmpty(taskjo)) { //普通任务 if (TaskTypeEnum.COMMON.getCode().equals(taskjo.getString("task_type"))) { updateTaskStatus(taskjo, TaskStatusEnum.END); + if (StringUtils.isNotBlank(taskjo.getString("next_point_code2"))) { + createReturnTask(taskjo); + } } else if (TaskTypeEnum.TAKE.getCode().equals(taskjo.getString("task_type")) || TaskTypeEnum.PUT.getCode().equals(taskjo.getString("task_type"))) { //取货 if (TaskTypeEnum.TAKE.getCode().equals(taskjo.getString("task_type"))) { @@ -745,7 +750,7 @@ public class HomeServiceImpl implements HomeService { } /** - * 定时清空过期任务 + * 定时清空超过三个月过期任务 */ @Async("taskExecutor") public void autoDeleteTask() { diff --git a/nladmin-system/src/main/java/org/nl/agv/service/impl/TaskServiceServiceImpl.java b/nladmin-system/src/main/java/org/nl/agv/service/impl/TaskServiceServiceImpl.java index 945a0f4..6516cc0 100644 --- a/nladmin-system/src/main/java/org/nl/agv/service/impl/TaskServiceServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/agv/service/impl/TaskServiceServiceImpl.java @@ -176,6 +176,9 @@ public class TaskServiceServiceImpl implements TaskService { if (ObjectUtil.isNotEmpty(taskrow)) { seq_num = taskrow.getInteger("seq_num") + 1; } + if(StringUtils.isNotBlank(jsonObject.get("next_point_code"))) { + taskjo.put("next_point_code2", jsonObject.get("next_point_code")); + } taskjo.put("task_type", type); taskjo.put("seq_num", type.equals(TaskTypeEnum.RETURN.getCode()) ? getSeqNum() : seq_num); taskjo.put("task_uuid", IdUtil.simpleUUID()); diff --git a/nladmin-system/src/main/java/org/nl/agv/websocket/SendHomeWebSocketServer.java b/nladmin-system/src/main/java/org/nl/agv/websocket/SendHomeWebSocketServer.java index 5d1d724..7c47398 100644 --- a/nladmin-system/src/main/java/org/nl/agv/websocket/SendHomeWebSocketServer.java +++ b/nladmin-system/src/main/java/org/nl/agv/websocket/SendHomeWebSocketServer.java @@ -82,7 +82,7 @@ public class SendHomeWebSocketServer { */ @OnMessage public void onMessage(String message, Session session) { - System.out.println(webSocketSet.size() + "_接收到消息_" + session.getId()); + //System.out.println(webSocketSet.size() + "_接收到消息_" + session.getId()); } @OnError diff --git a/nladmin-system/src/main/java/org/nl/utils/QueryInfoSchedule.java b/nladmin-system/src/main/java/org/nl/utils/QueryInfoSchedule.java index 4785694..6b93c8a 100644 --- a/nladmin-system/src/main/java/org/nl/utils/QueryInfoSchedule.java +++ b/nladmin-system/src/main/java/org/nl/utils/QueryInfoSchedule.java @@ -1,15 +1,10 @@ package org.nl.utils; -import cn.hutool.core.date.StopWatch; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import cn.hutool.core.date.StopWatch;; import lombok.extern.slf4j.Slf4j; import org.nl.agv.service.HomeService; -import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; - import javax.annotation.Resource; /** diff --git a/nladmin-system/src/main/resources/logback-spring.xml b/nladmin-system/src/main/resources/logback-spring.xml index 755d62e..a90555e 100644 --- a/nladmin-system/src/main/resources/logback-spring.xml +++ b/nladmin-system/src/main/resources/logback-spring.xml @@ -31,7 +31,7 @@ https://juejin.cn/post/6844903775631572999 ${LOG_HOME}/%d{yyyy-MM-dd}.%i.log - 30 + 15 120MB