From c07065825441554a91deb5025d18471dded06171 Mon Sep 17 00:00:00 2001
From: liejiu946 <liejiu946@163.com>
Date: Mon, 17 Mar 2025 14:42:54 +0800
Subject: [PATCH] =?UTF-8?q?opt:1.=E4=BC=98=E5=8C=96=E5=A4=9A=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskServiceServiceImpl.java    | 17 +++++++++++------
 .../src/main/resources/config/application.yml   |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

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 a8fc2ca..409e768 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
@@ -320,8 +320,11 @@ public class TaskServiceServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo
             }
         }
         try {
-            String clearSchedule = "HMI_Ctrl_Clear_Auto_Mode_Schedule";
-            sendToAgvUtil.send(clearSchedule);
+            //判断是否是终端发起的任务
+            if (StringUtils.isBlank(taskName)){
+                String clearSchedule = "HMI_Ctrl_Clear_Auto_Mode_Schedule";
+                sendToAgvUtil.send(clearSchedule);
+            }
             String instruct;
             int seq_num = 1;
             String task_status = "00";
@@ -396,7 +399,7 @@ public class TaskServiceServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo
                     en_task_status_name = getLanguage("Executing", "en");
                     zh_task_status_name = getLanguage("Executing", "zh");
                 }else {
-                    returnjo.put("code", "1");
+                    returnjo.put("code", "0");
                     returnjo.put("desc", TaskSendBackStatusEnum.getName(resultflag));
                     return returnjo;
                 }
@@ -587,9 +590,11 @@ public class TaskServiceServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo
             returnjo.put("code", "0");
             return returnjo;
         }
-        TaskInfo taskInfo = taskInfoMapper.selectOne( new LambdaQueryWrapper<>(TaskInfo.class)
-                .eq(TaskInfo::getTaskCode, taskCode)
-        );
+        WQLObject taskTable = WQLObject.getWQLObject("ST_TASK_INFO");
+        JSONObject taskInfo = taskTable.query("task_code='" + taskCode + "'").uniqueResult(0);
+//        TaskInfo taskInfo = taskInfoMapper.selectOne( new LambdaQueryWrapper<>(TaskInfo.class)
+//                .eq(TaskInfo::getTaskCode, taskCode)
+//        );
         if (ObjectUtil.isEmpty(taskInfo)){
             returnjo.put("result", "未找到任务号对应的任务");
             returnjo.put("code", "0");
diff --git a/nladmin-system/src/main/resources/config/application.yml b/nladmin-system/src/main/resources/config/application.yml
index aff3430..122785b 100644
--- a/nladmin-system/src/main/resources/config/application.yml
+++ b/nladmin-system/src/main/resources/config/application.yml
@@ -89,7 +89,7 @@ security:
     - /api/users
 mybatis-plus:
   configuration:
-    map-underscore-to-camel-case: false
+    map-underscore-to-camel-case: true
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
   mapper-locations:
     - classpath:org.nl.**.mapper/*.xml