From 845194c43ab016deb3476b9a80bf0b82731ac3bc Mon Sep 17 00:00:00 2001
From: LISHUAI <1793460677@qq.com>
Date: Fri, 6 Sep 2024 09:57:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E6=8E=92=E5=88=97=E5=B1=82=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/acs/task/rest/TaskController.java | 15 +++++++++++++++
 .../nl/acs/task/service/impl/TaskServiceImpl.java |  6 ------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java
index 9f644d289..8f5135b09 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java
@@ -1,12 +1,16 @@
 package org.nl.acs.task.rest;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
+import org.nl.acs.task.enums.TaskTypeEnum;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.acs.task.service.dto.TaskIdAndStatusDTO;
+import org.nl.common.exception.BadRequestException;
 import org.nl.common.logging.annotation.Log;
+import org.nl.config.language.LangProcess;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -52,10 +56,21 @@ public class TaskController {
     @Log("新增任务")
     //@SaCheckPermission("task:add")
     public ResponseEntity<Object> create(@Validated @RequestBody TaskDto dto) throws Exception {
+        //校验排列层为空
+        checkYZ(dto);
         taskService.create(dto);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
+    private static void checkYZ(TaskDto dto) {
+        if (dto.getTask_type().equals(TaskTypeEnum.AGV_Task.getIndex())){
+            if ((dto.getNext_point_code().startsWith("L")&&(StrUtil.isEmpty(dto.getTo_y()) || StrUtil.isEmpty(dto.getTo_z()))) || (dto.getStart_point_code().startsWith("L")&&(StrUtil.isEmpty(dto.getFrom_y()) || StrUtil.isEmpty(dto.getFrom_z())))){
+                throw new BadRequestException(LangProcess.msg("point_null"));
+            }
+
+        }
+    }
+
     @PostMapping(value = "/adds")
     @Log("常规任务保存")
     //@PreAuthorize("@el.check('task:add')")
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 15217c13e..4a4ae493f 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -1252,13 +1252,7 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
         String from_z = null;
         String to_y = null;
         String to_z = null;
-        //校验排列层为空
-        if (task.getTask_type().equals(TaskTypeEnum.AGV_Task.getIndex())){
-            if ((next_point_code.startsWith("L")&&(StrUtil.isEmpty(task.getTo_y()) || StrUtil.isEmpty(task.getTo_z()))) || (start_point_code.startsWith("L")&&(StrUtil.isEmpty(task.getFrom_y()) || StrUtil.isEmpty(task.getFrom_z())))){
-                throw new BadRequestException(LangProcess.msg("point_null"));
-            }
 
-        }
         CommonFinalParam commonFinalParam = new CommonFinalParam();
         if (StrUtil.contains(start_point_code, commonFinalParam.getBARRE()) && StrUtil.count(start_point_code, commonFinalParam.getBARRE()) == 2) {
             String[] start_point = start_point_code.split(commonFinalParam.getBARRE());