From feffa239a6b3ca90b3c25c634fd2a7e3b00cce95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Wed, 22 Apr 2026 17:27:39 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=8C=85=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardInspectSiteDeviceDriver.java | 2 +- .../StandardOrdinarySiteDeviceDriver.java | 2 +- .../task/service/impl/TaskFeedbackServiceImpl.java | 2 +- .../nl/acs/task/task/service/impl/TaskServiceImpl.java | 2 +- .../agvKit/controller/AcsToKitController.java | 2 +- .../agvKit/controller/KitToAcsController.java | 4 ++-- .../extInterface/agvKit/service/AcsToKitService.java | 2 +- .../extInterface/agvKit/service/KitToAcsService.java | 2 +- .../extInterface/agvKit/service/enums/MsgTypeEnum.java | 2 +- .../agvKit/service/enums/TaskPhaseEnum.java | 2 +- .../agvKit/service/enums/TaskStateEnum.java | 2 +- .../agvKit/service/impl/AcsToKitServiceImpl.java | 4 ++-- .../agvKit/service/impl/KitToAcsServiceImpl.java | 10 +++++----- .../wms/controller/AcsToWmsController.java | 2 +- .../wms/controller/WmsToAcsController.java | 2 +- .../nl/extInterface/wms/service/AcsToWmsService.java | 2 +- .../nl/extInterface/wms/service/WmsToAcsService.java | 2 +- .../wms/service/impl/AcsToWmsServiceImpl.java | 4 ++-- .../wms/service/impl/WmsToAcsServiceImpl.java | 4 ++-- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java index 5512cd4..b387af0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.api.agvKit.service.AcsToKitService; import org.nl.acs.device.deviceDriver.service.defination.opcDefination.AbstractOpcDeviceDriver; import org.nl.acs.device.storageMgt.service.dto.StorageCellDto; import org.nl.acs.device.storageMgt.service.impl.StorageCellServiceImpl; @@ -21,6 +20,7 @@ import org.nl.acs.task.task.service.dto.TaskDto; import org.nl.config.SpringContextHolder; import org.nl.config.language.LangProcess; import org.nl.config.lucene.service.LuceneExecuteLogService; +import org.nl.extInterface.agvKit.service.AcsToKitService; import java.util.Date; import java.util.HashMap; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java index 2f2ec89..5954109 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.api.agvKit.service.AcsToKitService; import org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.AbstractStandardDeviceDriver; import org.nl.acs.device.storageMgt.service.dto.StorageCellDto; import org.nl.acs.device.storageMgt.service.impl.StorageCellServiceImpl; @@ -18,6 +17,7 @@ import org.nl.acs.task.instruction.service.InstructionService; import org.nl.acs.task.task.service.TaskService; import org.nl.acs.task.task.service.dto.TaskDto; import org.nl.config.SpringContextHolder; +import org.nl.extInterface.agvKit.service.AcsToKitService; import java.util.Map; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java index 82ca942..2275194 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import org.nl.acs.task.task.service.mapper.TaskFeedbackMapper; import org.nl.common.db.CommonFinalParam; -import org.nl.acs.api.wms.service.AcsToWmsService; +import org.nl.extInterface.wms.service.AcsToWmsService; import org.nl.acs.task.task.domain.TaskFeedback; import org.nl.acs.task.task.service.TaskFeedbackService; import org.nl.acs.task.task.service.TaskService; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java index ad181ad..a218e20 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java @@ -26,7 +26,7 @@ import org.nl.acs.device.device.service.enums.DeviceType; import org.nl.acs.device.device.service.DeviceService; import org.nl.acs.device.device.service.impl.DeviceServiceImpl; import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; -import org.nl.acs.api.wms.service.AcsToWmsService; +import org.nl.extInterface.wms.service.AcsToWmsService; import org.nl.acs.task.instruction.domain.Instruction; import org.nl.acs.task.instruction.domain.InstructionMybatis; import org.nl.acs.task.instruction.enums.InstructionStatusEnum; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/AcsToKitController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/AcsToKitController.java index a480240..a70f452 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/AcsToKitController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/AcsToKitController.java @@ -1,5 +1,5 @@ -package org.nl.acs.api.agvKit.controller; +package org.nl.extInterface.agvKit.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/KitToAcsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/KitToAcsController.java index afbddec..cdcd118 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/KitToAcsController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/KitToAcsController.java @@ -1,14 +1,14 @@ -package org.nl.acs.api.agvKit.controller; +package org.nl.extInterface.agvKit.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.api.agvKit.service.KitToAcsService; import org.nl.common.exception.BadRequestException; import org.nl.common.logging.annotation.Log; +import org.nl.extInterface.agvKit.service.KitToAcsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/AcsToKitService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/AcsToKitService.java index 49b3c31..638c3fa 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/AcsToKitService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/AcsToKitService.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.agvKit.service; +package org.nl.extInterface.agvKit.service; import cn.hutool.http.HttpResponse; import org.nl.acs.task.instruction.domain.Instruction; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/KitToAcsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/KitToAcsService.java index 64eac31..8e45894 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/KitToAcsService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/KitToAcsService.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.agvKit.service; +package org.nl.extInterface.agvKit.service; import com.alibaba.fastjson.JSONObject; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/MsgTypeEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/MsgTypeEnum.java index dc3993a..b876317 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/MsgTypeEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/MsgTypeEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.agvKit.service.enums; +package org.nl.extInterface.agvKit.service.enums; public enum MsgTypeEnum { CREATE_TASK_REQ(3, "创建任务"), diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskPhaseEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskPhaseEnum.java index fe18391..52f1dee 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskPhaseEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskPhaseEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.agvKit.service.enums; +package org.nl.extInterface.agvKit.service.enums; public enum TaskPhaseEnum { PICKUP_REQUEST_OR_RESPONSE("1", "取货请求或者取请求应答（允许取货）"), diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskStateEnum.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskStateEnum.java index b84a21d..e8b839d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskStateEnum.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskStateEnum.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.agvKit.service.enums; +package org.nl.extInterface.agvKit.service.enums; public enum TaskStateEnum { NOT_STARTED("0", "任务未启动"), diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java index bc9c52b..01f1f95 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.agvKit.service.impl; +package org.nl.extInterface.agvKit.service.impl; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; @@ -10,7 +10,6 @@ import org.nl.acs.task.TaskConfig; import org.nl.acs.apiAdd.service.AddressService; import org.nl.acs.device.device.service.DeviceService; import org.nl.acs.device.device.service.impl.DeviceServiceImpl; -import org.nl.acs.api.agvKit.service.AcsToKitService; import org.nl.acs.task.instruction.domain.Instruction; import org.nl.config.MapOf; import org.nl.config.SpringContextHolder; @@ -19,6 +18,7 @@ import org.nl.config.lucene.enums.LogLevelEnum; import org.nl.config.lucene.enums.LogTypeEnum; import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.config.lucene.service.dto.LuceneLogDto; +import org.nl.extInterface.agvKit.service.AcsToKitService; import org.nl.system.service.param.ISysParamService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/KitToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/KitToAcsServiceImpl.java index 142e239..10335d4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/KitToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/KitToAcsServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.agvKit.service.impl; +package org.nl.extInterface.agvKit.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -8,10 +8,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device.service.entity.Device; import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; -import org.nl.acs.api.agvKit.service.enums.MsgTypeEnum; -import org.nl.acs.api.agvKit.service.enums.TaskPhaseEnum; -import org.nl.acs.api.agvKit.service.enums.TaskStateEnum; -import org.nl.acs.api.agvKit.service.KitToAcsService; import org.nl.acs.device.storageMgt.service.entity.StorageCell; import org.nl.acs.task.instruction.domain.Instruction; import org.nl.acs.task.instruction.enums.InstructionStatusEnum; @@ -19,6 +15,10 @@ import org.nl.acs.task.instruction.service.InstructionService; import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.device.storageMgt.service.StorageCellService; import org.nl.config.MapOf; +import org.nl.extInterface.agvKit.service.KitToAcsService; +import org.nl.extInterface.agvKit.service.enums.MsgTypeEnum; +import org.nl.extInterface.agvKit.service.enums.TaskPhaseEnum; +import org.nl.extInterface.agvKit.service.enums.TaskStateEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/AcsToWmsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/AcsToWmsController.java index c249fa8..5e331c7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/AcsToWmsController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/AcsToWmsController.java @@ -1,5 +1,5 @@ -package org.nl.acs.api.wms.controller; +package org.nl.extInterface.wms.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java index 6f348ea..3531ce4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java @@ -1,5 +1,5 @@ -package org.nl.acs.api.wms.controller; +package org.nl.extInterface.wms.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/AcsToWmsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/AcsToWmsService.java index 56ec25c..ff5dac7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/AcsToWmsService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/AcsToWmsService.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.wms.service; +package org.nl.extInterface.wms.service; public interface AcsToWmsService { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/WmsToAcsService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/WmsToAcsService.java index 0d1937f..fe9a1c7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/WmsToAcsService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/WmsToAcsService.java @@ -1,4 +1,4 @@ -package org.nl.acs.api.wms.service; +package org.nl.extInterface.wms.service; public interface WmsToAcsService { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/AcsToWmsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/AcsToWmsServiceImpl.java index 86e6253..4cf1749 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/AcsToWmsServiceImpl.java @@ -1,8 +1,8 @@ -package org.nl.acs.api.wms.service.impl; +package org.nl.extInterface.wms.service.impl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.api.wms.service.AcsToWmsService; +import org.nl.extInterface.wms.service.AcsToWmsService; import org.springframework.stereotype.Service; @Service diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/WmsToAcsServiceImpl.java index 7fa6fc4..f32a4df 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/WmsToAcsServiceImpl.java @@ -1,8 +1,8 @@ -package org.nl.acs.api.wms.service.impl; +package org.nl.extInterface.wms.service.impl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.api.wms.service.WmsToAcsService; +import org.nl.extInterface.wms.service.WmsToAcsService; import org.springframework.stereotype.Service; @Service