From 0965a0f907290a6d963fe182fdfe3f841a34b323 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 9 Apr 2026 15:03:40 +0800 Subject: [PATCH] =?UTF-8?q?init=EF=BC=9A=E7=BB=93=E6=9E=84=E9=87=8D?= =?UTF-8?q?=E7=BB=843?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/KitToAcsServiceImpl.java | 4 +- .../service/impl/AddressServiceImpl.java | 2 +- .../deviceAuto/DeviceExecuteAutoRunable.java | 6 +- .../OpcSignalSyncAutoRunnable.java | 10 +- .../opcSignalAuto/OpcSignalSyncExecutor.java | 10 +- .../service/impl/AutoRunServiceImpl.java | 2 +- .../device}/service/DeviceAppService.java | 6 +- .../DeviceDriverDefinationAppService.java | 4 +- .../service/dto/DeviceExtraManageDto.java | 2 +- .../device}/service/dto/DeviceManageDto.java | 2 +- .../device/device/service/entity/Device.java | 6 +- .../service/impl/DeviceAppServiceImpl.java | 18 +-- .../DeviceDriverDefinationAppServiceImpl.java | 6 +- .../service/impl/DeviceServiceImpl.java | 150 ++++++++--------- .../DeviceDriverDefination.java | 3 +- .../AbstractOpcDeviceDriver.java | 10 +- .../opcDefination/ItemProtocolP.java | 4 +- .../OpcDeviceDriverDefination.java | 4 +- .../standardInspectSite/ItemProtocol.java | 4 +- .../StandardInspectSiteDefination.java | 8 +- .../StandardInspectSiteDeviceDriver.java | 6 +- .../AbstractStandardDeviceDriver.java | 9 ++ .../StandardOrdinarySiteDefination.java | 6 +- .../StandardOrdinarySiteDeviceDriver.java | 6 +- .../service/{ => driver}/DeviceDriver.java | 3 +- .../service/driver/base/BaseDeviceDriver.java | 9 ++ .../DeviceStageMonitorPlugin.java | 2 +- .../DriverExecutePlugin.java | 2 +- .../impl/AbstractStandardDeviceDriver.java | 8 - .../service/impl/BaseDeviceDriver.java | 8 - .../service/impl/DeviceExtraServiceImpl.java | 2 +- .../impl/DeviceProtocolServiceImpl.java | 1 - .../service/impl/StorageCellServiceImpl.java | 4 +- .../opc/{ => opcOperator}/OpcOperator.java | 4 +- .../{ => opcOperator}/config/OpcConfig.java | 2 +- .../config}/QualityTypeValue.java | 2 +- .../service/OpcServerService.java} | 39 +++-- .../service/dto/OpcServerManageDto.java | 2 +- .../acs/iot/opc/service/OpcServerService.java | 60 ------- .../plc/service/impl/OpcPlcServiceImpl.java | 2 +- .../impl/DeviceStageMonitorServiceImpl.java | 4 +- .../impl/DeviceErrorLogServiceImpl.java | 2 +- .../service/impl/InstructionServiceImpl.java | 10 +- .../service/impl/RouteLineServiceImpl.java | 11 +- .../service/impl/RouteLocServiceImpl.java | 2 +- .../service/impl/RoutePlanServiceImpl.java | 2 +- .../service/impl/TaskFeedbackServiceImpl.java | 2 +- .../task/service/impl/TaskServiceImpl.java | 153 +++++++++--------- .../java/org/nl/common/utils/PageUtil.java | 16 +- .../java/org/nl/common/utils/ReadUtil.java | 2 +- .../java/org/nl/{ => init}/AppRunInit.java | 2 +- .../nl/{ => init}/ApplicationAutoInitial.java | 2 +- .../param/impl/SysParamServiceImpl.java | 2 +- .../service/quartz/task/AutoCreateInst.java | 4 +- .../trajectory/impl/TrajectoryImpl.java | 2 +- .../src/main/resources/log/OpcLog.xml | 2 +- 56 files changed, 289 insertions(+), 367 deletions(-) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/{iot/opc => device/device}/service/DeviceAppService.java (93%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/{iot/opc => device/device}/service/dto/DeviceExtraManageDto.java (90%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/{iot/opc => device/device}/service/dto/DeviceManageDto.java (98%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/{iot/opc => device/device}/service/impl/DeviceAppServiceImpl.java (96%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/{iot/opc => device/device}/service/impl/DeviceDriverDefinationAppServiceImpl.java (95%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{ => defination}/DeviceDriverDefination.java (86%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{impl => defination/opcDefination}/AbstractOpcDeviceDriver.java (97%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{impl => defination}/opcDefination/ItemProtocolP.java (79%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{impl => defination}/opcDefination/OpcDeviceDriverDefination.java (72%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{impl => defination}/opcDefination/standardInspectSite/ItemProtocol.java (90%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{impl => defination}/opcDefination/standardInspectSite/StandardInspectSiteDefination.java (80%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{impl => defination}/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java (98%) create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/AbstractStandardDeviceDriver.java rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{impl => defination}/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java (82%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{impl => defination}/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java (97%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{ => driver}/DeviceDriver.java (87%) create mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/base/BaseDeviceDriver.java rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{ => driver}/设备驱动执行插件/DeviceStageMonitorPlugin.java (85%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/{ => driver}/设备驱动执行插件/DriverExecutePlugin.java (83%) delete mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractStandardDeviceDriver.java delete mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/BaseDeviceDriver.java rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/{ => opcOperator}/OpcOperator.java (99%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/{ => opcOperator}/config/OpcConfig.java (94%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/{service/dto => opcOperator/config}/QualityTypeValue.java (94%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/{service/impl/OpcServerServiceImpl.java => opcOperator/service/OpcServerService.java} (91%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/{ => opcOperator}/service/dto/OpcServerManageDto.java (96%) delete mode 100644 acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/OpcServerService.java rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/{ => init}/AppRunInit.java (97%) rename acs2/nladmin-system/nlsso-server/src/main/java/org/nl/{ => init}/ApplicationAutoInitial.java (94%) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/agvKit/service/impl/KitToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/agvKit/service/impl/KitToAcsServiceImpl.java index fab5247..142e239 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/agvKit/service/impl/KitToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/agvKit/service/impl/KitToAcsServiceImpl.java @@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device.service.entity.Device; -import org.nl.acs.device.deviceDriver.service.DeviceDriver; +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; @@ -16,7 +16,7 @@ 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; import org.nl.acs.task.instruction.service.InstructionService; -import org.nl.acs.iot.opc.service.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.device.storageMgt.service.StorageCellService; import org.nl.config.MapOf; import org.springframework.beans.factory.annotation.Autowired; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/apiAdd/service/impl/AddressServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/apiAdd/service/impl/AddressServiceImpl.java index 47b1f33..eff141e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/apiAdd/service/impl/AddressServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/api/apiAdd/service/impl/AddressServiceImpl.java @@ -21,7 +21,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.FileUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.acs.api.apiAdd.service.entity.Address; import org.nl.acs.api.apiAdd.service.AddressService; import org.nl.acs.api.apiAdd.service.dto.AddressDto; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java index f4f30af..23ea381 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java @@ -3,9 +3,9 @@ package org.nl.acs.autoThread.autoRun.impl.deviceAuto; import lombok.extern.slf4j.Slf4j; import org.nl.acs.autoThread.autoRun.AbstractAutoRunnable; import org.nl.acs.autoThread.service.AutoRunService; -import org.nl.acs.device.deviceDriver.service.impl.BaseDeviceDriver; -import org.nl.acs.iot.opc.service.DeviceAppService; -import org.nl.acs.iot.opc.config.OpcConfig; +import org.nl.acs.device.deviceDriver.service.driver.base.BaseDeviceDriver; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.iot.opc.opcOperator.config.OpcConfig; import org.nl.acs.iot.udw.UnifiedDataAccessor; import org.nl.acs.iot.udw.UnifiedDataAccessorFactory; import org.nl.common.utils.BlockedRunable; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncAutoRunnable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncAutoRunnable.java index 9184e0d..c53deda 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncAutoRunnable.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncAutoRunnable.java @@ -3,10 +3,10 @@ package org.nl.acs.autoThread.autoRun.impl.opcSignalAuto; import cn.hutool.core.util.ObjectUtil; import org.dromara.dynamictp.core.support.ThreadPoolBuilder; import org.nl.acs.autoThread.autoRun.AbstractAutoRunnable; -import org.nl.acs.iot.opc.service.DeviceAppService; -ximport org.nl.acs.iot.opc.OpcServerService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto; -import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; +import org.nl.acs.iot.opc.opcOperator.service.OpcServerService; +import org.nl.acs.iot.opc.opcOperator.service.dto.OpcServerManageDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,6 +37,8 @@ public class OpcSignalSyncAutoRunnable extends AbstractAutoRunnable { .workQueue(MEMORY_SAFE_LINKED_BLOCKING_QUEUE.getName(), 2000) .buildDynamic(); + @Autowired + private OpcServerService opcServerService; @Autowired private DeviceAppService deviceAppService; @@ -56,7 +58,7 @@ public class OpcSignalSyncAutoRunnable extends AbstractAutoRunnable { { //Thread.sleep(10000L); isRun = true; - Map servers = deviceAppService.queryAllServerMap(); + Map servers = opcServerService.queryAllServerMap(); Map>> pros; do { Thread.sleep(1000L); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncExecutor.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncExecutor.java index 38776ba..e8544df 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncExecutor.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/opcSignalAuto/OpcSignalSyncExecutor.java @@ -5,12 +5,11 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; -import org.nl.acs.iot.opc.service.OpcServerService; -import org.nl.acs.iot.opc.OpcOperator; -import org.nl.acs.iot.opc.config.OpcConfig; +import org.nl.acs.iot.opc.opcOperator.OpcOperator; +import org.nl.acs.iot.opc.opcOperator.config.OpcConfig; import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto; -import org.nl.acs.iot.opc.service.dto.QualityTypeValue; -import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; +import org.nl.acs.iot.opc.opcOperator.config.QualityTypeValue; +import org.nl.acs.iot.opc.opcOperator.service.dto.OpcServerManageDto; import org.nl.acs.iot.udw.UnifiedDataAccessor; import org.nl.acs.iot.udw.UnifiedDataAccessorFactory; import org.nl.acs.iot.udw.UnifiedDataAppService; @@ -93,7 +92,6 @@ public class OpcSignalSyncExecutor implements Runnable, DataCallback, ServerConn private void runOld() { - OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService .class); while (true) { start: try { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java index 76fdfc6..b32e6b8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.nl.ApplicationAutoInitial; +import org.nl.init.ApplicationAutoInitial; import org.nl.acs.autoThread.autoRun.AbstractAutoRunnable; import org.nl.acs.autoThread.StartConfig; import org.nl.acs.autoThread.autoRunThread.service.enums.ThreadUsedStatusEnum; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/DeviceAppService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAppService.java similarity index 93% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/DeviceAppService.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAppService.java index f27cde8..6b21742 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/DeviceAppService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAppService.java @@ -1,9 +1,9 @@ -package org.nl.acs.iot.opc.service; +package org.nl.acs.device.device.service; import org.nl.acs.device.device.service.entity.Device; import org.nl.acs.device.device.service.enums.DeviceType; -import org.nl.acs.device.deviceDriver.service.DeviceDriver; -import org.nl.acs.iot.opc.service.dto.DeviceManageDto; +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; +import org.nl.acs.device.device.service.dto.DeviceManageDto; import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java index acf2487..b78a026 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java @@ -1,8 +1,8 @@ package org.nl.acs.device.device.service; import org.nl.acs.device.device.service.enums.DeviceType; -import org.nl.acs.device.deviceDriver.service.DeviceDriver; -import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/DeviceExtraManageDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraManageDto.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/DeviceExtraManageDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraManageDto.java index 59bfa76..4833b8b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/DeviceExtraManageDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraManageDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.iot.opc.service.dto; +package org.nl.acs.device.device.service.dto; import lombok.Data; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/DeviceManageDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceManageDto.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/DeviceManageDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceManageDto.java index d265411..0847d01 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/DeviceManageDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceManageDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.iot.opc.service.dto; +package org.nl.acs.device.device.service.dto; import com.baomidou.mybatisplus.annotation.TableField; import eu.bitwalker.useragentutils.DeviceType; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/entity/Device.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/entity/Device.java index 1113011..382437a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/entity/Device.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/entity/Device.java @@ -1,8 +1,8 @@ package org.nl.acs.device.device.service.entity; -import org.nl.acs.device.deviceDriver.service.DeviceDriver; -import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination; -import org.nl.acs.iot.opc.service.dto.DeviceExtraManageDto; +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; +import org.nl.acs.device.device.service.dto.DeviceExtraManageDto; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/DeviceAppServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAppServiceImpl.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/DeviceAppServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAppServiceImpl.java index 59b646a..11042ce 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/DeviceAppServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAppServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.iot.opc.service.impl; +package org.nl.acs.device.device.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; @@ -9,19 +9,19 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.extern.slf4j.Slf4j; -import org.nl.ApplicationAutoInitial; +import org.nl.init.ApplicationAutoInitial; import org.nl.acs.device.device.service.entity.Device; import org.nl.acs.device.device.service.enums.DeviceType; import org.nl.acs.device.device.service.DeviceDriverDefinationAppService; import org.nl.acs.device.device.service.mapper.DeviceMapper; -import org.nl.acs.device.deviceDriver.service.DeviceDriver; -import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination; -import org.nl.acs.device.deviceDriver.service.impl.AbstractOpcDeviceDriver; +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.defination.opcDefination.AbstractOpcDeviceDriver; import org.nl.acs.device.deviceExtInfo.service.entity.DeviceExtra; import org.nl.acs.device.deviceExtInfo.service.mapper.DeviceExtraMapper; -import org.nl.acs.iot.opc.service.DeviceAppService; -import org.nl.acs.iot.opc.service.dto.DeviceExtraManageDto; -import org.nl.acs.iot.opc.service.dto.DeviceManageDto; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.dto.DeviceExtraManageDto; +import org.nl.acs.device.device.service.dto.DeviceManageDto; import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto; import org.nl.acs.iot.opc.opc.service.entity.Opc; import org.nl.acs.iot.opc.opcPlc.service.entity.OpcPlc; @@ -238,7 +238,7 @@ public class DeviceAppServiceImpl implements DeviceAppService, ApplicationAutoIn @Override public synchronized void reload() { - List deviceManageDtos = deviceManageService.queryAllWithExtra(); + List deviceManageDtos = this.queryAllWithExtra(); this.devices = new ArrayList(); Collections.synchronizedList(this.devices); this.code_indexs = new ArrayList(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/DeviceDriverDefinationAppServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDriverDefinationAppServiceImpl.java similarity index 95% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/DeviceDriverDefinationAppServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDriverDefinationAppServiceImpl.java index 79c0942..79591aa 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/DeviceDriverDefinationAppServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDriverDefinationAppServiceImpl.java @@ -1,10 +1,10 @@ -package org.nl.acs.iot.opc.service.impl; +package org.nl.acs.device.device.service.impl; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device.service.enums.DeviceType; import org.nl.acs.device.device.service.DeviceDriverDefinationAppService; -import org.nl.acs.device.deviceDriver.service.DeviceDriver; -import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; import org.nl.common.exception.BadRequestException; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java index 1ab301a..1f0d6fd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java @@ -18,7 +18,9 @@ import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.map.ListOrderedMap; -import org.nl.ApplicationAutoInitial; +import org.nl.acs.device.deviceDriver.service.defination.opcDefination.standardInspectSite.StandardInspectSiteDeviceDriver; +import org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.standardOrdinarySite.StandardOrdinarySiteDeviceDriver; +import org.nl.init.ApplicationAutoInitial; import org.nl.acs.device.device.service.entity.Device; import org.nl.acs.device.deviceExtInfo.service.entity.DeviceExtra; import org.nl.acs.device.deviceDriver.service.dto.ItemDto; @@ -30,14 +32,13 @@ import org.nl.acs.task.route.service.mapper.RouteLineMapper; import org.nl.acs.device.storageMgt.service.entity.StorageCell; import org.nl.acs.device.storageMgt.service.mapper.StorageCellMapper; import org.nl.common.utils.ConvertUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.common.utils.ReadUtil; import org.nl.acs.device.device.service.DeviceDriverDefinationAppService; import org.nl.acs.device.deviceExtInfo.DeviceExtraService; -import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination; -import org.nl.acs.device.deviceDriver.service.impl.opcDefination.OpcDeviceDriverDefination; -import org.nl.acs.iot.opc.service.DeviceAppService; -import org.nl.acs.iot.opc.service.impl.DeviceAppServiceImpl; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.defination.opcDefination.OpcDeviceDriverDefination; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.iot.opc.opc.service.OpcService; import org.nl.acs.iot.opc.opc.service.dto.OpcDto; import org.nl.acs.iot.plc.service.OpcPlcService; @@ -91,7 +92,6 @@ public class DeviceServiceImpl extends CommonServiceImpl i // private final StageActorMapper stageActorMapper; private final StorageCellMapper storageCellMapper; private final DeviceExtraMapper deviceExtraMapper; - private final DeviceRunpointMapper deviceRunpointMapper; private final StageMapper stageMapper; private final DeviceExtraService deviceExtraService; @@ -594,27 +594,6 @@ public class DeviceServiceImpl extends CommonServiceImpl i } } - -// for(int i=0; i i log.info("更新设备主表信息"); DeviceDto dto = this.findById(device_id); - DeviceRunpointDto devrundto = new DeviceRunpointDto(); if (dto != null) { dto.setIs_config("true"); dto.setIs_route(parentForm.getString("is_route")); @@ -670,41 +648,41 @@ public class DeviceServiceImpl extends CommonServiceImpl i form.put("device_code", device_code); deviceExtraService.createByDeviceConfig(form, "01"); - //判断是否存在并开启站点管理 - if (form.containsKey("station_manager")) { - -// WQLObject wo = WQLObject.getWQLObject("acs_device_runpoint"); - if ("true".equals(form.get("station_manager").toString())) { - //判断数据库记录是否存在 不存在则新增 存在则修改 -// JSONObject json = wo.query("device_id ='" + device_id + "'").uniqueResult(0); - DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper) - .eq(DeviceRunpoint::getDevice_id, device_id) - .one(); - -// if (MapUtil.isEmpty(json)) { - if (ObjectUtil.isEmpty(deviceRunpoint)) { - devrundto.setDevice_code(dto.getDevice_code()); - devrundto.setDevice_id(dto.getDevice_id()); - devrundto.setCreate_by(SecurityUtils.getCurrentNickName()); - devrundto.setCreate_time(DateUtil.now()); - - DeviceRunpoint entity = ConvertUtil.convert(devrundto, DeviceRunpoint.class); - deviceRunpointMapper.insert(entity); - - } else { - deviceRunpoint.setContainer(null); - deviceRunpoint.setTaskno("0"); - deviceRunpoint.setHasgoods("0"); - deviceRunpoint.setRemark(null); - deviceRunpointMapper.updateById(deviceRunpoint); - } - } else { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(DeviceRunpoint::getDevice_id, device_id); - deviceRunpointMapper.delete(wrapper); - } - - } +// //判断是否存在并开启站点管理 +// if (form.containsKey("station_manager")) { +// +//// WQLObject wo = WQLObject.getWQLObject("acs_device_runpoint"); +// if ("true".equals(form.get("station_manager").toString())) { +// //判断数据库记录是否存在 不存在则新增 存在则修改 +//// JSONObject json = wo.query("device_id ='" + device_id + "'").uniqueResult(0); +// DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper) +// .eq(DeviceRunpoint::getDevice_id, device_id) +// .one(); +// +//// if (MapUtil.isEmpty(json)) { +// if (ObjectUtil.isEmpty(deviceRunpoint)) { +// devrundto.setDevice_code(dto.getDevice_code()); +// devrundto.setDevice_id(dto.getDevice_id()); +// devrundto.setCreate_by(SecurityUtils.getCurrentNickName()); +// devrundto.setCreate_time(DateUtil.now()); +// +// DeviceRunpoint entity = ConvertUtil.convert(devrundto, DeviceRunpoint.class); +// deviceRunpointMapper.insert(entity); +// +// } else { +// deviceRunpoint.setContainer(null); +// deviceRunpoint.setTaskno("0"); +// deviceRunpoint.setHasgoods("0"); +// deviceRunpoint.setRemark(null); +// deviceRunpointMapper.updateById(deviceRunpoint); +// } +// } else { +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(DeviceRunpoint::getDevice_id, device_id); +// deviceRunpointMapper.delete(wrapper); +// } +// +// } //有db JSONArray data1 = jsonObject.getJSONArray("data1"); if (data1 != null) { @@ -919,28 +897,28 @@ public class DeviceServiceImpl extends CommonServiceImpl i standardOrdinarySiteDeviceDriver.setBatch(""); device.setBatch(""); } -// WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint"); -// JSONObject json = runpointwo.query("device_code ='" + device_code + "'").uniqueResult(0); - DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper) - .eq(DeviceRunpoint::getDevice_code, device_code) - .one(); - if (!ObjectUtil.isEmpty(deviceRunpoint)) { -// DeviceRunpointDto obj = json.toJavaObject(DeviceRunpointDto.class); - deviceRunpoint.setHasgoods(hasGoodStatus); - deviceRunpoint.setMaterial_type(material_type); - deviceRunpoint.setBatch(batch); - device.setHas_goods(Integer.parseInt(hasGoodStatus)); - device.setMaterial_type(material_type); - device.setRemark(remark); - device.setQuantity(quantity); - device.setBatch(batch); - device.setIslock(islock); -// JSONObject updatejson = (JSONObject) JSONObject.toJSON(obj); -// runpointwo.update(updatejson, "device_code = '" + device_code + "'"); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(DeviceRunpoint::getDevice_code, device_code); - deviceRunpointMapper.delete(wrapper); - } +//// WQLObject runpointwo = WQLObject.getWQLObject("acs_device_runpoint"); +//// JSONObject json = runpointwo.query("device_code ='" + device_code + "'").uniqueResult(0); +//// DeviceRunpoint deviceRunpoint = new LambdaQueryChainWrapper<>(deviceRunpointMapper) +//// .eq(DeviceRunpoint::getDevice_code, device_code) +//// .one(); +// if (!ObjectUtil.isEmpty(deviceRunpoint)) { +//// DeviceRunpointDto obj = json.toJavaObject(DeviceRunpointDto.class); +//// deviceRunpoint.setHasgoods(hasGoodStatus); +//// deviceRunpoint.setMaterial_type(material_type); +//// deviceRunpoint.setBatch(batch); +// device.setHas_goods(Integer.parseInt(hasGoodStatus)); +// device.setMaterial_type(material_type); +// device.setRemark(remark); +// device.setQuantity(quantity); +// device.setBatch(batch); +// device.setIslock(islock); +//// JSONObject updatejson = (JSONObject) JSONObject.toJSON(obj); +//// runpointwo.update(updatejson, "device_code = '" + device_code + "'"); +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(DeviceRunpoint::getDevice_code, device_code); +// deviceRunpointMapper.delete(wrapper); +// } } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); standardInspectSiteDeviceDriver.setMaterial(material_type); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/DeviceDriverDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/DeviceDriverDefination.java similarity index 86% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/DeviceDriverDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/DeviceDriverDefination.java index eee0966..751b639 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/DeviceDriverDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/DeviceDriverDefination.java @@ -1,7 +1,8 @@ -package org.nl.acs.device.deviceDriver.service; +package org.nl.acs.device.deviceDriver.service.defination; import org.nl.acs.device.device.service.entity.Device; import org.nl.acs.device.device.service.enums.DeviceType; +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractOpcDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/AbstractOpcDeviceDriver.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractOpcDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/AbstractOpcDeviceDriver.java index 7f62feb..bfc8a55 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractOpcDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/AbstractOpcDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.deviceDriver.service.impl; +package org.nl.acs.device.deviceDriver.service.defination.opcDefination; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; @@ -6,13 +6,13 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.deviceDriver.service.driver.base.BaseDeviceDriver; import org.nl.acs.device.deviceExtInfo.service.entity.DeviceExtra; import org.nl.acs.device.deviceExtInfo.service.mapper.DeviceExtraMapper; import org.nl.acs.device.deviceDriver.service.dto.ItemValue; -import org.nl.acs.iot.opc.config.OpcConfig; -import org.nl.acs.iot.opc.service.OpcServerService; +import org.nl.acs.iot.opc.opcOperator.config.OpcConfig; +import org.nl.acs.iot.opc.opcOperator.service.OpcServerService; import org.nl.acs.iot.opc.opc.service.dto.OpcItemDto; -import org.nl.acs.iot.opc.service.impl.OpcServerServiceImpl; import org.nl.acs.iot.udw.UnifiedDataAccessor; import org.nl.acs.iot.udw.UnifiedDataAccessorFactory; import org.nl.acs.iot.udw.UnifiedDataAppService; @@ -248,7 +248,7 @@ public abstract class AbstractOpcDeviceDriver extends BaseDeviceDriver { this.last_items = this_items; this.sendTime = date; - OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerServiceImpl.class); + OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService.class); opcServerService.writeIntegerByNewConn(this.getOpcServer(), itemValues); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/ItemProtocolP.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/ItemProtocolP.java similarity index 79% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/ItemProtocolP.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/ItemProtocolP.java index 2782d0f..f544ecf 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/ItemProtocolP.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/ItemProtocolP.java @@ -1,6 +1,4 @@ -package org.nl.acs.device.deviceDriver.service.impl.opcDefination; - -import org.nl.acs.device.deviceDriver.service.impl.AbstractOpcDeviceDriver; +package org.nl.acs.device.deviceDriver.service.defination.opcDefination; import java.util.HashMap; import java.util.Map; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/OpcDeviceDriverDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/OpcDeviceDriverDefination.java similarity index 72% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/OpcDeviceDriverDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/OpcDeviceDriverDefination.java index 0e4d8f6..d186918 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/OpcDeviceDriverDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/OpcDeviceDriverDefination.java @@ -1,7 +1,7 @@ -package org.nl.acs.device.deviceDriver.service.impl.opcDefination; +package org.nl.acs.device.deviceDriver.service.defination.opcDefination; import org.nl.acs.device.deviceDriver.service.dto.ItemDto; -import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/ItemProtocol.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/ItemProtocol.java similarity index 90% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/ItemProtocol.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/ItemProtocol.java index f181d55..323174c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/ItemProtocol.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/ItemProtocol.java @@ -1,9 +1,9 @@ -package org.nl.acs.device.deviceDriver.service.impl.opcDefination.standardInspectSite; +package org.nl.acs.device.deviceDriver.service.defination.opcDefination.standardInspectSite; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.deviceDriver.service.defination.opcDefination.ItemProtocolP; import org.nl.acs.device.deviceDriver.service.dto.ItemDto; -import org.nl.acs.device.deviceDriver.service.impl.opcDefination.ItemProtocolP; import java.util.ArrayList; import java.util.List; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/StandardInspectSiteDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDefination.java similarity index 80% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/StandardInspectSiteDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDefination.java index 91ffdde..9be3ec8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/StandardInspectSiteDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device.deviceDriver.service.impl.opcDefination.standardInspectSite; +package org.nl.acs.device.deviceDriver.service.defination.opcDefination.standardInspectSite; import org.nl.acs.device.device.service.entity.Device; +import org.nl.acs.device.deviceDriver.service.defination.opcDefination.OpcDeviceDriverDefination; import org.nl.acs.device.deviceDriver.service.dto.ItemDto; import org.nl.acs.device.device.service.enums.DeviceType; -import org.nl.acs.device.deviceDriver.service.DeviceDriver; -import org.nl.acs.device.deviceDriver.service.impl.opcDefination.OpcDeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; import org.springframework.stereotype.Service; import java.util.LinkedList; @@ -33,7 +33,7 @@ public class StandardInspectSiteDefination extends OpcDeviceDriverDefination { @Override public DeviceDriver getDriverInstance(Device device) { - return (new StandardInspectSiteDeviceDriver()).setDevice(device).setDriverDefination(this); + return new StandardInspectSiteDeviceDriver().init(device,this); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java similarity index 98% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java index 2d85e15..5512cd4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/opcDefination/standardInspectSite/StandardInspectSiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.deviceDriver.service.impl.opcDefination.standardInspectSite; +package org.nl.acs.device.deviceDriver.service.defination.opcDefination.standardInspectSite; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -9,10 +9,10 @@ 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.impl.AbstractOpcDeviceDriver; +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; -import org.nl.acs.iot.opc.service.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.task.history.ErrorUtil; import org.nl.acs.task.instruction.domain.Instruction; import org.nl.acs.task.instruction.service.InstructionService; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/AbstractStandardDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/AbstractStandardDeviceDriver.java new file mode 100644 index 0000000..ae58308 --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/AbstractStandardDeviceDriver.java @@ -0,0 +1,9 @@ +package org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination; + +import lombok.Data; +import org.nl.acs.device.deviceDriver.service.driver.base.BaseDeviceDriver; + +@Data +public abstract class AbstractStandardDeviceDriver extends BaseDeviceDriver { + +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java similarity index 82% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java index 3990098..0a0dbf9 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device.deviceDriver.service.impl.ordinaryDefination.standardOrdinarySite; +package org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.standardOrdinarySite; import org.nl.acs.device.device.service.entity.Device; import org.nl.acs.device.device.service.enums.DeviceType; -import org.nl.acs.device.deviceDriver.service.DeviceDriver; -import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java index d607e66..2f2ec89 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/defination/ordinaryDefination/standardOrdinarySite/StandardOrdinarySiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.deviceDriver.service.impl.ordinaryDefination.standardOrdinarySite; +package org.nl.acs.device.deviceDriver.service.defination.ordinaryDefination.standardOrdinarySite; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -9,10 +9,10 @@ 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.impl.AbstractStandardDeviceDriver; +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; -import org.nl.acs.iot.opc.service.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.task.instruction.domain.Instruction; import org.nl.acs.task.instruction.service.InstructionService; import org.nl.acs.task.task.service.TaskService; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/DeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/DeviceDriver.java similarity index 87% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/DeviceDriver.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/DeviceDriver.java index 476d471..d09efd8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/DeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/DeviceDriver.java @@ -1,6 +1,7 @@ -package org.nl.acs.device.deviceDriver.service; +package org.nl.acs.device.deviceDriver.service.driver; import org.nl.acs.device.device.service.entity.Device; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; import java.util.Map; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/base/BaseDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/base/BaseDeviceDriver.java new file mode 100644 index 0000000..2c4ee68 --- /dev/null +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/base/BaseDeviceDriver.java @@ -0,0 +1,9 @@ +package org.nl.acs.device.deviceDriver.service.driver.base; + +import org.nl.acs.device.deviceDriver.service.driver.DeviceDriver; +import org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件.DeviceStageMonitorPlugin; +import org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件.DriverExecutePlugin; + +public abstract class +BaseDeviceDriver extends DeviceDriver implements DeviceStageMonitorPlugin, DriverExecutePlugin { +} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/设备驱动执行插件/DeviceStageMonitorPlugin.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/设备驱动执行插件/DeviceStageMonitorPlugin.java similarity index 85% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/设备驱动执行插件/DeviceStageMonitorPlugin.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/设备驱动执行插件/DeviceStageMonitorPlugin.java index 4d4c3c4..f0009c8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/设备驱动执行插件/DeviceStageMonitorPlugin.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/设备驱动执行插件/DeviceStageMonitorPlugin.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.deviceDriver.service.设备驱动执行插件; +package org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件; import com.alibaba.fastjson.JSONObject; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/设备驱动执行插件/DriverExecutePlugin.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/设备驱动执行插件/DriverExecutePlugin.java similarity index 83% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/设备驱动执行插件/DriverExecutePlugin.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/设备驱动执行插件/DriverExecutePlugin.java index c229bda..44074f5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/设备驱动执行插件/DriverExecutePlugin.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/driver/设备驱动执行插件/DriverExecutePlugin.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.deviceDriver.service.设备驱动执行插件; +package org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件; public interface DriverExecutePlugin { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractStandardDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractStandardDeviceDriver.java deleted file mode 100644 index cefe25a..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/AbstractStandardDeviceDriver.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.nl.acs.device.deviceDriver.service.impl; - -import lombok.Data; - -@Data -public abstract class AbstractStandardDeviceDriver extends BaseDeviceDriver { - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/BaseDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/BaseDeviceDriver.java deleted file mode 100644 index 4d9be29..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceDriver/service/impl/BaseDeviceDriver.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.nl.acs.device.deviceDriver.service.impl; - -import org.nl.acs.device.deviceDriver.service.DeviceDriver; -import org.nl.acs.device.deviceDriver.service.设备驱动执行插件.DeviceStageMonitorPlugin; -import org.nl.acs.device.deviceDriver.service.设备驱动执行插件.DriverExecutePlugin; - -public abstract class BaseDeviceDriver extends DeviceDriver implements DeviceStageMonitorPlugin, DriverExecutePlugin { -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceExtInfo/service/impl/DeviceExtraServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceExtInfo/service/impl/DeviceExtraServiceImpl.java index 43071c3..a3127f7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceExtInfo/service/impl/DeviceExtraServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceExtInfo/service/impl/DeviceExtraServiceImpl.java @@ -18,7 +18,7 @@ import org.nl.common.db.impl.CommonServiceImpl; import org.nl.acs.device.deviceExtInfo.service.dto.DeviceExtraDto; import org.nl.acs.device.deviceExtInfo.service.dto.DeviceExtraQueryParam; import org.nl.common.utils.ConvertUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceProtocol/service/impl/DeviceProtocolServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceProtocol/service/impl/DeviceProtocolServiceImpl.java index bf3a874..c04e066 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceProtocol/service/impl/DeviceProtocolServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/deviceProtocol/service/impl/DeviceProtocolServiceImpl.java @@ -12,7 +12,6 @@ import org.nl.acs.device.deviceExtInfo.service.entity.DeviceExtra; import org.nl.acs.device.deviceProtocol.service.DeviceProtocolService; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.*; -import org.nl.common.utils.utils.PageUtil; import org.nl.config.language.LangProcess; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storageMgt/service/impl/StorageCellServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storageMgt/service/impl/StorageCellServiceImpl.java index e26b722..65d702c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storageMgt/service/impl/StorageCellServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/storageMgt/service/impl/StorageCellServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import org.nl.ApplicationAutoInitial; +import org.nl.init.ApplicationAutoInitial; import org.nl.common.db.PageInfo; import org.nl.common.db.QueryHelpMybatisPlus; import org.nl.common.db.impl.CommonServiceImpl; @@ -18,7 +18,7 @@ import org.nl.acs.device.storageMgt.service.mapper.StorageCellMapper; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.acs.device.storageMgt.service.StorageCellService; import org.nl.acs.device.storageMgt.service.dto.StorageCellDto; import org.nl.acs.device.storageMgt.service.dto.StorageCellQueryParam; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcOperator.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/OpcOperator.java similarity index 99% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcOperator.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/OpcOperator.java index fb15658..e6c372b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/OpcOperator.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/OpcOperator.java @@ -1,4 +1,4 @@ -package org.nl.acs.iot.opc; +package org.nl.acs.iot.opc.opcOperator; import cn.hutool.core.util.NumberUtil; import lombok.extern.slf4j.Slf4j; @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import org.jinterop.dcom.common.JIException; import org.jinterop.dcom.core.*; import org.nl.acs.device.deviceDriver.service.dto.ItemValue; -import org.nl.acs.iot.opc.service.dto.QualityTypeValue; +import org.nl.acs.iot.opc.opcOperator.config.QualityTypeValue; import org.nl.common.exception.BadRequestException; import org.nl.config.MapOf; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/config/OpcConfig.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/config/OpcConfig.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/config/OpcConfig.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/config/OpcConfig.java index be16efe..207e02d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/config/OpcConfig.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/config/OpcConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.iot.opc.config; +package org.nl.acs.iot.opc.opcOperator.config; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/QualityTypeValue.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/config/QualityTypeValue.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/QualityTypeValue.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/config/QualityTypeValue.java index 29fce2a..45653b5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/QualityTypeValue.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/config/QualityTypeValue.java @@ -1,4 +1,4 @@ -package org.nl.acs.iot.opc.service.dto; +package org.nl.acs.iot.opc.opcOperator.config; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/OpcServerServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/service/OpcServerService.java similarity index 91% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/OpcServerServiceImpl.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/service/OpcServerService.java index 21fb89b..3af7253 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/impl/OpcServerServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/service/OpcServerService.java @@ -1,15 +1,14 @@ -package org.nl.acs.iot.opc.service.impl; +package org.nl.acs.iot.opc.opcOperator.service; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.jinterop.dcom.common.JIException; -import org.nl.ApplicationAutoInitial; +import org.nl.acs.iot.opc.opcOperator.OpcOperator; +import org.nl.init.ApplicationAutoInitial; import org.nl.acs.device.deviceDriver.service.dto.ItemValue; -import org.nl.acs.iot.opc.service.OpcServerService; -import org.nl.acs.iot.opc.OpcOperator; -import org.nl.acs.iot.opc.config.OpcConfig; -import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; +import org.nl.acs.iot.opc.opcOperator.config.OpcConfig; +import org.nl.acs.iot.opc.opcOperator.service.dto.OpcServerManageDto; import org.nl.acs.iot.opc.opc.service.mapper.OpcMapper; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.ThreadUtl; @@ -33,7 +32,7 @@ import java.util.*; */ @Service @Slf4j -public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoInitial { +public class OpcServerService implements ApplicationAutoInitial { @Autowired private OpcMapper opcMapper; @@ -42,7 +41,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn Map servers = Collections.synchronizedMap(new HashMap()); Map groups = Collections.synchronizedMap(new HashMap()); - public OpcServerServiceImpl() { + public OpcServerService() { } /** @@ -50,22 +49,22 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn * * @throws Exception */ - @Override + public void autoInitial() throws Exception { this.reload(); // 加载opc服务 if (OpcConfig.auto_start_opc) { Thread t = new Thread(() -> { - Iterator var1 = OpcServerServiceImpl.this.opcServerManageDtos.values().iterator(); + Iterator var1 = OpcServerService.this.opcServerManageDtos.values().iterator(); while (var1.hasNext()) { OpcServerManageDto dto = (OpcServerManageDto) var1.next(); try { - OpcServerServiceImpl.this.getServer(dto.getOpc_code()); - OpcServerServiceImpl.log.info("加载opc server {}", dto.getOpc_code()); + OpcServerService.this.getServer(dto.getOpc_code()); + OpcServerService.log.info("加载opc server {}", dto.getOpc_code()); } catch (Exception var4) { - OpcServerServiceImpl.log.warn("启动无法载入servers", var4); + OpcServerService.log.warn("启动无法载入servers", var4); } } }); @@ -73,13 +72,13 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn } } - @Override + public synchronized void reload() { this.opcServerManageDtos = this.queryAllServerMap(); this.opcServerManageDtos = Collections.synchronizedMap(this.opcServerManageDtos); } - @Override + public synchronized Group getServer(String code) { synchronized (this.buildLock(code)) { Group group = null; @@ -160,7 +159,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn /* /既锁住对象又参数 保持一致 */ - @Override + public synchronized Group getServerByNewConn(String code) { synchronized (this.buildLock(code)) { @@ -201,7 +200,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn } } - @Override + public synchronized void clearServer(String code) { try { Server server = (Server) this.servers.get(code); @@ -234,7 +233,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn } - @Override + public void writeInteger(String code, ItemValue... values) { try { Group group = this.getServer(code); @@ -254,7 +253,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn } } - @Override + public void writeIntegerByNewConn(String code, ItemValue... values) { try { Group group = this.getServerByNewConn(code); @@ -285,7 +284,7 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn return lock; } - @Override + public Map queryAllServerMap() { List opcServers = ConvertUtil.convertList(opcMapper.selectList(new LambdaQueryWrapper<>()), OpcServerManageDto.class); Map result = new HashMap(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcServerManageDto.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/service/dto/OpcServerManageDto.java similarity index 96% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcServerManageDto.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/service/dto/OpcServerManageDto.java index ca33629..8e5f313 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/dto/OpcServerManageDto.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/opcOperator/service/dto/OpcServerManageDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.iot.opc.service.dto; +package org.nl.acs.iot.opc.opcOperator.service.dto; /** * @author 20220102CG\noblelift diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/OpcServerService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/OpcServerService.java deleted file mode 100644 index af9baed..0000000 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/opc/service/OpcServerService.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.nl.acs.iot.opc.service; - -import org.nl.acs.device.deviceDriver.service.dto.ItemValue; -import org.nl.acs.iot.opc.service.dto.OpcServerManageDto; -import org.openscada.opc.lib.da.Group; - -import java.util.Map; - -/** - * @author ldjun - * @version 1.0 - * @date 2023年02月01日 11:26 - * @desc desc - */ -public interface OpcServerService { - - /** - * 重新加载 - */ - void reload(); - - /** - * 获取服务器 - * @param var1 - * @return - */ - Group getServer(String var1); - - /** - * 获取服务器 - * @param var1 - * @return - */ - Group getServerByNewConn(String var1); - - /** - * 写入整数 - * @param var1 - * @param var2 - */ - void writeInteger(String var1, ItemValue... var2); - - /** - * 写入整数 - * @param var1 - * @param var2 - */ - void writeIntegerByNewConn(String var1, ItemValue... var2); - - /** - * 清除服务器 - * @param var1 - */ - void clearServer(String var1); - - void cleanGroups(String var1); - - Map queryAllServerMap(); - -} diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/impl/OpcPlcServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/impl/OpcPlcServiceImpl.java index adc9cb8..d3cd4dd 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/impl/OpcPlcServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/iot/plc/service/impl/OpcPlcServiceImpl.java @@ -13,7 +13,7 @@ import org.nl.acs.iot.opc.opcPlc.service.dto.OpcPlcQueryParam; import org.nl.acs.iot.opc.opcPlc.service.mapper.OpcPlcMapper; import org.nl.acs.iot.plc.service.OpcPlcService; import org.nl.common.utils.ConvertUtil; -import org.nl.common.utils.utils.PageUtil; +import org.nl.common.utils.PageUtil; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/impl/DeviceStageMonitorServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/impl/DeviceStageMonitorServiceImpl.java index 1505b2a..e791b93 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/impl/DeviceStageMonitorServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/layout/device/service/impl/DeviceStageMonitorServiceImpl.java @@ -6,9 +6,9 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.device.service.entity.Device; -import org.nl.acs.device.deviceDriver.service.设备驱动执行插件.DeviceStageMonitorPlugin; +import org.nl.acs.device.deviceDriver.service.driver.设备驱动执行插件.DeviceStageMonitorPlugin; import org.nl.acs.layout.device.service.DeviceStageMonitorService; -import org.nl.acs.iot.opc.service.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.springframework.stereotype.Service; /** diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/impl/DeviceErrorLogServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/impl/DeviceErrorLogServiceImpl.java index ccbfc05..3def7be 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/impl/DeviceErrorLogServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/history/service/impl/DeviceErrorLogServiceImpl.java @@ -18,7 +18,7 @@ import org.nl.acs.task.history.domain.AcsDeviceErrorLog; import org.nl.acs.task.history.service.DeviceErrorLogService; import org.nl.acs.task.history.service.dto.DeviceErrorLogDto; import org.nl.acs.task.history.service.mapper.AcsDeviceErrorLogMapper; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; import org.nl.common.utils.SecurityUtils; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/impl/InstructionServiceImpl.java index 0d2124f..398489a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/instruction/service/impl/InstructionServiceImpl.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.nl.ApplicationAutoInitial; +import org.nl.init.ApplicationAutoInitial; import org.nl.acs.task.instruction.domain.Instruction; import org.nl.acs.task.instruction.domain.InstructionMybatis; import org.nl.acs.task.instruction.enums.InstructionStatusEnum; @@ -27,11 +27,11 @@ import org.nl.acs.device.device.service.entity.Device; 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.DeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; import org.nl.acs.task.instruction.service.dto.InstructionDto; import org.nl.acs.task.instruction.service.dto.InstructionQueryParam; -import org.nl.acs.iot.opc.service.DeviceAppService; -import org.nl.acs.iot.opc.service.impl.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl; import org.nl.acs.task.route.service.RouteLineService; import org.nl.acs.task.route.service.dto.RouteLineDto; import org.nl.acs.task.route.service.impl.RouteLineServiceImpl; @@ -49,7 +49,7 @@ import org.nl.common.db.impl.CommonServiceImpl; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.acs.task.instruction.service.InstructionService; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLineServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLineServiceImpl.java index d2f0e1e..80dbbf3 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLineServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLineServiceImpl.java @@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.AllArgsConstructor; -import org.nl.ApplicationAutoInitial; +import org.nl.init.ApplicationAutoInitial; import org.nl.acs.task.route.domain.RouteLine; import org.nl.acs.task.route.service.RouteLineService; import org.nl.acs.task.route.service.RoutePlanService; @@ -24,8 +24,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.dto.DeviceDto; import org.nl.acs.device.device.service.mapper.DeviceMapper; -import org.nl.acs.device.deviceDriver.RouteableDeviceDriver; -import org.nl.acs.iot.opc.service.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.task.route.service.dto.RoutePlanDto; import org.nl.common.db.PageInfo; import org.nl.common.db.QueryHelpMybatisPlus; @@ -33,7 +32,7 @@ import org.nl.common.db.impl.CommonServiceImpl; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.acs.task.route.service.dto.RouteLineDto; import org.nl.acs.task.route.service.dto.RouteLineQueryParam; import org.nl.common.utils.SecurityUtils; @@ -689,10 +688,6 @@ public class RouteLineServiceImpl extends CommonServiceImpl var2 = this.routeIndex.keySet().iterator(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLocServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLocServiceImpl.java index fa1484a..d9c3b3d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLocServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RouteLocServiceImpl.java @@ -19,7 +19,7 @@ import org.nl.common.db.impl.CommonServiceImpl; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.data.domain.Pageable; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RoutePlanServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RoutePlanServiceImpl.java index 8c0fa74..bec43b1 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RoutePlanServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/route/service/impl/RoutePlanServiceImpl.java @@ -21,7 +21,7 @@ import org.nl.common.db.impl.CommonServiceImpl; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.data.domain.Pageable; 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 b9851f0..82ca942 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 @@ -22,7 +22,7 @@ import org.nl.common.db.impl.CommonServiceImpl; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.beans.factory.annotation.Autowired; 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 83e6302..96a18b1 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 @@ -17,25 +17,23 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.nl.acs.AcsConfig; -import org.nl.ApplicationAutoInitial; +import org.nl.init.ApplicationAutoInitial; import org.nl.acs.task.task.enums.TaskStatusEnum; import org.nl.acs.task.task.service.mapper.TaskMapper; import org.nl.common.db.CommonFinalParam; import org.nl.acs.device.device.service.entity.Device; import org.nl.acs.device.device.service.enums.DeviceType; -import org.nl.acs.device.device.service.DeviceAssignedService; import org.nl.acs.device.device.service.DeviceService; -import org.nl.acs.device.device.service.dto.DeviceAssignedDto; import org.nl.acs.device.device.service.impl.DeviceServiceImpl; -import org.nl.acs.device.deviceDriver.service.DeviceDriverDefination; +import org.nl.acs.device.deviceDriver.service.defination.DeviceDriverDefination; import org.nl.acs.api.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; import org.nl.acs.task.instruction.service.InstructionService; import org.nl.acs.task.instruction.service.dto.InstructionDto; -import org.nl.acs.iot.opc.service.DeviceAppService; -import org.nl.acs.iot.opc.service.impl.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl; import org.nl.acs.task.route.domain.RoutePlan; import org.nl.acs.task.route.service.RouteLineService; import org.nl.acs.task.route.service.dto.RouteLineDto; @@ -49,7 +47,7 @@ import org.nl.acs.task.task.service.dto.TaskIdAndStatusDTO; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.ConvertUtil; import org.nl.common.utils.FileUtil; -import org.nl.common.utils.utils.PageUtil; + import org.nl.common.utils.PageUtil; import org.nl.acs.task.task.domain.Task; import org.nl.acs.task.task.service.TaskService; import org.nl.acs.task.task.service.dto.TaskDto; @@ -97,8 +95,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme private ISysParamService paramService; @Autowired private RouteLineService routeLineService; - @Autowired - private DeviceAssignedService deviceAssignedService; + @Autowired private InstructionService instructionService; @@ -1435,42 +1432,42 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override public String queryAssignedByDevice(String device_code, String task_nextdeice_code) { - List list = - deviceAssignedService.queryAssignedByDevice(device_code, task_nextdeice_code); - int flag1 = 0; - String flag2 = null; - for (int i = 0; i < list.size(); i++) { - DeviceAssignedDto dto = list.get(i); - String inst_nextDevice_code = dto.getInst_nextDevice_code(); - String task_nextDevice_code = dto.getTask_nextDevice_code(); - String param = dto.getParam(); - JSONObject jo = JSON.parseObject(param); - String regEx = "[`~!@#$%^&*()+=|{}':;'\\[\\].<>/?~！@#￥%……&*（）——+|{}【】'：”“’。、？]"; - Pattern p = Pattern.compile(regEx); - Matcher m = p.matcher(inst_nextDevice_code); - String toSpeechText = m.replaceAll("").trim(); - - String[] str = toSpeechText.split(","); - List pathlist = Arrays.asList(str); - for (int j = 0; j < pathlist.size(); j++) { - String this_device_code = pathlist.get(j).toString(); - JSONObject data = JSON.parseObject(jo.getString(this_device_code)); - String limit = data.getString("limit"); - int num = instructionService.querySameDestinationInst(this_device_code); - if (num >= Integer.parseInt(limit)) { - continue; - } - if (j == 0) { - flag1 = num; - } - if (num <= flag1) { - flag2 = this_device_code; - } - } - } - if (!StrUtil.isEmpty(flag2)) { - return flag2; - } +// List list = +// deviceAssignedService.queryAssignedByDevice(device_code, task_nextdeice_code); +// int flag1 = 0; +// String flag2 = null; +// for (int i = 0; i < list.size(); i++) { +// DeviceAssignedDto dto = list.get(i); +// String inst_nextDevice_code = dto.getInst_nextDevice_code(); +// String task_nextDevice_code = dto.getTask_nextDevice_code(); +// String param = dto.getParam(); +// JSONObject jo = JSON.parseObject(param); +// String regEx = "[`~!@#$%^&*()+=|{}':;'\\[\\].<>/?~！@#￥%……&*（）——+|{}【】'：”“’。、？]"; +// Pattern p = Pattern.compile(regEx); +// Matcher m = p.matcher(inst_nextDevice_code); +// String toSpeechText = m.replaceAll("").trim(); +// +// String[] str = toSpeechText.split(","); +// List pathlist = Arrays.asList(str); +// for (int j = 0; j < pathlist.size(); j++) { +// String this_device_code = pathlist.get(j).toString(); +// JSONObject data = JSON.parseObject(jo.getString(this_device_code)); +// String limit = data.getString("limit"); +// int num = instructionService.querySameDestinationInst(this_device_code); +// if (num >= Integer.parseInt(limit)) { +// continue; +// } +// if (j == 0) { +// flag1 = num; +// } +// if (num <= flag1) { +// flag2 = this_device_code; +// } +// } +// } +// if (!StrUtil.isEmpty(flag2)) { +// return flag2; +// } return null; } @@ -1675,39 +1672,39 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override public String queryAssignedByDeviceCode(String device_code, String task_nextDeice_code) { - List list = - deviceAssignedService.queryAssignedByDevice(device_code, task_nextDeice_code); - for (int i = 0; i < list.size(); i++) { - DeviceAssignedDto dto = list.get(i); - String deviceCode = dto.getDevice_code(); - String inst_nextDevice_code = dto.getInst_nextDevice_code(); - JSONObject param = JSON.parseObject(dto.getParam()); - List pathList = this.getPathList(inst_nextDevice_code); - for (int j = 0; j < pathList.size(); j++) { - String inst_next_device_code = pathList.get(j); - String limit = param.getString("limit"); - Boolean inOut = param.getBoolean("inOut"); - if (inOut) { - Device device = deviceAppService.findDeviceByCode(deviceCode); - if (device != null) { - if (StrUtil.equals(device.getDevice_type(), DeviceType.storage.toString())) { - if (instructionService.querySameNextDeviceCodeInstByIn(inst_next_device_code)) { - return inst_next_device_code; - } - } else { - if (instructionService.querySameNextDeviceCodeInstByOut(inst_next_device_code)) { - return inst_next_device_code; - } - } - } - } else { - Integer sameInstNum = instructionService.querySameDestinationInst(inst_next_device_code); - if (sameInstNum < Integer.parseInt(limit)) { - return inst_next_device_code; - } - } - } - } +// List list = +// deviceAssignedService.queryAssignedByDevice(device_code, task_nextDeice_code); +// for (int i = 0; i < list.size(); i++) { +// DeviceAssignedDto dto = list.get(i); +// String deviceCode = dto.getDevice_code(); +// String inst_nextDevice_code = dto.getInst_nextDevice_code(); +// JSONObject param = JSON.parseObject(dto.getParam()); +// List pathList = this.getPathList(inst_nextDevice_code); +// for (int j = 0; j < pathList.size(); j++) { +// String inst_next_device_code = pathList.get(j); +// String limit = param.getString("limit"); +// Boolean inOut = param.getBoolean("inOut"); +// if (inOut) { +// Device device = deviceAppService.findDeviceByCode(deviceCode); +// if (device != null) { +// if (StrUtil.equals(device.getDevice_type(), DeviceType.storage.toString())) { +// if (instructionService.querySameNextDeviceCodeInstByIn(inst_next_device_code)) { +// return inst_next_device_code; +// } +// } else { +// if (instructionService.querySameNextDeviceCodeInstByOut(inst_next_device_code)) { +// return inst_next_device_code; +// } +// } +// } +// } else { +// Integer sameInstNum = instructionService.querySameDestinationInst(inst_next_device_code); +// if (sameInstNum < Integer.parseInt(limit)) { +// return inst_next_device_code; +// } +// } +// } +// } return null; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java index 2949467..871187b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java @@ -15,7 +15,11 @@ */ package org.nl.common.utils; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.metadata.OrderItem; import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -65,6 +69,14 @@ public class PageUtil extends cn.hutool.core.util.PageUtil { return map; } - - + public static IPage toMybatisPage(Pageable pageable) { + com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageable.getPageNumber() + 1, pageable.getPageSize()); + for (Sort.Order order : pageable.getSort()) { + OrderItem orderItem = new OrderItem(); + orderItem.setAsc(order.isAscending()); + orderItem.setColumn(com.baomidou.mybatisplus.core.toolkit.StringUtils.camelToUnderline(order.getProperty())); + page.addOrder(orderItem); + } + return page; + } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ReadUtil.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ReadUtil.java index 5cfc18c..d6cedc0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ReadUtil.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ReadUtil.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp import lombok.extern.slf4j.Slf4j; import org.jinterop.dcom.common.JIException; import org.jinterop.dcom.core.JIVariant; -import org.nl.acs.iot.opc.OpcOperator; +import org.nl.acs.iot.opc.opcOperator.OpcOperator; import org.nl.acs.iot.opc.opc.service.entity.Opc; import org.nl.acs.iot.opc.opc.service.mapper.OpcMapper; import org.nl.common.exception.BadRequestException; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRunInit.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/init/AppRunInit.java similarity index 97% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRunInit.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/init/AppRunInit.java index f0c73ca..13a2725 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/AppRunInit.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/init/AppRunInit.java @@ -1,4 +1,4 @@ -package org.nl; +package org.nl.init; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/ApplicationAutoInitial.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/init/ApplicationAutoInitial.java similarity index 94% rename from acs2/nladmin-system/nlsso-server/src/main/java/org/nl/ApplicationAutoInitial.java rename to acs2/nladmin-system/nlsso-server/src/main/java/org/nl/init/ApplicationAutoInitial.java index 2830af7..0c4efbb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/ApplicationAutoInitial.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/init/ApplicationAutoInitial.java @@ -1,4 +1,4 @@ -package org.nl; +package org.nl.init; /** * Demo class diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java index 2edd708..b016856 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java @@ -11,8 +11,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; -import org.nl.common.utils.utils.PageUtil; import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.PageUtil; import org.nl.common.utils.SecurityUtils; import org.nl.config.MapOf; import org.nl.config.language.LangProcess; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index e32a6ba..a719869 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -9,8 +9,8 @@ import org.nl.common.db.CommonFinalParam; import org.nl.acs.task.instruction.enums.InstructionStatusEnum; import org.nl.acs.task.instruction.service.InstructionService; import org.nl.acs.task.instruction.domain.Instruction; -import org.nl.acs.iot.opc.service.DeviceAppService; -import org.nl.acs.iot.opc.service.impl.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl; import org.nl.acs.task.route.service.RouteLineService; import org.nl.acs.task.route.service.dto.RouteLineDto; import org.nl.acs.task.task.enums.AgvSystemTypeEnum; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java index deb385f..ab63f42 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/trajectory/impl/TrajectoryImpl.java @@ -2,7 +2,7 @@ package org.nl.system.service.trajectory.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.iot.opc.service.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.system.service.trajectory.TrajectoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/log/OpcLog.xml b/acs2/nladmin-system/nlsso-server/src/main/resources/log/OpcLog.xml index 8191918..e5c6379 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/log/OpcLog.xml +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/log/OpcLog.xml @@ -23,7 +23,7 @@ - +