root/stand_acs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:包名修改

Browse Source
This commit is contained in:
郑旭明\73939
2026-04-22 17:27:39 +08:00
parent fbbbd41c24
commit feffa239a6
19 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskFeedbackServiceImpl.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/task/service/impl/TaskServiceImpl.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/AcsToKitController.java
View File

@@ -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;

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/controller/KitToAcsController.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/AcsToKitService.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/KitToAcsService.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.api.agvKit.service;
package org.nl.extInterface.agvKit.service;
import com.alibaba.fastjson.JSONObject;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/MsgTypeEnum.java
View File

@@ -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, "创建任务"),

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskPhaseEnum.java
View File

@@ -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", "取货请求或者取请求应答（允许取货）"),

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/enums/TaskStateEnum.java
View File

@@ -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", "任务未启动"),

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/AcsToKitServiceImpl.java
View File

@@ -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;

10
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/agvKit/service/impl/KitToAcsServiceImpl.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/AcsToWmsController.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/controller/WmsToAcsController.java
View File

@@ -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;

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/AcsToWmsService.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.api.wms.service;
package org.nl.extInterface.wms.service;
public interface AcsToWmsService {

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/WmsToAcsService.java
View File

@@ -1,4 +1,4 @@
package org.nl.acs.api.wms.service;
package org.nl.extInterface.wms.service;
public interface WmsToAcsService {

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -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

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/extInterface/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -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