add:更新

nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java

@@ -1,6 +1,6 @@
 package org.nl.acs.address.domain;
 
-import org.nl.acs.common.base.CommonModel;
+import org.nl.acs.common.base.model.CommonModel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java

@@ -1,7 +1,7 @@
 package org.nl.acs.address.service;
 
 import org.nl.acs.common.base.PageInfo;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
 import org.nl.acs.address.domain.Address;
 import org.nl.acs.address.service.dto.AddressDto;
 import org.nl.acs.address.service.dto.AddressQueryParam;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java

@@ -14,7 +14,7 @@ import lombok.AllArgsConstructor;
 import org.nl.acs.common.base.CommonFinalParam;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
 import org.nl.common.exception.BadRequestException;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.common.utils.SecurityUtils;
@@ -27,8 +27,6 @@ import org.nl.acs.address.service.dto.AddressQueryParam;
 import org.nl.acs.address.service.mapper.AddressMapper;
 import org.nl.config.language.LangProcess;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/mapper/AddressMapper.java

@@ -1,6 +1,6 @@
 package org.nl.acs.address.service.mapper;
 
-import org.nl.acs.common.base.CommonMapper;
+import org.nl.acs.common.base.mapper.CommonMapper;
 import org.nl.acs.address.domain.Address;
 import org.springframework.stereotype.Repository;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java

@@ -3,12 +3,12 @@ package org.nl.acs.agv;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device.driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java

@@ -1,14 +1,9 @@
 package org.nl.acs.agv;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.AcsConfig;
 import org.nl.acs.instruction.domain.Instruction;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java

@@ -5,7 +5,6 @@ import groovy.lang.Lazy;
 import org.nl.acs.agv.server.XianGongAgvService;
 import org.nl.common.logging.annotation.Log;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java

@@ -8,12 +8,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.AgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
-import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
-import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device.device.enums.DeviceType;
 import org.nl.acs.task.service.TaskService;
 import org.nl.common.exception.BadRequestException;
 import org.nl.system.service.param.ISysParamService;
@@ -67,7 +66,7 @@ public class AgvServiceImpl implements AgvService {
         int type = Integer.parseInt(paramService.findByCode(AcsConfig.BUSINESSTYPE).getValue());
         switch (type) {
             case 4:
-                acsToWmsService.applyOpenOrCloseDoor(device_code, param);
+                //acsToWmsService.applyOpenOrCloseDoor(device_code, param);
                 break;
             default:
                 break;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java

@@ -13,16 +13,16 @@ import org.nl.acs.agv.AgvUtil;
 import org.nl.acs.agv.server.MagicAgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
 import org.nl.acs.common.base.CommonFinalParam;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device.driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
-import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
+import org.nl.acs.device.driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
-import org.nl.acs.device_driver.storage.standard_storage.StandardStorageDeviceDriver;
+import org.nl.acs.device.driver.storage.standard_storage.StandardStorageDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
-import org.nl.acs.opc.DeviceAppServiceImpl;
+import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl;
-import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device.device.enums.DeviceType;
 import org.nl.common.exception.BadRequestException;
 import org.nl.config.language.LangProcess;
 import org.nl.system.service.param.ISysParamService;
@@ -796,7 +796,8 @@ public class MagicAgvServiceImpl implements MagicAgvService {
         switch (type) {
             case 4:
                 if (StrUtil.equals(paramService.findByCode(AcsConfig.HASOTHERSYSTEM).getValue(), CommonFinalParam.ONE)) {
-                    String result = acsToWmsService.queryDoorsStatus().body();
+                   // String result = acsToWmsService.queryDoorsStatus().body();
+                    String result = null;
                     JSONArray ja = JSONArray.parseArray(result);
                     log.info("AGV查询自动门状态,反馈：{}", ja.toString());
                     return ja.toString();

nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java

@@ -6,16 +6,15 @@ import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.NDCAgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
-import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun;
 import org.nl.acs.auto.run.TwoNDCSocketConnectionAutoRun;
 import org.nl.acs.common.base.CommonFinalParam;
-import org.nl.acs.device.service.DeviceService;
+import org.nl.acs.device.device.service.DeviceService;
-import org.nl.acs.device.service.impl.DeviceServiceImpl;
+import org.nl.acs.device.device.service.impl.DeviceServiceImpl;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.log.service.DeviceExecuteLogService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
-import org.nl.acs.opc.DeviceAppServiceImpl;
+import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.common.utils.CodeUtil;
 import org.nl.config.SpringContextHolder;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

@@ -14,15 +14,14 @@ import org.nl.acs.agv.AgvUtil;
 import org.nl.acs.agv.AgvWaitUtil;
 import org.nl.acs.agv.server.XianGongAgvService;
 import org.nl.acs.agv.server.dto.AgvDto;
-import org.nl.acs.angle.domain.AcsPointAngle;
 import org.nl.acs.angle.service.IAcsPointAngleService;
 import org.nl.acs.common.base.CommonFinalParam;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
-import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device.device.enums.DeviceType;
 import org.nl.common.exception.BadRequestException;
 import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
@@ -32,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -656,7 +654,8 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
         switch (type) {
             case 4:
                 if (StrUtil.equals(paramService.findByCode(AcsConfig.HASOTHERSYSTEM).getValue(), CommonFinalParam.ONE)) {
-                    String result = acsToWmsService.queryDoorsStatus().body();
+                    //String result = acsToWmsService.queryDoorsStatus().body();
+                    String result = null;
                     JSONArray ja = JSONArray.parseArray(result);
                     log.info("AGV查询自动门状态,反馈：{}", ja.toString());
                     return ja.toString();

nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java

@@ -11,13 +11,13 @@ import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.AgvUtil;
 import org.nl.acs.agv.server.ZheDaAgvService;
 import org.nl.acs.common.base.CommonFinalParam;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
 
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
-import org.nl.acs.opc.DeviceAppServiceImpl;
+import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.system.service.param.ISysParamService;
@@ -223,7 +223,8 @@ public class ZheDaAgvServiceImpl implements ZheDaAgvService {
 //
 //                }
 
-                String resp = acsToWmsService.requestTaskAgain(address, task.getExt_task_id(), inst.getVehicle_code());
+                //String resp = acsToWmsService.requestTaskAgain(address, task.getExt_task_id(), inst.getVehicle_code());
+                String resp = null;
                 JSONObject respjson = JSONObject.parseObject(resp);
 
                 if (StrUtil.equals(inst.getInstruction_type(), THREE)) {

nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java

@@ -1,24 +1,19 @@
 package org.nl.acs.angle.service.impl;
 
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 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.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import org.nl.acs.angle.domain.AcsPointAngle;
 import org.nl.acs.angle.mapper.AcsPointAngleMapper;
 import org.nl.acs.angle.service.IAcsPointAngleService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.acs.device.domain.Device;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.acs.utils.PageUtil;
 import org.nl.common.exception.BadRequestException;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java

@@ -6,7 +6,6 @@ import org.nl.acs.auto.initial.ApplicationAutoInitialExecuter;
 import org.nl.acs.auto.initial.WebAutoInitialExecuter;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java

@@ -1,6 +1,8 @@
 package org.nl.acs.auto.run;
 
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.auto.run.enums.ThreadStatusEnum;
+import org.nl.acs.auto.run.enums.ThreadUsedStatusEnum;
 
 import java.util.Date;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/BlockedRunable.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/BlockedRunable.java

@@ -1,4 +1,4 @@
-package org.nl.acs.opc;
+package org.nl.acs.auto.run;
 
 import java.util.Date;
 import java.util.HashMap;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DeviceExecuteAutoRun.java

@@ -1,8 +1,9 @@
-package org.nl.acs.opc;
+package org.nl.acs.auto.run;
 
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.auto.run.AbstractAutoRunnable;
+import org.nl.acs.device.driver.ExecutableDeviceDriver;
-import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.device.device.service.DeviceAppService;
+import org.nl.acs.opc.opc.OpcStartTag;
 import org.nl.config.thread.TheadFactoryName;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -80,7 +81,7 @@ public class DeviceExecuteAutoRun extends AbstractAutoRunnable {
         for (int i = 0; !OpcStartTag.is_run; ++i) {
             log.info("设备执行线程等待opc同步线程...");
             Thread.sleep(1000L);
-            if (i > 60) {
+            if (i > 20) {
                 log.info("设备执行线程放弃等待opc同步线程...");
                 break;
             }

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@@ -4,10 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.NDCAgvService;
+import org.nl.acs.auto.run.service.AutoRunService;
 import org.nl.acs.common.base.CommonFinalParam;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device.service.DeviceService;
+import org.nl.acs.device.device.service.DeviceService;
-import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver;
+import org.nl.acs.device.driver.agv.ndcone.AgvNdcOneDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.instruction.domain.Instruction;
@@ -15,7 +16,7 @@ import org.nl.acs.instruction.enums.InstructionStatusEnum;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.impl.InstructionServiceImpl;
 import org.nl.acs.log.service.DeviceExecuteLogService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java

@@ -5,18 +5,19 @@ import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.NDCAgvService;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.auto.run.service.AutoRunService;
-import org.nl.acs.device.service.DeviceService;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver;
+import org.nl.acs.device.device.service.DeviceService;
-import org.nl.acs.device_driver.agv.ndctwo.AgvNdcTwoDeviceDriver;
+import org.nl.acs.device.driver.agv.ndcone.AgvNdcOneDeviceDriver;
-import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver;
+import org.nl.acs.device.driver.agv.ndctwo.AgvNdcTwoDeviceDriver;
+import org.nl.acs.device.driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.impl.InstructionServiceImpl;
 import org.nl.acs.log.service.DeviceExecuteLogService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.system.service.param.ISysParamService;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/config/DevelopConfig.java

@@ -1,4 +1,4 @@
-package org.nl.acs.auto.run;
+package org.nl.acs.auto.run.config;
 
 import java.util.ArrayList;
 import java.util.List;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/config/SystemConfig.java

@@ -1,6 +1,4 @@
-package org.nl.acs.auto.run;
+package org.nl.acs.auto.run.config;
-
-import org.nl.acs.common.base.CommonFinalParam;
 
 /**
  * Demo class

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/controller/AutoRunController.java

@@ -1,10 +1,10 @@
-package org.nl.acs.auto;
+package org.nl.acs.auto.run.controller;
 
 
 
 import lombok.RequiredArgsConstructor;
-import org.nl.acs.auto.run.AutoRunService;
+import org.nl.acs.auto.run.service.AutoRunService;
-import org.nl.acs.auto.run.ThreadDto;
+import org.nl.acs.auto.run.service.dto.ThreadDto;
 import org.nl.acs.utils.PageUtil;
 import org.nl.common.logging.annotation.Log;
 import org.springframework.beans.factory.annotation.Autowired;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/enums/ThreadStatusEnum.java

@@ -1,4 +1,4 @@
-package org.nl.acs.auto.run;
+package org.nl.acs.auto.run.enums;
 /**
  * Demo class
  *

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/enums/ThreadUsedStatusEnum.java

@@ -1,4 +1,4 @@
-package org.nl.acs.auto.run;
+package org.nl.acs.auto.run.enums;
 /**
  * Demo class
  *

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/AutoRunService.java

@@ -1,4 +1,6 @@
-package org.nl.acs.auto.run;
+package org.nl.acs.auto.run.service;
+
+import org.nl.acs.auto.run.service.dto.ThreadDto;
 
 import java.util.List;
 import java.util.Map;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/dto/ThreadDto.java

@@ -1,4 +1,7 @@
-package org.nl.acs.auto.run;
+package org.nl.acs.auto.run.service.dto;
+
+import org.nl.acs.auto.run.enums.ThreadStatusEnum;
+import org.nl.acs.auto.run.enums.ThreadUsedStatusEnum;
 
 import java.util.Date;
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/impl/AutoRunServiceImpl.java

@@ -1,12 +1,17 @@
-package org.nl.acs.auto.run;
+package org.nl.acs.auto.run.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Lang;
 import org.nl.acs.auto.initial.ApplicationAutoInitial;
+import org.nl.acs.auto.run.*;
+import org.nl.acs.auto.run.config.DevelopConfig;
+import org.nl.acs.auto.run.config.SystemConfig;
+import org.nl.acs.auto.run.enums.ThreadUsedStatusEnum;
+import org.nl.acs.auto.run.service.AutoRunService;
+import org.nl.acs.auto.run.service.dto.ThreadDto;
 import org.nl.common.exception.BadRequestException;
 
 import org.nl.config.language.LangProcess;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java

@@ -1,7 +1,5 @@
 package org.nl.acs.common.base;
 
-import com.alibaba.fastjson.JSONObject;
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.experimental.Accessors;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonMapper.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/mapper/CommonMapper.java

@@ -1,6 +1,5 @@
-package org.nl.acs.common.base;
+package org.nl.acs.common.base.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
@@ -8,7 +7,6 @@ import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWra
 import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.toolkit.ChainWrappers;
 import org.apache.ibatis.annotations.Mapper;
-import org.nl.acs.instruction.domain.Instruction;
 
 /**
  * 公共抽象Mapper接口类

nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonModel.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/model/CommonModel.java

@@ -1,4 +1,4 @@
-package org.nl.acs.common.base;
+package org.nl.acs.common.base.model;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/service/CommonService.java

@@ -1,4 +1,4 @@
-package org.nl.acs.common.base;
+package org.nl.acs.common.base.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/impl/CommonServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/service/impl/CommonServiceImpl.java

@@ -1,8 +1,8 @@
-package org.nl.acs.common.base.impl;
+package org.nl.acs.common.base.service.impl;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
 
 /**
  * 公共抽象service实现类

nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/DequeDefaultDeviceStrategy.java

@@ -2,7 +2,6 @@ package org.nl.acs.custompolicy;
 
 import org.nl.acs.instruction.domain.Instruction;
 import org.nl.acs.instruction.service.InstructionService;
-import org.nl.acs.instruction.service.SortUtlEx;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java

@@ -1,6 +1,6 @@
 package org.nl.acs.custompolicy.server;
 
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.custompolicy.domain.CustomPolicy;
 import org.nl.acs.custompolicy.server.dto.CustomPolicyDTO;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java

@@ -10,7 +10,7 @@ import jodd.util.StringUtil;
 import lombok.AllArgsConstructor;
 import org.nl.acs.auto.initial.ApplicationAutoInitial;
 import org.nl.acs.common.base.PageInfo;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
 import org.nl.acs.custompolicy.DeviceStrategy;
 import org.nl.acs.custompolicy.domain.CustomPolicy;
 import org.nl.acs.custompolicy.server.CustomPolicyService;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/mapper/CustomPolicyMapper.java

@@ -1,10 +1,8 @@
 package org.nl.acs.custompolicy.server.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.nl.acs.address.domain.Address;
+import org.nl.acs.common.base.mapper.CommonMapper;
-import org.nl.acs.common.base.CommonMapper;
 import org.nl.acs.custompolicy.domain.CustomPolicy;
-import org.nl.acs.custompolicy.server.dto.CustomPolicyDTO;
 import org.springframework.stereotype.Repository;
 
 import java.util.Set;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Device.java

@@ -1,8 +1,8 @@
-package org.nl.acs.device.domain;
+package org.nl.acs.device.device.domain;
 
-import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device.driver.DeviceDriver;
-import org.nl.acs.device_driver.DeviceDriverDefination;
+import org.nl.acs.device.driver.DeviceDriverDefination;
-import org.nl.acs.opc.DeviceExtraManageDto;
+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;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceAssigned.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.domain;
+package org.nl.acs.device.device.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.*;
 
 import lombok.*;
 import lombok.experimental.Accessors;
-import org.nl.acs.common.base.CommonModel;
+import org.nl.acs.common.base.model.CommonModel;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceDbitem.java

@@ -1,6 +1,6 @@
-package org.nl.acs.device.domain;
+package org.nl.acs.device.device.domain;
 
-import org.nl.acs.common.base.CommonModel;
+import org.nl.acs.common.base.model.CommonModel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceErpmapping.java

@@ -1,6 +1,6 @@
-package org.nl.acs.device.domain;
+package org.nl.acs.device.device.domain;
 
-import org.nl.acs.common.base.CommonModel;
+import org.nl.acs.common.base.model.CommonModel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.IdType;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceExtra.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.domain;
+package org.nl.acs.device.device.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.annotation.*;
 
 import lombok.*;
 import lombok.experimental.Accessors;
-import org.nl.acs.common.base.CommonModel;
+import org.nl.acs.common.base.model.CommonModel;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceMybatis.java

@@ -1,6 +1,6 @@
-package org.nl.acs.device.domain;
+package org.nl.acs.device.device.domain;
 
-import org.nl.acs.common.base.CommonModel;
+import org.nl.acs.common.base.model.CommonModel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceRunpoint.java

@@ -1,6 +1,6 @@
-package org.nl.acs.device.domain;
+package org.nl.acs.device.device.domain;
 
-import org.nl.acs.common.base.CommonModel;
+import org.nl.acs.common.base.model.CommonModel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Deviceisonline.java

@@ -1,6 +1,6 @@
-package org.nl.acs.device.domain;
+package org.nl.acs.device.device.domain;
 
-import org.nl.acs.common.base.CommonModel;
+import org.nl.acs.common.base.model.CommonModel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/DeviceType.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.enums;
+package org.nl.acs.device.device.enums;
 
 import cn.hutool.core.util.StrUtil;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/ErrorType.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/ErrorType.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.enums;
+package org.nl.acs.device.device.enums;
 
 public enum ErrorType {
     //

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceAssignedController.java

@@ -1,9 +1,9 @@
-package org.nl.acs.device.rest;
+package org.nl.acs.device.device.rest;
 
 
 import lombok.RequiredArgsConstructor;
-import org.nl.acs.device.service.DeviceAssignedService;
+import org.nl.acs.device.device.service.DeviceAssignedService;
-import org.nl.acs.device.service.dto.DeviceAssignedQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceAssignedQueryParam;
 import org.nl.common.logging.annotation.Log;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceController.java

@@ -1,11 +1,13 @@
-package org.nl.acs.device.rest;
+package org.nl.acs.device.device.rest;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
-import org.nl.acs.device.service.DeviceService;
+import org.nl.acs.device.device.service.DeviceService;
-import org.nl.acs.device.service.dto.DeviceDto;
+import org.nl.acs.device.device.service.dto.DeviceDto;
+import org.nl.acs.device.driver.stacker.double_stacker.enums.StrategyEnum;
 import org.nl.common.logging.annotation.Log;
+import org.nl.config.MapOf;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,7 +19,11 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author jiaolm
@@ -55,6 +61,12 @@ public class DeviceController {
         deviceService.downDeviceDBloadCSV(deviceService.queryDeviceProtocol(whereJson), response);
     }
 
+    @Log("导出设备协议")
+    @GetMapping(value = "/protocol/downloadCSVUA")
+    public void downDeviceDBloadCSVUA(HttpServletResponse response, @RequestParam Map whereJson) throws IOException {
+        deviceService.downDeviceDBloadCSVUA(deviceService.queryDeviceProtocol(whereJson), response);
+    }
+
     @PostMapping
     @Log("新增设备")
     public ResponseEntity<Object> create(@Validated @RequestBody DeviceDto dto) {
@@ -281,4 +293,18 @@ public class DeviceController {
     public void templateDriver(HttpServletResponse response) throws IOException {
         deviceService.templateDriver(response);
     }
+
+    @GetMapping({"/getStrategy"})
+    @Log("根据驱动编码获取db信息")
+    public ResponseEntity<Object> getStrategy() {
+        List<Map<String, Object>> list = Stream.of(StrategyEnum.values())
+                .map(strategy -> {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("value", strategy.getValue());
+                    map.put("label", strategy.getLabel());
+                    return map;
+                })
+                .collect(Collectors.toList());
+        return new ResponseEntity(list, HttpStatus.OK);
+    }
 }

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceDbitemController.java

@@ -1,9 +1,9 @@
-package org.nl.acs.device.rest;
+package org.nl.acs.device.device.rest;
 
 import org.nl.common.logging.annotation.Log;
-import org.nl.acs.device.service.DeviceDbitemService;
+import org.nl.acs.device.device.service.DeviceDbitemService;
-import org.nl.acs.device.service.dto.DeviceDbitemDto;
+import org.nl.acs.device.device.service.dto.DeviceDbitemDto;
-import org.nl.acs.device.service.dto.DeviceDbitemQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceErpmappingController.java

@@ -1,8 +1,8 @@
-package org.nl.acs.device.rest;
+package org.nl.acs.device.device.rest;
 
 import org.nl.common.logging.annotation.Log;
-import org.nl.acs.device.service.DeviceErpmappingService;
+import org.nl.acs.device.device.service.DeviceErpmappingService;
-import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto;
+import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceExtraController.java

@@ -1,11 +1,11 @@
-package org.nl.acs.device.rest;
+package org.nl.acs.device.device.rest;
 
 
 
 import lombok.RequiredArgsConstructor;
-import org.nl.acs.device.service.DeviceExtraService;
+import org.nl.acs.device.device.service.DeviceExtraService;
-import org.nl.acs.device.service.dto.DeviceExtraDto;
+import org.nl.acs.device.device.service.dto.DeviceExtraDto;
-import org.nl.acs.device.service.dto.DeviceExtraQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceExtraQueryParam;
 import org.nl.common.logging.annotation.Log;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceRunpointController.java

@@ -1,9 +1,9 @@
-package org.nl.acs.device.rest;
+package org.nl.acs.device.device.rest;
 
 import org.nl.common.logging.annotation.Log;
-import org.nl.acs.device.service.DeviceRunpointService;
+import org.nl.acs.device.device.service.DeviceRunpointService;
-import org.nl.acs.device.service.dto.DeviceRunpointDto;
+import org.nl.acs.device.device.service.dto.DeviceRunpointDto;
-import org.nl.acs.device.service.dto.DeviceRunpointQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceisonlineController.java

@@ -1,9 +1,9 @@
-package org.nl.acs.device.rest;
+package org.nl.acs.device.device.rest;
 
 import org.nl.common.logging.annotation.Log;
-import org.nl.acs.device.service.DeviceisonlineService;
+import org.nl.acs.device.device.service.DeviceisonlineService;
-import org.nl.acs.device.service.dto.DeviceisonlineDto;
+import org.nl.acs.device.device.service.dto.DeviceisonlineDto;
-import org.nl.acs.device.service.dto.DeviceisonlineQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam;
 import org.springframework.data.domain.Pageable;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAppService.java

@@ -1,9 +1,10 @@
-package org.nl.acs.opc;
+package org.nl.acs.device.device.service;
 
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device.device.enums.DeviceType;
-import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device.driver.DeviceDriver;
-import org.nl.acs.device_driver.LinewayDeviceDriver;
+import org.nl.acs.device.driver.LinewayDeviceDriver;
+import org.nl.acs.opc.opc.OpcItemDto;
 
 import java.util.List;
 import java.util.Map;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAssignedService.java

@@ -1,9 +1,9 @@
-package org.nl.acs.device.service;
+package org.nl.acs.device.device.service;
 
-import org.nl.acs.device.domain.DeviceAssigned;
+import org.nl.acs.device.device.domain.DeviceAssigned;
-import org.nl.acs.device.service.dto.DeviceAssignedDto;
+import org.nl.acs.device.device.service.dto.DeviceAssignedDto;
-import org.nl.acs.device.service.dto.DeviceAssignedQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceAssignedQueryParam;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
 import org.nl.acs.common.base.PageInfo;
 import org.springframework.data.domain.Pageable;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDbitemService.java

@@ -1,10 +1,10 @@
-package org.nl.acs.device.service;
+package org.nl.acs.device.device.service;
 
 import org.nl.acs.common.base.PageInfo;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
-import org.nl.acs.device.domain.DeviceDbitem;
+import org.nl.acs.device.device.domain.DeviceDbitem;
-import org.nl.acs.device.service.dto.DeviceDbitemDto;
+import org.nl.acs.device.device.service.dto.DeviceDbitemDto;
-import org.nl.acs.device.service.dto.DeviceDbitemQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java

@@ -1,8 +1,8 @@
-package org.nl.acs.device.service;
+package org.nl.acs.device.device.service;
 
-import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device.device.enums.DeviceType;
-import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device.driver.DeviceDriver;
-import org.nl.acs.device_driver.DeviceDriverDefination;
+import org.nl.acs.device.driver.DeviceDriverDefination;
 
 import java.util.List;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceErpmappingService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceErpmappingService.java

@@ -1,10 +1,10 @@
-package org.nl.acs.device.service;
+package org.nl.acs.device.device.service;
 
 import org.nl.acs.common.base.PageInfo;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
-import org.nl.acs.device.domain.DeviceErpmapping;
+import org.nl.acs.device.device.domain.DeviceErpmapping;
-import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto;
+import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto;
-import org.nl.acs.device.service.dto.DeviceErpmappingQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceErpmappingQueryParam;
 import org.springframework.data.domain.Pageable;
 
 import javax.servlet.http.HttpServletResponse;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceExtraService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceExtraService.java

@@ -1,10 +1,10 @@
-package org.nl.acs.device.service;
+package org.nl.acs.device.device.service;
 
 import com.alibaba.fastjson.JSONObject;
-import org.nl.acs.device.domain.DeviceExtra;
+import org.nl.acs.device.device.domain.DeviceExtra;
-import org.nl.acs.device.service.dto.DeviceExtraDto;
+import org.nl.acs.device.device.service.dto.DeviceExtraDto;
-import org.nl.acs.device.service.dto.DeviceExtraQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceExtraQueryParam;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
 import org.nl.acs.common.base.PageInfo;
 import org.springframework.data.domain.Pageable;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceManageService.java

@@ -1,4 +1,6 @@
-package org.nl.acs.opc;
+package org.nl.acs.device.device.service;
+
+import org.nl.acs.device.device.service.dto.DeviceManageDto;
 
 import java.util.List;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceRunpointService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceRunpointService.java

@@ -1,10 +1,10 @@
-package org.nl.acs.device.service;
+package org.nl.acs.device.device.service;
 
 import org.nl.acs.common.base.PageInfo;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
-import org.nl.acs.device.domain.DeviceRunpoint;
+import org.nl.acs.device.device.domain.DeviceRunpoint;
-import org.nl.acs.device.service.dto.DeviceRunpointDto;
+import org.nl.acs.device.device.service.dto.DeviceRunpointDto;
-import org.nl.acs.device.service.dto.DeviceRunpointQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceService.java

@@ -1,13 +1,13 @@
-package org.nl.acs.device.service;
+package org.nl.acs.device.device.service;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
 import org.nl.acs.storage_cell.service.dto.StorageCellDto;
 import org.nl.acs.common.base.PageInfo;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
-import org.nl.acs.device.service.dto.DeviceDto;
+import org.nl.acs.device.device.service.dto.DeviceDto;
-import org.nl.acs.device.service.dto.DeviceQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceQueryParam;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -389,4 +389,6 @@ public interface DeviceService extends CommonService<Device> {
     void uploadDriver(MultipartFile file, HttpServletRequest request);
 
     void templateDriver(HttpServletResponse response) throws IOException;
+
+    void downDeviceDBloadCSVUA(JSONArray queryDeviceProtocol, HttpServletResponse response);
 }

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceisonlineService.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceisonlineService.java

@@ -1,10 +1,10 @@
-package org.nl.acs.device.service;
+package org.nl.acs.device.device.service;
 
 import org.nl.acs.common.base.PageInfo;
-import org.nl.acs.common.base.CommonService;
+import org.nl.acs.common.base.service.CommonService;
-import org.nl.acs.device.domain.Deviceisonline;
+import org.nl.acs.device.device.domain.Deviceisonline;
-import org.nl.acs.device.service.dto.DeviceisonlineDto;
+import org.nl.acs.device.device.service.dto.DeviceisonlineDto;
-import org.nl.acs.device.service.dto.DeviceisonlineQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/AcsDeviceErpmappingDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.*;
 import lombok.experimental.Accessors;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 
 import lombok.*;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedQueryParam.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedQueryParam.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.*;
 import lombok.experimental.Accessors;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemQueryParam.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.*;
 import lombok.experimental.Accessors;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceErpmappingQueryParam.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 
 import lombok.*;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExtraManageDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraManageDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.opc;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.Data;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraQueryParam.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraQueryParam.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceManageDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.opc;
+package org.nl.acs.device.device.service.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import eu.bitwalker.useragentutils.DeviceType;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceQueryParam.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.*;
 import lombok.experimental.Accessors;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointQueryParam.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineDto.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.*;
 import lombok.experimental.Accessors;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineQueryParam.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.dto;
+package org.nl.acs.device.device.service.dto;
 
 import lombok.Getter;
 import lombok.Setter;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAppServiceImpl.java

@@ -1,17 +1,21 @@
-package org.nl.acs.opc;
+package org.nl.acs.device.device.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.acs.auto.initial.ApplicationAutoInitial;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device.device.enums.DeviceType;
-import org.nl.acs.device.service.DeviceDriverDefinationAppService;
+import org.nl.acs.device.device.service.DeviceAppService;
-import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device.device.service.DeviceDriverDefinationAppService;
-import org.nl.acs.device_driver.DeviceDriverDefination;
+import org.nl.acs.device.device.service.DeviceManageService;
-import org.nl.acs.device_driver.LinewayDeviceDriver;
+import org.nl.acs.device.device.service.dto.DeviceManageDto;
-import org.nl.acs.device_driver.driver.OpcDeviceDriver;
+import org.nl.acs.device.driver.DeviceDriver;
+import org.nl.acs.device.driver.DeviceDriverDefination;
+import org.nl.acs.device.driver.LinewayDeviceDriver;
+import org.nl.acs.device.driver.OpcDeviceDriver;
+import org.nl.acs.opc.opc.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAssignedServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.impl;
+package org.nl.acs.device.device.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -9,14 +9,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import lombok.AllArgsConstructor;
 import org.nl.acs.common.base.CommonFinalParam;
-import org.nl.acs.device.domain.DeviceAssigned;
+import org.nl.acs.device.device.domain.DeviceAssigned;
-import org.nl.acs.device.service.DeviceAssignedService;
+import org.nl.acs.device.device.service.DeviceAssignedService;
-import org.nl.acs.device.service.dto.DeviceAssignedDto;
+import org.nl.acs.device.device.service.dto.DeviceAssignedDto;
-import org.nl.acs.device.service.dto.DeviceAssignedQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceAssignedQueryParam;
-import org.nl.acs.device.service.mapper.DeviceAssignedMapper;
+import org.nl.acs.device.device.service.mapper.DeviceAssignedMapper;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.common.utils.FileUtil;
 import org.nl.acs.utils.PageUtil;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDbitemServiceImpl.java

@@ -1,17 +1,17 @@
-package org.nl.acs.device.service.impl;
+package org.nl.acs.device.device.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.acs.utils.PageUtil;
-import org.nl.acs.device.domain.DeviceDbitem;
+import org.nl.acs.device.device.domain.DeviceDbitem;
-import org.nl.acs.device.service.DeviceDbitemService;
+import org.nl.acs.device.device.service.DeviceDbitemService;
-import org.nl.acs.device.service.dto.DeviceDbitemDto;
+import org.nl.acs.device.device.service.dto.DeviceDbitemDto;
-import org.nl.acs.device.service.dto.DeviceDbitemQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam;
-import org.nl.acs.device.service.mapper.DeviceDbitemMapper;
+import org.nl.acs.device.device.service.mapper.DeviceDbitemMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDriverDefinationAppServiceImpl.java

@@ -1,10 +1,10 @@
-package org.nl.acs.opc;
+package org.nl.acs.device.device.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device.device.enums.DeviceType;
-import org.nl.acs.device.service.DeviceDriverDefinationAppService;
+import org.nl.acs.device.device.service.DeviceDriverDefinationAppService;
-import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device.driver.DeviceDriver;
-import org.nl.acs.device_driver.DeviceDriverDefination;
+import org.nl.acs.device.driver.DeviceDriverDefination;
 import org.nl.common.exception.BadRequestException;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceErpmappingServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.impl;
+package org.nl.acs.device.device.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -10,14 +10,14 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import lombok.AllArgsConstructor;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device.domain.DeviceErpmapping;
+import org.nl.acs.device.device.domain.DeviceErpmapping;
-import org.nl.acs.device.service.DeviceErpmappingService;
+import org.nl.acs.device.device.service.DeviceErpmappingService;
-import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto;
+import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto;
-import org.nl.acs.device.service.dto.DeviceErpmappingQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceErpmappingQueryParam;
-import org.nl.acs.device.service.mapper.DeviceErpmappingMapper;
+import org.nl.acs.device.device.service.mapper.DeviceErpmappingMapper;
-import org.nl.acs.device.service.mapper.DeviceMapper;
+import org.nl.acs.device.device.service.mapper.DeviceMapper;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.acs.utils.PageUtil;
 import org.nl.common.exception.BadRequestException;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceExtraServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.impl;
+package org.nl.acs.device.device.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -10,12 +10,12 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import lombok.AllArgsConstructor;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
-import org.nl.acs.device.domain.DeviceExtra;
+import org.nl.acs.device.device.domain.DeviceExtra;
-import org.nl.acs.device.service.DeviceExtraService;
+import org.nl.acs.device.device.service.DeviceExtraService;
-import org.nl.acs.device.service.dto.DeviceExtraDto;
+import org.nl.acs.device.device.service.dto.DeviceExtraDto;
-import org.nl.acs.device.service.dto.DeviceExtraQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceExtraQueryParam;
-import org.nl.acs.device.service.mapper.DeviceExtraMapper;
+import org.nl.acs.device.device.service.mapper.DeviceExtraMapper;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.acs.utils.PageUtil;
 import org.nl.common.exception.BadRequestException;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceManageServiceImpl.java

@@ -1,22 +1,24 @@
-package org.nl.acs.opc;
+package org.nl.acs.device.device.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import lombok.extern.slf4j.Slf4j;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device.domain.DeviceExtra;
+import org.nl.acs.device.device.domain.DeviceExtra;
-import org.nl.acs.device.service.mapper.DeviceExtraMapper;
+import org.nl.acs.device.device.service.DeviceManageService;
-import org.nl.acs.device.service.mapper.DeviceMapper;
+import org.nl.acs.device.device.service.dto.DeviceExtraManageDto;
-import org.nl.acs.device.service.mapper.DeviceRunpointMapper;
+import org.nl.acs.device.device.service.dto.DeviceManageDto;
-import org.nl.acs.opc.domain.Opc;
+import org.nl.acs.device.device.service.mapper.DeviceExtraMapper;
-import org.nl.acs.opc.domain.OpcPlc;
+import org.nl.acs.device.device.service.mapper.DeviceMapper;
-import org.nl.acs.opc.service.mapper.OpcMapper;
+import org.nl.acs.device.device.service.mapper.DeviceRunpointMapper;
-import org.nl.acs.opc.service.mapper.OpcPlcMapper;
+import org.nl.acs.opc.opc.domain.Opc;
+import org.nl.acs.opc.opc.domain.OpcPlc;
+import org.nl.acs.opc.opc.service.mapper.OpcMapper;
+import org.nl.acs.opc.opc.service.mapper.OpcPlcMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceRunpointServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceRunpointServiceImpl.java

@@ -1,17 +1,17 @@
-package org.nl.acs.device.service.impl;
+package org.nl.acs.device.device.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.acs.utils.PageUtil;
-import org.nl.acs.device.domain.DeviceRunpoint;
+import org.nl.acs.device.device.domain.DeviceRunpoint;
-import org.nl.acs.device.service.DeviceRunpointService;
+import org.nl.acs.device.device.service.DeviceRunpointService;
-import org.nl.acs.device.service.dto.DeviceRunpointDto;
+import org.nl.acs.device.device.service.dto.DeviceRunpointDto;
-import org.nl.acs.device.service.dto.DeviceRunpointQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam;
-import org.nl.acs.device.service.mapper.DeviceRunpointMapper;
+import org.nl.acs.device.device.service.mapper.DeviceRunpointMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java

@@ -1,4 +1,4 @@
-package org.nl.acs.device.service.impl;
+package org.nl.acs.device.device.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -17,59 +17,53 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.ListOrderedMap;
-import org.apache.commons.lang.LocaleUtils;
 import org.nl.acs.auto.initial.ApplicationAutoInitial;
-import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+import org.nl.acs.device.driver.ItemDto;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device.domain.DeviceExtra;
+import org.nl.acs.device.device.domain.DeviceExtra;
-import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device.device.enums.DeviceType;
-import org.nl.acs.device.service.mapper.DeviceExtraMapper;
+import org.nl.acs.device.device.service.mapper.DeviceExtraMapper;
-import org.nl.acs.device.domain.DeviceRunpoint;
+import org.nl.acs.device.device.domain.DeviceRunpoint;
-import org.nl.acs.device.service.mapper.DeviceRunpointMapper;
+import org.nl.acs.device.device.service.mapper.DeviceRunpointMapper;
-import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
+import org.nl.acs.device.driver.stacker.double_stacker.StandardStackerDeviceDriver;
-import org.nl.acs.device_driver.one_conveyor.scanner_weight_conveyor.ConveyorWithScannerWeightDeviceDriver;
+import org.nl.acs.opc.opc.OpcConfig;
-import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver;
-import org.nl.acs.monitor.DeviceStageMonitor;
-import org.nl.acs.opc.OpcConfig;
 import org.nl.acs.route.domain.RouteLine;
 import org.nl.acs.route.service.mapper.RouteLineMapper;
 import org.nl.acs.storage_cell.domain.StorageCell;
 import org.nl.acs.storage_cell.service.mapper.StorageCellMapper;
-import org.nl.acs.udw.mqttUdw.ItemsDataAccessor;
+import org.nl.acs.udw.mqttUdw.TagDataAccessor;
-import org.nl.acs.udw.mqttUdw.factory.ItemDataAccessorFactory;
+import org.nl.acs.udw.mqttUdw.factory.TagsDataAccessorFactory;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.acs.utils.PageUtil;
-import org.nl.acs.device.service.DeviceDriverDefinationAppService;
+import org.nl.acs.device.device.service.DeviceDriverDefinationAppService;
-import org.nl.acs.device.service.DeviceExtraService;
+import org.nl.acs.device.device.service.DeviceExtraService;
-import org.nl.acs.device_driver.DeviceDriverDefination;
+import org.nl.acs.device.driver.DeviceDriverDefination;
-import org.nl.acs.device_driver.ScannerDeviceDriver;
+import org.nl.acs.device.driver.ScannerDeviceDriver;
-import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
+import org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
-import org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.StandardCoveyorControlWithScannerDeviceDriver;
+import org.nl.acs.device.driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
-import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver;
+import org.nl.acs.device.driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
-import org.nl.acs.device_driver.conveyor.standard_ordinary_site.StandardOrdinarySiteDeviceDriver;
+import org.nl.acs.device.driver.scanner.standard_scanner.StandardScannerDeviceDriver;
-import org.nl.acs.device_driver.scanner.standard_scanner.StandardScannerDeviceDriver;
+import org.nl.acs.device.driver.OpcDeviceDriverDefination;
-import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;
+import org.nl.acs.device.device.service.dto.DeviceRunpointDto;
-import org.nl.acs.device.service.dto.DeviceRunpointDto;
+import org.nl.acs.device.device.service.DeviceAppService;
-import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.opc.opc.service.OpcService;
-import org.nl.acs.opc.DeviceAppServiceImpl;
+import org.nl.acs.opc.opc.service.dto.OpcDto;
-import org.nl.acs.opc.service.OpcService;
+import org.nl.acs.opc.plc.service.OpcPlcService;
-import org.nl.acs.opc.service.dto.OpcDto;
+import org.nl.acs.opc.opc.service.dto.OpcPlcDto;
-import org.nl.acs.plc.service.OpcPlcService;
-import org.nl.acs.opc.service.dto.OpcPlcDto;
 import org.nl.acs.storage_cell.service.dto.StorageCellDto;
 import org.nl.acs.utils.ExportCSVUtil;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
 import org.nl.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.*;
-import org.nl.acs.device.service.DeviceService;
+import org.nl.acs.device.device.service.DeviceService;
-import org.nl.acs.device.service.dto.DeviceDto;
+import org.nl.acs.device.device.service.dto.DeviceDto;
-import org.nl.acs.device.service.dto.DeviceQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceQueryParam;
-import org.nl.acs.device.service.mapper.DeviceMapper;
+import org.nl.acs.device.device.service.mapper.DeviceMapper;
-import org.nl.config.driver.ExcelTemplateCreator;
+import org.nl.config.generator_template.ExcelTemplateCreator;
-import org.nl.config.driver.GeneratorDriverTemplate;
+import org.nl.config.generator_template.GeneratorDriverTemplate;
 import org.nl.config.language.LangProcess;
 import org.nl.config.mqtt2.MqttService;
 import org.nl.system.service.dict.ISysDictService;
@@ -78,7 +72,6 @@ import org.nl.system.service.logicflow.dao.mapper.StageMapper;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.common.utils.CodeUtil;
 import org.nl.config.SpringContextHolder;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -91,6 +84,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 
 /**
@@ -120,8 +114,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
     private final DeviceDriverDefinationAppService deviceDriverDefinationAppService;
     private final DeviceAppService deviceAppService;
     private final ISysParamService paramService;
-    @Autowired
-    private MqttService mqttService;
 
     private final ISysDictService iSysDictService;
     List<StorageCellDto> storageCells = new ArrayList<>();
@@ -968,9 +960,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
             standardInspectSiteDeviceDriver.setBatch(batch);
             device.setMaterial_type(material_type);
             device.setBatch(batch);
-        } else if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) {
-            SiemensConveyorDeviceDriver siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver();
-            siemensConveyorDeviceDriver.setDeviceStatus(form);
         } else if (device.getDeviceDriver() instanceof StandardCoveyorControlWithScannerDeviceDriver) {
             StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver
                     = (StandardCoveyorControlWithScannerDeviceDriver) device.getDeviceDriver();
@@ -978,12 +967,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
         } else if (device.getDeviceDriver() instanceof StandardStackerDeviceDriver) {
             StandardStackerDeviceDriver standardStackerDeviceDriver = (StandardStackerDeviceDriver) device.getDeviceDriver();
             standardStackerDeviceDriver.setDeviceStatus(form);
-        } else if (device.getDeviceDriver() instanceof ConveyorWithScannerWeightDeviceDriver) {
-            ConveyorWithScannerWeightDeviceDriver conveyorWithScannerWeightDeviceDriver = (ConveyorWithScannerWeightDeviceDriver) device.getDeviceDriver();
-            conveyorWithScannerWeightDeviceDriver.setDeviceStatus(form);
-        } else if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
-            BeltConveyorDeviceDriver beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) device.getDeviceDriver();
-            beltConveyorDeviceDriver.setDeviceStatus(form);
         }
     }
 
@@ -1257,7 +1240,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
 //
 //        }
 
-        ItemsDataAccessor accessor = ItemDataAccessorFactory.getItemsDataAccessor(OpcConfig.udw_opc_value_key);
+        TagDataAccessor accessor = TagsDataAccessorFactory.getTagsAccessor(OpcConfig.udw_opc_value_key);
         JSONArray result = new JSONArray();
         for (int i = 0; i < dbItems.size(); i++) {
             Object ob = dbItems.get(i);
@@ -1288,23 +1271,24 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
     @Override
     public void testWrite(Map map) {
         List dbItems = (List) map.get("dbItems");
-        List<Map<String,Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list = new ArrayList<>();
         //String opc_id = (String) map.get("opc_id");
-       // Map<String, Object> itemMap = new HashMap<String, Object>();
+        // Map<String, Object> itemMap = new HashMap<String, Object>();
         for (int i = 0; i < dbItems.size(); i++) {
             Object ob = dbItems.get(i);
             JSONObject json = (JSONObject) JSONObject.toJSON(ob);
             if (!StrUtil.isEmpty(json.getString("dbw_value"))) {
-               // itemMap.put(json.getString("code"), json.getString("dbw_value"));
+                // itemMap.put(json.getString("code"), json.getString("dbw_value"));
-                Map<String,Object> valueMap = new HashMap<>();
+                Map<String, Object> valueMap = new HashMap<>();
-                valueMap.put("id",json.getString("code"));
+                valueMap.put("id", json.getString("code"));
-                valueMap.put("v",json.get("dbw_value"));
+                valueMap.put("v", json.get("dbw_value"));
                 list.add(valueMap);
             }
         }
+        MqttService mqttService = SpringContextHolder.getBean(MqttService.class);
         mqttService.publishMessage(JSON.toJSONString(list));
-      //  Server server = ReadUtil.getServer(opc_id);
+        //  Server server = ReadUtil.getServer(opc_id);
-      //  ReadUtil.write(itemMap, server);
+        //  ReadUtil.write(itemMap, server);
     }
 
     /**
@@ -2050,4 +2034,76 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
     public void templateDriver(HttpServletResponse response) throws IOException {
         ExcelTemplateCreator.createExcelTemplate(response);
     }
+
+    @Override
+    public void downDeviceDBloadCSVUA(JSONArray jsonarr, HttpServletResponse response) {
+        List<Object[]> cellList = new ArrayList<>();
+        for (int i = 0; i < jsonarr.size(); i++) {
+            List item = new ArrayList();
+            JSONObject jo = jsonarr.getJSONObject(i);
+            String extra_code = jo.getString("extra_code");
+            //校验数据 格式为： RD1.RD1.A1.mode
+            int num = countStr(extra_code, ".");
+            if (num != 3) {
+                throw new BadRequestException(extra_code + "数据格式不正确");
+            }
+            int randomNum1 = ThreadLocalRandom.current().nextInt(1, 100);
+            int randomNum2 = ThreadLocalRandom.current().nextInt(1, 100);
+            String random = "ns=" + randomNum1 + ";i=" + randomNum2;
+            extra_code = extra_code.substring(extra_code.indexOf(".") + 1, extra_code.length());
+            extra_code = extra_code.substring(extra_code.indexOf(".") + 1, extra_code.length());
+            item.add(extra_code);
+            item.add(random);
+            String datatype = jo.getString("extra_name");
+            //西门子1200、1500 为DB
+            if (datatype.startsWith("DB")) {
+                //校验数据 格式为：DB600.B1
+//                if(datatype.indexOf(".") == -1 ){
+//                    throw new BadRequestException(jo.getString("extra_code") + "点位数据格式不正确");
+//                }
+//                int count = countStr(datatype,".");
+//                if(count != 1){
+//                    throw new BadRequestException(jo.getString("extra_code") + "点位数据格式不正确");
+//                }
+
+                String str1 = datatype.substring(0, datatype.indexOf("."));
+                String headtype = datatype.substring(str1.length() + 1, datatype.length());
+                if (headtype.startsWith("B")) {
+                    if (headtype.contains(".")) {
+                        datatype = "Boolean";
+                    } else {
+                        datatype = "Byte";
+                    }
+                } else if (headtype.startsWith("W")) {
+                    datatype = "Word";
+                } else if (headtype.startsWith("D")) {
+                    datatype = "DWord";
+                } else if (headtype.startsWith("S")) {
+                    datatype = "String";
+                } else if (headtype.startsWith("REAL")) {
+                    datatype = "Double";
+                }
+            } else {
+                //西门子200
+                if (datatype.indexOf(".") == -1) {
+                    datatype = "Byte";
+                } else {
+                    datatype = "Boolean";
+                }
+            }
+
+            item.add(datatype);
+            item.add("1");
+            item.add("R/W");
+            item.add("100");
+
+            cellList.add(item.toArray());
+        }
+
+        String[] tableHeaderArr = {"Tag Name", "Address", "Data Type", "Respect Data Type",
+                "Client Access", "Scan Rate"};
+        String fileName = "导出文件.csv";
+        byte[] bytes = ExportCSVUtil.writeCsvAfterToBytes(tableHeaderArr, cellList);
+        ExportCSVUtil.responseSetProperties(fileName, bytes, response);
+    }
 }

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceisonlineServiceImpl.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceisonlineServiceImpl.java

@@ -1,17 +1,17 @@
-package org.nl.acs.device.service.impl;
+package org.nl.acs.device.device.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.nl.acs.common.base.PageInfo;
 import org.nl.acs.common.base.QueryHelpMybatisPlus;
-import org.nl.acs.common.base.impl.CommonServiceImpl;
+import org.nl.acs.common.base.service.impl.CommonServiceImpl;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.acs.utils.PageUtil;
-import org.nl.acs.device.domain.Deviceisonline;
+import org.nl.acs.device.device.domain.Deviceisonline;
-import org.nl.acs.device.service.DeviceisonlineService;
+import org.nl.acs.device.device.service.DeviceisonlineService;
-import org.nl.acs.device.service.dto.DeviceisonlineDto;
+import org.nl.acs.device.device.service.dto.DeviceisonlineDto;
-import org.nl.acs.device.service.dto.DeviceisonlineQueryParam;
+import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam;
-import org.nl.acs.device.service.mapper.DeviceisonlineMapper;
+import org.nl.acs.device.device.service.mapper.DeviceisonlineMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceAssignedMapper.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceAssignedMapper.java

@@ -1,7 +1,7 @@
-package org.nl.acs.device.service.mapper;
+package org.nl.acs.device.device.service.mapper;
 
-import org.nl.acs.device.domain.DeviceAssigned;
+import org.nl.acs.device.device.domain.DeviceAssigned;
-import org.nl.acs.common.base.CommonMapper;
+import org.nl.acs.common.base.mapper.CommonMapper;
 import org.springframework.stereotype.Repository;
 
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceDbitemMapper.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceDbitemMapper.java

@@ -1,7 +1,7 @@
-package org.nl.acs.device.service.mapper;
+package org.nl.acs.device.device.service.mapper;
 
-import org.nl.acs.common.base.CommonMapper;
+import org.nl.acs.common.base.mapper.CommonMapper;
-import org.nl.acs.device.domain.DeviceDbitem;
+import org.nl.acs.device.device.domain.DeviceDbitem;
 import org.springframework.stereotype.Repository;
 
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceErpmappingMapper.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceErpmappingMapper.java

@@ -1,7 +1,7 @@
-package org.nl.acs.device.service.mapper;
+package org.nl.acs.device.device.service.mapper;
 
-import org.nl.acs.common.base.CommonMapper;
+import org.nl.acs.common.base.mapper.CommonMapper;
-import org.nl.acs.device.domain.DeviceErpmapping;
+import org.nl.acs.device.device.domain.DeviceErpmapping;
 import org.springframework.stereotype.Repository;
 
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceExtraMapper.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceExtraMapper.java

@@ -1,11 +1,11 @@
-package org.nl.acs.device.service.mapper;
+package org.nl.acs.device.device.service.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.nl.acs.device.domain.DeviceExtra;
+import org.nl.acs.device.device.domain.DeviceExtra;
-import org.nl.acs.common.base.CommonMapper;
+import org.nl.acs.common.base.mapper.CommonMapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMapper.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMapper.java

@@ -1,11 +1,11 @@
-package org.nl.acs.device.service.mapper;
+package org.nl.acs.device.device.service.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.nl.acs.common.base.CommonMapper;
+import org.nl.acs.common.base.mapper.CommonMapper;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
 import org.springframework.stereotype.Repository;
 
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMappers.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMappers.java

@@ -1,9 +1,8 @@
-package org.nl.acs.device.service.mapper;
+package org.nl.acs.device.device.service.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.mybatis.spring.annotation.MapperScan;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device.domain.Device;
 
 @Mapper
 public interface DeviceMappers extends BaseMapper<Device> {

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceRunpointMapper.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceRunpointMapper.java

@@ -1,7 +1,7 @@
-package org.nl.acs.device.service.mapper;
+package org.nl.acs.device.device.service.mapper;
 
-import org.nl.acs.common.base.CommonMapper;
+import org.nl.acs.common.base.mapper.CommonMapper;
-import org.nl.acs.device.domain.DeviceRunpoint;
+import org.nl.acs.device.device.domain.DeviceRunpoint;
 import org.springframework.stereotype.Repository;
 
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceisonlineMapper.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceisonlineMapper.java

@@ -1,7 +1,7 @@
-package org.nl.acs.device.service.mapper;
+package org.nl.acs.device.device.service.mapper;
 
-import org.nl.acs.common.base.CommonMapper;
+import org.nl.acs.common.base.mapper.CommonMapper;
-import org.nl.acs.device.domain.Deviceisonline;
+import org.nl.acs.device.device.domain.Deviceisonline;
 import org.springframework.stereotype.Repository;
 
 /**

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java

@@ -1,14 +0,0 @@
-package org.nl.acs.device.device_driver;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-/**
- * 驱动类型
- * https://blog.csdn.net/moneyshi/article/details/82978073
- */
-public enum DriverTypeEnum {
-
-
-}

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/AbstractDeviceDriver.java

@@ -1,24 +1,16 @@
-package org.nl.acs.device_driver.driver;
+package org.nl.acs.device.driver;
 
 import lombok.Data;
-import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.device.domain.Device;
-import org.nl.acs.device_driver.DeviceDriver;
-import org.nl.acs.device_driver.DeviceDriverDefination;
 
 @Data
 public class AbstractDeviceDriver implements DeviceDriver {
 
     public Device device;
     private DeviceDriverDefination driverDefination;
-    private boolean stop = false;
+    public boolean online = true;
-
-    public Boolean online;
-
 
     public AbstractDeviceDriver() {
-//        this.execute_log = new BusinessLoggerImpl(BusinessDomain.device_execute.name());
-//        this.device_log = BusinessLoggerFactory.getNoRepeatBusinessLogger(BusinessDomain.device_execute.name());
-
     }
 
     @Override
@@ -34,7 +26,7 @@ public class AbstractDeviceDriver implements DeviceDriver {
 
     @Override
     public DeviceDriver setDriverDefination(DeviceDriverDefination var1) {
-        this.driverDefination = driverDefination;
+        this.driverDefination = var1;
         return this;
     }
 
@@ -42,9 +34,4 @@ public class AbstractDeviceDriver implements DeviceDriver {
         this.device = device;
         return this;
     }
-
-    @Override
-    public String toString() {
-        return "";
-    }
 }

nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java → nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/AbstractOpcDeviceDriver.java

@@ -1,32 +1,32 @@
-package org.nl.acs.device_driver.driver;
+package org.nl.acs.device.driver;
 
 import com.alibaba.fastjson.JSON;
-import org.nl.acs.opc.*;
+import org.nl.acs.opc.opc.OpcConfig;
-import org.nl.acs.udw.mqttUdw.ItemsDataAccessor;
+import org.nl.acs.udw.mqttUdw.TagDataAccessor;
-import org.nl.acs.udw.mqttUdw.factory.ItemDataAccessorFactory;
+import org.nl.acs.udw.mqttUdw.factory.TagsDataAccessorFactory;
 import org.nl.common.exception.BadRequestException;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.nl.config.mqtt2.MqttService;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
+@ConditionalOnClass
 public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements OpcDeviceDriver {
 
-    private final MqttService mqttService = SpringContextHolder.getBean(MqttService.class);
     private final LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean(LuceneExecuteLogService.class);
 
-    private final ItemsDataAccessor opcUdw;
+    private final TagDataAccessor opcUdw;
 
     public AbstractOpcDeviceDriver() {
-        this.opcUdw = ItemDataAccessorFactory.getItemsDataAccessor(OpcConfig.udw_opc_value_key);
+        this.opcUdw = TagsDataAccessorFactory.getTagsAccessor(OpcConfig.udw_opc_value_key);
     }
 
     @Override
-    public ItemsDataAccessor getOpcValueAccessor() {
+    public TagDataAccessor getOpcValueAccessor() {
         return this.opcUdw;
     }
 
@@ -44,6 +44,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
             map.put("id", getId() + key);
             map.put("v", value);
             list.add(map);
+            MqttService mqttService = SpringContextHolder.getBean(MqttService.class);
             mqttService.publishMessage(JSON.toJSONString(list));
             luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getDevice_code(), "下发电气信号 [" + key + ":" + value + "] 成功"));
         } catch (Exception e) {
@@ -79,6 +80,7 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
                         return map;
                     })
                     .collect(Collectors.toList());
+            MqttService mqttService = SpringContextHolder.getBean(MqttService.class);
             mqttService.publishMessage(JSON.toJSONString(list));
             luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getDevice_code(), "下发电气信号 [" + JSON.toJSONString(keys_values) + "] 成功"));
         } catch (Exception e) {