diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java index daf062f..d19e62a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/domain/Address.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java index d5cd406..4f2a767 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/AddressService.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java index 49bfbe9..928589c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/mapper/AddressMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/mapper/AddressMapper.java index c063228..132edca 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/mapper/AddressMapper.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java index f6034d9..6f0a8be 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/AgvWaitUtil.java +++ b/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_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device.device.domain.Device; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java index 8588c6e..8834a5e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java index 063da5b..1606dde 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/rest/XianGongAgvController.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java index 8786b5b..5bc9565 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java +++ b/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.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceAppService; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java index 5b2d6f0..b6580dd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/MagicAgvServiceImpl.java +++ b/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_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; -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.device.domain.Device; +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.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.opc.DeviceAppServiceImpl; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl; +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(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index 5d89569..e507cd4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/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.service.impl.DeviceServiceImpl; +import org.nl.acs.device.device.service.DeviceService; +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.opc.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java index c976366..f067779 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java +++ b/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.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceAppService; +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(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java index 67e55ed..fd2ff6f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/ZheDaAgvServiceImpl.java +++ b/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.opc.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +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)) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java index 4616ad2..d1738ea 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/angle/service/impl/AcsPointAngleServiceImpl.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java index 4429bcb..171ec25 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java +++ b/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; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java index f106ddb..ebf6a31 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/BlockedRunable.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/BlockedRunable.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/BlockedRunable.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/BlockedRunable.java index f21e6c9..7a18c89 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/BlockedRunable.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DeviceExecuteAutoRun.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DeviceExecuteAutoRun.java index 7acb57b..75869e4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java +++ b/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.driver.ExecutableDeviceDriver; +import org.nl.acs.device.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; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index 19f5de0..6cb5fdc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/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.service.DeviceService; -import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceService; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java index f4c18fd..c05e7e7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java +++ b/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.device.service.DeviceService; -import org.nl.acs.device_driver.agv.ndcone.AgvNdcOneDeviceDriver; -import org.nl.acs.device_driver.agv.ndctwo.AgvNdcTwoDeviceDriver; -import org.nl.acs.device_driver.autodoor.standard_autodoor.StandardAutodoorDeviceDriver; +import org.nl.acs.auto.run.service.AutoRunService; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.agv.ndcone.AgvNdcOneDeviceDriver; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/config/DevelopConfig.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/config/DevelopConfig.java index 7efc94a..b78cc63 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/config/SystemConfig.java similarity index 88% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/config/SystemConfig.java index da7da13..34b5dfd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java +++ b/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; - -import org.nl.acs.common.base.CommonFinalParam; +package org.nl.acs.auto.run.config; /** * Demo class diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/controller/AutoRunController.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/controller/AutoRunController.java index fbb5bd4..113e2d1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java +++ b/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.ThreadDto; +import org.nl.acs.auto.run.service.AutoRunService; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/enums/ThreadStatusEnum.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/enums/ThreadStatusEnum.java index 6fade68..ed55231 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java +++ b/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 * diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/enums/ThreadUsedStatusEnum.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/enums/ThreadUsedStatusEnum.java index 4ffb8ad..fb20ead 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java +++ b/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 * diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/AutoRunService.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/AutoRunService.java index 41057ca..5303bbe 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/dto/ThreadDto.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/dto/ThreadDto.java index 03f0260..509079a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java +++ b/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; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/impl/AutoRunServiceImpl.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/service/impl/AutoRunServiceImpl.java index a5708c7..f2508a7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java index 58a218c..1702d67 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/PageInfo.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/mapper/CommonMapper.java similarity index 89% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/mapper/CommonMapper.java index ca27018..fc1ac90 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonMapper.java +++ b/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接口类 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonModel.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/model/CommonModel.java similarity index 86% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonModel.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/model/CommonModel.java index c9d9685..b5e4041 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonModel.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/service/CommonService.java similarity index 82% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/service/CommonService.java index b0e49f5..0b8f6d0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/CommonService.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/impl/CommonServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/service/impl/CommonServiceImpl.java similarity index 77% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/impl/CommonServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/service/impl/CommonServiceImpl.java index 99d6794..60c375e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/common/base/impl/CommonServiceImpl.java +++ b/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实现类 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/DequeDefaultDeviceStrategy.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/DequeDefaultDeviceStrategy.java index b6f6d3f..f97ad96 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/DequeDefaultDeviceStrategy.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java index abf4ab2..377fb18 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java index db1245f..aafc3db 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/mapper/CustomPolicyMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/mapper/CustomPolicyMapper.java index 628f557..0390711 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/mapper/CustomPolicyMapper.java +++ b/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.CommonMapper; +import org.nl.acs.common.base.mapper.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Device.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Device.java index 143936d..d85f29e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Device.java +++ b/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.DeviceDriverDefination; -import org.nl.acs.opc.DeviceExtraManageDto; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.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/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceAssigned.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceAssigned.java index f2d2016..4325ec2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceAssigned.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceDbitem.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceDbitem.java index 4417d70..ff0b586 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceDbitem.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceErpmapping.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceErpmapping.java index dbe10c3..3c2cab2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceErpmapping.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceExtra.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceExtra.java index b12dcbe..1ed09d3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceExtra.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceMybatis.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceMybatis.java index 6030ebe..0a04b97 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceMybatis.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceRunpoint.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/DeviceRunpoint.java index cdbcf9d..9418650 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/DeviceRunpoint.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Deviceisonline.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/domain/Deviceisonline.java index 5158bdf..e8a89c5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/domain/Deviceisonline.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/DeviceType.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/DeviceType.java index dff18ec..93c4056 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/DeviceType.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/ErrorType.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/ErrorType.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/ErrorType.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/enums/ErrorType.java index 627079a..cffa7bf 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/ErrorType.java +++ b/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 { // diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceAssignedController.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceAssignedController.java index 8a6fb4d..c6c1d92 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceAssignedController.java +++ b/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.service.dto.DeviceAssignedQueryParam; +import org.nl.acs.device.device.service.DeviceAssignedService; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceController.java similarity index 89% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceController.java index 0ef5da2..b380595 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceController.java +++ b/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.service.dto.DeviceDto; +import org.nl.acs.device.device.service.DeviceService; +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 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 getStrategy() { + List> list = Stream.of(StrategyEnum.values()) + .map(strategy -> { + Map map = new HashMap<>(); + map.put("value", strategy.getValue()); + map.put("label", strategy.getLabel()); + return map; + }) + .collect(Collectors.toList()); + return new ResponseEntity(list, HttpStatus.OK); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceDbitemController.java similarity index 89% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceDbitemController.java index 637e033..1ecdc1c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceDbitemController.java +++ b/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.service.dto.DeviceDbitemDto; -import org.nl.acs.device.service.dto.DeviceDbitemQueryParam; +import org.nl.acs.device.device.service.DeviceDbitemService; +import org.nl.acs.device.device.service.dto.DeviceDbitemDto; +import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceErpmappingController.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceErpmappingController.java index cc1d26c..49d7cf9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceErpmappingController.java +++ b/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.service.dto.AcsDeviceErpmappingDto; +import org.nl.acs.device.device.service.DeviceErpmappingService; +import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceExtraController.java similarity index 89% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceExtraController.java index ba33778..12f4afd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceExtraController.java +++ b/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.service.dto.DeviceExtraDto; -import org.nl.acs.device.service.dto.DeviceExtraQueryParam; +import org.nl.acs.device.device.service.DeviceExtraService; +import org.nl.acs.device.device.service.dto.DeviceExtraDto; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceRunpointController.java similarity index 88% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceRunpointController.java index 0fae6b0..032e458 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceRunpointController.java +++ b/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.service.dto.DeviceRunpointDto; -import org.nl.acs.device.service.dto.DeviceRunpointQueryParam; +import org.nl.acs.device.device.service.DeviceRunpointService; +import org.nl.acs.device.device.service.dto.DeviceRunpointDto; +import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceisonlineController.java similarity index 89% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/rest/DeviceisonlineController.java index 3cf784c..b382dbb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/rest/DeviceisonlineController.java +++ b/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.service.dto.DeviceisonlineDto; -import org.nl.acs.device.service.dto.DeviceisonlineQueryParam; +import org.nl.acs.device.device.service.DeviceisonlineService; +import org.nl.acs.device.device.service.dto.DeviceisonlineDto; +import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAppService.java similarity index 89% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAppService.java index bc74092..34f6abe 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppService.java +++ b/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.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.LinewayDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.LinewayDeviceDriver; +import org.nl.acs.opc.opc.OpcItemDto; import java.util.List; import java.util.Map; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAssignedService.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceAssignedService.java index 03c1224..161e85b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceAssignedService.java +++ b/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.service.dto.DeviceAssignedDto; -import org.nl.acs.device.service.dto.DeviceAssignedQueryParam; -import org.nl.acs.common.base.CommonService; +import org.nl.acs.device.device.domain.DeviceAssigned; +import org.nl.acs.device.device.service.dto.DeviceAssignedDto; +import org.nl.acs.device.device.service.dto.DeviceAssignedQueryParam; +import org.nl.acs.common.base.service.CommonService; import org.nl.acs.common.base.PageInfo; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDbitemService.java similarity index 83% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDbitemService.java index ef54ba9..99aa0f5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDbitemService.java +++ b/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.device.domain.DeviceDbitem; -import org.nl.acs.device.service.dto.DeviceDbitemDto; -import org.nl.acs.device.service.dto.DeviceDbitemQueryParam; +import org.nl.acs.common.base.service.CommonService; +import org.nl.acs.device.device.domain.DeviceDbitem; +import org.nl.acs.device.device.service.dto.DeviceDbitemDto; +import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java similarity index 82% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceDriverDefinationAppService.java index c39e008..74067d9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceDriverDefinationAppService.java +++ b/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_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceErpmappingService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceErpmappingService.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceErpmappingService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceErpmappingService.java index 0eff5a9..25a0739 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceErpmappingService.java +++ b/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.device.domain.DeviceErpmapping; -import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto; -import org.nl.acs.device.service.dto.DeviceErpmappingQueryParam; +import org.nl.acs.common.base.service.CommonService; +import org.nl.acs.device.device.domain.DeviceErpmapping; +import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto; +import org.nl.acs.device.device.service.dto.DeviceErpmappingQueryParam; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceExtraService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceExtraService.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceExtraService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceExtraService.java index ec8041e..41b30c5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceExtraService.java +++ b/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.service.dto.DeviceExtraDto; -import org.nl.acs.device.service.dto.DeviceExtraQueryParam; -import org.nl.acs.common.base.CommonService; +import org.nl.acs.device.device.domain.DeviceExtra; +import org.nl.acs.device.device.service.dto.DeviceExtraDto; +import org.nl.acs.device.device.service.dto.DeviceExtraQueryParam; +import org.nl.acs.common.base.service.CommonService; import org.nl.acs.common.base.PageInfo; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceManageService.java similarity index 78% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceManageService.java index 856ac5e..d019676 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageService.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceRunpointService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceRunpointService.java similarity index 85% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceRunpointService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceRunpointService.java index 1b5eea3..149adba 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceRunpointService.java +++ b/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.device.domain.DeviceRunpoint; -import org.nl.acs.device.service.dto.DeviceRunpointDto; -import org.nl.acs.device.service.dto.DeviceRunpointQueryParam; +import org.nl.acs.common.base.service.CommonService; +import org.nl.acs.device.device.domain.DeviceRunpoint; +import org.nl.acs.device.device.service.dto.DeviceRunpointDto; +import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceService.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceService.java index 91cb982..0acbf0d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceService.java +++ b/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.device.service.dto.DeviceDto; -import org.nl.acs.device.service.dto.DeviceQueryParam; +import org.nl.acs.common.base.service.CommonService; +import org.nl.acs.device.device.service.dto.DeviceDto; +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 { void uploadDriver(MultipartFile file, HttpServletRequest request); void templateDriver(HttpServletResponse response) throws IOException; + + void downDeviceDBloadCSVUA(JSONArray queryDeviceProtocol, HttpServletResponse response); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceisonlineService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceisonlineService.java similarity index 83% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceisonlineService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/DeviceisonlineService.java index 53b190e..ff0f182 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/DeviceisonlineService.java +++ b/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.device.domain.Deviceisonline; -import org.nl.acs.device.service.dto.DeviceisonlineDto; -import org.nl.acs.device.service.dto.DeviceisonlineQueryParam; +import org.nl.acs.common.base.service.CommonService; +import org.nl.acs.device.device.domain.Deviceisonline; +import org.nl.acs.device.device.service.dto.DeviceisonlineDto; +import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/AcsDeviceErpmappingDto.java similarity index 92% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/AcsDeviceErpmappingDto.java index b5d6c8a..1422f28 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/AcsDeviceErpmappingDto.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedDto.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedDto.java index 9fd6843..cea9d17 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedDto.java +++ b/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.*; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedQueryParam.java similarity index 76% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedQueryParam.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceAssignedQueryParam.java index 6a7e54a..64529a5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceAssignedQueryParam.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemDto.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemDto.java index 955a3bb..7917cd4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemDto.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemQueryParam.java similarity index 76% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDbitemQueryParam.java index 7429e0b..420c78b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDbitemQueryParam.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDto.java similarity index 97% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceDto.java index 8fc4f1d..8f54f61 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceDto.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceErpmappingQueryParam.java similarity index 76% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceErpmappingQueryParam.java index fa0440f..7e1a0eb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceErpmappingQueryParam.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraDto.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraDto.java index e9f11db..40ba528 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraDto.java +++ b/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.*; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExtraManageDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraManageDto.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExtraManageDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraManageDto.java index 1a7d63d..4833b8b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceExtraManageDto.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraQueryParam.java similarity index 76% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraQueryParam.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceExtraQueryParam.java index 61286db..a2e8a33 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceExtraQueryParam.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceManageDto.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceManageDto.java index 30f34d3..0847d01 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageDto.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceQueryParam.java similarity index 75% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceQueryParam.java index 42bdf3f..32ae13e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceQueryParam.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointDto.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointDto.java index d3820c3..15b2113 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointDto.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointQueryParam.java similarity index 76% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceRunpointQueryParam.java index 5ea2de2..e59e8c8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceRunpointQueryParam.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineDto.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineDto.java index 9fe6bb7..574a5c5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineDto.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineQueryParam.java similarity index 76% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/dto/DeviceisonlineQueryParam.java index 2dae32d..62428df 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/dto/DeviceisonlineQueryParam.java +++ b/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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAppServiceImpl.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAppServiceImpl.java index 55fd508..91282be 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java +++ b/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.enums.DeviceType; -import org.nl.acs.device.service.DeviceDriverDefinationAppService; -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.driver.OpcDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.DeviceDriverDefinationAppService; +import org.nl.acs.device.device.service.DeviceManageService; +import org.nl.acs.device.device.service.dto.DeviceManageDto; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAssignedServiceImpl.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceAssignedServiceImpl.java index b2554ac..27306af 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceAssignedServiceImpl.java +++ b/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.service.DeviceAssignedService; -import org.nl.acs.device.service.dto.DeviceAssignedDto; -import org.nl.acs.device.service.dto.DeviceAssignedQueryParam; -import org.nl.acs.device.service.mapper.DeviceAssignedMapper; +import org.nl.acs.device.device.domain.DeviceAssigned; +import org.nl.acs.device.device.service.DeviceAssignedService; +import org.nl.acs.device.device.service.dto.DeviceAssignedDto; +import org.nl.acs.device.device.service.dto.DeviceAssignedQueryParam; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDbitemServiceImpl.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDbitemServiceImpl.java index 4863911..a610293 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceDbitemServiceImpl.java +++ b/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.service.DeviceDbitemService; -import org.nl.acs.device.service.dto.DeviceDbitemDto; -import org.nl.acs.device.service.dto.DeviceDbitemQueryParam; -import org.nl.acs.device.service.mapper.DeviceDbitemMapper; +import org.nl.acs.device.device.domain.DeviceDbitem; +import org.nl.acs.device.device.service.DeviceDbitemService; +import org.nl.acs.device.device.service.dto.DeviceDbitemDto; +import org.nl.acs.device.device.service.dto.DeviceDbitemQueryParam; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDriverDefinationAppServiceImpl.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceDriverDefinationAppServiceImpl.java index f3a3b0d..9172e41 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceDriverDefinationAppServiceImpl.java +++ b/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.service.DeviceDriverDefinationAppService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceDriverDefinationAppService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; import org.nl.common.exception.BadRequestException; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceErpmappingServiceImpl.java similarity index 92% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceErpmappingServiceImpl.java index 6bf9409..49b1920 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceErpmappingServiceImpl.java +++ b/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.device.domain.Device; -import org.nl.acs.device.domain.DeviceErpmapping; -import org.nl.acs.device.service.DeviceErpmappingService; -import org.nl.acs.device.service.dto.AcsDeviceErpmappingDto; -import org.nl.acs.device.service.dto.DeviceErpmappingQueryParam; -import org.nl.acs.device.service.mapper.DeviceErpmappingMapper; -import org.nl.acs.device.service.mapper.DeviceMapper; +import org.nl.acs.common.base.service.impl.CommonServiceImpl; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.domain.DeviceErpmapping; +import org.nl.acs.device.device.service.DeviceErpmappingService; +import org.nl.acs.device.device.service.dto.AcsDeviceErpmappingDto; +import org.nl.acs.device.device.service.dto.DeviceErpmappingQueryParam; +import org.nl.acs.device.device.service.mapper.DeviceErpmappingMapper; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceExtraServiceImpl.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceExtraServiceImpl.java index 5e94751..bc0059f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java +++ b/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.device.domain.DeviceExtra; -import org.nl.acs.device.service.DeviceExtraService; -import org.nl.acs.device.service.dto.DeviceExtraDto; -import org.nl.acs.device.service.dto.DeviceExtraQueryParam; -import org.nl.acs.device.service.mapper.DeviceExtraMapper; +import org.nl.acs.common.base.service.impl.CommonServiceImpl; +import org.nl.acs.device.device.domain.DeviceExtra; +import org.nl.acs.device.device.service.DeviceExtraService; +import org.nl.acs.device.device.service.dto.DeviceExtraDto; +import org.nl.acs.device.device.service.dto.DeviceExtraQueryParam; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceManageServiceImpl.java similarity index 92% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceManageServiceImpl.java index 9254b5e..a7b9a53 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceManageServiceImpl.java +++ b/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.domain.DeviceExtra; -import org.nl.acs.device.service.mapper.DeviceExtraMapper; -import org.nl.acs.device.service.mapper.DeviceMapper; -import org.nl.acs.device.service.mapper.DeviceRunpointMapper; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.opc.domain.OpcPlc; -import org.nl.acs.opc.service.mapper.OpcMapper; -import org.nl.acs.opc.service.mapper.OpcPlcMapper; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.domain.DeviceExtra; +import org.nl.acs.device.device.service.DeviceManageService; +import org.nl.acs.device.device.service.dto.DeviceExtraManageDto; +import org.nl.acs.device.device.service.dto.DeviceManageDto; +import org.nl.acs.device.device.service.mapper.DeviceExtraMapper; +import org.nl.acs.device.device.service.mapper.DeviceMapper; +import org.nl.acs.device.device.service.mapper.DeviceRunpointMapper; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceRunpointServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceRunpointServiceImpl.java similarity index 86% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceRunpointServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceRunpointServiceImpl.java index 2057bdd..a2f97c6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceRunpointServiceImpl.java +++ b/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.service.DeviceRunpointService; -import org.nl.acs.device.service.dto.DeviceRunpointDto; -import org.nl.acs.device.service.dto.DeviceRunpointQueryParam; -import org.nl.acs.device.service.mapper.DeviceRunpointMapper; +import org.nl.acs.device.device.domain.DeviceRunpoint; +import org.nl.acs.device.device.service.DeviceRunpointService; +import org.nl.acs.device.device.service.dto.DeviceRunpointDto; +import org.nl.acs.device.device.service.dto.DeviceRunpointQueryParam; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceServiceImpl.java index 035ce65..01a3e40 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/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.domain.Device; -import org.nl.acs.device.domain.DeviceExtra; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.mapper.DeviceExtraMapper; -import org.nl.acs.device.domain.DeviceRunpoint; -import org.nl.acs.device.service.mapper.DeviceRunpointMapper; -import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.one_conveyor.scanner_weight_conveyor.ConveyorWithScannerWeightDeviceDriver; -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.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.domain.DeviceExtra; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.mapper.DeviceExtraMapper; +import org.nl.acs.device.device.domain.DeviceRunpoint; +import org.nl.acs.device.device.service.mapper.DeviceRunpointMapper; +import org.nl.acs.device.driver.stacker.double_stacker.StandardStackerDeviceDriver; +import org.nl.acs.opc.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.factory.ItemDataAccessorFactory; +import org.nl.acs.udw.mqttUdw.TagDataAccessor; +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.service.DeviceExtraService; -import org.nl.acs.device_driver.DeviceDriverDefination; -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_inspect_site.StandardInspectSiteDeviceDriver; -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.defination.OpcDeviceDriverDefination; -import org.nl.acs.device.service.dto.DeviceRunpointDto; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.service.OpcService; -import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.plc.service.OpcPlcService; -import org.nl.acs.opc.service.dto.OpcPlcDto; +import org.nl.acs.device.device.service.DeviceDriverDefinationAppService; +import org.nl.acs.device.device.service.DeviceExtraService; +import org.nl.acs.device.driver.DeviceDriverDefination; +import org.nl.acs.device.driver.ScannerDeviceDriver; +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_ordinary_site.StandardOrdinarySiteDeviceDriver; +import org.nl.acs.device.driver.scanner.standard_scanner.StandardScannerDeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; +import org.nl.acs.device.device.service.dto.DeviceRunpointDto; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.opc.opc.service.OpcService; +import org.nl.acs.opc.opc.service.dto.OpcDto; +import org.nl.acs.opc.plc.service.OpcPlcService; +import org.nl.acs.opc.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.service.dto.DeviceDto; -import org.nl.acs.device.service.dto.DeviceQueryParam; -import org.nl.acs.device.service.mapper.DeviceMapper; -import org.nl.config.driver.ExcelTemplateCreator; -import org.nl.config.driver.GeneratorDriverTemplate; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.device.service.dto.DeviceDto; +import org.nl.acs.device.device.service.dto.DeviceQueryParam; +import org.nl.acs.device.device.service.mapper.DeviceMapper; +import org.nl.config.generator_template.ExcelTemplateCreator; +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 i private final DeviceDriverDefinationAppService deviceDriverDefinationAppService; private final DeviceAppService deviceAppService; private final ISysParamService paramService; - @Autowired - private MqttService mqttService; private final ISysDictService iSysDictService; List storageCells = new ArrayList<>(); @@ -968,9 +960,6 @@ public class DeviceServiceImpl extends CommonServiceImpl 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 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 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 i @Override public void testWrite(Map map) { List dbItems = (List) map.get("dbItems"); - List> list = new ArrayList<>(); + List> list = new ArrayList<>(); //String opc_id = (String) map.get("opc_id"); - // Map itemMap = new HashMap(); + // Map itemMap = new HashMap(); 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")); - Map valueMap = new HashMap<>(); - valueMap.put("id",json.getString("code")); - valueMap.put("v",json.get("dbw_value")); + // itemMap.put(json.getString("code"), json.getString("dbw_value")); + Map valueMap = new HashMap<>(); + valueMap.put("id", json.getString("code")); + 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); - // ReadUtil.write(itemMap, server); + // Server server = ReadUtil.getServer(opc_id); + // ReadUtil.write(itemMap, server); } /** @@ -2050,4 +2034,76 @@ public class DeviceServiceImpl extends CommonServiceImpl i public void templateDriver(HttpServletResponse response) throws IOException { ExcelTemplateCreator.createExcelTemplate(response); } + + @Override + public void downDeviceDBloadCSVUA(JSONArray jsonarr, HttpServletResponse response) { + List 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); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceisonlineServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceisonlineServiceImpl.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceisonlineServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/impl/DeviceisonlineServiceImpl.java index 2f56784..26aade2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceisonlineServiceImpl.java +++ b/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.service.DeviceisonlineService; -import org.nl.acs.device.service.dto.DeviceisonlineDto; -import org.nl.acs.device.service.dto.DeviceisonlineQueryParam; -import org.nl.acs.device.service.mapper.DeviceisonlineMapper; +import org.nl.acs.device.device.domain.Deviceisonline; +import org.nl.acs.device.device.service.DeviceisonlineService; +import org.nl.acs.device.device.service.dto.DeviceisonlineDto; +import org.nl.acs.device.device.service.dto.DeviceisonlineQueryParam; +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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceAssignedMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceAssignedMapper.java similarity index 55% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceAssignedMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceAssignedMapper.java index c5731ea..593458f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceAssignedMapper.java +++ b/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.common.base.CommonMapper; +import org.nl.acs.device.device.domain.DeviceAssigned; +import org.nl.acs.common.base.mapper.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceDbitemMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceDbitemMapper.java similarity index 54% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceDbitemMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceDbitemMapper.java index 6459046..c3cf1e8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceDbitemMapper.java +++ b/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.device.domain.DeviceDbitem; +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.device.device.domain.DeviceDbitem; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceErpmappingMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceErpmappingMapper.java similarity index 55% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceErpmappingMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceErpmappingMapper.java index 1f9c490..fd1f5fa 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceErpmappingMapper.java +++ b/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.device.domain.DeviceErpmapping; +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.device.device.domain.DeviceErpmapping; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceExtraMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceExtraMapper.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceExtraMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceExtraMapper.java index e7753a8..eb9e98f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceExtraMapper.java +++ b/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.common.base.CommonMapper; +import org.nl.acs.device.device.domain.DeviceExtra; +import org.nl.acs.common.base.mapper.CommonMapper; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMapper.java similarity index 88% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMapper.java index 3fd6369..df60248 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMapper.java +++ b/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.device.domain.Device; +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.device.device.domain.Device; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMappers.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMappers.java similarity index 56% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMappers.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceMappers.java index b3610d3..d33e23b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceMappers.java +++ b/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.domain.Device; +import org.nl.acs.device.device.domain.Device; @Mapper public interface DeviceMappers extends BaseMapper { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceRunpointMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceRunpointMapper.java similarity index 55% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceRunpointMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceRunpointMapper.java index 49acb4d..f455a2e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceRunpointMapper.java +++ b/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.device.domain.DeviceRunpoint; +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.device.device.domain.DeviceRunpoint; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceisonlineMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceisonlineMapper.java similarity index 55% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceisonlineMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device/service/mapper/DeviceisonlineMapper.java index bb25217..9ee7ec6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/mapper/DeviceisonlineMapper.java +++ b/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.device.domain.Deviceisonline; +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.device.device.domain.Deviceisonline; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java deleted file mode 100644 index e49d55c..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java +++ /dev/null @@ -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 { - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/AbstractDeviceDriver.java similarity index 52% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/AbstractDeviceDriver.java index 702af66..0795675 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractDeviceDriver.java +++ b/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_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.Device; @Data public class AbstractDeviceDriver implements DeviceDriver { public Device device; private DeviceDriverDefination driverDefination; - private boolean stop = false; - - public Boolean online; - + public boolean online = true; 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 ""; - } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/AbstractOpcDeviceDriver.java similarity index 86% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/AbstractOpcDeviceDriver.java index 232ce8b..858d417 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java +++ b/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.udw.mqttUdw.ItemsDataAccessor; -import org.nl.acs.udw.mqttUdw.factory.ItemDataAccessorFactory; +import org.nl.acs.opc.opc.OpcConfig; +import org.nl.acs.udw.mqttUdw.TagDataAccessor; +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) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriver.java similarity index 71% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriver.java index 7cb17bc..186489d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriver.java @@ -1,9 +1,7 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; +import org.nl.acs.device.device.domain.Device; import java.util.ArrayList; import java.util.List; @@ -64,19 +62,4 @@ public interface DeviceDriver { return devicesList; } - /** - * getModeName - * @param mode - * @return - */ - default String getModeName(String mode) { - if (StrUtil.equals("0", mode)) { - mode = "脱机"; - } else if (StrUtil.equals(CommonFinalParam.TWO, mode)) { - mode = "联机"; - } else { - mode = RequestMethodEnum.getName(mode); - } - return ObjectUtil.isEmpty(mode) ? "无效的请求,驱动中未配置" : mode; - } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/BaseTagsDataReader.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverBaseReader.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/BaseTagsDataReader.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverBaseReader.java index 99f89cd..8893a6f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/BaseTagsDataReader.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverBaseReader.java @@ -1,6 +1,8 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; import com.alibaba.fastjson.JSON; +import org.nl.acs.device.utils.ArrayComparisonUtil; +import org.nl.acs.device.utils.ArrayConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ReflectionUtils; @@ -17,9 +19,9 @@ import java.util.function.Supplier; * @Author Gengby * @Date 2024/4/1 */ -public interface BaseTagsDataReader { +public interface DeviceDriverBaseReader { - public static final Logger LOGGER = LoggerFactory.getLogger(BaseTagsDataReader.class); + public static final Logger LOGGER = LoggerFactory.getLogger(DeviceDriverBaseReader.class); public static final boolean ENABLE_LOGGING_FLAG = true; @@ -35,63 +37,51 @@ public interface BaseTagsDataReader { static Map, Supplier> createDefaultValuesSuppliers() { Map, Supplier> defaultMap = new HashMap<>(); - defaultMap.put(int.class, () -> 0); defaultMap.put(Integer.class, () -> 0); defaultMap.put(int[].class, () -> new int[0]); defaultMap.put(Integer[].class, () -> new Integer[0]); - defaultMap.put(double.class, () -> 0.0d); defaultMap.put(Double.class, () -> 0.0d); defaultMap.put(double[].class, () -> new double[0]); defaultMap.put(Double[].class, () -> new Double[0]); - defaultMap.put(long.class, () -> 0L); defaultMap.put(Long.class, () -> 0L); defaultMap.put(long[].class, () -> new long[0]); defaultMap.put(Long[].class, () -> new Long[0]); - defaultMap.put(boolean.class, () -> false); defaultMap.put(Boolean.class, () -> Boolean.FALSE); defaultMap.put(boolean[].class, () -> new boolean[0]); defaultMap.put(Boolean[].class, () -> new Boolean[0]); - defaultMap.put(byte.class, () -> (byte) 0); defaultMap.put(Byte.class, () -> (byte) 0); defaultMap.put(byte[].class, () -> new byte[0]); defaultMap.put(Byte[].class, () -> new Byte[0]); - defaultMap.put(char.class, () -> '\u0000'); defaultMap.put(Character.class, () -> '\u0000'); defaultMap.put(char[].class, () -> new char[0]); defaultMap.put(Character[].class, () -> new Character[0]); - defaultMap.put(short.class, () -> (short) 0); defaultMap.put(Short.class, () -> (short) 0); defaultMap.put(short[].class, () -> new short[0]); defaultMap.put(Short[].class, () -> new Short[0]); - defaultMap.put(float.class, () -> 0.0f); defaultMap.put(Float.class, () -> 0.0f); defaultMap.put(float[].class, () -> new float[0]); defaultMap.put(Float[].class, () -> new Float[0]); - defaultMap.put(String.class, () -> ""); defaultMap.put(String[].class, () -> new String[0]); - return defaultMap; } static Map, Supplier> getLimitPlacesValue(Class filedType, T value) { Map, Supplier> limitMap = new HashMap<>(); Map, Function>> strategyMap = new HashMap<>(); - strategyMap.put(Double.class, v -> () -> ArrayConverter.limit4Places(String.valueOf(value))); - strategyMap.put(double.class, v -> () -> ArrayConverter.limit4Places(String.valueOf(value))); - strategyMap.put(Float.class, v -> () -> ArrayConverter.limit2Places(String.valueOf(value))); - strategyMap.put(float.class, v -> () -> ArrayConverter.limit2Places(String.valueOf(value))); - Optional.ofNullable(strategyMap.get(filedType)) - .map(func -> func.apply(value)) - .ifPresent(supplier -> limitMap.put(filedType, supplier)); + strategyMap.put(Double.class, v -> () -> ArrayConverter.limitDoublePlaces(String.valueOf(value))); + strategyMap.put(double.class, v -> () -> ArrayConverter.limitDoublePlaces(String.valueOf(value))); + strategyMap.put(Float.class, v -> () -> ArrayConverter.limitFloatPlaces(String.valueOf(value))); + strategyMap.put(float.class, v -> () -> ArrayConverter.limitFloatPlaces(String.valueOf(value))); + Optional.ofNullable(strategyMap.get(filedType)).map(func -> func.apply(value)).ifPresent(supplier -> limitMap.put(filedType, supplier)); return limitMap; } @@ -111,13 +101,11 @@ public interface BaseTagsDataReader { strategyMap.put(boolean[].class, v -> () -> ArrayConverter.convertStringToArrayOfBoolean(JSON.toJSONString(v))); strategyMap.put(Boolean[].class, v -> () -> ArrayConverter.convertStringToArrayOfBooleanObject(JSON.toJSONString(v))); strategyMap.put(String[].class, v -> () -> ArrayConverter.convertStringToArrayOfString(JSON.toJSONString(v))); - strategyMap.put(Double[].class, v -> () -> ArrayConverter.convertStringToArrayOfDoubleObject(JSON.toJSONString(v), ArrayConverter::limit4Places)); - strategyMap.put(double[].class, v -> () -> ArrayConverter.convertStringToArrayOfDouble(JSON.toJSONString(v), ArrayConverter::limit4Places)); - strategyMap.put(Float[].class, v -> () -> ArrayConverter.convertStringToArrayOfFloatObject(JSON.toJSONString(v), ArrayConverter::limit2Places)); - strategyMap.put(float[].class, v -> () -> ArrayConverter.convertStringToArrayOfFloat(JSON.toJSONString(v), ArrayConverter::limit2Places)); - Optional.ofNullable(strategyMap.get(filedType)) - .map(func -> func.apply(value)) - .ifPresent(supplier -> arrayMap.put(filedType, supplier)); + strategyMap.put(Double[].class, v -> () -> ArrayConverter.convertStringToArrayOfDoubleObject(JSON.toJSONString(v), ArrayConverter::limitDoublePlaces)); + strategyMap.put(double[].class, v -> () -> ArrayConverter.convertStringToArrayOfDouble(JSON.toJSONString(v), ArrayConverter::limitDoublePlaces)); + strategyMap.put(Float[].class, v -> () -> ArrayConverter.convertStringToArrayOfFloatObject(JSON.toJSONString(v), ArrayConverter::limitFloatPlaces)); + strategyMap.put(float[].class, v -> () -> ArrayConverter.convertStringToArrayOfFloat(JSON.toJSONString(v), ArrayConverter::limitFloatPlaces)); + Optional.ofNullable(strategyMap.get(filedType)).map(func -> func.apply(value)).ifPresent(supplier -> arrayMap.put(filedType, supplier)); return arrayMap; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverDefination.java similarity index 83% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverDefination.java index 891f718..893ebd3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/DeviceDriverDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverDefination.java @@ -1,7 +1,7 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/FeedLmsRealFailed.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverFeedLmsRealFailed.java similarity index 63% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/FeedLmsRealFailed.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverFeedLmsRealFailed.java index 6739059..675a607 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/FeedLmsRealFailed.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/DeviceDriverFeedLmsRealFailed.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; import com.alibaba.fastjson.JSONObject; @@ -6,6 +6,6 @@ import com.alibaba.fastjson.JSONObject; * @author: geng by * @createDate: 2023/4/21 */ -public interface FeedLmsRealFailed { +public interface DeviceDriverFeedLmsRealFailed { public JSONObject feedLmsRealFailedInfo(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ExecutableDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ExecutableDeviceDriver.java similarity index 84% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ExecutableDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ExecutableDeviceDriver.java index d5f3ec3..1b537ef 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ExecutableDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ExecutableDeviceDriver.java @@ -1,6 +1,4 @@ -package org.nl.acs.device_driver.driver; - -import org.nl.acs.device_driver.DeviceDriver; +package org.nl.acs.device.driver; public interface ExecutableDeviceDriver extends DeviceDriver { /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ItemDto.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ItemDto.java index b9d5cd8..e7448cd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/standard_inspect/ItemDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ItemDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.device_driver.standard_inspect; +package org.nl.acs.device.driver; import lombok.Data; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ItemValue.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ItemValue.java index 824c769..7121e9b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/ItemValue.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ItemValue.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.driver; +package org.nl.acs.device.driver; /** * @author ldjun diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/LinewayDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/LinewayDeviceDriver.java similarity index 87% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/LinewayDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/LinewayDeviceDriver.java index b57bc92..036c222 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/LinewayDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/LinewayDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcDeviceDriver.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcDeviceDriver.java index cf5a6d8..1555b9b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.driver; +package org.nl.acs.device.driver; import cn.hutool.core.util.ObjectUtil; @@ -6,12 +6,11 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.domain.DeviceExtra; -import org.nl.acs.device.service.mapper.DeviceExtraMapper; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.opc.OpcItemDto; -import org.nl.acs.udw.mqttUdw.ItemsDataAccessor; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.domain.DeviceExtra; +import org.nl.acs.device.device.service.mapper.DeviceExtraMapper; +import org.nl.acs.opc.opc.OpcItemDto; +import org.nl.acs.udw.mqttUdw.TagDataAccessor; import org.nl.config.SpringContextHolder; import java.util.ArrayList; @@ -25,7 +24,7 @@ public interface OpcDeviceDriver extends DeviceDriver { * * @return */ - ItemsDataAccessor getOpcValueAccessor(); + TagDataAccessor getOpcValueAccessor(); DeviceExtraMapper deviceExtraMapper = SpringContextHolder.getBean("deviceExtraMapper"); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcDeviceDriverDefination.java similarity index 64% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcDeviceDriverDefination.java index c5c16dd..69312f4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/defination/OpcDeviceDriverDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcDeviceDriverDefination.java @@ -1,7 +1,4 @@ -package org.nl.acs.device_driver.defination; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.DeviceDriverDefination; +package org.nl.acs.device.driver; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/standard_inspect/OpcPlcDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcPlcDto.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/standard_inspect/OpcPlcDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcPlcDto.java index cd14a76..c22b0c2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/standard_inspect/OpcPlcDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/OpcPlcDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.device.device_driver.standard_inspect; +package org.nl.acs.device.driver; import lombok.Data; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RouteableDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/RouteableDeviceDriver.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RouteableDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/RouteableDeviceDriver.java index b0b2e49..65487c2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RouteableDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/RouteableDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; public interface RouteableDeviceDriver extends DeviceDriver { /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ScannerDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ScannerDeviceDriver.java similarity index 89% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ScannerDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ScannerDeviceDriver.java index 864b938..d67fb91 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ScannerDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/ScannerDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; public interface ScannerDeviceDriver extends DeviceDriver { /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/StandardRequestMethod.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/StandardRequestMethod.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/StandardRequestMethod.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/StandardRequestMethod.java index 27f036e..01e9430 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/StandardRequestMethod.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/StandardRequestMethod.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; public interface StandardRequestMethod { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/StorageDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/StorageDeviceDriver.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/StorageDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/StorageDeviceDriver.java index b9cc052..5a819b5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/StorageDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/StorageDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.driver; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/magic_agv/MagicAgvDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/magic_agv/MagicAgvDefination.java index 5c2a2c3..0732a42 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/magic_agv/MagicAgvDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.agv.magic_agv; +package org.nl.acs.device.driver.agv.magic_agv; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/magic_agv/MagicAgvDeviceDriver.java similarity index 66% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/magic_agv/MagicAgvDeviceDriver.java index 2ccc733..e80ccc6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/magic_agv/MagicAgvDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/magic_agv/MagicAgvDeviceDriver.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.agv.magic_agv; +package org.nl.acs.device.driver.agv.magic_agv; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; +import org.nl.acs.device.driver.AbstractDeviceDriver; import org.springframework.stereotype.Service; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndcone/AgvNdcOneDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndcone/AgvNdcOneDefination.java index 68913dc..22bd43d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndcone/AgvNdcOneDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.agv.ndcone; +package org.nl.acs.device.driver.agv.ndcone; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndcone/AgvNdcOneDeviceDriver.java similarity index 86% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndcone/AgvNdcOneDeviceDriver.java index 4572870..501e669 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.agv.ndcone; +package org.nl.acs.device.driver.agv.ndcone; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -9,15 +9,14 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.FeedLmsRealFailed; -import org.nl.acs.device_driver.agv.utils.OneAgvPhase; -import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; -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.driver.AbstractDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverFeedLmsRealFailed; +import org.nl.acs.device.driver.agv.utils.OneAgvPhase; +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.AbstractDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.instruction.domain.Instruction; @@ -25,7 +24,7 @@ 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.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; import org.nl.config.SpringContextHolder; @@ -41,7 +40,7 @@ import java.util.Map; @Slf4j @Data @RequiredArgsConstructor -public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, DeviceStageMonitor, FeedLmsRealFailed { +public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, DeviceStageMonitor, DeviceDriverFeedLmsRealFailed { ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); @@ -156,7 +155,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //货架 StandardStorageDeviceDriver standardStorageDeviceDriver; // - SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; //分配 车id //(不需要WCS反馈) @@ -211,26 +209,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic standardOrdinarySiteDeviceDriver.setInst(inst); } - if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); - if (siemensConveyorDeviceDriver.getMove() == 1) { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - message = siemensConveyorDeviceDriver.getDevice_code() + "请求取货条件不满足待机有货"; - log.info("请求取货条件不满足待机有货"); - } - } - - if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); - if (siemensConveyorDeviceDriver.getMove() == 1) { - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - message = siemensConveyorDeviceDriver.getDevice_code() + "请求取货条件不满足待机有货"; - log.info("请求取货条件不满足待机有货"); - } - } - if (device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } @@ -281,26 +259,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic standardOrdinarySiteDeviceDriver.setInst(inst); } - if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); - if (siemensConveyorDeviceDriver.getTo_command() == 2) { - log.info("取货完成请求离开，当前输送to_command:" + siemensConveyorDeviceDriver.getTo_command()); - data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("取货完成请求离开下发输送信号，当前输送to_command:" + siemensConveyorDeviceDriver.getTo_command()); - List list = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_command"); - map.put("value", CommonFinalParam.TWO); - list.add(map); - try { - siemensConveyorDeviceDriver.writing(list); - siemensConveyorDeviceDriver.writing(list); - } catch (Exception e) { - e.printStackTrace(); - } - } - } if (device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { standardStorageDeviceDriver = (StandardStorageDeviceDriver) device.getDeviceDriver(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndctwo/AgvNdcTwoDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndctwo/AgvNdcTwoDefination.java index 2fc507b..8deff81 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndctwo/AgvNdcTwoDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.agv.ndctwo; +package org.nl.acs.device.driver.agv.ndctwo; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index d128412..eab6080 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.agv.ndctwo; +package org.nl.acs.device.driver.agv.ndctwo; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -9,15 +9,15 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.auto.run.TwoNDCSocketConnectionAutoRun; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.FeedLmsRealFailed; -import org.nl.acs.device_driver.agv.utils.TwoAgvPhase; -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.storage.standard_storage.StandardStorageDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverFeedLmsRealFailed; +import org.nl.acs.device.driver.agv.utils.TwoAgvPhase; +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.storage.standard_storage.StandardStorageDeviceDriver; +import org.nl.acs.device.driver.AbstractDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.history.ErrorUtil; @@ -26,7 +26,7 @@ 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.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.task.service.impl.TaskServiceImpl; @@ -45,7 +45,7 @@ import java.util.Map; @Slf4j @Data @RequiredArgsConstructor -public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, DeviceStageMonitor, FeedLmsRealFailed { +public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements DeviceDriver, DeviceStageMonitor, DeviceDriverFeedLmsRealFailed { ISysParamService ISysParamService = SpringContextHolder.getBean(ISysParamService.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); @@ -780,7 +780,7 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic param.put("device_name", this.getDevice().getDevice_name()); param.put("device_type", "4"); param.put("product_area", ISysParamService.findByCode("productArea").getValue()); - acsToWmsService.sendDeviceStatus(param); + //acsToWmsService.sendDeviceStatus(param); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/IAgv.java similarity index 76% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/IAgv.java index 87efc38..14af6f4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/IAgv.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/IAgv.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.agv.utils; +package org.nl.acs.device.driver.agv.utils; public interface IAgv { /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/OneAgvPhase.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/OneAgvPhase.java index d611d3f..1a7eddc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/OneAgvPhase.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/OneAgvPhase.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.agv.utils; +package org.nl.acs.device.driver.agv.utils; import org.springframework.stereotype.Service; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/TwoAgvPhase.java similarity index 97% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/TwoAgvPhase.java index 0050427..a8e796e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/utils/TwoAgvPhase.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/utils/TwoAgvPhase.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.agv.utils; +package org.nl.acs.device.driver.agv.utils; import org.springframework.stereotype.Service; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/ItemProtocol.java similarity index 99% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/ItemProtocol.java index 18fe2fc..b07a093 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/ItemProtocol.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.agv.xg_agv; +package org.nl.acs.device.driver.agv.xg_agv; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/XgagvDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/XgagvDefination.java index 1ce3a1a..a22c1ba 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/XgagvDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.agv.xg_agv; +package org.nl.acs.device.driver.agv.xg_agv; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/XgagvDeviceDriver.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/XgagvDeviceDriver.java index 6de9e12..4c460dd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv/XgagvDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv/XgagvDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.agv.xg_agv; +package org.nl.acs.device.driver.agv.xg_agv; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -9,17 +9,17 @@ import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.instruction.domain.Instruction; import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.conveyor.standard_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; @@ -30,9 +30,7 @@ import org.nl.config.lucene.service.dto.LuceneLogDto; import org.springframework.beans.factory.annotation.Autowired; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** @@ -389,15 +387,16 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device LuceneLogDto reqlogDto = LuceneLogDto.builder() .device_code(device_code) .content("请求参数:" + jo) - .requestparam("请求参数:" + jo) + .request_param("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); luceneExecuteLogService.deviceExecuteLog(reqlogDto); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; LuceneLogDto resplogDto = LuceneLogDto.builder() .device_code(device_code) .content("返回参数:" + resp.body()) - .responseparam("返回参数:" + resp.body()) + .response_param("返回参数:" + resp.body()) .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); @@ -430,15 +429,16 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device LuceneLogDto reqlogDto = LuceneLogDto.builder() .device_code(device_code) .content("请求参数:" + jo) - .requestparam("请求参数:" + jo) + .request_param("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); luceneExecuteLogService.deviceExecuteLog(reqlogDto); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + // HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; LuceneLogDto resplogDto = LuceneLogDto.builder() .device_code(device_code) .content("返回参数:" + resp.body()) - .responseparam("返回参数:" + resp.body()) + .response_param("返回参数:" + resp.body()) .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); @@ -467,15 +467,16 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device LuceneLogDto reqlogDto = LuceneLogDto.builder() .device_code(device_code) .content("请求参数:" + jo) - .requestparam("请求参数:" + jo) + .request_param("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); luceneExecuteLogService.deviceExecuteLog(reqlogDto); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; LuceneLogDto resplogDto = LuceneLogDto.builder() .device_code(device_code) .content("返回参数:" + resp.body()) - .responseparam("返回参数:" + resp.body()) + .response_param("返回参数:" + resp.body()) .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); @@ -502,15 +503,16 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device LuceneLogDto reqlogDto = LuceneLogDto.builder() .device_code(device_code) .content("请求参数:" + jo) - .requestparam("请求参数:" + jo) + .request_param("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); luceneExecuteLogService.deviceExecuteLog(reqlogDto); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; LuceneLogDto resplogDto = LuceneLogDto.builder() .device_code(device_code) .content("返回参数:" + resp.body()) - .responseparam("返回参数:" + resp.body()) + .response_param("返回参数:" + resp.body()) .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); @@ -532,15 +534,16 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device LuceneLogDto reqlogDto = LuceneLogDto.builder() .device_code(device_code) .content("请求参数:" + jo) - .requestparam("请求参数:" + jo) + .request_param("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); luceneExecuteLogService.deviceExecuteLog(reqlogDto); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); LuceneLogDto resplogDto = LuceneLogDto.builder() .device_code(device_code) .content("返回参数:" + resp.body()) - .responseparam("返回参数:" + resp.body()) + .response_param("返回参数:" + resp.body()) .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); @@ -557,7 +560,8 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device jo.put("status", "6"); jo.put("device_code", this.device_code); ja.add(jo); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; if (resp.getStatus() == 200) { writing("to_di_height", 0); writing("to_di_low", 0); @@ -570,7 +574,8 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device jo.put("status", "7"); jo.put("device_code", this.device_code); ja.add(jo); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; if (resp.getStatus() == 200) { writing("to_di_low", 0); } else { @@ -596,15 +601,16 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device LuceneLogDto reqlogDto = LuceneLogDto.builder() .device_code(device_code) .content("请求参数:" + jo) - .requestparam("请求参数:" + jo) + .request_param("请求参数:" + jo) .method("feedAgvTaskStatus") .build(); luceneExecuteLogService.deviceExecuteLog(reqlogDto); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; LuceneLogDto resplogDto = LuceneLogDto.builder() .device_code(device_code) .content("返回参数:" + resp.body()) - .responseparam("返回参数:" + resp.body()) + .response_param("返回参数:" + resp.body()) .method("feedAgvTaskStatus") .status_code(String.valueOf(resp.getStatus())) .build(); @@ -622,7 +628,8 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device jo.put("status", "6"); jo.put("device_code", "A4"); ja.add(jo); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; if (resp.getStatus() == 200) { writing("to_di_height", 0); writing("to_di_low", 0); @@ -636,7 +643,8 @@ public class XgagvDeviceDriver extends AbstractOpcDeviceDriver implements Device jo.put("status", "7"); jo.put("device_code", "A4"); ja.add(jo); - HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + //HttpResponse resp = acsToWmsService.feedAgvTaskStatus(ja); + HttpResponse resp = null; if (resp.getStatus() == 200) { writing("to_di_height", 0); } else { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv_car/XgAgvCarDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv_car/XgAgvCarDefination.java index e07d85d..8c98087 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv_car/XgAgvCarDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.agv.xg_agv_car; +package org.nl.acs.device.driver.agv.xg_agv_car; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java index 68dfce5..fb9d036 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java @@ -1,6 +1,5 @@ -package org.nl.acs.device_driver.agv.xg_agv_car; +package org.nl.acs.device.driver.agv.xg_agv_car; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -10,18 +9,18 @@ import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.agv.server.XianGongAgvService; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.AbstractDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; 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.log.service.DeviceExecuteLogService; import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; import org.nl.config.SpringContextHolder; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/ItemProtocol.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/ItemProtocol.java index ba8e720..b178d54 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/ItemProtocol.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.autodoor.standard_autodoor; +package org.nl.acs.device.driver.autodoor.standard_autodoor; import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/StandardAutodoorDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/StandardAutodoorDefination.java index 77ae810..c645fbd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/StandardAutodoorDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.autodoor.standard_autodoor; +package org.nl.acs.device.driver.autodoor.standard_autodoor; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java index 1fdb49f..fda3e42 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/autodoor/standard_autodoor/StandardAutodoorDeviceDriver.java @@ -1,13 +1,13 @@ -package org.nl.acs.device_driver.autodoor.standard_autodoor; +package org.nl.acs.device.driver.autodoor.standard_autodoor; import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.config.SpringContextHolder; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/button/1 b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/button/1 new file mode 100644 index 0000000..e69de29 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDefinition.java similarity index 53% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDefinition.java index a13b2c4..ce1a258 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDefinition.java @@ -1,44 +1,40 @@ -package org.nl.acs.device_driver.conveyor.double_belt_conveyor; +package org.nl.acs.device.driver.conveyor.appearance_inspection_scannner_conveyor; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; import java.util.List; -/** - * 双工位-输送机 - */ @Service -public class DoubleBeltConveyorDefination implements OpcDeviceDriverDefination { +public class AppearanceInspectionScannerConveyorDefinition implements OpcDeviceDriverDefination { @Override public String getDriverCode() { - return "double_belt_conveyor"; + return "appearance_inspection_scanner_conveyor_device"; } @Override public String getDriverName() { - return "双工位-输送机"; + return "输送机-外形检测-扫码"; } @Override public String getDriverDescription() { - return "双工位-输送机"; + return "输送机-外形检测-扫码"; } @Override public DeviceDriver getDriverInstance(Device device) { - return (new DoubleBeltConveyorDeviceDriver()).setDevice(device).setDriverDefination(this); - + return (new AppearanceInspectionScannerConveyorDeviceDriver()).setDevice(device).setDriverDefination(this); } @Override public Class getDeviceDriverType() { - return DoubleBeltConveyorDeviceDriver.class; + return AppearanceInspectionScannerConveyorDeviceDriver.class; } @Override @@ -57,5 +53,4 @@ public class DoubleBeltConveyorDefination implements OpcDeviceDriverDefination { public List getWriteableItemDtos() { return ItemProtocol.getWriteableItemDtos(); } - } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java new file mode 100644 index 0000000..63a65ad --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/AppearanceInspectionScannerConveyorDeviceDriver.java @@ -0,0 +1,573 @@ +package org.nl.acs.device.driver.conveyor.appearance_inspection_scannner_conveyor; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.driver.*; +import org.nl.acs.device.driver.conveyor.appearance_inspection_scannner_conveyor.enums.CommandEnum; +import org.nl.acs.device.enums.RequestTypeEnum; +import org.nl.acs.ext.UnifiedResponse; +import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.instruction.enums.InstructionStatusEnum; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.monitor.DeviceStageMonitor; +import org.nl.acs.route.service.RouteLineService; +import org.nl.acs.route.service.dto.RouteLineDto; +import org.nl.acs.task.enums.TaskStatusEnum; +import org.nl.acs.task.enums.TaskTypeEnum; +import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.service.dto.TaskDto; +import org.nl.common.utils.CodeUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.config.SpringContextHolder; +import org.nl.config.lucene.service.LuceneExecuteLogService; +import org.nl.config.lucene.service.dto.LuceneLogDto; + +import java.io.Serializable; +import java.util.*; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +@Slf4j +@Getter +@Setter +@RequiredArgsConstructor +public class AppearanceInspectionScannerConveyorDeviceDriver extends AbstractOpcDeviceDriver implements + DeviceDriver, + ExecutableDeviceDriver, + RouteableDeviceDriver, + DeviceStageMonitor, + StandardRequestMethod, + DeviceDriverBaseReader { + + private final LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); + private final AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class); + private final InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); + private final TaskService taskService = SpringContextHolder.getBean(TaskService.class); + private final RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); + private final DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); + + private static final Lock LOCK = new ReentrantLock(); + + /** + * 心跳 + */ + private int heartbeat = 0; + private int lastHeartbeat = 0; + /** + * 工作模式 + */ + private int mode = 0; + private int lastMode = 0; + /** + * 光电信号 + */ + private int move = 0; + private int lastMove = 0; + /** + * 动作信号 + */ + private int action = 0; + private int lastAction = 0; + /** + * 报警信号 + */ + private int error = 0; + private int lastError = 0; + /** + * 任务号 + */ + private int task = 0; + private int lastTask = 0; + /** + * 托盘类型 + */ + private int containerType = 0; + private int lastContainerType = 0; + /** + * 托盘方向 + */ + private int containerDirection = 0; + private int lastContainerDirection = 0; + /** + * 高度 + */ + private int height = 0; + private int lastHeight = 0; + /** + * 重量 + */ + private float weight = 0; + private float lastWeight = 0; + /** + * 托盘条码 + */ + private String barcode; + private String lastBarcode; + /** + * 下发命令 + */ + private int toCommand = 0; + private int lastToCommand = 0; + /** + * 下发目标站 + */ + private int toTarget = 0; + private int lastToTarget = 0; + /** + * 下发任务号 + */ + private int toTask = 0; + private int lastToTask = 0; + /** + * 下发托盘类型 + */ + private int toContainerType = 0; + private int lastToContainerType = 0; + /** + * 当前设备编号 + */ + private String currentDeviceCode; + + /** + * 消息 + */ + private String message; + + /** + * 请求标记 + */ + boolean requireSuccess = false; + + /** + * 请求时间 + */ + private long requireTime = System.currentTimeMillis(); + + + /** + * 申请入库等待时间 + */ + private long requireInTaskTime = System.currentTimeMillis(); + + /** + * 请求间隔时间 + */ + private long requireTimeOut = 3000L; + + /** + * 设备异常标记 + */ + private boolean isError = false; + + @Override + public Device getDevice() { + return this.device; + } + + @Override + public & KeyProvider, T> T getOpcValue(E item, Class fieldClassType) { + return (T) this.getValue(item.getKey()); + } + + @Override + public void setLog(String key, Object newValue, Object oldValue) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "自动线程读取信号:" + key + ",由" + oldValue + "->" + newValue)); + } + + @Override + public void execute() { + this.currentDeviceCode = this.getDevice().getDevice_code(); + this.loadAssignData(currentDeviceCode, ItemProtocol.class); + } + + @Override + public void executeLogic() { + if (this.move != this.lastMove) { + this.requireSuccess = false; + } + if (!StrUtil.equals(this.barcode, this.lastBarcode)) { + this.requireInTaskTime = System.currentTimeMillis(); + } + if (this.move != 0 && this.task > 0) { + this.update_instruction_status_by_task(); + } +// else if (this.move != 0 && StrUtil.isNotEmpty(this.barcode)) { +// this.update_instruction_status_by_barcode(); +// } + if (!this.online) { + this.message = "设备离线"; + } else if (this.mode == 0) { + this.message = "设备未联机"; + } else if (this.error != 0) { + this.message = "设备报警"; + this.isError = true; + } else { + this.isError = false; + this.message = ""; + //编写业务逻辑方法 + if (this.mode == 2 && this.move > 0 && StrUtil.isNotEmpty(this.barcode) && !requireSuccess) { + //查询入库信息 + this.createInInstruction2(); + } else if (this.mode == 2 && this.move == 0 && !requireSuccess) { + //查询出库信息 + String cacheDeviceCode = Optional.ofNullable(this.getExtraValue().get("cacheDeviceCode")).map(Object::toString).orElse(""); + if (ObjectUtil.isNotEmpty(cacheDeviceCode)) { + this.createOutInstruction2(cacheDeviceCode); + } else { + this.createOutInstruction2(this.currentDeviceCode); + } + } else if (this.mode == 6 && move > 0 && !requireSuccess) { + //向上位申请任务 + this.applyInTask(); + } + } + } + + + private boolean isTimeValid(long currentTimeMillis) { + return currentTimeMillis - this.requireTime >= this.requireTimeOut; + } + + /** + * 申请入库任务 + */ + private void applyInTask() { + long currentTimeMillis = System.currentTimeMillis(); + if (!isTimeValid(currentTimeMillis)) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); + } else { + this.requireTime = currentTimeMillis; + JSONObject requestParam = new JSONObject(); + requestParam.put("device_code", this.currentDeviceCode); + requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); + requestParam.put("barcode", this.barcode); + requestParam.put("weight", this.weight); + requestParam.put("height", this.height); + UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); + if (response.isSuccess()) { + this.requireSuccess = true; + } + } + } + + +// public void createInInstruction() { +// long currentTimeMillis = System.currentTimeMillis(); +// if (!isTimeValid(currentTimeMillis)) { +// log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); +// } else { +// TaskDto taskDto = taskService.findReadyByStartDeviceCode(this.currentDeviceCode); +// Instruction instDto = instructionService.findReadyInst(this.currentDeviceCode); +// if (ObjectUtil.isNotEmpty(taskDto) && ObjectUtil.isEmpty(instDto)) { +// instDto = new Instruction(); +// List shortPathsList = routeLineService.getShortPathLines(taskDto.getStart_device_code(), taskDto.getNext_device_code(), taskDto.getRoute_plan_code()); +// if (CollectionUtil.isEmpty(shortPathsList)) { +// logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 不存在该点的路由信息!")); +// return; +// } +// RouteLineDto routeLineDto = shortPathsList.get(0); +// String path = routeLineDto.getPath(); +// String[] str = path.split("->"); +// List pathList = Arrays.asList(str); +// int start = 0; +// String start_device_code = pathList.get(start); +// String next_device_code = pathList.get(start + 1); +// setInstruction(instDto, taskDto, start_device_code, next_device_code); +// Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); +// if (nextDevice == null) { +// logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 未配置指令终点驱动信息, 终点: " + instDto.getNext_device_code())); +// return; +// } +// try { +// instructionService.create(instDto); +// taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); +// taskService.update(taskDto); +// int nextAddress = Optional.ofNullable(nextDevice.getExtraValue().get("address")).map(Object::toString).map(Integer::parseInt).orElse(0); +// this.writing(Arrays.asList(ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_COMMAND.getKey()), Arrays.asList(nextAddress, instDto.getInstruction_code(), CommandEnum.COMMAND_1.getValue())); +// } catch (Exception e) { +// logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 原因:" + e.getMessage())); +// return; +// } +// this.requireSuccess = true; +// } else if (ObjectUtil.isEmpty(taskDto) && ObjectUtil.isNotEmpty(instDto)) { +// String next_device_code = instDto.getNext_device_code(); +// Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); +// if (nextDevice != null && StrUtil.equals(nextDevice.getDevice_type(), "conveyor")) { +// Integer address = Optional.ofNullable(nextDevice.getExtraValue().get("address")).map(Object::toString).map(Integer::parseInt).orElse(0); +// this.writing(Arrays.asList(ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_COMMAND.getKey()), Arrays.asList(instDto.getInstruction_code(), address, CommandEnum.COMMAND_1.getValue())); +// this.requireSuccess = true; +// } +// } +// } +// } + + public void createInInstruction2() { + long currentTimeMillis = System.currentTimeMillis(); + if (!isTimeValid(currentTimeMillis)) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); + } else { + TaskDto taskDto = taskService.findReadyByVehicleCode(this.barcode); + Instruction instDto = instructionService.findReadyInstByVehicleCode(this.barcode); + if (ObjectUtil.isNotEmpty(taskDto) && ObjectUtil.isEmpty(instDto)) { + if (!StrUtil.equals(this.currentDeviceCode, taskDto.getStart_device_code())) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "当前载具号:" + this.barcode + ", 对应的设备号, 与查询到的任务起点： " + taskDto.getStart_device_code() + " 不一致, 无法生成指令。")); + return; + } + instDto = new Instruction(); + List shortPathsList = routeLineService.getShortPathLines(taskDto.getStart_device_code(), taskDto.getNext_device_code(), taskDto.getRoute_plan_code()); + if (CollectionUtil.isEmpty(shortPathsList)) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 不存在该点的路由信息!")); + return; + } + RouteLineDto routeLineDto = shortPathsList.get(0); + String path = routeLineDto.getPath(); + String[] str = path.split("->"); + List pathList = Arrays.asList(str); + int start = 0; + String start_device_code = pathList.get(start); + String next_device_code = pathList.get(start + 1); + setInstruction(instDto, taskDto, start_device_code, next_device_code); + Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); + if (nextDevice == null) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 未配置指令终点驱动信息, 终点: " + instDto.getNext_device_code())); + return; + } + try { + instructionService.create(instDto); + taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); + taskService.update(taskDto); + if (nextDevice.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + int nextAddress = Optional.ofNullable(nextDevice.getExtraValue().get("address")).map(Object::toString).map(Integer::parseInt).orElse(0); + this.writing(Arrays.asList(ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_COMMAND.getKey()), Arrays.asList(nextAddress, instDto.getInstruction_code(), CommandEnum.COMMAND_1.getValue())); + } + } catch (Exception e) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 原因:" + e.getMessage())); + return; + } + this.requireSuccess = true; + } else if (ObjectUtil.isEmpty(taskDto) && ObjectUtil.isNotEmpty(instDto)) { + String next_device_code = instDto.getNext_device_code(); + Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); + if (nextDevice != null && StrUtil.equals(nextDevice.getDevice_type(), "conveyor")) { + Integer address = Optional.ofNullable(nextDevice.getExtraValue().get("address")).map(Object::toString).map(Integer::parseInt).orElse(0); + this.writing(Arrays.asList(ItemProtocol.TO_TASK.getKey(), ItemProtocol.TO_TARGET.getKey(), ItemProtocol.TO_COMMAND.getKey()), Arrays.asList(instDto.getInstruction_code(), address, CommandEnum.COMMAND_1.getValue())); + this.requireSuccess = true; + } + } + + } + } + + +// 暂时不要删除 +// public void createOutInstruction() { +// long currentTimeMillis = System.currentTimeMillis(); +// if (!isTimeValid(currentTimeMillis)) { +// log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); +// } else { +// TaskDto taskDto = taskService.findReadyTaskByNextDeviceCode(this.currentDeviceCode); +// Instruction instDto = instructionService.findReadyInstByEnd(this.currentDeviceCode); +// if (ObjectUtil.isNotEmpty(taskDto) && ObjectUtil.isEmpty(instDto)) { +// instDto = new Instruction(); +// List shortPathsList = routeLineService.getShortPathLines(taskDto.getStart_device_code(), taskDto.getNext_device_code(), taskDto.getRoute_plan_code()); +// if (CollectionUtil.isEmpty(shortPathsList)) { +// logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 不存在该点的路由信息!")); +// return; +// } +// RouteLineDto routeLineDto = shortPathsList.get(0); +// String path = routeLineDto.getPath(); +// String[] str = path.split("->"); +// List pathList = Arrays.asList(str); +// int start = 0; +// String start_device_code = pathList.get(start); +// String next_device_code = pathList.get(start + 1); +// String start_point_code = null; +// if (StrUtil.equals(deviceAppService.findDeviceTypeByCode(start_device_code), "storage")) { +// start_point_code = start_device_code + "-" + taskDto.getFrom_y() + "-" + taskDto.getFrom_z(); +// } else { +// start_point_code = start_device_code; +// } +// setInstruction(instDto, taskDto, start_device_code, start_point_code, next_device_code, next_device_code); +// Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); +// if (nextDevice == null) { +// logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 未配置指令终点驱动信息, 终点: " + instDto.getNext_device_code())); +// return; +// } +// try { +// instructionService.create(instDto); +// taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); +// taskService.update(taskDto); +// } catch (Exception e) { +// logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 原因:" + e.getMessage())); +// return; +// } +// this.requireSuccess = true; +// } +// } +// } + + public void createOutInstruction2(String deviceCode) { + long currentTimeMillis = System.currentTimeMillis(); + if (!isTimeValid(currentTimeMillis)) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); + } else { + LOCK.lock(); + try { + TaskDto taskDto = taskService.findReadyTaskByNextDeviceCode(deviceCode); + Instruction instDto = instructionService.findReadyInstByEnd(deviceCode); + if (ObjectUtil.isNotEmpty(taskDto) && ObjectUtil.isEmpty(instDto)) { + instDto = new Instruction(); + List shortPathsList = routeLineService.getShortPathLines(taskDto.getStart_device_code(), taskDto.getNext_device_code(), taskDto.getRoute_plan_code()); + if (CollectionUtil.isEmpty(shortPathsList)) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 不存在该点的路由信息!")); + return; + } + RouteLineDto routeLineDto = shortPathsList.get(0); + String path = routeLineDto.getPath(); + String[] str = path.split("->"); + List pathList = Arrays.asList(str); + int start = 0; + String start_device_code = pathList.get(start); + String next_device_code = pathList.get(start + 1); + String start_point_code = null; + if (StrUtil.equals(deviceAppService.findDeviceTypeByCode(start_device_code), "storage")) { + start_point_code = start_device_code + "-" + taskDto.getFrom_y() + "-" + taskDto.getFrom_z(); + } else { + start_point_code = start_device_code; + } + setInstruction(instDto, taskDto, start_device_code, start_point_code, next_device_code, next_device_code); + Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); + if (nextDevice == null) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 未配置指令终点驱动信息, 终点: " + instDto.getNext_device_code())); + return; + } + try { + instructionService.create(instDto); + taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); + taskService.update(taskDto); + } catch (Exception e) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 原因:" + e.getMessage())); + return; + } + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建出库指令成功,指令号:" + instDto.getInstruction_code() + " , 任务号:" + instDto.getTask_code())); + this.requireSuccess = true; + } + } finally { + LOCK.unlock(); + } + } + } + + + /** + * 更新指令状态 + */ + @SneakyThrows + public void update_instruction_status_by_task() { + Instruction instruction = instructionService.findByCodeFromCache(String.valueOf(this.task)); + if (ObjectUtil.isNotEmpty(instruction)) { + update_inst_status(instruction); + } + } + + @SneakyThrows + private void update_instruction_status_by_barcode() { + Instruction instruction = instructionService.findByVehicleCodeFromCache(this.barcode); + if (ObjectUtil.isNotEmpty(instruction)) { + update_inst_status(instruction); + } + } + + @SneakyThrows + private void update_inst_status(Instruction instruction) { + if (InstructionStatusEnum.READY.getIndex().equals(instruction.getInstruction_status()) && this.currentDeviceCode.equals(instruction.getStart_device_code())) { + instruction.setInstruction_status(InstructionStatusEnum.BUSY.getIndex()); + instruction.setExecute_device_code(this.currentDeviceCode); + instructionService.update(instruction); + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "指令号:" + instruction.getInstruction_code() + ", 修改指令状态为 -> " + InstructionStatusEnum.BUSY.getName())); + } else if ((InstructionStatusEnum.BUSY.getIndex().equals(instruction.getInstruction_status()) || InstructionStatusEnum.READY.getIndex().equals(instruction.getInstruction_status())) && this.currentDeviceCode.equals(instruction.getNext_device_code())) { + instruction.setInstruction_status(InstructionStatusEnum.FINISHED.getIndex()); + instruction.setExecute_device_code(this.currentDeviceCode); + instructionService.finish(instruction); + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "指令号:" + instruction.getInstruction_code() + ", 修改指令状态为 -> " + InstructionStatusEnum.FINISHED.getName())); + } + } + + @Override + public JSONObject getDeviceStatusName() throws Exception { + JSONObject jo = new JSONObject(); + jo.put("device_code", this.currentDeviceCode); + jo.put("device_name", this.getDevice().getDevice_name()); + jo.put("driver_type", "appearance_inspection_scanner_conveyor_device"); + jo.put("is_click", true); + jo.put("message", this.message); + jo.put("isOnline", this.online); + jo.put("isError", this.isError); + return jo; + } + + @Override + public void setDeviceStatus(JSONObject data) { + + } + + private void setInstruction(Instruction instdto, TaskDto taskDto, String start_device_code, String next_device_code) { + instdto.setInstruction_id(IdUtil.simpleUUID()); + instdto.setInstruction_code(CodeUtil.getNewCode("INSTRUCT_NO")); + instdto.setRoute_plan_code(taskDto.getRoute_plan_code()); + instdto.setRemark(taskDto.getRemark()); + instdto.setMaterial(taskDto.getMaterial()); + instdto.setQuantity(taskDto.getQuantity()); + instdto.setTask_id(taskDto.getTask_id()); + instdto.setTask_code(taskDto.getTask_code()); + instdto.setVehicle_code(taskDto.getVehicle_code()); + String now = DateUtil.now(); + instdto.setCreate_time(now); + instdto.setCreate_by(SecurityUtils.getCurrentNickName()); + instdto.setStart_device_code(start_device_code); + instdto.setNext_device_code(next_device_code); + instdto.setStart_point_code(start_device_code); + instdto.setNext_point_code(next_device_code); + instdto.setPriority(taskDto.getPriority()); + instdto.setInstruction_status(InstructionStatusEnum.READY.getIndex()); + instdto.setExecute_device_code(start_device_code); + instdto.setInstruction_type(taskDto.getTask_type()); + } + + private void setInstruction(Instruction instdto, TaskDto taskDto, String start_device_code, String start_point_code, String next_device_code, String next_point_code) { + instdto.setInstruction_id(IdUtil.simpleUUID()); + instdto.setInstruction_code(CodeUtil.getNewCode("INSTRUCT_NO")); + instdto.setRoute_plan_code(taskDto.getRoute_plan_code()); + instdto.setRemark(taskDto.getRemark()); + instdto.setMaterial(taskDto.getMaterial()); + instdto.setQuantity(taskDto.getQuantity()); + instdto.setTask_id(taskDto.getTask_id()); + instdto.setTask_code(taskDto.getTask_code()); + instdto.setVehicle_code(taskDto.getVehicle_code()); + String now = DateUtil.now(); + instdto.setCreate_time(now); + instdto.setCreate_by(SecurityUtils.getCurrentNickName()); + instdto.setStart_device_code(start_device_code); + instdto.setNext_device_code(next_device_code); + instdto.setStart_point_code(start_point_code); + instdto.setNext_point_code(next_point_code); + instdto.setPriority(taskDto.getPriority()); + instdto.setInstruction_status(InstructionStatusEnum.READY.getIndex()); + instdto.setExecute_device_code(start_device_code); + instdto.setInstruction_type(taskDto.getTask_type()); + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/ItemProtocol.java new file mode 100644 index 0000000..ab4c064 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/ItemProtocol.java @@ -0,0 +1,70 @@ +package org.nl.acs.device.driver.conveyor.appearance_inspection_scannner_conveyor; + +import org.nl.acs.device.driver.ItemDto; + +import org.nl.acs.device.driver.DeviceDriverBaseReader; + +import java.util.List; +import java.util.ArrayList; + +public enum ItemProtocol implements DeviceDriverBaseReader.KeyProvider { + HEARTBEAT("heartbeat", "心跳", "DB600.B0"), + MODE("mode", "工作模式", "DB600.B1"), + MOVE("move", "光电信号", "DB600.B2"), + ACTION("action", "动作信号", "DB600.B3"), + ERROR("error", "报警信号", "DB600.B5"), + TASK("task", "任务号", "DB600.D6"), + CONTAINER_TYPE("containerType", "托盘类型", "DB600.B7"), + CONTAINER_DIRECTION("containerDirection", "托盘方向", "DB600.B8"), + HEIGHT("height", "高度", "DB600.B9"), + WEIGHT("weight", "重量", "DB600.D10"), + BARCODE("barcode", "托盘条码", "DB600.STRING1.50"), + TO_COMMAND("toCommand", "下发命令", "DB610.W0"), + TO_TARGET("toTarget", "下发目标站", "DB610.W4"), + TO_TASK("toTask", "下发任务号", "DB610.D6"), + TO_CONTAINER_TYPE("toContainerType", "下发托盘类型", "DB610.W8"); + + private final String key; + private final String description; + private final String address; + + ItemProtocol(String key, String description, String address) { + this.key = key; + this.description = description; + this.address = address; + } + + @Override + public String getKey() { + return this.key; + } + + public String getDescription() { + return description; + } + + public String getAddress() { + return address; + } + + public static List getReadableItemDtos() { + List list = new ArrayList<>(); + for (ItemProtocol prop : values()) { + if (!prop.getKey().startsWith("to")) { + list.add(new ItemDto(prop.getKey(), prop.getDescription(), prop.getAddress())); + } + } + return list; + } + + public static List getWriteableItemDtos() { + List list = new ArrayList<>(); + for (ItemProtocol prop : values()) { + if (prop.getKey().startsWith("to")) { + list.add(new ItemDto(prop.getKey(), prop.getDescription(), prop.getAddress())); + } + } + return list; + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/enums/CommandEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/enums/CommandEnum.java new file mode 100644 index 0000000..8327ef9 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/appearance_inspection_scannner_conveyor/enums/CommandEnum.java @@ -0,0 +1,26 @@ +package org.nl.acs.device.driver.conveyor.appearance_inspection_scannner_conveyor.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/26 + */ +@Getter +@AllArgsConstructor +public enum CommandEnum { + COMMAND_1(1, "执行任务"), + COMMAND_2(2, "开始取货"), + COMMAND_3(3, "取货完成"), + COMMAND_4(4, "开始放货"), + COMMAND_5(5, "放货完成"), + COMMAND_6(6, "反馈申请入库任务成功"), + COMMAND_7(7, "反馈申请二楼出库任务成功"), + COMMAND_8(8, "反馈申请三楼出库任务成功"), + COMMAND_99(99, "申请失败"); + + private final int value; + private final String label; +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/ItemProtocol.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/ItemProtocol.java index f209573..4a7dda7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/ItemProtocol.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java similarity index 80% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java index 49e296e..01219ba 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/StandardConveyorControlDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java index efee9b9..de80476 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -9,20 +9,20 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.custompolicy.WaitingInstructionDeque; import org.nl.acs.custompolicy.server.CustomPolicyService; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; 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.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.WcsConfig; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.opc.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.domain.Task; @@ -350,11 +350,11 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver public void writing(int command, int target, int task) { String to_command = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command; + + "." + org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_command; String to_target = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_target; + + "." + org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_target; String to_task = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_task; + + "." + org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_scanner.ItemProtocol.item_to_task; //String opcservcerid = this.getDevice().getOpc_server_id(); //Server server = ReadUtil.getServer(opcservcerid); Map itemMap = new HashMap(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java similarity index 97% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java index e8e748f..ccc6739 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/ItemProtocol.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_plcscanner; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java similarity index 81% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java index 35c5adf..39502d9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorControlWithPlcScannerDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_plcscanner; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java similarity index 87% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java index a3ed588..a4d329b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardConveyorWithPlcScannerConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_plcscanner; public class StandardConveyorWithPlcScannerConfig { public static String relation_scanner = "link_scanner"; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java index ea3f5d6..0519d59 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_plcscanner/StandardCoveyorControlWithPlcScannerDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_plcscanner; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_plcscanner; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -12,19 +12,19 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.nl.acs.AcsConfig; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.WcsConfig; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.opc.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.domain.Task; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java similarity index 97% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java index 6cee0a0..fe6b979 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/ItemProtocol.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_scanner; import cn.hutool.core.util.StrUtil; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java similarity index 81% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java index f8986f8..181e7b4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorControlWithScannerDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_scanner; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java similarity index 87% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java index 43a939f..2e11a5e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardConveyorWithScannerConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_scanner; public class StandardConveyorWithScannerConfig { public static String relation_scanner = "link_scanner"; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java index 29781ea..419ef38 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_conveyor_control_with_scanner; +package org.nl.acs.device.driver.conveyor.standard_conveyor_control_with_scanner; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -12,21 +12,21 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.nl.acs.AcsConfig; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.ScannerDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.ScannerDeviceDriver; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.WcsConfig; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.opc.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.enums.TaskStatusEnum; @@ -709,7 +709,8 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe apply.put("vehicle_code", container_code); apply.put("device_code", device_code); apply.put("type", CommonFinalParam.ONE); - String str = acsToWmsService.applyTaskToWms(apply); + //String str = acsToWmsService.applyTaskToWms(apply); + String str = null; JSONObject jo = JSON.parseObject(str); if (ObjectUtil.isEmpty(jo)) { message = "接口不通"; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/ItemProtocol.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/ItemProtocol.java index cb14d82..1525c72 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/ItemProtocol.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.conveyor.standard_inspect_site; +package org.nl.acs.device.driver.conveyor.standard_inspect_site; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java similarity index 80% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java index 96997e7..ab97134 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/StandardInspectSiteDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.conveyor.standard_inspect_site; +package org.nl.acs.device.driver.conveyor.standard_inspect_site; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java similarity index 97% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 07bb5e8..3c0ad58 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_inspect_site; +package org.nl.acs.device.driver.conveyor.standard_inspect_site; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -7,17 +7,17 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; 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.monitor.DeviceStageMonitor; -import org.nl.acs.opc.WcsConfig; +import org.nl.acs.opc.opc.WcsConfig; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.domain.Task; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java index f2fd473..481bbc5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.conveyor.standard_ordinary_site; +package org.nl.acs.device.driver.conveyor.standard_ordinary_site; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java index 88a1e4c..0aaffc7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/conveyor/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver.conveyor.standard_ordinary_site; +package org.nl.acs.device.driver.conveyor.standard_ordinary_site; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; @@ -7,19 +7,18 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.AbstractDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; 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.log.service.DeviceExecuteLogService; import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.task.service.TaskService; import org.nl.config.SpringContextHolder; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigController.java similarity index 92% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigController.java index 3da9358..2f23bee 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigController.java @@ -1,11 +1,11 @@ -package org.nl.acs.device.device_driver; +package org.nl.acs.device.driver.device_driver_config; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.service.DeviceExtraService; +import org.nl.acs.device.device.service.DeviceExtraService; import org.nl.common.logging.annotation.Log; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigDto.java similarity index 81% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigDto.java index b4c669f..fa22cd1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigDto.java @@ -1,7 +1,7 @@ -package org.nl.acs.device.device_driver; +package org.nl.acs.device.driver.device_driver_config; import lombok.Data; -import org.nl.acs.device.service.dto.DeviceExtraDto; +import org.nl.acs.device.device.service.dto.DeviceExtraDto; import java.util.List; import java.util.Map; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigService.java similarity index 77% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigService.java index a2a2e89..128dec8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigService.java @@ -1,6 +1,6 @@ -package org.nl.acs.device.device_driver; +package org.nl.acs.device.driver.device_driver_config; -import org.nl.acs.device.service.dto.DeviceExtraDto; +import org.nl.acs.device.device.service.dto.DeviceExtraDto; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigServiceImpl.java similarity index 71% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigServiceImpl.java index c3901e8..0ac7025 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/device_driver/DeviceDriverConfigServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/device_driver_config/DeviceDriverConfigServiceImpl.java @@ -1,6 +1,6 @@ -package org.nl.acs.device.device_driver; +package org.nl.acs.device.driver.device_driver_config; -import org.nl.acs.device.service.dto.DeviceExtraDto; +import org.nl.acs.device.device.service.dto.DeviceExtraDto; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/group/1 b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/group/1 new file mode 100644 index 0000000..e69de29 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/ItemProtocol.java similarity index 88% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/ItemProtocol.java index cd262b0..82140e3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/ItemProtocol.java @@ -1,7 +1,7 @@ -package org.nl.acs.device_driver.two_conveyor.lamp_three_color; +package org.nl.acs.device.driver.other.lamp_three_color; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/LampThreecolorDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/LampThreecolorDefination.java index 97cf318..706b05f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/LampThreecolorDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.two_conveyor.lamp_three_color; +package org.nl.acs.device.driver.other.lamp_three_color; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/LampThreecolorDeviceDriver.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/LampThreecolorDeviceDriver.java index dac2fdc..36867ea 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/lamp_three_color/LampThreecolorDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/other/lamp_three_color/LampThreecolorDeviceDriver.java @@ -1,12 +1,12 @@ -package org.nl.acs.device_driver.two_conveyor.lamp_three_color; +package org.nl.acs.device.driver.other.lamp_three_color; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.config.SpringContextHolder; import org.springframework.beans.factory.annotation.Autowired; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/plc/1 b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/plc/1 new file mode 100644 index 0000000..e69de29 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/plcDb/1 b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/plcDb/1 new file mode 100644 index 0000000..e69de29 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/ItemProtocol.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/ItemProtocol.java index 50ae39e..23afa56 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/ItemProtocol.java @@ -1,8 +1,8 @@ -package org.nl.acs.device_driver.rgv; +package org.nl.acs.device.driver.rgv; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/RgvDefination.java similarity index 78% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/RgvDefination.java index 80da861..567f6a3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/RgvDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.rgv; +package org.nl.acs.device.driver.rgv; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/RgvDeviceDriver.java similarity index 83% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/RgvDeviceDriver.java index b18af18..531da18 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/rgv/RgvDeviceDriver.java @@ -1,25 +1,19 @@ -package org.nl.acs.device_driver.rgv; +package org.nl.acs.device.driver.rgv; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceExtraService; -import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.FeedLmsRealFailed; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.wms.data.ApplyManipulatorActionRequest; -import org.nl.acs.ext.wms.data.ApplyManipulatorActionResponse; -import org.nl.acs.ext.wms.data.ApplyPlugPullSitResponse; -import org.nl.acs.ext.wms.data.ApplyPlugPullSiteRequest; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceExtraService; +import org.nl.acs.device.device.service.impl.DeviceExtraServiceImpl; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverFeedLmsRealFailed; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; import org.nl.acs.ext.wms.service.AcsToWmsService; import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.history.ErrorUtil; @@ -29,12 +23,11 @@ import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.impl.RouteLineServiceImpl; import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; import org.nl.config.SpringContextHolder; import org.nl.config.language.LangProcess; import org.springframework.beans.factory.annotation.Autowired; @@ -50,7 +43,7 @@ import java.util.Map; @Slf4j @Data @RequiredArgsConstructor -public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, FeedLmsRealFailed { +public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, DeviceDriverFeedLmsRealFailed { protected ItemProtocol itemProtocol = new ItemProtocol(this); @Autowired @@ -284,32 +277,32 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr * // */ public synchronized void applyTask() { - ApplyManipulatorActionRequest applyManipulatorActionRequest = new ApplyManipulatorActionRequest(); - ApplyManipulatorActionResponse applyManipulatorActionResponse; - String direction = (String) this.getDevice().getExtraValue().get("direction"); - applyManipulatorActionRequest.setDevice_code(device_code); - applyManipulatorActionRequest.setDirection(direction);//rgv申请位置 - applyManipulatorActionRequest.setQzz_no(String.valueOf(barcode));//气涨轴编码 - applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest); - Map map = new LinkedHashMap<>(); - if (applyManipulatorActionResponse.getCode() == 200) { - Map data = applyManipulatorActionResponse.getData(); - String point_code2 = data.get("point_code2");//目标站点 - String material_code = data.get("material_code");//子卷号 - map.put("to_target", point_code2); - map.put("to_sub_volume_no", material_code); - map.put("to_command", "1"); - this.writing(map); - logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务,返回参数:" + applyManipulatorActionResponse); - message = "申请行架任务成功"; - } else { - message = applyManipulatorActionResponse.getMessage(); - map.put("to_command", 99); - this.writing(map); - requireSucess = true; - message = "申请行架任务失败"; - logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务反馈失败,返回参数:" + applyManipulatorActionResponse); - } +// ApplyManipulatorActionRequest applyManipulatorActionRequest = new ApplyManipulatorActionRequest(); +// ApplyManipulatorActionResponse applyManipulatorActionResponse; +// String direction = (String) this.getDevice().getExtraValue().get("direction"); +// applyManipulatorActionRequest.setDevice_code(device_code); +// applyManipulatorActionRequest.setDirection(direction);//rgv申请位置 +// applyManipulatorActionRequest.setQzz_no(String.valueOf(barcode));//气涨轴编码 +// applyManipulatorActionResponse = acsToWmsService.applyManipulatorActionRequest(applyManipulatorActionRequest); +// Map map = new LinkedHashMap<>(); +// if (applyManipulatorActionResponse.getCode() == 200) { +// Map data = applyManipulatorActionResponse.getData(); +// String point_code2 = data.get("point_code2");//目标站点 +// String material_code = data.get("material_code");//子卷号 +// map.put("to_target", point_code2); +// map.put("to_sub_volume_no", material_code); +// map.put("to_command", "1"); +// this.writing(map); +// logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务,返回参数:" + applyManipulatorActionResponse); +// message = "申请行架任务成功"; +// } else { +// message = applyManipulatorActionResponse.getMessage(); +// map.put("to_command", 99); +// this.writing(map); +// requireSucess = true; +// message = "申请行架任务失败"; +// logServer.deviceExecuteLog(this.device_code, "", "", "申请行架任务反馈失败,返回参数:" + applyManipulatorActionResponse); +// } } public void writing(Map map) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/robot/1 b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/robot/1 new file mode 100644 index 0000000..e69de29 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/scanner/standard_scanner/StandardScannerDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/scanner/standard_scanner/StandardScannerDefination.java index 1564986..9c5fb41 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/scanner/standard_scanner/StandardScannerDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.scanner.standard_scanner; +package org.nl.acs.device.driver.scanner.standard_scanner; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/scanner/standard_scanner/StandardScannerDeviceDriver.java similarity index 83% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/scanner/standard_scanner/StandardScannerDeviceDriver.java index fe793d8..7568758 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/scanner/standard_scanner/StandardScannerDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/scanner/standard_scanner/StandardScannerDeviceDriver.java @@ -1,16 +1,16 @@ -package org.nl.acs.device_driver.scanner.standard_scanner; +package org.nl.acs.device.driver.scanner.standard_scanner; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.ScannerDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.ScannerDeviceDriver; +import org.nl.acs.device.driver.AbstractDeviceDriver; import org.nl.acs.monitor.DeviceStageMonitor; +import org.nl.acs.udw.mqttUdw.TagDataAccessor; +import org.nl.acs.udw.mqttUdw.factory.TagsDataAccessorFactory; import org.nl.acs.socket.SocketConfig; -import org.nl.acs.udw.UnifiedDataAccessor; -import org.nl.acs.udw.UnifiedDataAccessorFactory; /** * 标准版扫码器 @@ -20,10 +20,10 @@ import org.nl.acs.udw.UnifiedDataAccessorFactory; public class StandardScannerDeviceDriver extends AbstractDeviceDriver implements ScannerDeviceDriver, DeviceDriver, DeviceStageMonitor { - UnifiedDataAccessor accessor_value; + TagDataAccessor accessor_value; public StandardScannerDeviceDriver() { - this.accessor_value = UnifiedDataAccessorFactory.getAccessor(SocketConfig.udw_unit_key); + this.accessor_value = TagsDataAccessorFactory.getTagsAccessor(SocketConfig.udw_unit_key); } public String getIp() { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDefination.java index 9d7ef11..daedcde 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.led.led_screen; +package org.nl.acs.device.driver.screen.led_screen; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDeviceDriver.java similarity index 70% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDeviceDriver.java index be389c2..dc86789 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/led/led_screen/LedScreenDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/screen/led_screen/LedScreenDeviceDriver.java @@ -1,13 +1,13 @@ -package org.nl.acs.device_driver.led.led_screen; +package org.nl.acs.device.driver.screen.led_screen; import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.AbstractDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; import org.nl.acs.monitor.DeviceStageMonitor; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/shadow/1 b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/shadow/1 new file mode 100644 index 0000000..e69de29 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/ItemProtocol.java new file mode 100644 index 0000000..d82c2ad --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/ItemProtocol.java @@ -0,0 +1,92 @@ +package org.nl.acs.device.driver.stacker.double_stacker; + +import org.nl.acs.device.driver.ItemDto; + +import org.nl.acs.device.driver.DeviceDriverBaseReader; + +import java.util.List; +import java.util.ArrayList; + +public enum ItemProtocol implements DeviceDriverBaseReader.KeyProvider { + HEARTBEAT("heartbeat", "心跳", "DB101.B0"), + DEVICE_CODE("stackerDeviceCode", "调度号", "DB101.B1"), + MODE("mode", "工作模式", "DB101.B2"), + STACKER_ERROR("stacker_error", "堆垛机主体报警", "DB101.B3"), + ACTION("action", "行走动作信号", "DB101.B5"), + FRONT_COMMAND("front_command", "前叉作业状态", "DB101.B31"), + FRONT_TASK("front_task", "前叉任务号", "DB101.B32"), + FRONT_YERROR("front_Yerror", "前叉Y轴报警（载货台）", "DB101.B36"), + FRONT_ZERROR("front_Zerror", "前叉Z轴报警（货叉）", "DB101.B37"), + FRONT_Z("front_z", "前叉行走排号", "DB101.B38"), + FRONT_X("front_x", "前叉行走列号", "DB101.B39"), + FRONT_Y("front_y", "前叉行走层号", "DB101.B40"), + FRONT_ACTION("front_action", "前叉载货台升降动作信号", "DB101.B42"), + FRONT_CARGOERROR("front_cargoError", "前叉载货台超限信号", "DB101.B43"), + FRONT_FORKCARGO("front_forkCargo", "前叉货叉探货信号", "DB101.B48"), + FRONT_FORKLOCATION("front_forkLocation", "前叉货叉位置信号", "DB101.B49"), + FRONT_FORKACTION("front_forkAction", "前叉货叉动作信号", "DB101.B50"), + BACK_COMMAND("back_command", "后叉作业状态", "DB101.B101"), + BACK_TASK("back_task", "后叉任务号", "DB101.B102"), + BACK_YERROR("back_Yerror", "后叉Y轴报警（载货台）", "DB101.B106"), + BACK_ZERROR("back_Zerror", "后叉Z轴报警（货叉）", "DB101.B107"), + BACK_Z("back_z", "后叉行走排号", "DB101.B108"), + BACK_X("back_x", "后叉行走列号", "DB101.B109"), + BACK_Y("back_y", "后叉行走层号", "DB101.B110"), + BACK_ACTION("back_action", "后叉载货台升降动作信号", "DB101.B112"), + BACK_CARGOERROR("back_cargoError", "后叉载货台超限信号", "DB101.B113"), + BACK_FORKCARGO("back_forkCargo", "后叉货叉探货信号", "DB101.B118"), + BACK_FORKLOCATION("back_forkLocation", "后叉货叉位置信号", "DB101.B119"), + BACK_FORKACTION("back_forkAction", "后叉货叉动作信号", "DB101.B120"), + TO_DEVICE_CODE("to_device_code", "调度号", "DB100.B1"), + TO_COMMAND("to_command", "作业命令", "DB100.B2"), + TO_CHOOSE_FORK("to_choose_fork", "货叉选择", "DB100.B4"), + TO_Z("to_z", "作业排", "DB100.B6"), + TO_X("to_x", "作业列", "DB100.B7"), + TO_Y("to_y", "作业层", "DB100.B8"), + TO_FRONT_TASK("to_front_task", "前叉任务号", "DB100.D10"), + TO_BACK_TASK("to_back_task", "后叉任务号", "DB100.D34"); + + private final String key; + private final String description; + private final String address; + + ItemProtocol(String key, String description, String address) { + this.key = key; + this.description = description; + this.address = address; + } + + @Override + public String getKey() { + return this.key; + } + + public String getDescription() { + return description; + } + + public String getAddress() { + return address; + } + + public static List getReadableItemDtos() { + List list = new ArrayList<>(); + for (ItemProtocol prop : values()) { + if (!prop.getKey().startsWith("to")) { + list.add(new ItemDto(prop.getKey(), prop.getDescription(), prop.getAddress())); + } + } + return list; + } + + public static List getWriteableItemDtos() { + List list = new ArrayList<>(); + for (ItemProtocol prop : values()) { + if (prop.getKey().startsWith("to")) { + list.add(new ItemDto(prop.getKey(), prop.getDescription(), prop.getAddress())); + } + } + return list; + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDefinition.java similarity index 66% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDefinition.java index cbd46bf..65ff211 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDefinition.java @@ -1,30 +1,30 @@ -package org.nl.acs.device_driver.stacker.standard_stacker; +package org.nl.acs.device.driver.stacker.double_stacker; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; import java.util.List; @Service -public class StandardStackerDefination implements OpcDeviceDriverDefination { +public class StandardStackerDefinition implements OpcDeviceDriverDefination { @Override public String getDriverCode() { - return "standard_stacker"; + return "standard_stacker_device"; } @Override public String getDriverName() { - return "标准版-单工位堆垛机"; + return "标准版-堆垛机"; } @Override public String getDriverDescription() { - return "标准版-单工位堆垛机"; + return "标准版-堆垛机"; } @Override @@ -53,5 +53,4 @@ public class StandardStackerDefination implements OpcDeviceDriverDefination { public List getWriteableItemDtos() { return ItemProtocol.getWriteableItemDtos(); } - } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDeviceDriver.java new file mode 100644 index 0000000..10f777b --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/StandardStackerDeviceDriver.java @@ -0,0 +1,1066 @@ +package org.nl.acs.device.driver.stacker.double_stacker; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.driver.*; +import org.nl.acs.device.driver.conveyor.appearance_inspection_scannner_conveyor.AppearanceInspectionScannerConveyorDeviceDriver; +import org.nl.acs.device.driver.stacker.double_stacker.enums.CommandEnum; +import org.nl.acs.device.driver.stacker.double_stacker.enums.SendSignalEnum; +import org.nl.acs.device.driver.stacker.double_stacker.enums.StrategyEnum; +import org.nl.acs.device.driver.storage.standard_storage.StandardStorageDeviceDriver; +import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.instruction.enums.InstructionStatusEnum; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.monitor.DeviceStageMonitor; +import org.nl.acs.task.enums.TaskStatusEnum; +import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.service.dto.TaskDto; +import org.nl.acs.utils.StringUtil; +import org.nl.common.utils.CodeUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.config.SpringContextHolder; +import org.nl.config.lucene.service.LuceneExecuteLogService; +import org.nl.config.lucene.service.dto.LuceneLogDto; + +import java.util.*; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +@Slf4j +@Getter +@Setter +@RequiredArgsConstructor +public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver implements + DeviceDriver, + ExecutableDeviceDriver, + RouteableDeviceDriver, + DeviceStageMonitor, + StandardRequestMethod, + DeviceDriverBaseReader { + + private final LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); + private final InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); + private final DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); + private final TaskService taskService = SpringContextHolder.getBean(TaskService.class); + + private static final Lock LOCK = new ReentrantLock(); + + /** + * 心跳 + */ + private int heartbeat = 0; + private int lastHeartbeat = 0; + /** + * 调度号 + */ + private int stackerDeviceCode = 0; + private int lastStackerDeviceCode = 0; + /** + * 工作模式 + */ + private int mode = 0; + private int lastMode = 0; + /** + * 堆垛机主体报警 + */ + private int stacker_error = 0; + private int lastStacker_error = 0; + /** + * 行走动作信号 + */ + private int action = 0; + private int lastAction = 0; + /** + * 前叉作业状态 + */ + private int front_command = 0; + private int lastFront_command = 0; + /** + * 前叉任务号 + */ + private int front_task = 0; + private int lastFront_task = 0; + /** + * 前叉Y轴报警（载货台） + */ + private int front_Yerror = 0; + private int lastFront_Yerror = 0; + /** + * 前叉Z轴报警（货叉） + */ + private int front_Zerror = 0; + private int lastFront_Zerror = 0; + /** + * 前叉行走排号 + */ + private int front_z = 0; + private int lastFront_z = 0; + /** + * 前叉行走列号 + */ + private int front_x = 0; + private int lastFront_x = 0; + /** + * 前叉行走层号 + */ + private int front_y = 0; + private int lastFront_y = 0; + /** + * 前叉载货台升降动作信号 + */ + private int front_action = 0; + private int lastFront_action = 0; + /** + * 前叉载货台超限信号 + */ + private int front_cargoError = 0; + private int lastFront_cargoError = 0; + /** + * 前叉货叉探货信号 + */ + private int front_forkCargo = 0; + private int lastFront_forkCargo = 0; + /** + * 前叉货叉位置信号 + */ + private int front_forkLocation = 0; + private int lastFront_forkLocation = 0; + /** + * 前叉货叉动作信号 + */ + private int front_forkAction = 0; + private int lastFront_forkAction = 0; + /** + * 后叉作业状态 + */ + private int back_command = 0; + private int lastBack_command = 0; + /** + * 后叉任务号 + */ + private int back_task = 0; + private int lastBack_task = 0; + /** + * 后叉Y轴报警（载货台） + */ + private int back_Yerror = 0; + private int lastBack_Yerror = 0; + /** + * 后叉Z轴报警（货叉） + */ + private int back_Zerror = 0; + private int lastBack_Zerror = 0; + /** + * 后叉行走排号 + */ + private int back_z = 0; + private int lastBack_z = 0; + /** + * 后叉行走列号 + */ + private int back_x = 0; + private int lastBack_x = 0; + /** + * 后叉行走层号 + */ + private int back_y = 0; + private int lastBack_y = 0; + /** + * 后叉载货台升降动作信号 + */ + private int back_action = 0; + private int lastBack_action = 0; + /** + * 后叉载货台超限信号 + */ + private int back_cargoError = 0; + private int lastBack_cargoError = 0; + /** + * 后叉货叉探货信号 + */ + private int back_forkCargo = 0; + private int lastBack_forkCargo = 0; + /** + * 后叉货叉位置信号 + */ + private int back_forkLocation = 0; + private int lastBack_forkLocation = 0; + /** + * 后叉货叉动作信号 + */ + private int back_forkAction = 0; + private int lastBack_forkAction = 0; + /** + * 调度号 + */ + private int to_device_code = 0; + private int lastTo_device_code = 0; + /** + * 作业命令 + */ + private int to_command = 0; + private int lastTo_command = 0; + /** + * 货叉选择 + */ + private int to_choose_fork = 0; + private int lastTo_choose_fork = 0; + /** + * 作业排 + */ + private int to_z = 0; + private int lastTo_z = 0; + /** + * 作业列 + */ + private int to_x = 0; + private int lastTo_x = 0; + /** + * 作业层 + */ + private int to_y = 0; + private int lastTo_y = 0; + /** + * 前叉任务号 + */ + private int to_front_task = 0; + private int lastTo_front_task = 0; + /** + * 后叉任务号 + */ + private int to_back_task = 0; + private int lastTo_back_task = 0; + /** + * 当前设备编号 + */ + private String currentDeviceCode; + + /** + * 消息 + */ + private String message; + + /** + * 设备报警标记 + */ + private boolean isError; + + /** + * 请求标记 + */ + boolean requireSuccess = false; + + /** + * 请求时间 + */ + private long requireTime = System.currentTimeMillis(); + + /** + * 请求间隔时间 + */ + private long requireTimeOut = 5000L; + + /** + * 禁止入库 + */ + private boolean prohibitInWarehouse = false; + /** + * 禁止出库 + */ + private boolean prohibitOutWarehouse = false; + /** + * 停止接收任务 + */ + private boolean stopReceiveTask = false; + + /** + * 堆垛机叉数 1单叉 2双叉 + */ + private int stackerNum = 1; + + @Override + public Device getDevice() { + return this.device; + } + + @Override + public & KeyProvider, T> T getOpcValue(E item, Class fieldClassType) { + return (T) this.getValue(item.getKey()); + } + + @Override + public void setLog(String key, Object newValue, Object oldValue) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "自动线程读取信号:" + key + ",由" + oldValue + "->" + newValue)); + } + + @Override + public void execute() { + this.currentDeviceCode = this.getDevice().getDevice_code(); + this.loadAssignData(currentDeviceCode, ItemProtocol.class); + } + + private boolean isTimeValid(long currentTimeMillis) { + return currentTimeMillis - this.requireTime >= this.requireTimeOut; + } + + private boolean isStandby() { + return CommandEnum.STANDY.getStatus() == this.front_command && this.back_command == CommandEnum.STANDY.getStatus(); + } + + private boolean isPickup() { + boolean all1 = this.front_command == CommandEnum.PICKUP.getStatus() && this.back_command == CommandEnum.PICKUP.getStatus(); + boolean front1 = this.front_command == CommandEnum.PICKUP.getStatus() && this.back_command == CommandEnum.STANDY.getStatus(); + boolean back1 = this.front_command == CommandEnum.STANDY.getStatus() && this.back_command == CommandEnum.PICKUP.getStatus(); + return all1 || front1 || back1; + } + + private boolean isPickupComplete() { + boolean all2 = this.front_command == CommandEnum.PICKUP_COMPLETE.getStatus() && this.back_command == CommandEnum.PICKUP_COMPLETE.getStatus(); + boolean front2 = this.front_command == CommandEnum.PICKUP_COMPLETE.getStatus() && this.back_command == CommandEnum.STANDY.getStatus(); + boolean back2 = this.front_command == CommandEnum.STANDY.getStatus() && this.back_command == CommandEnum.PICKUP_COMPLETE.getStatus(); + return all2 || front2 || back2; + } + + private boolean isRelease() { + boolean all3 = this.front_command == CommandEnum.RELEASE.getStatus() && this.back_command == CommandEnum.RELEASE.getStatus(); + boolean front3 = this.front_command == CommandEnum.RELEASE.getStatus() && this.back_command == CommandEnum.STANDY.getStatus(); + boolean back3 = this.front_command == CommandEnum.STANDY.getStatus() && this.back_command == CommandEnum.RELEASE.getStatus(); + return all3 || front3 || back3; + } + + private boolean isUnload() { + boolean all4 = this.front_command == CommandEnum.UNLOAD.getStatus() && this.back_command == CommandEnum.UNLOAD.getStatus(); + boolean front4 = this.front_command == CommandEnum.UNLOAD.getStatus() && this.back_command == CommandEnum.STANDY.getStatus(); + boolean back4 = this.front_command == CommandEnum.STANDY.getStatus() && this.back_command == CommandEnum.UNLOAD.getStatus(); + return all4 || front4 || back4; + } + + private boolean isUnloadComplete() { + boolean all5 = this.front_command == CommandEnum.UNLOAD_COMPLETE.getStatus() && this.back_command == CommandEnum.UNLOAD_COMPLETE.getStatus(); + boolean front5 = this.front_command == CommandEnum.UNLOAD_COMPLETE.getStatus() && this.back_command == CommandEnum.STANDY.getStatus(); + boolean back5 = this.front_command == CommandEnum.STANDY.getStatus() && this.back_command == CommandEnum.UNLOAD_COMPLETE.getStatus(); + return all5 || front5 || back5; + } + + private List getFrontKeys() { + return Arrays.asList(ItemProtocol.TO_Z.getKey(), ItemProtocol.TO_X.getKey(), ItemProtocol.TO_Y.getKey(), ItemProtocol.TO_FRONT_TASK.getKey(), ItemProtocol.TO_CHOOSE_FORK.getKey(), ItemProtocol.TO_COMMAND.getKey()); + } + + private List getBackKeys() { + return Arrays.asList(ItemProtocol.TO_Z.getKey(), ItemProtocol.TO_X.getKey(), ItemProtocol.TO_Y.getKey(), ItemProtocol.TO_BACK_TASK.getKey(), ItemProtocol.TO_CHOOSE_FORK.getKey(), ItemProtocol.TO_COMMAND.getKey()); + } + + private List getFBKeys() { + return Arrays.asList(ItemProtocol.TO_Z.getKey(), ItemProtocol.TO_X.getKey(), ItemProtocol.TO_Y.getKey(), ItemProtocol.TO_FRONT_TASK.getKey(), ItemProtocol.TO_BACK_TASK.getKey(), ItemProtocol.TO_CHOOSE_FORK.getKey(), ItemProtocol.TO_COMMAND.getKey()); + } + + private Integer handExtraIntValue(Device device, String extraName) { + return Optional.ofNullable(device.getExtraValue().get(extraName)).map(Object::toString).map(Integer::parseInt).orElse(0); + } + + private String handExtraStringValue(Device device, String extraName) { + return Optional.ofNullable(device.getExtraValue().get(extraName)).map(Object::toString).orElse(""); + } + + private boolean instanceAppearance(Device device) { + return device == null ? false : device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver; + } + + private boolean instanceStorage(Device device) { + return device == null ? false : device.getDeviceDriver() instanceof StandardStorageDeviceDriver; + } + + @Override + public void executeLogic() { + stackerNum = Optional.ofNullable(this.getExtraValue().get("stackerNum")).map(Object::toString).map(Integer::parseInt).orElse(1); + if (this.back_command != this.lastBack_command || this.front_command != this.lastFront_command) { + this.requireSuccess = false; + } + this.updateInstStatus(); + if (!this.online) { + this.message = "设备离线"; + } else if (this.mode != 3) { + this.message = "设备未联机"; + } else if (this.stacker_error != 0) { + this.message = "设备报警"; + this.isError = true; + } else { + this.message = ""; + this.isError = false; + //编写业务逻辑方法 + //待机 + if (mode == 3 && this.isStandby() && !this.requireSuccess) { + Instruction frontInst = instructionService.findByCodeFromCache(String.valueOf(this.front_task)); + Instruction backInst = instructionService.findByCodeFromCache(String.valueOf(this.back_task)); + if (ObjectUtil.isEmpty(frontInst) && ObjectUtil.isEmpty(backInst)) { + if (this.to_command != 0) { + this.writing(ItemProtocol.TO_COMMAND.getKey(), 0); + } + this.applyTask(); + } else { + //下发放货信息给堆垛机 + this.sendPutInfoToPlc(frontInst, backInst); + } + } + //取货中 + else if (mode == 3 && this.isPickup() && !this.requireSuccess) { + this.clearInfoToPlc(); + } + //取货完成 + else if (mode == 3 && this.isPickupComplete() && !requireSuccess) { + Instruction frontInst = instructionService.findByCodeFromCache(String.valueOf(this.front_task)); + Instruction backInst = instructionService.findByCodeFromCache(String.valueOf(this.back_task)); + if (this.front_command == CommandEnum.PICKUP_COMPLETE.getStatus() && this.back_command == CommandEnum.PICKUP_COMPLETE.getStatus()) { + this.sendPutInfoToPlc(frontInst, backInst); + } else if (this.front_command == CommandEnum.PICKUP_COMPLETE.getStatus()) { + String front_start_device_code = frontInst.getStart_device_code(); + String front_next_device_code = frontInst.getNext_device_code(); + Device front_start_device = deviceAppService.findDeviceByCode(front_start_device_code); + Device front_next_device = deviceAppService.findDeviceByCode(front_next_device_code); + //入库 + if (instanceAppearance(front_start_device) && instanceStorage(front_next_device)) { + String getLinkDeviceCode = this.handExtraStringValue(front_start_device, "getLinkDeviceCode"); + String backNoY = this.handExtraStringValue(this.getDevice(), "backNoY"); + backInst = instructionService.findReadyInstByLinkDeviceCodeAndStartDeviceCode(getLinkDeviceCode, backNoY); + if (ObjectUtil.isNotEmpty(backInst)) { + String back_start_device_code = backInst.getStart_device_code(); + Device back_start_device = deviceAppService.findDeviceByCode(back_start_device_code); + this.backWrite(back_start_device, backInst); + } else { + Instruction inst = instructionService.findBusyInstByNextDeviceCode(getLinkDeviceCode); + if (ObjectUtil.isNotEmpty(inst)) { + return; + } else { + //下发前叉放货信息 + this.sendPutInfoToPlc(frontInst, backInst); + } + } + } + //出库 + else if (instanceStorage(front_start_device) && instanceAppearance(front_next_device)) { + String getLinkDeviceCode = this.handExtraStringValue(front_next_device, "getLinkDeviceCode"); + String backNoY = this.handExtraStringValue(this.getDevice(), "backNoY"); + backInst = instructionService.findReadyInstByLinkDeviceCodeAndNextDeviceCode(getLinkDeviceCode, backNoY); + if (ObjectUtil.isNotEmpty(backInst)) { + this.backWrite(backInst); + } else { + //下发前叉放货信息 + this.sendPutInfoToPlc(frontInst, backInst); + } + } else { + //下发前叉放货信息 + this.sendPutInfoToPlc(frontInst, backInst); + } + } else if (this.back_command == CommandEnum.PICKUP_COMPLETE.getStatus()) { + String back_start_device_code = backInst.getStart_device_code(); + String back_next_device_code = backInst.getNext_device_code(); + Device back_start_device = deviceAppService.findDeviceByCode(back_start_device_code); + Device back_next_device = deviceAppService.findDeviceByCode(back_next_device_code); + //入库 + if (instanceAppearance(back_start_device) && instanceStorage(back_next_device)) { + String getLinkDeviceCode = this.handExtraStringValue(back_start_device, "getLinkDeviceCode"); + String frontNoY = this.handExtraStringValue(this.getDevice(), "frontNoY"); + frontInst = instructionService.findReadyInstByLinkDeviceCodeAndStartDeviceCode(getLinkDeviceCode, frontNoY); + if (ObjectUtil.isNotEmpty(frontInst)) { + String front_start_device_code = frontInst.getStart_device_code(); + Device front_start_device = deviceAppService.findDeviceByCode(front_start_device_code); + this.frontWrite(front_start_device, frontInst); + } else { + Instruction inst = instructionService.findBusyInstByNextDeviceCode(getLinkDeviceCode); + if (ObjectUtil.isNotEmpty(inst)) { + return; + } else { + //下发后叉放货信息 + this.sendPutInfoToPlc(frontInst, backInst); + } + } + } + //出库 + else if (instanceStorage(back_start_device) && instanceAppearance(back_next_device)) { + String getLinkDeviceCode = this.handExtraStringValue(back_next_device, "getLinkDeviceCode"); + String frontNoY = this.handExtraStringValue(this.getDevice(), "frontNoY"); + frontInst = instructionService.findReadyInstByLinkDeviceCodeAndNextDeviceCode(getLinkDeviceCode, frontNoY); + if (ObjectUtil.isNotEmpty(frontInst)) { + this.frontWrite(frontInst); + } else { + //下发后叉放货信息 + this.sendPutInfoToPlc(frontInst, backInst); + } + } else { + //下发后叉放货信息 + this.sendPutInfoToPlc(frontInst, backInst); + } + } + this.requireSuccess = true; + } + //放货中 + else if (mode == 3 && this.isRelease() && !this.requireSuccess) { + if (this.lastBack_command != CommandEnum.UNLOAD.getStatus() && this.lastFront_command != CommandEnum.UNLOAD.getStatus()) { + this.clearInfoToPlc(); + } else if (this.lastBack_command != CommandEnum.UNLOAD.getStatus() && this.back_command != CommandEnum.STANDY.getStatus()) { + this.clearInfoToPlc(); + } else if (this.lastFront_command != CommandEnum.UNLOAD.getStatus() && this.front_command != CommandEnum.STANDY.getStatus()) { + this.clearInfoToPlc(); + } else { + this.requireSuccess = true; + } + } + //请求卸货 + else if (mode == 3 && this.isUnload() && !requireSuccess) { + this.writing(ItemProtocol.TO_COMMAND.getKey(), SendSignalEnum.COMMAND_THREE.getSignalNum()); + this.requireSuccess = true; + } + //卸货完成 + else if (mode == 3 && this.isUnloadComplete() && !requireSuccess) { + if (this.front_command == CommandEnum.UNLOAD_COMPLETE.getStatus() && this.back_command == CommandEnum.UNLOAD_COMPLETE.getStatus()) { + this.writing(ItemProtocol.TO_COMMAND.getKey(), SendSignalEnum.COMMAND_ELEVEN.getSignalNum()); + } else if (this.front_command == CommandEnum.UNLOAD_COMPLETE.getStatus()) { + this.writing(ItemProtocol.TO_COMMAND.getKey(), SendSignalEnum.COMMAND_ELEVEN.getSignalNum()); + //根据后叉指令号,查询后叉指令，下发后叉放货指令信息 + Instruction backTask = instructionService.findByCodeFromCache(String.valueOf(back_task)); + if (ObjectUtil.isNotEmpty(backTask)) { + this.sendPutInfoToPlc(null, backTask); + } + } else if (this.back_command == CommandEnum.UNLOAD_COMPLETE.getStatus()) { + this.writing(ItemProtocol.TO_COMMAND.getKey(), SendSignalEnum.COMMAND_ELEVEN.getSignalNum()); + //根据前叉指令号,查询前叉指令，下发前叉放货指令信息 + Instruction frontTask = instructionService.findByCodeFromCache(String.valueOf(front_task)); + if (ObjectUtil.isNotEmpty(frontTask)) { + this.sendPutInfoToPlc(frontTask, null); + } + } + this.requireSuccess = true; + } + } + } + + + private void applyTask() { + long currentTimeMillis = System.currentTimeMillis(); + if (!isTimeValid(currentTimeMillis)) { + log.trace("触发时间因为小于{}毫秒，而被无视", this.requireTimeOut); + } else { + this.requireTime = currentTimeMillis; + LOCK.lock(); + try { + this.applyMoveTask(); + } finally { + LOCK.unlock(); + } + } + } + + + /** + * 移库任务 + */ + private void applyMoveTask() { + List xDeviceCodeList = this.getExtraDeviceCodes("xDeviceCodeList"); + String frontNoY = this.handExtraStringValue(this.getDevice(), "frontNoY"); + String backNoY = this.handExtraStringValue(this.getDevice(), "backNoY"); + List frontTaskDtos = taskService.findReadyTaskByXDeviceCode(xDeviceCodeList, frontNoY); + TaskDto frontTaskDto = null; + TaskDto backTaskDto = null; + if (CollectionUtil.isNotEmpty(frontTaskDtos)) { + //如果当前堆垛机是双叉 + if (stackerNum == 2) { + for (TaskDto frontTask : frontTaskDtos) { + //查找一起取放的移库任务 + TaskDto backTask = taskService.findAllBindTask(frontTask, backNoY); + if (ObjectUtil.isEmpty(backTask)) { + //查找一起取的移库任务 + backTask = taskService.findFrontBindTask(frontTask, backNoY); + } + if (ObjectUtil.isNotEmpty(backTask)) { + frontTaskDto = frontTask; + backTaskDto = backTask; + break; + } + } + } + if (ObjectUtil.isEmpty(frontTaskDto) && ObjectUtil.isEmpty(backTaskDto)) { + //查询前叉移库任务 + frontTaskDto = frontTaskDtos.get(0); + } + } else { + //查找后叉移库任务 + if (stackerNum == 2) { + List backTaskDtos = taskService.findReadyTaskByXDeviceCode(xDeviceCodeList, backNoY); + if (CollectionUtil.isNotEmpty(backTaskDtos)) { + backTaskDto = backTaskDtos.get(0); + } + } + } + if (ObjectUtil.isNotEmpty(frontTaskDto) && ObjectUtil.isNotEmpty(backTaskDto)) { + Instruction frontInst = new Instruction(); + setInstruction(frontInst, frontTaskDto); + Instruction backInst = new Instruction(); + setInstruction(backInst, backTaskDto); + try { + instructionService.create(frontInst); + instructionService.create(backInst); + frontTaskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); + backTaskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); + taskService.update(frontTaskDto); + taskService.update(backTaskDto); + } catch (Exception e) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 原因:" + e.getMessage())); + return; + } + this.FBWrite(frontInst, backInst); + this.requireSuccess = true; + //下发双叉任务 + } else if (ObjectUtil.isNotEmpty(frontTaskDto)) { + //下发前叉任务 + Instruction frontInst = new Instruction(); + setInstruction(frontInst, frontTaskDto); + try { + instructionService.create(frontInst); + frontTaskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); + taskService.update(frontTaskDto); + } catch (Exception e) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 原因:" + e.getMessage())); + return; + } + this.frontWrite(frontInst); + this.requireSuccess = true; + } else if (ObjectUtil.isNotEmpty(backTaskDto)) { + //下发后叉任务 + Instruction backInst = new Instruction(); + setInstruction(backInst, backTaskDto); + try { + instructionService.create(backInst); + backTaskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); + taskService.update(backTaskDto); + } catch (Exception e) { + logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "创建指令失败, 原因:" + e.getMessage())); + return; + } + this.backWrite(backInst); + this.requireSuccess = true; + } else { + String strategyValue = Optional.ofNullable(this.getExtraValue().get("strategyValue")).map(Object::toString).orElse(""); + switch (strategyValue) { + case "2": + this.applyOutTask(); + break; + case "3": + this.applyTaskByTime(); + break; + default: + this.applyInTask(); + break; + } + } + } + + + /** + * 入库 + */ + private void applyInTask() { + List getFrontDeviceCodeList = this.getExtraDeviceCodes("frontDeviceCodeList"); + String frontNoY = this.handExtraStringValue(this.getDevice(), "frontNoY"); + List getBackDeviceCodeList = this.getExtraDeviceCodes("backDeviceCodeList"); + String backNoY = this.handExtraStringValue(this.getDevice(), "backNoY"); + List frontInsts = instructionService.findReadyInstByStartDeviceCode(getFrontDeviceCodeList, frontNoY); + Instruction frontInst = null; + Instruction backInst = null; + Device front_start_device = null; + Device back_start_device = null; + if (CollectionUtil.isNotEmpty(frontInsts)) { + frontInst = frontInsts.get(0); + if (ObjectUtil.isNotEmpty(frontInst) && stackerNum == 2) { + String front_start_device_code = frontInst.getStart_device_code(); + front_start_device = deviceAppService.findDeviceByCode(front_start_device_code); + if (front_start_device != null) { + String getLinkDeviceCode = this.handExtraStringValue(front_start_device, "getLinkDeviceCode"); + backInst = instructionService.findReadyInstByLinkDeviceCodeAndStartDeviceCode(getLinkDeviceCode, backNoY); + if (ObjectUtil.isEmpty(backInst)) { + Instruction inst = instructionService.findBusyInstByNextDeviceCode(getLinkDeviceCode); + if (ObjectUtil.isNotEmpty(inst)) { + return; + } + } + } + } + } else { + if (stackerNum == 2) { + List backInsts = instructionService.findReadyInstByStartDeviceCode(getBackDeviceCodeList, backNoY); + if (CollectionUtil.isNotEmpty(backInsts)) { + backInst = backInsts.get(0); + } + if (ObjectUtil.isNotEmpty(backInst)) { + String back_start_device_code = backInst.getStart_device_code(); + back_start_device = deviceAppService.findDeviceByCode(back_start_device_code); + if (back_start_device != null) { + String getLinkDeviceCode = this.handExtraStringValue(back_start_device, "getLinkDeviceCode"); + frontInst = instructionService.findReadyInstByLinkDeviceCodeAndStartDeviceCode(getLinkDeviceCode, frontNoY); + if (ObjectUtil.isEmpty(frontInst)) { + Instruction inst = instructionService.findBusyInstByNextDeviceCode(getLinkDeviceCode); + if (ObjectUtil.isNotEmpty(inst)) { + return; + } + } + } + } + } + } + if (ObjectUtil.isNotEmpty(frontInst) && ObjectUtil.isNotEmpty(backInst)) { + this.FBWrite(front_start_device, frontInst, backInst); + this.requireSuccess = true; + } else if (ObjectUtil.isNotEmpty(frontInst)) { + this.frontWrite(front_start_device, frontInst); + this.requireSuccess = true; + } else if (ObjectUtil.isNotEmpty(backInst)) { + this.backWrite(back_start_device, backInst); + this.requireSuccess = true; + } else { + String strategyValue = Optional.ofNullable(this.getExtraValue().get("strategyValue")).map(Object::toString).orElse(""); + if (ObjectUtil.equals(strategyValue, StrategyEnum.IN.getValue())) { + this.applyOutTask(); + } + } + } + + /** + * 出库 + */ + private void applyOutTask() { + List getFrontDeviceCodeList = this.getExtraDeviceCodes("frontDeviceCodeList"); + List getBackDeviceCodeList = this.getExtraDeviceCodes("backDeviceCodeList"); + String frontNoY = this.handExtraStringValue(this.getDevice(), "frontNoY"); + String backNoY = this.handExtraStringValue(this.getDevice(), "backNoY"); + List frontInsts = instructionService.findReadyInstByNextDeviceCode(getFrontDeviceCodeList, frontNoY); + Instruction frontInst = null; + Instruction backInst = null; + if (CollectionUtil.isNotEmpty(frontInsts)) { + frontInst = frontInsts.get(0); + if (ObjectUtil.isNotEmpty(frontInst) && stackerNum == 2) { + String front_next_device_code = frontInst.getNext_device_code(); + Device front_next_device = deviceAppService.findDeviceByCode(front_next_device_code); + if (front_next_device != null) { + String getLinkDeviceCode = this.handExtraStringValue(front_next_device, "getLinkDeviceCode"); + backInst = instructionService.findReadyInstByNextDeviceCode(frontInst, getLinkDeviceCode, backNoY); + } + } + } else { + if (stackerNum == 2) { + List backInsts = instructionService.findReadyInstByNextDeviceCode(getBackDeviceCodeList, backNoY); + if (CollectionUtil.isNotEmpty(backInsts)) { + backInst = backInsts.get(0); + } + } + } + if (ObjectUtil.isNotEmpty(frontInst) && ObjectUtil.isNotEmpty(backInst)) { + this.FBWrite(frontInst, backInst); + this.requireSuccess = true; + } else if (ObjectUtil.isNotEmpty(frontInst)) { + this.frontWrite(frontInst); + this.requireSuccess = true; + } else if (ObjectUtil.isNotEmpty(backInst)) { + this.backWrite(backInst); + this.requireSuccess = true; + } else { + Integer strategyValue = this.handExtraIntValue(this.getDevice(), "strategyValue"); + if (ObjectUtil.equals(strategyValue, StrategyEnum.OUT.getValue())) { + this.applyInTask(); + } + } + } + + /** + * 时间顺序策略 + */ + private void applyTaskByTime() { + List getFrontDeviceCodeList = this.getExtraDeviceCodes("frontDeviceCodeList"); + String frontNoY = this.handExtraStringValue(this.getDevice(), "frontNoY"); + List frontInsts = instructionService.findReadyInstByDeviceCode(getFrontDeviceCodeList, frontNoY); + Instruction frontInst = null; + if (CollectionUtil.isNotEmpty(frontInsts)) { + frontInst = frontInsts.get(0); + } + if (ObjectUtil.isNotEmpty(frontInst)) { + String front_start_device_code = frontInst.getStart_device_code(); + Device front_start_device = deviceAppService.findDeviceByCode(front_start_device_code); + String backNoY = this.handExtraStringValue(this.getDevice(), "backNoY"); + if (front_start_device != null && front_start_device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + String getLinkDeviceCode = this.handExtraStringValue(front_start_device, "getLinkDeviceCode"); + Instruction backInst = instructionService.findReadyInstByStartDeviceCode(frontInst, getLinkDeviceCode, backNoY); + if (ObjectUtil.isNotEmpty(getLinkDeviceCode) && deviceAppService.findDeviceByCode(getLinkDeviceCode) != null && ObjectUtil.isNotEmpty(backInst)) { + this.FBWrite(front_start_device, frontInst, backInst); + this.requireSuccess = true; + } else { + this.frontWrite(front_start_device, frontInst); + this.requireSuccess = true; + } + } else if (front_start_device != null && front_start_device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { + String next_device_code = frontInst.getNext_device_code(); + Device next_device = deviceAppService.findDeviceByCode(next_device_code); + if (next_device != null && next_device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + String getLinkDeviceCode = Optional.ofNullable(next_device.getExtraValue().get("getLinkDeviceCode")).map(Object::toString).orElse(null); + Instruction backInst = instructionService.findReadyInstByNextDeviceCode(frontInst, getLinkDeviceCode, backNoY); + if (ObjectUtil.isNotEmpty(getLinkDeviceCode) && deviceAppService.findDeviceByCode(getLinkDeviceCode) != null && ObjectUtil.isNotEmpty(backInst)) { + this.FBWrite(frontInst, backInst); + this.requireSuccess = true; + } else { + this.frontWrite(frontInst); + this.requireSuccess = true; + } + } + } + } else { + List getBackDeviceCodeList = this.getExtraDeviceCodes("backDeviceCodeList"); + String backNoY = this.handExtraStringValue(this.getDevice(), "backNoY"); + List backInsts = instructionService.findReadyInstByDeviceCode(getBackDeviceCodeList, backNoY); + Instruction backInst = null; + if (CollectionUtil.isNotEmpty(backInsts)) { + backInst = backInsts.get(0); + } + if (ObjectUtil.isNotEmpty(backInst)) { + String back_start_device_code = backInst.getStart_device_code(); + Device back_start_device = deviceAppService.findDeviceByCode(back_start_device_code); + if (back_start_device != null && back_start_device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + this.backWrite(back_start_device, backInst); + this.requireSuccess = true; + } else if (back_start_device != null && back_start_device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { + this.backWrite(backInst); + this.requireSuccess = true; + } + } + } + } + + private void frontWrite(Instruction frontInst) { + List values = Arrays.asList(Integer.parseInt(StringUtil.handleString(frontInst.getFrom_x())), Integer.parseInt(frontInst.getFrom_y()), Integer.parseInt(frontInst.getFrom_z()), frontInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_ONE.getSignalNum(), SendSignalEnum.COMMAND_ONE.getSignalNum()); + this.writing(this.getFrontKeys(), values); + } + + private void frontWrite(Device frontDevice, Instruction frontInst) { + Integer frontX = this.handExtraIntValue(frontDevice, "currentX"); + Integer frontY = this.handExtraIntValue(frontDevice, "currentY"); + Integer frontZ = this.handExtraIntValue(frontDevice, "currentZ"); + List values = Arrays.asList(frontX, frontY, frontZ, frontInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_ONE.getSignalNum(), SendSignalEnum.COMMAND_ONE.getSignalNum()); + this.writing(this.getFrontKeys(), values); + } + + private void backWrite(Instruction backInst) { + List values = Arrays.asList(Integer.parseInt(StringUtil.handleString(backInst.getFrom_x())), Integer.parseInt(backInst.getFrom_y()), Integer.parseInt(backInst.getFrom_z()), backInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_TWO.getSignalNum(), SendSignalEnum.COMMAND_ONE.getSignalNum()); + this.writing(this.getBackKeys(), values); + } + + private void backWrite(Device backDevice, Instruction backInst) { + Integer backX = this.handExtraIntValue(backDevice, "currentX"); + Integer backY = this.handExtraIntValue(backDevice, "currentY"); + Integer backZ = this.handExtraIntValue(backDevice, "currentZ"); + List values = Arrays.asList(backX, backY, backZ, backInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_TWO.getSignalNum(), SendSignalEnum.COMMAND_ONE.getSignalNum()); + this.writing(this.getBackKeys(), values); + } + + private void FBWrite(Instruction frontInst, Instruction backInst) { + List values = Arrays.asList(Integer.parseInt(StringUtil.handleString(frontInst.getFrom_x())), Integer.parseInt(frontInst.getFrom_y()), Integer.parseInt(frontInst.getFrom_z()), frontInst.getInstruction_code(), backInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_THREE.getSignalNum(), SendSignalEnum.COMMAND_ONE.getSignalNum()); + this.writing(this.getFBKeys(), values); + } + + private void FBWrite(Device frontDevice, Instruction frontInst, Instruction backInst) { + Integer frontX = this.handExtraIntValue(frontDevice, "currentX"); + Integer frontY = this.handExtraIntValue(frontDevice, "currentY"); + Integer frontZ = this.handExtraIntValue(frontDevice, "currentZ"); + List values = Arrays.asList(frontX, frontY, frontZ, frontInst.getInstruction_code(), backInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_THREE.getSignalNum(), SendSignalEnum.COMMAND_ONE.getSignalNum()); + this.writing(this.getFBKeys(), values); + } + + + /** + * 更新指令状态 + */ + private void updateInstStatus() { + if (this.mode == 3 && this.back_task > 0) { + this.updateInstStatusBusy(this.back_task); + } + if (this.mode == 3 && this.front_task > 0) { + this.updateInstStatusBusy(this.front_task); + } + if (this.mode == 3 && this.back_task > 0 && CommandEnum.UNLOAD_COMPLETE.getStatus() == this.back_command) { + this.updateInstStatusFinish(this.back_task); + } + if (this.mode == 3 && this.front_task > 0 && CommandEnum.UNLOAD_COMPLETE.getStatus() == this.front_command) { + this.updateInstStatusFinish(this.front_task); + } + } + + private void updateInstStatusBusy(int instCode) { + Instruction instruction = instructionService.findByCodeFromCache(String.valueOf(instCode)); + if (ObjectUtil.isNotEmpty(instruction) && InstructionStatusEnum.READY.getIndex().equals(instruction.getInstruction_status())) { + instruction.setInstruction_status(InstructionStatusEnum.BUSY.getIndex()); + instruction.setExecute_device_code(this.currentDeviceCode); + instructionService.update(instruction); + } + } + + @SneakyThrows + private void updateInstStatusFinish(int instCode) { + Instruction instruction = instructionService.findByCodeFromCache(String.valueOf(instCode)); + if (ObjectUtil.isNotEmpty(instruction) && (InstructionStatusEnum.BUSY.getIndex().equals(instruction.getInstruction_status()) || InstructionStatusEnum.READY.getIndex().equals(instruction.getInstruction_status()))) { + instruction.setInstruction_status(InstructionStatusEnum.FINISHED.getIndex()); + instruction.setExecute_device_code(this.currentDeviceCode); + instructionService.finish(instruction); + } + } + + + @Override + public JSONObject getDeviceStatusName() throws Exception { + JSONObject jo = new JSONObject(); + jo.put("device_code", this.currentDeviceCode); + jo.put("device_name", this.getDevice().getDevice_name()); + jo.put("driver_type", "standard_stacker_device"); + jo.put("is_click", true); + jo.put("message", this.message); + jo.put("isOnline", this.online); + jo.put("isError", this.isError); + jo.put("prohibitInWarehouse", this.prohibitInWarehouse); + jo.put("prohibitOutWarehouse", this.prohibitOutWarehouse); + jo.put("stopReceiveTask", this.stopReceiveTask); + jo.put("requireSuccess", this.requireSuccess ? "1" : "0"); + return jo; + } + + @Override + public void setDeviceStatus(JSONObject data) { + if (ObjectUtil.isNotEmpty(data)) { + //监控大屏下发作业命令清警-5、召回-7、急停-8 + Integer toCommand = data.getInteger("toCommand"); + if (toCommand != null) { + this.writing(ItemProtocol.TO_COMMAND.getKey(), toCommand); + } + //ACS监控大屏设置禁止入库、禁止出库、停止接收任务 + Boolean prohibitInWarehouse = data.getBoolean("prohibitInWarehouse"); + this.prohibitInWarehouse = prohibitInWarehouse; + Boolean prohibitOutWarehouse = data.getBoolean("prohibitOutWarehouse"); + this.prohibitOutWarehouse = prohibitOutWarehouse; + Boolean stopReceiveTask = data.getBoolean("stopReceiveTask"); + this.stopReceiveTask = stopReceiveTask; + String requireSuccess = data.getString("requireSuccess"); + if (StrUtil.equals("0", requireSuccess)) { + this.requireSuccess = false; + } else if (StrUtil.equals("1", requireSuccess)) { + this.requireSuccess = true; + } + } + } + + private void sendPutInfoToPlc(Instruction frontInst, Instruction backInst) { + if (ObjectUtil.isNotEmpty(frontInst) && ObjectUtil.isNotEmpty(backInst) && isBindPut(frontInst, backInst)) { + String next_device_code = frontInst.getNext_device_code(); + Device next_device = deviceAppService.findDeviceByCode(next_device_code); + if (next_device != null && next_device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { + this.writing(this.getFBKeys(), Arrays.asList(Integer.parseInt(StringUtil.handleString(frontInst.getTo_x())), Integer.parseInt(frontInst.getTo_y()), Integer.parseInt(frontInst.getTo_z()), frontInst.getInstruction_code(), backInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_THREE.getSignalNum(), SendSignalEnum.COMMAND_TWO.getSignalNum())); + } else if (next_device != null && next_device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + Integer x = this.handExtraIntValue(next_device, "currentX"); + Integer y = this.handExtraIntValue(next_device, "currentY"); + Integer z = this.handExtraIntValue(next_device, "currentZ"); + this.writing(this.getFBKeys(), Arrays.asList(x, y, z, frontInst.getInstruction_code(), backInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_THREE.getSignalNum(), SendSignalEnum.COMMAND_TWO.getSignalNum())); + } + } else if (ObjectUtil.isNotEmpty(frontInst) && !isBindPut(frontInst, backInst)) { + String next_device_code = frontInst.getNext_device_code(); + Device next_device = deviceAppService.findDeviceByCode(next_device_code); + if (next_device != null && next_device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { + this.writing(this.getFrontKeys(), Arrays.asList(Integer.parseInt(StringUtil.handleString(frontInst.getTo_x())), Integer.parseInt(frontInst.getTo_y()), Integer.parseInt(frontInst.getTo_z()), frontInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_ONE.getSignalNum(), SendSignalEnum.COMMAND_TWO.getSignalNum())); + } else if (next_device != null && next_device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + Integer x = this.handExtraIntValue(next_device, "currentX"); + Integer y = this.handExtraIntValue(next_device, "currentY"); + Integer z = this.handExtraIntValue(next_device, "currentZ"); + this.writing(this.getFrontKeys(), Arrays.asList(x, y, z, frontInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_ONE.getSignalNum(), SendSignalEnum.COMMAND_TWO.getSignalNum())); + } + } else if (ObjectUtil.isNotEmpty(backInst) && !isBindPut(frontInst, backInst)) { + String next_device_code = backInst.getNext_device_code(); + Device next_device = deviceAppService.findDeviceByCode(next_device_code); + if (next_device != null && next_device.getDeviceDriver() instanceof StandardStorageDeviceDriver) { + this.writing(this.getBackKeys(), Arrays.asList(Integer.parseInt(StringUtil.handleString(backInst.getTo_x())), Integer.parseInt(backInst.getTo_y()), Integer.parseInt(backInst.getTo_z()), backInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_TWO.getSignalNum(), SendSignalEnum.COMMAND_TWO.getSignalNum())); + } else if (next_device != null && next_device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + Integer x = this.handExtraIntValue(next_device, "currentX"); + Integer y = this.handExtraIntValue(next_device, "currentY"); + Integer z = this.handExtraIntValue(next_device, "currentZ"); + this.writing(this.getBackKeys(), Arrays.asList(x, y, z, backInst.getInstruction_code(), SendSignalEnum.CHOOSE_FORK_TWO.getSignalNum(), SendSignalEnum.COMMAND_TWO.getSignalNum())); + } + } + } + + private boolean isBindPut(Instruction frontInst, Instruction backInst) { + if (ObjectUtil.isNotEmpty(frontInst) && ObjectUtil.isNotEmpty(backInst)) { + String front_next_device_code = frontInst.getNext_device_code(); + String back_next_device_code = backInst.getNext_device_code(); + Device front_device = deviceAppService.findDeviceByCode(front_next_device_code); + Device back_device = deviceAppService.findDeviceByCode(back_next_device_code); + String back_device_code = this.handExtraStringValue(front_device, "getLinkDeviceCode"); + String front_to_x = frontInst.getTo_x(); + String front_to_y = frontInst.getTo_y(); + String front_to_z = frontInst.getTo_z(); + + String back_to_x = backInst.getTo_x(); + String back_to_y = backInst.getTo_y(); + String back_to_z = backInst.getTo_z(); + boolean flagX = StrUtil.equals(front_to_x, back_to_x); + boolean flagY = (Integer.parseInt(front_to_y) / 4 == Integer.parseInt(back_to_y) / 4) && (((Integer.parseInt(front_to_y) % 4) + (Integer.parseInt(back_to_y) % 4) == 2) || (Integer.parseInt(front_to_y) % 4) + (Integer.parseInt(back_to_z) % 4) == 4); + boolean flagZ = StrUtil.equals(front_to_z, back_to_z); + if (flagX && flagY && flagZ) { + return true; + } else if (StrUtil.equals(back_next_device_code, back_device_code)) { + return true; + } + } + return false; + } + + private void clearInfoToPlc() { + boolean isFrontPickup = this.front_command == CommandEnum.PICKUP.getStatus(); + boolean isBackPickup = this.back_command == CommandEnum.PICKUP.getStatus(); + boolean isFrontRelease = this.front_command == CommandEnum.RELEASE.getStatus(); + boolean isBackRelease = this.back_command == CommandEnum.RELEASE.getStatus(); + boolean isPickupOrRelease = (isFrontPickup && isBackPickup) || (isFrontRelease && isBackRelease); + if (isPickupOrRelease) { + this.writing(this.getFBKeys(), Arrays.asList(0, 0, 0, 0, 0, 0, 0)); + } else if (isFrontPickup || isFrontRelease) { + this.writing(this.getFrontKeys(), Arrays.asList(0, 0, 0, 0, 0, 0)); + } else if (isBackPickup || isBackRelease) { + this.writing(this.getBackKeys(), Arrays.asList(0, 0, 0, 0, 0, 0)); + } + this.requireSuccess = true; + } + + private void setInstruction(Instruction instdto, TaskDto taskDto) { + instdto.setInstruction_id(IdUtil.simpleUUID()); + instdto.setInstruction_code(CodeUtil.getNewCode("INSTRUCT_NO")); + instdto.setRoute_plan_code(taskDto.getRoute_plan_code()); + instdto.setRemark(taskDto.getRemark()); + instdto.setMaterial(taskDto.getMaterial()); + instdto.setQuantity(taskDto.getQuantity()); + instdto.setTask_id(taskDto.getTask_id()); + instdto.setTask_code(taskDto.getTask_code()); + instdto.setVehicle_code(taskDto.getVehicle_code()); + String now = DateUtil.now(); + instdto.setCreate_time(now); + instdto.setCreate_by(SecurityUtils.getCurrentNickName()); + instdto.setStart_device_code(taskDto.getStart_device_code()); + instdto.setNext_device_code(taskDto.getNext_device_code()); + instdto.setStart_point_code(taskDto.getStart_point_code()); + instdto.setNext_point_code(taskDto.getNext_point_code()); + instdto.setPriority(taskDto.getPriority()); + instdto.setInstruction_status(InstructionStatusEnum.READY.getIndex()); + instdto.setExecute_device_code(taskDto.getStart_device_code()); + instdto.setInstruction_type(taskDto.getTask_type()); + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/CommandEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/CommandEnum.java new file mode 100644 index 0000000..12d192f --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/CommandEnum.java @@ -0,0 +1,42 @@ +/** + * @author ls + * @date 2023/12/4 13:42 + */ +package org.nl.acs.device.driver.stacker.double_stacker.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum CommandEnum { + /** + * 动作信号 + */ + STANDY(0, "待机"), + PICKUP(1, "取货中"), + PICKUP_COMPLETE(2, "取货完成"), + RELEASE(3, "放货中"), + UNLOAD(4, "请求卸货"), + UNLOAD_COMPLETE(5, "卸货完成"), + PICKUP_PREPARATION(6, "取货准备"), + RECALL(7, "召回"), + STOP(8, "急停"), + UNKNOWN(9, "不明"), + CHECKING(10, "盘库中"), + CHECKED(10, "盘库完成"); + + private Integer status; + private String desc; + + public static String getDesc(Integer status) { + for (CommandEnum c : CommandEnum.values()) { + if (c.getStatus().equals(status)) { + return c.getDesc(); + } + } + return null; + } + + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/SendSignalEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/SendSignalEnum.java new file mode 100644 index 0000000..f88af11 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/SendSignalEnum.java @@ -0,0 +1,33 @@ +package org.nl.acs.device.driver.stacker.double_stacker.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/23 + */ +@Getter +@AllArgsConstructor +public enum SendSignalEnum { + COMMAND_ONE(1, "取货"), + COMMAND_TWO(2, "放货"), + COMMAND_THREE(3, "通知可放货"), + COMMAND_FOUR(4, "取消作业（没用）"), + COMMAND_FIVE(5, "解警"), + COMMAND_SIX(6, "取货准备"), + COMMAND_SEVEN(7, "召回"), + COMMAND_EIGHT(8, "急停"), + COMMAND_NINE(9, "申请脱机（没用）"), + COMMAND_TEN(10, "申请联机（没用）"), + COMMAND_ELEVEN(11, "确认收到放货完成"), + COMMAND_TWELVE(12, "消防任务"), + + CHOOSE_FORK_ONE(1, "前叉"), + CHOOSE_FORK_TWO(2, "后叉"), + CHOOSE_FORK_THREE(3, "双叉"); + + private final int signalNum; + private final String signalDesc; + } \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/StrategyEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/StrategyEnum.java new file mode 100644 index 0000000..f6bd93b --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/stacker/double_stacker/enums/StrategyEnum.java @@ -0,0 +1,20 @@ +package org.nl.acs.device.driver.stacker.double_stacker.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/25 + */ +@Getter +@AllArgsConstructor +public enum StrategyEnum { + IN("1", "入库优先策略"), + OUT("2", "出库优先策略"), + TIME("3", "时间顺序策略"); + + private final String value; + private final String label; +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/ItemProtocol.java similarity index 88% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/ItemProtocol.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/ItemProtocol.java index 5293ab2..81abad2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/ItemProtocol.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/ItemProtocol.java @@ -1,7 +1,7 @@ -package org.nl.acs.device_driver.conveyor.lnsh_station2; +package org.nl.acs.device.driver.station.lnsh_station2; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device_driver.BaseTagsDataReader; +import org.nl.acs.device.driver.DeviceDriverBaseReader; +import org.nl.acs.device.driver.ItemDto; import java.util.ArrayList; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * @Author Gengby * @Date 2024/4/1 */ -public enum ItemProtocol implements BaseTagsDataReader.KeyProvider { +public enum ItemProtocol implements DeviceDriverBaseReader.KeyProvider { HEARTBEAT("heartbeat", "心跳", "DB81.B10"), MODE("mode", "工作模式", "DB81.B1"), MOVE("move", "光电开关信号", "DB81.B2"), diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/LnshStationDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/LnshStationDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/LnshStationDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/LnshStationDefination.java index cd7b3fe..7ec358a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/LnshStationDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/LnshStationDefination.java @@ -1,10 +1,10 @@ -package org.nl.acs.device_driver.conveyor.lnsh_station2; +package org.nl.acs.device.driver.station.lnsh_station2; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; +import org.nl.acs.device.driver.ItemDto; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.OpcDeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/LnshStationDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/LnshStationDeviceDriver.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/LnshStationDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/LnshStationDeviceDriver.java index 41ae4f4..65da0f5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/lnsh_station2/LnshStationDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/lnsh_station2/LnshStationDeviceDriver.java @@ -1,18 +1,17 @@ -package org.nl.acs.device_driver.conveyor.lnsh_station2; +package org.nl.acs.device.driver.station.lnsh_station2; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.BaseTagsDataReader; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.StandardRequestMethod; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.device.driver.DeviceDriverBaseReader; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.StandardRequestMethod; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; import org.nl.acs.monitor.DeviceStageMonitor; import org.nl.config.SpringContextHolder; import org.nl.config.lucene.service.LuceneExecuteLogService; @@ -30,7 +29,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements RouteableDeviceDriver, DeviceStageMonitor, StandardRequestMethod, - BaseTagsDataReader { + DeviceDriverBaseReader { private final LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); @@ -51,14 +50,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements /** * 光电信号 */ - private int move = 0; - private int lastMove = 0; + private float move = 0; + private float lastMove = 0; /** * 取放信号 */ - private int action = 0; - private int lastAction = 0; + private double action = 0; + private double lastAction = 0; /** * 进出信号 @@ -75,14 +74,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements /** * 任务号 */ - private String[] task; - private String[] lastTask; + private float task; + private float lastTask; /** * 重量 */ - private double[] weight; - private double[] lastWeight; + private double weight; + private double lastWeight; /** * 物料信息 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDefination.java similarity index 63% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDefination.java index 7db8379..5efe8dd 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.conveyor.belt_with_station; +package org.nl.acs.device.driver.station.with_station; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; import org.springframework.stereotype.Service; import java.util.LinkedList; @@ -21,19 +21,17 @@ public class WithStationDefination implements DeviceDriverDefination { @Override public String getDriverName() { - return "输送线关联站点"; + return "输送线关联驱动"; } @Override public String getDriverDescription() { - return "输送线关联站点"; + return "输送线关联驱动"; } - - @Override public DeviceDriver getDriverInstance(Device device) { - return (new WithStationDeviceDriver()).setDevice(device).setDriverDefination(this); + return new WithStationDeviceDriver().setDevice(device).setDriverDefination(this); } @@ -45,7 +43,7 @@ public class WithStationDefination implements DeviceDriverDefination { @Override public List getFitDeviceTypes() { List types = new LinkedList(); - types.add(DeviceType.conveyor); + types.add(DeviceType.station); return types; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDeviceDriver.java new file mode 100644 index 0000000..0839649 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/station/with_station/WithStationDeviceDriver.java @@ -0,0 +1,125 @@ +package org.nl.acs.device.driver.station.with_station; + +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.Data; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.driver.AbstractOpcDeviceDriver; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.ExecutableDeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.conveyor.appearance_inspection_scannner_conveyor.AppearanceInspectionScannerConveyorDeviceDriver; +import org.nl.acs.device.enums.RequestTypeEnum; +import org.nl.acs.ext.UnifiedResponse; +import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; +import org.nl.acs.monitor.DeviceStageMonitor; +import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.service.dto.TaskDto; +import org.nl.config.SpringContextHolder; +import org.nl.config.lucene.service.LuceneExecuteLogService; + +import java.util.List; +import java.util.Optional; + +/** + * 关联驱动 + */ +@Slf4j +@Data +@RequiredArgsConstructor +public class WithStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { + + private final DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class); + private final TaskService taskServer = SpringContextHolder.getBean(TaskService.class); + private final AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); + private final LuceneExecuteLogService logServer = SpringContextHolder.getBean(LuceneExecuteLogService.class); + + /** + * 请求标记 + */ + private boolean requireSuccess = false; + + /** + * 当前设备号 + */ + private String device_code = null; + + @Override + public void execute() { + device_code = this.getDeviceCode(); + Long waitTime = Optional.ofNullable(this.getExtraValue().get("apply_time")).map(Object::toString).map(Long::parseLong).orElse(System.currentTimeMillis() * 1000); + List linkDeviceCodeList = this.getExtraDeviceCodes("link_device_code"); + for (int i = 0; i < linkDeviceCodeList.size(); i++) { + String deviceCode = linkDeviceCodeList.get(i); + Device device = deviceAppservice.findDeviceByCode(deviceCode); + AppearanceInspectionScannerConveyorDeviceDriver appearanceInspectionScannerConveyorDeviceDriver; + if (ObjectUtil.isNotEmpty(device) && device.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + appearanceInspectionScannerConveyorDeviceDriver = (AppearanceInspectionScannerConveyorDeviceDriver) device.getDeviceDriver(); + if (appearanceInspectionScannerConveyorDeviceDriver.getMove() == 0) { + requireSuccess = false; + continue; + } + if (!requireSuccess && StrUtil.isNotEmpty(appearanceInspectionScannerConveyorDeviceDriver.getBarcode())) { + TaskDto taskDto = taskServer.findByContainer(appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); + if (ObjectUtil.isEmpty(taskDto)) { + JSONObject requestParam = new JSONObject(); + requestParam.put("type", RequestTypeEnum.APPLY_IN_TASK.getType()); + String getLinkDeviceCode = Optional.ofNullable(device.getExtraValue().get("getLinkDeviceCode")).map(Object::toString).orElse(null); + if (StrUtil.isEmpty(getLinkDeviceCode)) { + requestParam.put("device_code1", deviceCode); + requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); + UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); + if (response.isSuccess()) { + this.requireSuccess = true; + } + } else { + Device linkDevice = deviceAppservice.findDeviceByCode(getLinkDeviceCode); + if (ObjectUtil.isNotEmpty(linkDevice) && linkDevice.getDeviceDriver() instanceof AppearanceInspectionScannerConveyorDeviceDriver) { + AppearanceInspectionScannerConveyorDeviceDriver appearanceInspectionScannerConveyorDeviceDriver2 = (AppearanceInspectionScannerConveyorDeviceDriver) linkDevice.getDeviceDriver(); + if (appearanceInspectionScannerConveyorDeviceDriver2.getMove() == 1) { + TaskDto taskDto2 = taskServer.findByContainer(appearanceInspectionScannerConveyorDeviceDriver2.getBarcode()); + if (ObjectUtil.isEmpty(taskDto2)) { + requestParam.put("device_code1", deviceCode); + requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); + requestParam.put("device_code2", getLinkDeviceCode); + requestParam.put("barcode2", appearanceInspectionScannerConveyorDeviceDriver2.getBarcode()); + UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); + if (response.isSuccess()) { + this.requireSuccess = true; + } + } + } else { + if (System.currentTimeMillis() - appearanceInspectionScannerConveyorDeviceDriver.getRequireInTaskTime() > waitTime) { + requestParam.put("device_code1", deviceCode); + requestParam.put("barcode1", appearanceInspectionScannerConveyorDeviceDriver.getBarcode()); + UnifiedResponse response = acsToWmsService.applyTaskToWms(requestParam); + if (response.isSuccess()) { + this.requireSuccess = true; + } + } + } + } + } + } + } + } + } + } + + + @Override + public JSONObject getDeviceStatusName() { + JSONObject jo = new JSONObject(); + return jo; + } + + @Override + public void setDeviceStatus(JSONObject data) { + + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/storage/standard_storage/StandardStorageDefination.java similarity index 79% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDefination.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/storage/standard_storage/StandardStorageDefination.java index f400fe9..891a683 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDefination.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/storage/standard_storage/StandardStorageDefination.java @@ -1,9 +1,9 @@ -package org.nl.acs.device_driver.storage.standard_storage; +package org.nl.acs.device.driver.storage.standard_storage; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; +import org.nl.acs.device.device.enums.DeviceType; import org.springframework.stereotype.Service; import java.util.LinkedList; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/storage/standard_storage/StandardStorageDeviceDriver.java similarity index 64% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDeviceDriver.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/storage/standard_storage/StandardStorageDeviceDriver.java index 4311add..f477566 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/storage/standard_storage/StandardStorageDeviceDriver.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/driver/storage/standard_storage/StandardStorageDeviceDriver.java @@ -1,11 +1,11 @@ -package org.nl.acs.device_driver.storage.standard_storage; +package org.nl.acs.device.driver.storage.standard_storage; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.StorageDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.RouteableDeviceDriver; +import org.nl.acs.device.driver.StorageDeviceDriver; +import org.nl.acs.device.driver.AbstractDeviceDriver; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestMethodEnum.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestMethodEnum.java index 729262f..67dcb4c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestMethodEnum.java @@ -1,10 +1,9 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.enums; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.common.base.CommonFinalParam; /** * 驱动类型 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestTypeEnum.java new file mode 100644 index 0000000..9d0265e --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/enums/RequestTypeEnum.java @@ -0,0 +1,18 @@ +package org.nl.acs.device.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +@Getter +@AllArgsConstructor +public enum RequestTypeEnum { + APPLY_IN_TASK("1", "申请任务"); + + private final String type; + private final String desc; +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ArrayComparisonUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/utils/ArrayComparisonUtil.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ArrayComparisonUtil.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/utils/ArrayComparisonUtil.java index 66eddd8..70eb251 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ArrayComparisonUtil.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/utils/ArrayComparisonUtil.java @@ -1,4 +1,4 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.utils; import cn.hutool.core.util.ObjectUtil; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ArrayConverter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/utils/ArrayConverter.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ArrayConverter.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/utils/ArrayConverter.java index 933b31f..70db848 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/ArrayConverter.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/utils/ArrayConverter.java @@ -1,4 +1,6 @@ -package org.nl.acs.device_driver; +package org.nl.acs.device.utils; + +import org.nl.config.mqtt2.TagsUtil; import java.math.BigDecimal; import java.math.RoundingMode; @@ -175,12 +177,12 @@ public interface ArrayConverter { } - static float limit2Places(String value) { - return BigDecimal.valueOf(Float.parseFloat(value)).setScale(2, RoundingMode.HALF_UP).floatValue(); + static float limitFloatPlaces(String value) { + return BigDecimal.valueOf(Float.parseFloat(value)).setScale(TagsUtil.SCALE, RoundingMode.HALF_DOWN).floatValue(); } - static double limit4Places(String value) { - return BigDecimal.valueOf(Double.parseDouble(value)).setScale(4, RoundingMode.HALF_UP).doubleValue(); + static double limitDoublePlaces(String value) { + return BigDecimal.valueOf(Double.parseDouble(value)).setScale(TagsUtil.SCALE, RoundingMode.HALF_DOWN).doubleValue(); } @FunctionalInterface diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/HeartbeatableDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/HeartbeatableDeviceDriver.java deleted file mode 100644 index 1d833cf..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/HeartbeatableDeviceDriver.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.nl.acs.device_driver; - -public interface HeartbeatableDeviceDriver extends DeviceDriver { - default void checkHeartbeat() { - } - - /** - * isOnline - * @return - */ - default boolean isOnline() { - return false; - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDefination.java deleted file mode 100644 index 0008a24..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDefination.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.nl.acs.device_driver.conveyor.belt_conveyor; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 标准版-输送机 - */ -@Service -public class BeltConveyorDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "belt_conveyor"; - } - - @Override - public String getDriverName() { - return "标准版-输送机"; - } - - @Override - public String getDriverDescription() { - return "标准版-输送机"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new BeltConveyorDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return BeltConveyorDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return ItemProtocol.getReadableItemDtos(); - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java deleted file mode 100644 index 0c7ea20..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ /dev/null @@ -1,790 +0,0 @@ -package org.nl.acs.device_driver.conveyor.belt_conveyor; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.AcsConfig; -import org.nl.acs.agv.server.AgvService; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.ErrorType; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.enums.AcsToLmsApplyTaskTypeEnum; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; -import org.nl.acs.history.ErrorUtil; -import org.nl.acs.history.service.DeviceErrorLogService; -import org.nl.acs.history.service.dto.DeviceErrorLogDto; -import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.enums.TaskTypeEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.utils.SecurityUtils; -import org.nl.config.SpringContextHolder; -import org.nl.config.language.LangProcess; -import org.nl.config.lucene.service.LuceneExecuteLogService; -import org.nl.config.lucene.service.dto.LuceneLogDto; -import org.nl.system.service.param.ISysParamService; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -import static redis.clients.jedis.HostAndPort.localhost; - -/** - * 输送线 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean(DeviceService.class); - @Autowired - TaskService taskserver = SpringContextHolder.getBean(TaskService.class); - @Autowired - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); - @Autowired - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); - @Autowired - AgvService agvService = SpringContextHolder.getBean(AgvService.class); - @Autowired - DeviceErrorLogService errorLogServer = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); - - LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); - - ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); - - private Date instruction_update_time = new Date(); - private Date require_apply_strangulation_time = new Date(); - private int instruction_update_time_out = 500; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - private Date instruction_apply_time = new Date(); - private int instruction_require_time_out = 3000; - - /** - * 心跳 - */ - int heartbeat = 0; - int last_heartbeat = 0; - /** - * 工作模式 - */ - int mode = 0; - int last_mode = 0; - /** - * 光电信号 - */ - int move = 0; - int last_move = 0; - /** - * 托盘方向 - */ - int container_direction = 0; - int last_container_direction = 0; - /** - * 报警 - */ - int error = 0; - int last_error = 0; - /** - * 动作信号 - */ - int action = 0; - int last_action = 0; - /** - * 任务号 - */ - int task = 0; - int last_task = 0; - /** - * 托盘类型 - */ - int container_type = 0; - int last_container_type = 0; - /** - * 纯数字托盘号 - */ - int container_no = 0; - int last_container_no = 0; - - int inventory_qty = 0; - int out_finish = 0; - /** - * 下发命令 - */ - int to_command = 0; - int last_to_command = 0; - /** - * 下发目标站 - */ - int to_target = 0; - int last_to_target = 0; - /** - * 下发任务号 - */ - int to_task = 0; - int last_to_task = 0; - /** - * 下发接纯数字托盘号 - */ - int to_container_no = 0; - int last_to_container_no = 0; - /** - * 下发托盘类型 - */ - int to_container_type = 0; - int last_to_container_type = 0; - - String barcode = null; - - - //子卷条码 - String material_barcode = null; - String last_material_barcode = null; - /** - * 当前指令 - */ - Instruction inst = null; - - String material = null; - - Boolean isonline = true; - - Boolean iserror = false; - - /** - * 1-执行任务；2-取货完成；3-放货完成； - */ - int flag; - - - int last_inventory_qty = 0; - int last_out_finish = 0; - - String last_material = null; - String message = null; - String device_code; - String task_code = null; - String vehicle_code; - String inst_message; - - /** - * led点阵屏信息 - */ - JSONObject led_message = null; - - - @Override - public Device getDevice() { - return this.device; - } - - /** - * 请求成功标记 - */ - Boolean requireSucess = false; - - @Override - public void execute() { - try { - device_code = this.getDeviceCode(); - heartbeat = this.itemProtocol.getHeartbeat(); - mode = this.itemProtocol.getMode(); - move = this.itemProtocol.getMove(); - action = this.itemProtocol.getAction(); - container_direction = this.itemProtocol.getContainer_direction(); - container_type = this.itemProtocol.getContainer_type(); - error = this.itemProtocol.getError(); - task = this.itemProtocol.getTask(); - container_no = this.itemProtocol.getContainer_no(); - material_barcode= this.itemProtocol.getMaterialBarcode(); - to_command = this.itemProtocol.getTo_command(); - to_target = this.itemProtocol.getTotarget(); - to_task = this.itemProtocol.getTo_task(); - to_container_no = this.itemProtocol.getContainer_direction(); - to_container_type = this.itemProtocol.getContainer_no(); - - - if (mode != last_mode) { - - requireSucess = false; - - } - - - if (move != 0 && task > 0) { - update_instruction_status(); - } - - } catch (Exception var17) { - var17.printStackTrace(); - logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)); - } - - - if (mode == 0) { - this.setIsonline(false); - message = "universal_off-line"; - } else if (error != 0) { - this.setIserror(true); - message = "universal_message3"; - - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - - switch (mode) { - case 1: - log.debug("弃用(留作兼容)"); - break; - case 2: - //申请任务 - if (move == 1 && !requireSucess) { - instruction_require(); - } - break; - case 3: - log.info("运行中"); - break; - case 4: - //申请出货 - if (move == 1 && !requireSucess) { - //request_for_shipment(String.valueOf(mode), item_out_seq_arr, item_out_qty_arr); - } - break; - case 5: - //申请AGV任务 - if (move == 1 && !requireSucess) { - applyAgvTask(); - } - break; - case 6: - //二楼到一楼输送线申请行架任务 - if (move == 1 && !requireSucess) { - applyManipulatorTask(); - } - break; - - default: - break; - } - } - last_heartbeat = heartbeat; - last_mode = mode; - last_move = move; - last_error = error; - last_container_direction = container_direction; - last_container_no = container_no; - last_container_type = container_type; - last_action = action; - last_task = task; - last_to_command = to_command; - last_to_target = to_target; - last_to_task = to_task; - last_to_container_no = to_container_no; - last_to_container_type = to_container_type; - - } - - - private void applyManipulatorTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - JSONObject param = new JSONObject(); - param.put("device_code", device_code); - param.put("material_barcode", material_barcode); - logServer.deviceExecuteLog(this.device_code, "", "", "二楼到一楼输送线申请行架任务,参数:" + param); - String response = acsToWmsService.applyTowToOne(param); - JSONObject jo = JSON.parseObject(response); - if (response == null || jo.getInteger("status") == 200) { - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("二楼到一楼输送线申请行架任务,参数,接口返回:" + jo) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto2); - this.requireSucess = true; - } else { - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("二楼到一楼输送线申请行架任务,返回参数:" + jo.getString("body")) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto2); - } - } - } - - - - - public synchronized void applyAgvTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - String hand_barcode = null; - this.instruction_require_time = date; - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { - //判断是否有手动补码 如果有就申请补码agv任务 - if (StrUtil.isNotEmpty(hand_barcode)) { - JSONObject apply = new JSONObject(); - apply.put("device_code", device_code); - apply.put("vehicle_code", hand_barcode); - - String str = acsToWmsService.applyTaskToWms(apply); - JSONObject jo = JSON.parseObject(str); - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("申请AGV任务,参数,接口返回:" + jo) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto2); - if (ObjectUtil.isEmpty(jo)) { - message = "one_message15"; - } else { - if (jo.getInteger("status") == 200) { - message = "one_message16"; - List list = new ArrayList(); - while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".to_command").toString() - , "8")) { - this.writing(list); - logServer.deviceExecuteLog(device_code, "", "", "再次下发mode信号"); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - LuceneLogDto logDto = LuceneLogDto.builder() - .device_code(device_code) - .content("申请AGV任务,返回参数:" + jo.getString("body")) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto); - requireSucess = true; - } else { - message = "one_message17" + jo.get("message").toString(); - } - } - return; - } - JSONObject apply = new JSONObject(); - apply.put("device_code", device_code); - - apply.put("vehicle_code", barcode); - - String str = acsToWmsService.applySendOutTwo(apply); - logServer.deviceExecuteLog(this.device_code, "", "", "申请AGV任务,请求参数:" + apply + ",响应参数"); - - JSONObject jo = JSON.parseObject(str); - if (ObjectUtil.isEmpty(jo)) { - message = "one_message15"; -// requireSucess = true; - } else { - if (jo.getInteger("status") == 200) { - message = "one_message16"; - List list = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_command"); - map.put("value", "8"); - list.add(map); - this.writing(list); - while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".to_command").toString() - , "8")) { - this.writing(list); - logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发mode信号"); - try { - Thread.sleep(500); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - logServer.deviceExecuteLog(this.device_code, "", "", "申请AGV任务,返回参数:" + jo); - requireSucess = true; - } else { - message = "one_message17" + jo.get("message").toString(); - } - } - - } - } - } - - - - - /** - * 申请任务 - */ - public synchronized Boolean - instruction_require() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - //查找有没有对应的指令 - Instruction inst = instructionService.findByDeviceCodeFromCache(this.device_code); - if (ObjectUtil.isNotNull(inst) && CommonFinalParam.ONE.equals(inst.getInstruction_type())) { - List routeLineDtos = routeLineService.selectDeviceCodeList(this.device_code); - if (routeLineDtos.size() < 1) { - return false; - } - int i = 0; - for (RouteLineDto routeLineDto : routeLineDtos) { - if (routeLineDto.getNext_device_code().equals(inst.getNext_device_code())) { - i++; - } - } - if (i == 0) { - return false; - } - Device nextdevice = deviceAppservice.findDeviceByCode(inst.getNext_device_code()); - String next_addr = nextdevice.getExtraValue().get("address").toString(); - TaskDto taskDto = taskserver.findByCodeFromCache(inst.getTask_code()); - //List paperArray = getPaperArray(null); - if (ObjectUtil.isEmpty(inst)) { - return false; - } - List list = new ArrayList(); - writeData(next_addr, list, inst); - led_message = getLedMessage(inst); - requireSucess = true; - return true; - } else { - //判断是否有相同起点的,任务状态就绪的任务 - TaskDto taskdto = taskserver.findByStartCodeAndReady(device_code); - if (ObjectUtil.isNull(taskdto)) { - return false; - } - if (ObjectUtil.isNotNull(taskdto) && TaskTypeEnum.Conveyor_Task.getIndex().equals(taskdto.getTask_type())) { - //判断指令的起点和当前的设备号相同 - if (!taskdto.getStart_device_code().equals(device_code)) { - return false; - } - //判断当前任务号是否存在指令 - String taskid = taskdto.getTask_id(); - String taskcode = taskdto.getTask_code(); - String priority = taskdto.getPriority(); - String start_point_code = taskdto.getStart_point_code(); - String start_device_code = taskdto.getStart_device_code(); - String route_plan_code = taskdto.getRoute_plan_code(); - String next_device_code = ""; - /** - * 开始平均分配 - */ - String this_coevice_code = taskserver.queryAssignedByDevice(device_code, taskdto.getNext_device_code()); - if (StrUtil.isEmpty(this_coevice_code)) { - List shortPathsList = routeLineService.getShortPathLines(start_device_code, taskdto.getNext_device_code(), route_plan_code); - RouteLineDto routeLineDto = shortPathsList.get(0); - - String path = routeLineDto.getPath(); - String type = routeLineDto.getType(); - String[] str = path.split("->"); - - List pathlist = Arrays.asList(str); - int index = 0; - for (int m = 0; m < pathlist.size(); m++) { - if (pathlist.get(m).equals(start_device_code)) { - index = m + 1; - break; - } - } - next_device_code = pathlist.get(index); - } else { - next_device_code = this_coevice_code; - } - //校验路由关系 - List shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code); - if (ObjectUtils.isEmpty(shortPathsList) || shortPathsList.size() < 1) { - throw new RuntimeException("路由不通!"); - } - Device startdevice = deviceAppservice.findDeviceByCode(start_device_code); - Device nextdevice = deviceAppservice.findDeviceByCode(next_device_code); - String next_point_code; - if (StrUtil.equals(deviceAppservice.findDeviceTypeByCode(next_device_code), "storage")) { - next_point_code = taskdto.getTo_x() + "-" + taskdto.getTo_y() + "-" + taskdto.getTo_z(); - } else { - next_point_code = next_device_code; - } - Instruction instdto = new Instruction(); - packageData(instdto, route_plan_code, taskdto, taskid, taskcode, start_device_code, next_device_code, start_point_code, next_point_code, priority); - log.error("=================================,{}", instdto.getCreate_by()); - try { - instructionService.create(instdto); - } catch (Exception e) { - e.printStackTrace(); - log.error("指令创建失败!,{}", e.getMessage()); - return false; - } - taskdto.setTask_status(TaskStatusEnum.BUSY.getIndex()); - taskserver.update(taskdto); - requireSucess = true; - String next_addr = nextdevice.getExtraValue().get("address").toString(); - List list = new ArrayList(); - writeData(next_addr, list, instdto); - led_message = getLedMessage(instdto); - requireSucess = true; - return true; - } - } - return false; - } - } - - private void writeData(String next_addr, List list, Instruction inst) { - Map map = new HashMap(); - map.put("code", "to_target"); - map.put("value", next_addr); - list.add(map); - Map map1 = new HashMap(); - map1.put("code", "to_task"); - map1.put("value", inst.getInstruction_code()); - list.add(map1); - Map map2 = new HashMap(); - map2.put("code", "to_command"); - map2.put("value", "1"); - list.add(map2); - Map map3 = new HashMap(); - map3.put("code", "to_container_type"); - map3.put("value", "1"); - list.add(map3); - Map map4 = new HashMap(); - map4.put("code", "to_container_no"); - map4.put("value", "1"); - list.add(map4); - - this.writing(list); - } - - private static void packageData(Instruction instdto, String route_plan_code, TaskDto taskdto, String taskid, String taskcode, String start_device_code, String next_device_code, String start_point_code, String next_point_code, String priority) { - instdto.setInstruction_id(IdUtil.simpleUUID()); - instdto.setRoute_plan_code(route_plan_code); - instdto.setRemark(taskdto.getRemark()); - instdto.setMaterial(taskdto.getMaterial()); - instdto.setQuantity(taskdto.getQuantity()); - instdto.setTask_id(taskid); - instdto.setTask_code(taskcode); - String now = DateUtil.now(); - instdto.setCreate_time(now); - instdto.setCreate_by(SecurityUtils.getCurrentNickName()); - instdto.setStart_device_code(start_device_code); - instdto.setNext_device_code(next_device_code); - instdto.setStart_point_code(start_point_code); - instdto.setNext_point_code(next_point_code); - instdto.setPriority(priority); - instdto.setInstruction_status("0"); - instdto.setExecute_device_code(start_point_code); - } - - public void writeData(String next_addr, Instruction instdto, Map map) { - - } - - public String getToParam() { - return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; - } - - public void writing(List list) { - -// Map itemMap = new HashMap(); -// for (int i = 0; i < list.size(); i++) { -// Object ob = list.get(i); -// JSONObject json = (JSONObject) JSONObject.toJSON(ob); -// if (!StrUtil.isEmpty(json.getString("value"))) { -// String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() -// + "." + json.getString("code"); -// itemMap.put(to_param, json.getString("value")); -// } -// } -// logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); -// try { -// this.checkcontrol(itemMap); -// } catch (Exception e) { -// e.printStackTrace(); -// try { -// this.checkcontrol(itemMap); -// } catch (Exception e1) { -// e1.printStackTrace(); -// } -// } - - } - - public void writing(String key, String param) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - //String opcservcerid = this.getDevice().getOpc_server_id(); - //Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - - itemMap.put(to_param, Integer.parseInt(param)); - //itemMap.put(to_param, Integer.parseInt(value)); - // this.control(itemMap); - logServer.deviceExecuteLog(device_code, "", "", "下发电气信号设备号:" + device_code + ",下发电气:" + to_param + ",下发电气值:" + param); - } - - public synchronized boolean finish_instruction() throws Exception { - instructionService.finish(inst); - return true; - } - - @Override - public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); - String mode = ""; - String requireSucess = "0"; - if (this.requireSucess) { - requireSucess = "1"; - } - if (this.getMode() == 0) { - mode = LangProcess.msg("universal_off-line"); - } else if (this.getMode() == 1) { - mode = LangProcess.msg("universal_stand-alone"); - } else if (this.getMode() == 2) { - mode = LangProcess.msg("universal_standby"); - } else if (this.getMode() == 3) { - mode = LangProcess.msg("universal_operation"); - }else if (this.getMode() == 5) { - mode = LangProcess.msg("one_mode3"); - } - - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("message", LangProcess.msg(message)); - jo.put("error", this.getError()); - jo.put("move", move); - jo.put("is_click", true); - jo.put("isOnline", this.getIsonline()); - jo.put("requireSucess", requireSucess); - return jo; - } - - /** - * 获取任务信息 - */ - public JSONObject getLedMessage(Instruction instdto) { - JSONObject json = new JSONObject(); - json.put("task_code", instdto.getTask_code()); - json.put("inst_code", instdto.getInstruction_code()); - json.put("start_device_code", instdto.getStart_device_code()); - json.put("next_device_code", instdto.getNext_device_code()); - json.put("material_type", instdto.getMaterial()); - json.put("quantity", instdto.getQuantity()); - json.put("vehicle_code", instdto.getVehicle_code()); - json.put("instruction_status", instdto.getInstruction_status()); - json.put("entry_time", instdto.getCreate_time()); - json.put("ip", localhost); - return json; - } - - - /** - * 更新指令状态 - */ - public synchronized void update_instruction_status() throws Exception { - Date date = new Date(); - if (date.getTime() - this.instruction_update_time.getTime() < (long) this.instruction_update_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_update_time_out); - } else { - this.instruction_update_time = date; - inst = checkInst(); - if (inst != null) { - //a点到b点,给状态说允许取货 - if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex()) && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) { - inst.setInstruction_status(CommonFinalParam.ONE); - inst.setExecute_device_code(this.device_code); - instructionService.update(inst); - logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈执行中状态,反馈成功,指令号:" + task); - } - //当货物到达b点,实现完成指令 - - if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.BUSY.getIndex()) || StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex())) { - if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) { - inst.setExecute_device_code(this.device_code); - finish_instruction(); - logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈完成状态,反馈成功,指令号:" + task); - } - } - } - } - } - - public Instruction checkInst() { - if (ObjectUtil.isNotEmpty(this.inst)) { - if (this.task > 0) { - if (this.inst.getInstruction_code().equals(String.valueOf(this.task))) { - return this.inst; - } else { - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - return inst; - } - } - } else { - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - return inst; - } - return null; - } - - - @Override - public void setDeviceStatus(JSONObject data) { - String requestSucess = data.getString("requireSucess"); - if (StrUtil.equals(requestSucess, "0")) { - this.requireSucess = false; - } else if (StrUtil.equals(requestSucess, "1")) { - this.requireSucess = true; - } - } - - public static boolean arrayEquals(int[] a, int[] b) { - // 判断两个数组长度是否相等 - if (a.length != b.length) { - return false; - } - // 判断两个数组对应位置上的元素是否相同 - for (int i = 0; i < a.length; i++) { - if (a[i] != b[i]) { - return false; - } - } - return true; - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java deleted file mode 100644 index 29b39a6..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java +++ /dev/null @@ -1,226 +0,0 @@ -package org.nl.acs.device_driver.conveyor.belt_conveyor; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - /** - * 心跳 - */ - public static String item_heartbeat = "heartbeat"; - /** - * 工作模式 - */ - public static String item_mode = "mode"; - /** - * 光电信号 - */ - public static String item_move = "move"; - /** - * 动作信号 - */ - public static String item_action = "action"; - /** - * 报警 - */ - public static String item_error = "error"; - /** - * 托盘方向 - */ - public static String item_container_direction = "container_direction"; - /** - * 托盘类型 - */ - public static String item_container_type = "container_type"; - /** - * 任务号 - */ - public static String item_task = "task"; - /** - * 出数字托盘号 - */ - public static String item_container_no = "container_no"; - - /** - * 子卷条码 - */ - public static String item_material_barcode = "material_barcode"; - - /** - * 下发命令 - */ - public static String item_to_command = "to_command"; - /** - * 下发托盘类型 - */ - public static String item_to_container_type = "to_container_type"; - /** - * 下发接纯数字托盘号 - */ - public static String item_to_container_no = "to_container_no"; - /** - * 下发任务号 - */ - public static String item_to_task = "to_task"; - /** - * 下发目标站 - */ - public static String item_to_target = "to_target"; - - /** - * 托盘条码 - */ - public static String item_barcode = "barcode"; - - - - - private BeltConveyorDeviceDriver driver; - - public ItemProtocol(BeltConveyorDeviceDriver driver) { - this.driver = driver; - } - - public String getMaterialBarcode() { - return this.getOpcStringValue(item_material_barcode); - } - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getContainer_direction() { - return this.getOpcIntegerValue(item_container_direction); - } - - public int getContainer_type() { - return this.getOpcIntegerValue(item_container_type); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getContainer_no() { - return this.getOpcIntegerValue(item_container_no); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getTo_task() { - return this.getOpcIntegerValue(item_to_task); - } - - public String getBarcode() { - return this.getOpcStringValue(item_barcode); - } - - - - public int getTotarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getTo_command() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getTo_container_type() { - return this.getOpcIntegerValue(item_to_container_type); - } - - public int getTo_container_no() { - return this.getOpcIntegerValue(item_to_container_no); - } - - Boolean isonline; - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (StrUtil.isBlank(value)) { - - } else { - return value; - } - return "0"; - } - - public int[] getOpcArrayValue(String protocol) { - int[] arrayValue = this.driver.getIntegeregerArrayValue(protocol); - if (ObjectUtil.isNull(arrayValue)) { - - } else { - return arrayValue; - } - return new int[3]; - } - - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB101.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB101.B2")); - list.add(new ItemDto(item_move, "光电信号", "DB101.B3")); - list.add(new ItemDto(item_container_direction, "托盘方向", "DB101.B4")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB101.B5")); - list.add(new ItemDto(item_container_no, "纯数字托盘号", "DB101.D7")); - list.add(new ItemDto(item_action, "动作类型", "DB101.B6")); - list.add(new ItemDto(item_error, "报警", "DB101.B58")); - list.add(new ItemDto(item_task, "任务号", "DB101.D68")); - list.add(new ItemDto(item_material_barcode, "子卷条码", "DB601.STRING1.50")); - list.add(new ItemDto(item_barcode, "托盘条码", "DB602.STRING1.50")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_target, "下发仓位号", "DB102.W2")); - list.add(new ItemDto(item_to_command, "下发命令", "DB102.W4")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB102.D1")); - list.add(new ItemDto(item_to_container_no, "下发接纯数字托盘号", "DB102.D3")); - list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB102.B5")); - return list; - } - - @Override - public String toString() { - return ""; - } - -} - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/Paper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/Paper.java deleted file mode 100644 index d98844d..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/Paper.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.acs.device_driver.conveyor.belt_conveyor; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class Paper implements Serializable { - /** - * 设备号 - */ - private String device_code; - - private String material_code; - private String qty; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDeviceDriver.java deleted file mode 100644 index 8abba3e..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_with_station/WithStationDeviceDriver.java +++ /dev/null @@ -1,257 +0,0 @@ -package org.nl.acs.device_driver.conveyor.belt_with_station; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.agv.server.NDCAgvService; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.conveyor.double_belt_conveyor.DoubleBeltConveyorDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -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.domain.InstructionMybatis; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.acs.utils.ConvertUtil; -import org.nl.config.SpringContextHolder; - -import java.util.*; - -/** - * 关联驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class WithStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { - - DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class); - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - DeviceService deviceservice = SpringContextHolder.getBean("deviceServiceImpl"); - RouteLineService routelineserver = SpringContextHolder.getBean("routeLineServiceImpl"); - TaskService taskServer = SpringContextHolder.getBean("taskServiceImpl"); - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); - DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); - NDCAgvService agvService = SpringContextHolder.getBean(NDCAgvService.class); - - - int error = 0; - Boolean iserror = false; - Boolean islock = false; - boolean requireSucess = false; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - private Date instruction_update_time = new Date(); - private int instruction_require_time_out = 30000; - private int instruction_update_time_out = 500; - - String message; - - // 1 上位系统允许进入 2 上位系统允许离开 - int option = 0; - - private int index = 0; - - int mode = 2; - - int move; - - @Override - public void execute() throws Exception { - - - //取关联设备 list 要求：先配置外侧的站点 - //遍历 - List sddjExtraCodeList = this.getExtraDeviceCodes("link_device_code"); - //只需要判断对接位就可以 - for (int i = 0; i < 4; ) { - Device sddjExtraCode1 = deviceAppservice.findDeviceByCode(sddjExtraCodeList.get(i)); - Device sddjExtraCode2 = deviceAppservice.findDeviceByCode(sddjExtraCodeList.get(i + 1)); - Device sddjExtraCode3 = deviceAppservice.findDeviceByCode(sddjExtraCodeList.get(i + 2)); - Device sddjExtraCode4 = deviceAppservice.findDeviceByCode(sddjExtraCodeList.get(i + 3)); - DoubleBeltConveyorDeviceDriver doubleBeltConveyorDeviceDriverStart; - DoubleBeltConveyorDeviceDriver doubleBeltConveyorDeviceDriverEnd1; - DoubleBeltConveyorDeviceDriver doubleBeltConveyorDeviceDriverEnd2; - DoubleBeltConveyorDeviceDriver doubleBeltConveyorDeviceDriverWith; - if (sddjExtraCode1.getDeviceDriver() instanceof DoubleBeltConveyorDeviceDriver && sddjExtraCode2.getDeviceDriver() instanceof DoubleBeltConveyorDeviceDriver) { - doubleBeltConveyorDeviceDriverStart = (DoubleBeltConveyorDeviceDriver) sddjExtraCode1.getDeviceDriver(); - doubleBeltConveyorDeviceDriverEnd1 = (DoubleBeltConveyorDeviceDriver) sddjExtraCode2.getDeviceDriver(); - doubleBeltConveyorDeviceDriverEnd2 = (DoubleBeltConveyorDeviceDriver) sddjExtraCode3.getDeviceDriver(); - doubleBeltConveyorDeviceDriverWith = (DoubleBeltConveyorDeviceDriver) sddjExtraCode4.getDeviceDriver(); - //判断输送线是否有任务 - List tasks = taskServer.findByStartCodeAndBusy(doubleBeltConveyorDeviceDriverStart.getDevice_code()); - if (CollectionUtil.isNotEmpty(tasks) && tasks.size() == 2) { - String nextPointCode1 = tasks.get(0).getNext_point_code(); - String nextPointCode2 = tasks.get(1).getNext_point_code(); - if (StrUtil.contains(nextPointCode1, "-") && StrUtil.contains(nextPointCode2, "-")) { - //判断关联的输送线是否满足状态 - if (doubleBeltConveyorDeviceDriverEnd1.getMode() == 2 && doubleBeltConveyorDeviceDriverEnd1.getMove() == 1) { - //判断任务列是否相邻 - String[] split1 = nextPointCode1.split("-"); - String x1; - String x2; - if (Integer.parseInt(split1[1]) < 10) { - x1 = "0" + (Integer.parseInt(split1[1]) - 1); - x2 = "0" + (Integer.parseInt(split1[1]) + 1); - } else { - x1 = "" + (Integer.parseInt(split1[1]) - 1); - x2 = "" + (Integer.parseInt(split1[1]) + 1); - } - String nextPointCodeDown = split1[0] + "-" + x1 + "-" + split1[2]; - String nextPointCodeUp = split1[0] + "-" + x2 + "-" + split1[2]; - if (!nextPointCode2.equals(nextPointCodeDown) && !nextPointCode2.equals(nextPointCodeUp)) { - if ("1".equals(tasks.get(0) - .getTask_type())) { - //创建单指令 - extracted(doubleBeltConveyorDeviceDriverEnd1, doubleBeltConveyorDeviceDriverWith); - log.info("虚拟工位指令创建成功"); - } - } else { - //判断是否大于等待时间 - if (null != doubleBeltConveyorDeviceDriverEnd1.getArrivalTime() && System.currentTimeMillis() - doubleBeltConveyorDeviceDriverEnd1.getArrivalTime().getTime() - < Integer.parseInt(this.getExtraValue().get("apply_time").toString()) * 1000) { - if (doubleBeltConveyorDeviceDriverEnd2.getMode() == 2 && doubleBeltConveyorDeviceDriverEnd2.getMove() == 1) { - //创建双指令 - extracted(doubleBeltConveyorDeviceDriverEnd1, doubleBeltConveyorDeviceDriverWith); - extracted(doubleBeltConveyorDeviceDriverEnd2, doubleBeltConveyorDeviceDriverWith); - log.info("虚拟工位指令创建成功"); - requireSucess = true; - } - } else { - extracted(doubleBeltConveyorDeviceDriverEnd1, doubleBeltConveyorDeviceDriverWith); - } - } - } - } - } - } - break; - } - } - - - private void extracted(DoubleBeltConveyorDeviceDriver doubleBeltConveyorDeviceDriver, DoubleBeltConveyorDeviceDriver doubleBeltConveyorDeviceDriverWith) throws Exception { - if (doubleBeltConveyorDeviceDriver.getMove() != 0 && doubleBeltConveyorDeviceDriver.getTask() > 0) { - Date date = new Date(); - if (date.getTime() - this.instruction_update_time.getTime() < (long) this.instruction_update_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_update_time_out); - } else { - this.instruction_update_time = date; - Instruction inst = instructionService.findByCodeFromCache(String.valueOf(doubleBeltConveyorDeviceDriver.getTask())); - if (inst != null) { - //当货物到达b点,实现完成指令 - if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.BUSY.getIndex()) || StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex())) { - inst.setExecute_device_code(doubleBeltConveyorDeviceDriver.getDevice_code()); - inst.setNext_device_code(doubleBeltConveyorDeviceDriverWith.getDevice_code()); - finish_instruction(inst); - logServer.deviceExecuteLog(doubleBeltConveyorDeviceDriver.getDevice_code(), "", "", "入库输送线任务开始反馈完成状态,反馈成功,指令号:" + doubleBeltConveyorDeviceDriver.getTask()); - - } - } - } - } - } - - - public synchronized boolean finish_instruction(Instruction inst) throws Exception { - instructionService.finish(inst); - return true; - } - - - public String getToParam() { - return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; - } - - - //将扩展表中的字符串数据转换成集合 - @Override - public List getExtraDeviceCodes(String extraName) { - String extraValue = (String) this.getDevice().getExtraValue().get(extraName); - String devices1 = extraValue.substring(1, extraValue.length() - 1); - List devicesList = new ArrayList<>(); - String[] devices = devices1.split(","); - for (int i = 0; i < devices.length; i++) { - String s = devices[i].replace("\"", "").replace("\"", ""); - devicesList.add(s); - } - return devicesList; - } - - @Override - public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); - String mode = ""; - String action = ""; - String move = ""; - String option = ""; - if (this.getOption() == 0) { - option = "禁止进出"; - } else if (this.getOption() == 1) { - option = "允许进入"; - } else if (this.getOption() == 2) { - option = "允许离开"; - } - - if (this.getMode() == 0) { - mode = "未联机"; - } else if (this.getMode() == 1) { - mode = "单机"; - } else if (this.getMode() == 2) { - mode = "联机"; - } else if (this.getMode() == 3) { - mode = "运行中"; - } - - if (this.getMove() == 0) { - move = "无货"; - jo.put("hasGoods", false); - } else if (this.getMove() == 1) { - move = "有货"; - jo.put("hasGoods", true); - } else if (this.getMove() == 2) { - move = "有托盘有货"; - jo.put("hasGoods", true); - } - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("isOnline", true); - jo.put("error", this.getError()); - jo.put("isError", this.getIserror()); - jo.put("option", option); - jo.put("is_click", true); - return jo; - } - - - @Override - public void setDeviceStatus(JSONObject data) { - String flag = data.getString("option"); - if (StrUtil.isNotEmpty(flag)) { - option = Integer.parseInt(flag); - } - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java deleted file mode 100644 index 911998f..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java +++ /dev/null @@ -1,670 +0,0 @@ -package org.nl.acs.device_driver.conveyor.double_belt_conveyor; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.agv.server.AgvService; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -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.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.utils.SecurityUtils; -import org.nl.config.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -import static redis.clients.jedis.HostAndPort.localhost; - -/** - * 双工位输送线 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class DoubleBeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class); - InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); - DeviceService deviceservice = SpringContextHolder.getBean(DeviceService.class); - TaskService taskserver = SpringContextHolder.getBean(TaskService.class); - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); - DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); - AgvService agvService = SpringContextHolder.getBean(AgvService.class); - - private Date instruction_update_time = new Date(); - private Date require_apply_strangulation_time = new Date(); - private int instruction_update_time_out = 500; - private Date instruction_require_time = new Date(); - private Date instruction_finished_time = new Date(); - private Date instruction_apply_time = new Date(); - private int instruction_require_time_out = 3000; - private Date arrivalTime = null; - - //心跳 - int heartbeat = 0; - int last_heartbeat = 0; - //工作模式 - int mode = 0; - int last_mode = 0; - //光电信号 - int move = 0; - int last_move = 0; - //托盘方向 - int container_direction = 0; - int last_container_direction = 0; - //报警 - int error = 0; - int last_error = 0; - //动作信号 - int action = 0; - int last_action = 0; - //任务号 - int task = 0; - int last_task = 0; - //托盘类型 - int container_type = 0; - int last_container_type = 0; - //纯数字托盘号 - int container_no = 0; - int last_container_no = 0; - - int inventory_qty = 0; - int out_finish = 0; - //下发命令 - int to_command = 0; - int last_to_command = 0; - //下发目标站 - int to_target = 0; - int last_to_target = 0; - //下发任务号 - int to_task = 0; - int last_to_task = 0; - //下发接纯数字托盘号 - int to_container_no = 0; - int last_to_container_no = 0; - //下发托盘类型 - int to_container_type = 0; - int last_to_container_type = 0; - - - - - //当前指令 - Instruction inst = null; - - String material = null; - - Boolean isonline = true; - - Boolean iserror = false; - - //1-执行任务；2-取货完成；3-放货完成； - int flag; - - - int last_inventory_qty = 0; - int last_out_finish = 0; - - String last_material = null; - String message = null; - String device_code; - String task_code = null; - String vehicle_code; - String inst_message; - - //led点阵屏信息 - JSONObject led_message = null; - - - @Override - public Device getDevice() { - return this.device; - } - - //请求成功标记 - Boolean requireSucess = false; - - @Override - public void execute() { - try { - device_code = this.getDeviceCode(); - heartbeat = this.itemProtocol.getHeartbeat(); - mode = this.itemProtocol.getMode(); - move = this.itemProtocol.getMove(); - action = this.itemProtocol.getAction(); - container_direction = this.itemProtocol.getContainer_direction(); - container_type = this.itemProtocol.getContainer_type(); - error = this.itemProtocol.getError(); - task = this.itemProtocol.getTask(); - container_no = this.itemProtocol.getContainer_no(); - to_command = this.itemProtocol.getTo_command(); - to_target = this.itemProtocol.getTotarget(); - to_task = this.itemProtocol.getTo_task(); - to_container_no = this.itemProtocol.getContainer_direction(); - to_container_type = this.itemProtocol.getContainer_no(); - - if (mode != last_mode) { - JSONObject param = new JSONObject(); - param.put("device_code", this.device_code); - param.put("mode", Math.min(mode, 3)); - param.put("device_name", this.getDevice().getDevice_name()); - param.put("device_type", "1"); - requireSucess = false; - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); - } - if (move != last_move) { - logServer.deviceItemValue(this.device_code, "move", String.valueOf(move)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move); - } - if (container_direction != last_container_direction) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(container_direction)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号container_direction：" + last_container_direction + "->" + container_direction); - } - if (container_type != last_container_type) { - logServer.deviceItemValue(this.device_code, "container_type", String.valueOf(container_type)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号container_type：" + last_container_type + "->" + container_type); - } - if (container_no != last_container_no) { - logServer.deviceItemValue(this.device_code, "container_no", String.valueOf(container_no)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号container_no：" + last_container_no + "->" + container_no); - } - if (action != last_action) { - logServer.deviceItemValue(this.device_code, "action", String.valueOf(action)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action); - } - if (to_command != last_to_command) { - logServer.deviceItemValue(this.device_code, "to_command", String.valueOf(to_command)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号to_command：" + last_to_command + "->" + to_command); - } - if (to_target != last_to_target) { - logServer.deviceItemValue(this.device_code, "to_target", String.valueOf(to_target)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号to_target：" + last_to_target + "->" + to_target); - } - if (to_task != last_to_task) { - logServer.deviceItemValue(this.device_code, "to_task", String.valueOf(to_task)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号to_task：" + last_to_task + "->" + to_task); - } - if (to_container_no != last_to_container_no) { - logServer.deviceItemValue(this.device_code, "to_container_no", String.valueOf(to_container_no)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号to_container_no：" + last_to_container_no + "->" + to_container_no); - } - if (to_container_type != last_to_container_type) { - logServer.deviceItemValue(this.device_code, "to_container_type", String.valueOf(to_container_type)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号to_container_type：" + last_to_container_type + "->" + to_container_type); - } - if (error != last_error) { - if (error != 0) { - - } - logServer.deviceItemValue(this.device_code, "error", String.valueOf(error)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error); - } - if (task != last_task) { - logServer.deviceItemValue(this.device_code, "task", String.valueOf(task)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task); - } - - - if (move != 0 && task > 0) { - update_instruction_status(); - } - - } catch (Exception var17) { - var17.printStackTrace(); - logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)); - } - - - if (mode == 0) { - this.setIsonline(false); - message = "未联机"; - } else if (error != 0) { - this.setIserror(true); - message = "有报警"; - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - - } - switch (mode) { - case 1: - log.debug("弃用(留作兼容)"); - break; - case 2: - //申请任务 - if (move == 1 && !requireSucess) { - instruction_require(); - } - break; - case 3: - log.info("运行中"); - break; - case 4: - //申请出货 - if (move == 1 && !requireSucess) { - //request_for_shipment(String.valueOf(mode), item_out_seq_arr, item_out_qty_arr); - } - break; - default: - break; - } - last_heartbeat = heartbeat; - last_mode = mode; - last_move = move; - last_error = error; - last_container_direction = container_direction; - last_container_no = container_no; - last_container_type = container_type; - last_action = action; - last_task = task; - last_to_command = to_command; - last_to_target = to_target; - last_to_task = to_task; - last_to_container_no = to_container_no; - last_to_container_type = to_container_type; - - } - - - - public void writing(List list) { - -// Map itemMap = new HashMap(); -// for (int i = 0; i < list.size(); i++) { -// Object ob = list.get(i); -// JSONObject json = (JSONObject) JSONObject.toJSON(ob); -// if (!StrUtil.isEmpty(json.getString("value"))) { -// String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() -// + "." + json.getString("code"); -// itemMap.put(to_param, json.getString("value")); -// } -// } -// logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); -// try { -// this.checkcontrol(itemMap); -// } catch (Exception e) { -// e.printStackTrace(); -// try { -// this.checkcontrol(itemMap); -// } catch (Exception e1) { -// e1.printStackTrace(); -// } -// } - } - - - /*public synchronized void request_for_shipment(String mode, String item_out_seq_arr, int[] item_out_qty_arr) { - Date date = new Date(); - if (date.getTime() - this.require_apply_strangulation_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - } else { - this.require_apply_strangulation_time = date; - ApplyPaperActionRequest applyPaperActionRequest = new ApplyPaperActionRequest(); - applyPaperActionRequest.setDevice_code(this.device_code); - applyPaperActionRequest.setType("1"); - applyPaperActionRequest.setTask_code(String.valueOf(task)); - //获取出库顺序 - boolean contains = item_out_seq_arr.contains(","); - boolean contains1 = item_out_seq_arr.contains("，"); - - if (contains) { - String[] split = item_out_seq_arr.split(","); - applyPaperActionRequest.setMaterial1(split[0]); - applyPaperActionRequest.setMaterial1(split[1]); - } else if (contains1) { - String[] split = item_out_seq_arr.split("，"); - applyPaperActionRequest.setMaterial1(split[0]); - applyPaperActionRequest.setMaterial1(split[1]); - } else { - applyPaperActionRequest.setMaterial1(item_out_seq_arr); - } - if (item_out_qty_arr.length >= 1 && item_out_qty_arr.length < 4) { - applyPaperActionRequest.setQty1(String.valueOf(item_out_qty_arr[0])); - applyPaperActionRequest.setQty2(String.valueOf(item_out_qty_arr[1])); - } - ApplyPaperActionResponse applyPaperActionResponse = acsToWmsService.applyPaperActionRequest(applyPaperActionRequest); - if (ObjectUtil.isNull(applyPaperActionResponse)) { - message = "请求失败"; - requireSucess = false; - return; - } - Map map3 = new HashMap(); - if (applyPaperActionResponse.getstatus() == 200) { - map3.put("to_command", "4"); - this.writing(map3); - requireSucess = true; - logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管,返回参数:" + applyPaperActionResponse); - message = "申请出货成功"; - } else { - message = applyPaperActionResponse.getMessage(); - map3.put("to_command", "5"); - this.writing(map3); - requireSucess = false; - message = "出库顺序错误"; - logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管,返回参数:" + applyPaperActionResponse); - } - } - } -*/ - - /** - * 申请任务 - */ - public synchronized Boolean instruction_require() { - List list = new ArrayList<>(); - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - //查找有没有对应的指令 - Instruction inst = instructionService.findByDeviceCodeFromCache(this.device_code); - if (ObjectUtil.isNotNull(inst) && "1".equals(inst.getInstruction_type())) { - Device nextdevice = deviceAppservice.findDeviceByCode(inst.getNext_device_code()); - String next_addr = nextdevice.getExtraValue().get("address").toString(); - TaskDto taskDto = taskserver.findByCodeFromCache(inst.getTask_code()); - //List paperArray = getPaperArray(null); - if (ObjectUtil.isEmpty(inst)) { - return false; - } - Map map = new LinkedHashMap<>(); - map.put("to_target", next_addr); - map.put("to_task", inst.getInstruction_code()); - map.put("to_command", "1"); - map.put("to_container_type", "1"); - map.put("to_container_no", "1"); - this.writing(map); - led_message = getLedMessage(inst); - requireSucess = true; - return true; - } else { - //判断是否有相同起点的,任务状态就绪的任务 - TaskDto taskdto = taskserver.findByStartCodeAndReady(device_code); - if (ObjectUtil.isNull(taskdto)) { - return false; - } - if (ObjectUtil.isNotNull(taskdto) && "1".equals(taskdto.getTask_type())) { - //判断指令的起点和当前的设备号相同 - if (!taskdto.getStart_device_code().equals(device_code)) { - return false; - } - //判断当前任务号是否存在指令 - String taskid = taskdto.getTask_id(); - String taskcode = taskdto.getTask_code(); - String priority = taskdto.getPriority(); - String start_point_code = taskdto.getStart_point_code(); - String start_device_code = taskdto.getStart_device_code(); - String route_plan_code = taskdto.getRoute_plan_code(); - String next_device_code = ""; - /** - * 开始平均分配 - */ - String this_coevice_code = taskserver.queryAssignedByDevice(device_code, taskdto.getNext_device_code()); - if (StrUtil.isEmpty(this_coevice_code)) { - List shortPathsList = routeLineService.getShortPathLines(start_device_code, taskdto.getNext_device_code(), route_plan_code); - RouteLineDto routeLineDto = shortPathsList.get(0); - - String path = routeLineDto.getPath(); - String type = routeLineDto.getType(); - String[] str = path.split("->"); - - List pathlist = Arrays.asList(str); - int index = 0; - for (int m = 0; m < pathlist.size(); m++) { - if (pathlist.get(m).equals(start_device_code)) { - index = m + 1; - break; - } - } - next_device_code = pathlist.get(index); - } else { - next_device_code = this_coevice_code; - } - //校验路由关系 - List shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code); - if (ObjectUtils.isEmpty(shortPathsList) || shortPathsList.size()<1) { - throw new RuntimeException("路由不通!"); - } - Device startdevice = deviceAppservice.findDeviceByCode(start_device_code); - Device nextdevice = deviceAppservice.findDeviceByCode(next_device_code); - String next_point_code; - if (StrUtil.equals(deviceAppservice.findDeviceTypeByCode(next_device_code), "storage")) { - next_point_code = taskdto.getTo_x() + "-" + taskdto.getTo_y() + "-" + taskdto.getTo_z(); - } else { - next_point_code = next_device_code; - } - Instruction instdto = new Instruction(); - instdto.setInstruction_id(IdUtil.simpleUUID()); - instdto.setRoute_plan_code(route_plan_code); - instdto.setRemark(taskdto.getRemark()); - instdto.setMaterial(taskdto.getMaterial()); - instdto.setQuantity(taskdto.getQuantity()); - instdto.setTask_id(taskid); - instdto.setTask_code(taskcode); - String now = DateUtil.now(); - instdto.setCreate_time(now); - instdto.setCreate_by(SecurityUtils.getCurrentNickName()); - instdto.setStart_device_code(start_device_code); - instdto.setNext_device_code(next_device_code); - instdto.setStart_point_code(start_point_code); - instdto.setNext_point_code(next_point_code); - instdto.setPriority(priority); - instdto.setInstruction_status("0"); - instdto.setExecute_device_code(start_point_code); - log.error("=================================,{}",instdto.getCreate_by()); - try { - instructionService.create(instdto); - } catch (Exception e) { - e.printStackTrace(); - log.error("指令创建失败!", e.getMessage()); - return false; - } - taskdto.setTask_status(TaskStatusEnum.BUSY.getIndex()); - taskserver.update(taskdto); - requireSucess = true; - Map map = new LinkedHashMap<>(); - String next_addr = nextdevice.getExtraValue().get("address").toString(); - map.put("to_target", next_addr); - map.put("to_task", instdto.getInstruction_code()); - map.put("to_command", "1"); - map.put("to_container_type", "1"); - map.put("to_container_no", "1"); - this.writing(map); - led_message = getLedMessage(instdto); - requireSucess = true; - return true; - } - } - return false; - } - } - - public void writeData(String next_addr, Instruction instdto, Map map) { - - } - - public String getToParam() { - return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; - } - - - public void writing(Map map) { - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - Map itemMap = new LinkedHashMap<>(); - map.forEach((key, value) -> { - if (ObjectUtil.isNotEmpty(value)) { - itemMap.put(getToParam() + key, value); - } - }); - if (ObjectUtil.isNotEmpty(itemMap)) { - //this.control(itemMap); - logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); - } - } - - - - public void writing(String key, String param) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - //String opcservcerid = this.getDevice().getOpc_server_id(); - //Server server = ReadUtil.getServer(opcservcerid); - Map itemMap = new HashMap(); - - itemMap.put(to_param, Integer.parseInt(param)); - //itemMap.put(to_param, Integer.parseInt(value)); - //this.control(itemMap); - logServer.deviceExecuteLog(device_code, "", "", "下发电气信号设备号:" + device_code + ",下发电气:" + to_param + ",下发电气值:" + param); - } - - public synchronized boolean finish_instruction() throws Exception { - instructionService.finish(inst); - return true; - } - - @Override - public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); - String mode = ""; - - if (this.getMode() == 0) { - mode = "未联机"; - } else if (this.getMode() == 1) { - mode = "单机"; - } else if (this.getMode() == 2) { - mode = "联机"; - } else if (this.getMode() == 3) { - mode = "入库中"; - } else if (this.getMode() == 4) { - mode = "出库中"; - } - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", mode); - //jo.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); - jo.put("inventory_qty", inventory_qty); - jo.put("out_finish", out_finish); - jo.put("material", material); - jo.put("isOnline", this.getIsonline()); - - return jo; - } - - /** - * 获取任务信息 - */ - public JSONObject getLedMessage(Instruction instdto){ - JSONObject json = new JSONObject(); - json.put("task_code", instdto.getTask_code()); - json.put("inst_code", instdto.getInstruction_code()); - json.put("start_device_code", instdto.getStart_device_code()); - json.put("next_device_code", instdto.getNext_device_code()); - json.put("material_type", instdto.getMaterial()); - json.put("quantity", instdto.getQuantity()); - json.put("vehicle_code", instdto.getVehicle_code()); - json.put("instruction_status",instdto.getInstruction_status()); - json.put("entry_time", instdto.getCreate_time()); - json.put("ip", localhost); - return json; - } - - - - /** - * 更新指令状态 - */ - public synchronized void update_instruction_status() { - Date date = new Date(); - if (date.getTime() - this.instruction_update_time.getTime() < (long) this.instruction_update_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_update_time_out); - } else { - this.instruction_update_time = date; - inst = checkInst(); - if (inst != null) { - //a点,给状态说允许取货 - if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex()) && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) { - inst.setInstruction_status(InstructionStatusEnum.BUSY.getIndex()); - inst.setExecute_device_code(this.device_code); - instructionService.update(inst); - logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈执行中状态,反馈成功,指令号:" + task); - } - //当b点存在货物的时候设置到达时间 - if (StrUtil.equals(inst.getInstruction_status(), CommonFinalParam.ONE) || StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex())) { - if (!StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code()) && mode ==2 && move == 1) { - this.arrivalTime = new Date(); - } - } - - - - - } - } - } - - public Instruction checkInst() { - if (ObjectUtil.isNotEmpty(this.inst)) { - if (this.task > 0) { - if (this.inst.getInstruction_code().equals(String.valueOf(this.task))) { - return this.inst; - } else { - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - return inst; - } - } - } else { - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - return inst; - } - return null; - } - - - @Override - public void setDeviceStatus(JSONObject data) { - - } - - public static boolean arrayEquals(int[] a, int[] b) { - // 判断两个数组长度是否相等 - if (a.length != b.length) { - return false; - } - // 判断两个数组对应位置上的元素是否相同 - for (int i = 0; i < a.length; i++) { - if (a[i] != b[i]) { - return false; - } - } - return true; - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/ItemProtocol.java deleted file mode 100644 index 81b27c0..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/ItemProtocol.java +++ /dev/null @@ -1,181 +0,0 @@ -package org.nl.acs.device_driver.conveyor.double_belt_conveyor; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - //心跳 - public static String item_heartbeat = "heartbeat"; - //工作模式 - public static String item_mode = "mode"; - //光电信号 - public static String item_move = "move"; - //动作信号 - public static String item_action = "action"; - //报警 - public static String item_error = "error"; - //托盘方向 - public static String item_container_direction = "container_direction"; - //托盘类型 - public static String item_container_type = "container_type"; - //任务号 - public static String item_task = "task"; - //出数字托盘号 - public static String item_container_no = "container_no"; - - //下发命令 - public static String item_to_command = "to_command"; - //下发托盘类型 - public static String item_to_container_type = "to_container_type"; - //下发接纯数字托盘号 - public static String item_to_container_no = "to_container_no"; - //下发任务号 - public static String item_to_task = "to_task"; - //下发目标站 - public static String item_to_target = "to_target"; - - - - private DoubleBeltConveyorDeviceDriver driver; - - public ItemProtocol(DoubleBeltConveyorDeviceDriver driver) { - this.driver = driver; - } - - - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getContainer_direction() { - return this.getOpcIntegerValue(item_container_direction); - } - - public int getContainer_type() { - return this.getOpcIntegerValue(item_container_type); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getContainer_no() { - return this.getOpcIntegerValue(item_container_no); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getTo_task() { - return this.getOpcIntegerValue(item_to_task); - } - - - public int getTotarget() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getTo_command() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getTo_container_type() { - return this.getOpcIntegerValue(item_to_container_type); - } - - public int getTo_container_no() { - return this.getOpcIntegerValue(item_to_container_no); - } - - Boolean isonline; - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (StrUtil.isBlank(value)) { - - } else { - return value; - } - return "0"; - } - - public int[] getOpcArrayValue(String protocol) { - int[] arrayValue = this.driver.getIntegeregerArrayValue(protocol); - if (ObjectUtil.isNull(arrayValue)) { - - } else { - return arrayValue; - } - return new int[3]; - } - - - - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB101.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB101.B2")); - list.add(new ItemDto(item_move, "光电信号", "DB101.B3")); - list.add(new ItemDto(item_container_direction, "托盘方向", "DB101.B4")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB101.B5")); - list.add(new ItemDto(item_container_no, "纯数字托盘号", "DB101.D7")); - list.add(new ItemDto(item_action, "动作类型", "DB101.B6")); - list.add(new ItemDto(item_error, "报警", "DB101.B58")); - list.add(new ItemDto(item_task, "任务号", "DB101.D68")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_target , "下发仓位号", "DB102.W2")); - list.add(new ItemDto(item_to_command, "下发命令", "DB102.W4")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB102.D1")); - list.add(new ItemDto(item_to_container_no, "下发接纯数字托盘号", "DB102.D3")); - list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB102.B5")); - return list; - } - - @Override - public String toString() { - return ""; - } - -} - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/Paper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/Paper.java deleted file mode 100644 index db6c691..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/Paper.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.acs.device_driver.conveyor.double_belt_conveyor; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class Paper implements Serializable { - //设备号 - private String device_code; - // - private String material_code; - private String qty; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDefination.java deleted file mode 100644 index d02180f..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDefination.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.nl.acs.device_driver.conveyor.double_station_stacker; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class DoubleStationStackerDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "double_station_stacker"; - } - - @Override - public String getDriverName() { - return "标准版-双工位堆垛机"; - } - - @Override - public String getDriverDescription() { - return "标准版-双工位堆垛机"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new DoubleStationStackerDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return DoubleStationStackerDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.stacker); - return types; - } - - @Override - public List getReadableItemDtos() { - return ItemProtocol.getReadableItemDtos(); - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDeviceDriver.java deleted file mode 100644 index c9b8288..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/DoubleStationStackerDeviceDriver.java +++ /dev/null @@ -1,1025 +0,0 @@ -package org.nl.acs.device_driver.conveyor.double_station_stacker; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.domain.DeviceExtra; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceExtraService; -import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.conveyor.double_station_stacker.enums.CommandEnum; -import org.nl.acs.device_driver.conveyor.double_station_stacker.enums.SortEnum; -import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.impl.RouteLineServiceImpl; -import org.nl.acs.task.service.TaskService; -import org.nl.config.SpringContextHolder; - -import java.util.*; -import java.util.stream.Collectors; - -/** - * 双工位堆垛机驱动 - */ -@EqualsAndHashCode(callSuper = true) -@Slf4j -@Data -@RequiredArgsConstructor -public class DoubleStationStackerDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - - TaskService takeover = SpringContextHolder.getBean("taskServiceImpl"); - - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - - DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineServiceImpl.class); - - DeviceExtraService deviceExtraService = SpringContextHolder.getBean(DeviceExtraServiceImpl.class); - - public static final Integer MAX_Y = 6; - public static final Integer MIN_Y = 1; - - /** - * 心跳 - */ - Integer heartbeat = 0; - Integer lastHeartbeat = 0; - /** - * 堆垛机号 - */ - Integer itemDeviceCode = 0; - Integer lastItemDeviceCode = 0; - /** - * 工作模式 - */ - Integer mode = 0; - Integer lastMode = 0; - - /** - * 行走开关信号 - */ - Float move = 0F; - Float lastMove = 0F; - /** - * 行走动作信号 - */ - Float action = 0F; - Float lastAction = 0F; - /** - * 前叉作业状态 - */ - Integer frontCommand = 0; - Integer lastFrontCommand = 0; - /** - * 前叉任务号 - */ - Integer frontTask = 0; - Integer lastFrontTask = 0; - - /** - * 行走激光数值 - */ - Integer distanceX = 0; - Integer lastDistanceX = 0; - - /** - * 特殊开关量1 - */ - Float special1 = 0F; - Float lastSpecial1 = 0F; - /** - * 特殊开关量2 - */ - Float special2 = 0F; - Float lastSpecial2 = 0F; - - /** - * 水箱和消防缓存位有无货 - */ - Float storageCache = 0F; - Float lastStorageCache = 0F; - - - /** - * 后叉作业状态 - */ - Integer backCommand = 0; - Integer lastBackCommand = 0; - /** - * 后叉任务号 - */ - Integer backTask = 0; - Integer lastBackTask = 0; - - /** - * 前叉Z轴报警（货叉） - */ - Integer frontZerror = 0; - Integer lastFrontZerror = 0; - /** - * 后叉Z轴报警（货叉） - */ - Integer backZerror = 0; - Integer lastBackZerror = 0; - - /** - * 前叉行走排号 - */ - Integer frontZ = 0; - Integer lastFrontZ = 0; - /** - * 前行走列号 - */ - Integer frontX = 0; - Integer lastFrontX = 0; - /** - * 前行走层号 - */ - Integer frontY = 0; - Integer lastFrontY = 0; - /** - * 后叉行走排号 - */ - Integer backZ = 0; - Integer lastBackZ = 0; - /** - * 后行走列号 - */ - Integer backX = 0; - Integer lastBackX = 0; - /** - * 后行走层号 - */ - Integer backY = 0; - Integer lastBackY = 0; - - /** - * 前货叉探货信号 - */ - Float frontForkCargo = 0F; - Float lastFrontForkCargo = 0F; - - /** - * 后货叉探货信号 - */ - Float backForkCargo = 0F; - Float lastBackForkCargo = 0F; - - - /** - * 前货叉位置信号 - */ - Float frontForkLocation = 0F; - Float lastFrontForkLocation = 0F; - /** - * 后货叉位置信号 - */ - Float backForkLocation = 0F; - Float lastBackForkLocation = 0F; - - /** - * 前货叉动作信号 - */ - Float frontForkAction = 0F; - Float lastFrontForkAction = 0F; - /** - * 后货叉动作信号 - */ - Float backForkAction = 0F; - Float lastBackForkAction = 0F; - - - String message = null; - - String device_code = null; - - String notCreateInstMessage = null; - - private int instructionRequireTimeOut = 3000; - private int instructionUpdateTimeOut = 3000; - private Date instructionRequireTime = new Date(); - private Date instructionUpdateTime = new Date(); - List getDeviceCodeList = null; - List putDeviceCodeList = null; - - /** - * 请求成功标记 - */ - Boolean requireSucess = false; - - /** - * 禁止入库 - */ - private boolean prohibitInWarehouse = false; - /** - * 禁止出库 - */ - private boolean prohibitOutWarehouse = false; - /** - * 停止接收任务 - */ - private boolean stopReceiveTask = false; - - - @Override - public Device getDevice() { - return this.device; - } - - @Override - public void execute() { - try { - //设置参数 - setData(); - - //记录日志 - setLog(); - - //更新指令状态 - updateAllstatues(); - - } catch (Exception var17) { - var17.printStackTrace(); - logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)); - } - if (mode != 3) { - message = "未联机"; - } else if (frontZerror != 0 || backZerror != 0) { - message = "有报警"; - } else { - Map map = new LinkedHashMap<>(); - if (CommandEnum.STANDY.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.STANDY.getStatus())) { - applyTask(); - requireSucess = true; - } - if (CommandEnum.PICKUP.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.PICKUP.getStatus())) { - message = "取货中"; - } - if (CommandEnum.PICKUP_COMPLETE.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.PICKUP_COMPLETE.getStatus())) { - message = "取货完成"; - LinkedList inst = new LinkedList<>(); - getIns(inst); - if (CollectionUtil.isNotEmpty(inst) && ObjectUtil.isNotEmpty(inst.get(0))) { - String startDeviceCode = inst.get(0).getStart_device_code(); - Device startDevice = deviceAppService.findDeviceByCode(startDeviceCode); - writeStorageOrConveyor(inst, startDeviceCode, startDevice, map); - } - if (CollectionUtil.isNotEmpty(inst) && ObjectUtil.isEmpty(inst.get(0))) { - String startDeviceCode = inst.get(1).getStart_device_code(); - Device startDevice = deviceAppService.findDeviceByCode(startDeviceCode); - writeStorageOrConveyor(inst, startDeviceCode, startDevice, map); - } - map.put("to_command", CommandEnum.PICKUP_COMPLETE.getStatus()); - requireSucess = true; - } - if (CommandEnum.RELEASE.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.RELEASE.getStatus())) { - message = "放货中"; - } - if (CommandEnum.UNLOAD.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.UNLOAD.getStatus())) { - message = "请求卸货(申请卸货)"; - LinkedList inst = new LinkedList<>(); - getIns(inst); - if (CollectionUtil.isNotEmpty(inst) && ObjectUtil.isNotEmpty(inst.get(0))) { - String nextDeviceCode = inst.get(0).getNext_device_code(); - Device nextDevice = deviceAppService.findDeviceByCode(nextDeviceCode); - //指令为执行 - if (unloadCheck(nextDevice)) { - return; - } - map.put("to_command", 3); - requireSucess = true; - } - if (CollectionUtil.isNotEmpty(inst) && ObjectUtil.isEmpty(inst.get(0))) { - String nextDeviceCode = inst.get(1).getNext_device_code(); - Device nextDevice = deviceAppService.findDeviceByCode(nextDeviceCode); - if (unloadCheck(nextDevice)) { - return; - } - map.put("to_command", 3); - requireSucess = true; - } - } - if (CommandEnum.UNLOAD_COMPLETE.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.UNLOAD_COMPLETE.getStatus())) { - message = "放货完成"; - map.put("to_command", 5); - LinkedList inst = new LinkedList<>(); - getIns(inst); - try { - if (CollectionUtil.isNotEmpty(inst)) { - for (Instruction instruction : inst) { - finishInstruction(instruction); - } - } - } catch (Exception e) { - e.printStackTrace(); - } - requireSucess = true; - - } - - if (CommandEnum.PICKUP_PREPARATION.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.PICKUP_PREPARATION.getStatus())) { - message = "取货准备(会库位台)"; - map.put("to_command", 6); - requireSucess = true; - } - if (CommandEnum.RECALL.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.RECALL.getStatus())) { - message = "召回"; - map.put("to_command", 7); - requireSucess = true; - } - if (CommandEnum.STOP.getStatus().equals(frontCommand) || backCommand.equals(CommandEnum.STOP.getStatus())) { - message = "急停"; - map.put("to_command", 8); - requireSucess = true; - } - if (ObjectUtil.isNotNull(map)) { - this.writing(map); - } - } - lastHeartbeat = heartbeat; - lastItemDeviceCode = itemDeviceCode; - lastMode = mode; - lastFrontCommand = frontCommand; - lastBackCommand = backCommand; - lastFrontTask = frontTask; - lastBackTask = backTask; - lastMove = move; - lastFrontZerror = frontZerror; - lastBackZerror = backZerror; - lastFrontZ = frontZ; - lastBackZ = backZ; - lastFrontX = frontX; - lastBackX = backX; - lastFrontY = frontY; - lastBackY = backY; - lastAction = action; - lastDistanceX = distanceX; - lastFrontForkCargo = frontForkCargo; - lastBackForkCargo = backForkCargo; - lastFrontForkLocation = frontForkLocation; - lastBackForkLocation = backForkLocation; - lastFrontForkAction = frontForkAction; - lastBackForkAction = backForkAction; - lastSpecial1 = special1; - lastSpecial2 = special2; - lastStorageCache = storageCache; - - } - - private boolean unloadCheck(Device nextDevice) { - SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; - if (nextDevice.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) nextDevice.getDeviceDriver(); - if (siemensConveyorDeviceDriver.getMode() != 2 || siemensConveyorDeviceDriver.getMove() == 1) { - notCreateInstMessage = "未下发电气信号原因->输送线-货架对接位:" + siemensConveyorDeviceDriver.getDeviceCode() + - "有货或未联机,无法下发指令!指令号:"; - return true; - } - } - return false; - } - - private void getIns(LinkedList inst) { - if (ObjectUtil.isNotEmpty(this.frontTask)) { - Instruction instructionFront = instructionService.findByCodeFromCache(String.valueOf(frontTask)); - if (ObjectUtil.isNotEmpty(instructionFront)) { - inst.add(instructionFront); - } - } - if (ObjectUtil.isNotEmpty(this.backTask)) { - Instruction instructionBack = instructionService.findByCodeFromCache(String.valueOf(backTask)); - if (CollectionUtil.isNotEmpty(inst) && ObjectUtil.isNotEmpty(instructionBack)) { - inst.add(instructionBack); - } - if (CollectionUtil.isEmpty(inst) && ObjectUtil.isNotEmpty(instructionBack)) { - inst.add(null); - inst.add(instructionBack); - } - } - - } - - private void updateAllstatues() { - if (mode == 3 && frontTask > 0) { - Date date = new Date(); - if (date.getTime() - this.instructionUpdateTime.getTime() < (long) this.instructionUpdateTimeOut) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instructionUpdateTimeOut); - - } else { - this.instructionUpdateTime = date; - updateInstructionStatus(frontTask); - } - } - if (mode == 3 && backTask > 0) { - Date date = new Date(); - if (date.getTime() - this.instructionUpdateTime.getTime() < (long) this.instructionUpdateTimeOut) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instructionUpdateTimeOut); - - } else { - this.instructionUpdateTime = date; - //更改指令状态 - updateInstructionStatus(backTask); - } - } - if (mode == 3 && backTask > 0 && frontTask > 0) { - Date date = new Date(); - if (date.getTime() - this.instructionUpdateTime.getTime() < (long) this.instructionUpdateTimeOut) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instructionUpdateTimeOut); - - } else { - this.instructionUpdateTime = date; - //更改指令状态 - updateInstructionStatus(frontTask); - updateInstructionStatus(backTask); - } - } - } - - private void updateInstructionStatus(Integer task) { - if (task > 0) { - Instruction inst = instructionService.findByCodeFromCache(String.valueOf(task)); - if (inst != null) { - if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex())) { - inst.setInstruction_status(InstructionStatusEnum.BUSY.getIndex()); - inst.setExecute_device_code(this.device_code); - instructionService.update(inst); - } - } - } - } - - /** - * 申请任务 - */ - public synchronized boolean applyTask() { - Date date = new Date(); - if (date.getTime() - this.instructionRequireTime.getTime() < (long) this.instructionRequireTimeOut) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instructionRequireTimeOut); - return false; - } else { - this.instructionRequireTime = date; - //输入:指令类型多种\ 指令状态多种\ - Instruction instruction1 = new Instruction(); - instruction1.setInstruction_status(InstructionStatusEnum.READY.getIndex()); - List instructions = instructionService.findByDeviceCodes(instruction1, false); - List instructionList = new ArrayList<>(); - //根据路由过滤指令 - if (checkRute(instructions, instructionList)) { - return false; - } - if (CollUtil.isEmpty(instructionList) || instructionList.size() < 1) { - return false; - } - this.sortInst(instructionList); - - Instruction inst = instructionList.get(0); - LinkedList instructionsAll = new LinkedList<>(); - instructionsAll.add(inst); - //找出有相邻的列的指令,如果没有按照单叉走，有按照双叉走 - if (findInstruction(instructionList, inst, instructionsAll)) { - return false; - } - - - //写信号 - if (wirteData(instructionsAll)) { - return false; - } - - - } - return false; - } - - private boolean checkRute(List instructions, List instructionList) { - if (CollUtil.isEmpty(instructions) || instructions.size() < 1) { - return true; - } - for (Instruction instruction : instructions) { - List routeLines = routeLineService.selectDeviceCodeList(instruction.getStart_device_code()); - if (CollUtil.isEmpty(routeLines) || routeLines.size() < 1) { - message = "没有输送线到堆垛机的路由"; - logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->" - + this.device_code + "的路由"); - continue; - } - for (RouteLineDto routeLineDto : routeLines) { - if (this.getDeviceCode().equals(routeLineDto.getNext_device_code())) { - List routeLineDtoList = routeLineService.selectDeviceCodeList(this.getDeviceCode()); - if (CollUtil.isEmpty(routeLines) || routeLines.size() < 1) { - message = "没有输送线到堆垛机的路由"; - logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->" - + this.device_code + "的路由"); - continue; - } - for (RouteLineDto routeLinedto : routeLineDtoList) { - if (instruction.getNext_device_code().equals(routeLinedto.getNext_device_code())) { - instructionList.add(instruction); - } - } - } - } - } - return false; - } - - private boolean wirteData(LinkedList inst) { - List list = new ArrayList<>(); - if (StrUtil.equals(inst.get(0).getInstruction_status(), InstructionStatusEnum.READY.getIndex())) { - String startDeviceCode = inst.get(0).getStart_device_code(); - Device startDevice = deviceAppService.findDeviceByCode(startDeviceCode); - BeltConveyorDeviceDriver beltConveyorDeviceDriver; - if (startDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { - beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) startDevice.getDeviceDriver(); - if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 0) { - notCreateInstMessage = "未下发电气信号原因->输送线-货架对接位:" + beltConveyorDeviceDriver.getDevice_code() + - "无货或未联机,无法下发指令!指令号:" + inst.get(0).getInstruction_code(); - return true; - } - } - //前叉信号写入 - HashMap map = new HashMap<>(); - if (inst.size() == 1 && ObjectUtil.isNotEmpty(inst.get(0))) { - map.put("to_device_code", this.getDevice().getAddress()); - map.put("to_command", CommandEnum.PICKUP.getStatus().toString()); - map.put("to_front_task", inst.get(0).getInstruction_code()); - - } else if (inst.size() > 1 && ObjectUtil.isEmpty(inst.get(1))) { - map.put("to_device_code", this.getDevice().getAddress()); - map.put("to_command", CommandEnum.PICKUP.getStatus().toString()); - map.put("to_back_task", inst.get(1).getInstruction_code()); - } else { - map.put("to_device_code", this.getDevice().getAddress()); - map.put("to_command", CommandEnum.PICKUP.getStatus().toString()); - map.put("to_front_task", inst.get(0).getInstruction_code()); - map.put("to_back_task", inst.get(1).getInstruction_code()); - } - writeStorageOrConveyor(inst, startDeviceCode, startDevice, map); - list.add(map); - this.writing(list); - } - return false; - } - - private void writeStorageOrConveyor(LinkedList inst, String startDeviceCode, Device startDevice, Map map) { - if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { - List list = deviceExtraService.list(Wrappers.lambdaQuery(DeviceExtra.class).eq(DeviceExtra::getDevice_code, startDeviceCode)); - for (DeviceExtra deviceExtra : list) { - if ("x".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_x", deviceExtra.getExtra_value()); - } - if ("z".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_z", deviceExtra.getExtra_value()); - } - if ("y".equals(deviceExtra.getExtra_code()) && StrUtil.isNotEmpty(deviceExtra.getExtra_value())) { - map.put("to_y", deviceExtra.getExtra_value()); - } - } - } - if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name())) { - if (ObjectUtil.isNotEmpty(inst.get(0))) { - map.put("to_y", inst.get(0).getFrom_z()); - if (inst.get(0).getFrom_x().length() > 1) { - String substring = inst.get(0).getFrom_x().substring(1); - map.put("to_z", substring); - } else { - map.put("to_z", inst.get(0).getFrom_x()); - } - map.put("to_x", inst.get(0).getFrom_y()); - } else { - //只存在后叉的情况 - map.put("to_y", Integer.parseInt(inst.get(0).getFrom_z()) + 1); - if (inst.get(0).getFrom_x().length() > 1) { - String substring = inst.get(0).getFrom_x().substring(1); - map.put("to_z", Integer.parseInt(substring) + 1); - } else { - map.put("to_z", Integer.parseInt(inst.get(0).getFrom_x()) + 1); - } - map.put("to_x", Integer.parseInt(inst.get(0).getFrom_y()) + 1); - } - } - } - - private boolean findInstruction(List instructionList, Instruction inst, LinkedList instructionsAll) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - CommonFinalParam commonFinalParam = new CommonFinalParam(); - wrapper.in(DeviceExtra::getExtra_name, "no_front_y", "no_front_x", "no_back_y", "no_back_x", "sort"); - List deviceExtras = deviceExtraMapper.selectList(wrapper); - //默认第一条指令为前叉判断是否符合 - if (StringUtils.isEmpty(inst.getNext_point_code()) && !StringUtils.contains(inst.getNext_point_code(), commonFinalParam.getBARRE())) { - - return true; - - } else { - String[] splitFront = inst.getNext_point_code().split(commonFinalParam.getBARRE()); - List frontY = deviceExtras.stream().filter(item -> "no_front_y".equals(item.getExtra_name())).collect(Collectors.toList()); - List frontX = deviceExtras.stream().filter(item -> "no_front_x".equals(item.getExtra_name())).collect(Collectors.toList()); - List backY = deviceExtras.stream().filter(item -> "no_back_y".equals(item.getExtra_name())).collect(Collectors.toList()); - List backX = deviceExtras.stream().filter(item -> "no_back_x".equals(item.getExtra_name())).collect(Collectors.toList()); - List sort = deviceExtras.stream().filter(item -> "sort".equals(item.getExtra_name())).collect(Collectors.toList()); - //存在配置的禁止前排列 - if (checkY(splitFront, frontY)) { - return true; - } - if (checkX(splitFront, frontX)) { - return true; - } - - if (Integer.valueOf(splitFront[1]).equals(MIN_Y)) { - return true; - } - String x1; - String x2; - if (Integer.parseInt(splitFront[1]) < 10) { - x1 = "0" + (Integer.parseInt(splitFront[1]) - 1); - x2 = "0" + (Integer.parseInt(splitFront[1]) + 1); - } else { - x1 = "" + (Integer.parseInt(splitFront[1]) - 1); - x2 = "" + (Integer.parseInt(splitFront[1]) + 1); - } - //根据排序进行加减 - String nextPointCodeDown = splitFront[0] + commonFinalParam.getBARRE() + x1 + commonFinalParam.getBARRE() + splitFront[2]; - String nextPointCodeUp = splitFront[0] + commonFinalParam.getBARRE() + x2 + commonFinalParam.getBARRE() + splitFront[2]; - if (CollectionUtil.isNotEmpty(sort) && SortEnum.BACK.getCode().equals(sort.get(0).getExtra_value())) { - nextPointCodeDown = splitFront[0] + commonFinalParam.getBARRE() + x2 + commonFinalParam.getBARRE() + splitFront[2]; - nextPointCodeUp = splitFront[0] + commonFinalParam.getBARRE() + x1 + commonFinalParam.getBARRE() + splitFront[2]; - } - - if (Integer.valueOf(splitFront[1]).equals(MAX_Y)) { - String finalNextPointCodeDown = nextPointCodeDown; - List instructionNextPointList = instructionList.stream().filter(item -> item.getNext_point_code().equals(finalNextPointCodeDown)).collect(Collectors.toList()); - if (instructionNextPointList.size() > 0) { - String[] splitBack = instructionNextPointList.get(0).getNext_point_code().split(commonFinalParam.getBARRE()); - if (checkY(splitBack, backY)) { - return true; - } - if (checkX(splitBack, backX)) { - return true; - } - instructionsAll.add(instructionNextPointList.get(0)); - } - } else { - String finalNextPointCodeDown1 = nextPointCodeDown; - List instructionNextPointList1 = instructionList.stream().filter(item -> item.getNext_point_code().equals(finalNextPointCodeDown1)).collect(Collectors.toList()); - String finalNextPointCodeUp = nextPointCodeUp; - List instructionNextPointList2 = instructionList.stream().filter(item -> item.getNext_point_code().equals(finalNextPointCodeUp)).collect(Collectors.toList()); - - if (instructionNextPointList1.size() > 0) { - String[] splitBack = instructionNextPointList1.get(0).getNext_point_code().split(commonFinalParam.getBARRE()); - if (checkY(splitBack, backY)) { - return true; - } - if (checkX(splitBack, backX)) { - return true; - } - instructionsAll.add(instructionNextPointList1.get(0)); - return false; - } - if (instructionNextPointList2.size() > 0) { - //前叉的上一列有指令，此时前叉变成后叉，重新校验 - String[] splitBack = instructionNextPointList2.get(0).getNext_point_code().split(commonFinalParam.getBARRE()); - if (checkY(splitBack, frontY)) { - return true; - } - if (checkX(splitBack, frontX)) { - return true; - } - instructionsAll.addFirst(null); - if (checkY(splitFront, backY)) { - return true; - } - if (checkX(splitFront, backX)) { - return true; - } - instructionsAll.removeFirst(); - instructionsAll.addFirst(instructionNextPointList2.get(0)); - return false; - } - } - - } - return false; - } - - private boolean checkX(String[] split, List x) { - if (x.size() != 0 && StringUtils.isNotEmpty(x.get(0).getExtra_value())) { - String[] splitValue = x.get(0).getExtra_value().split(","); - Set set = new HashSet<>(Arrays.asList(splitValue)); - return set.contains(split[0]); - } - return false; - } - - private boolean checkY(String[] split, List y) { - if (y.size() != 0 && StringUtils.isNotEmpty(y.get(0).getExtra_value())) { - String[] splitValue = y.get(0).getExtra_value().split(","); - Set set = new HashSet<>(Arrays.asList(splitValue)); - return set.contains(split[1]); - } - return false; - } - - - /** - * 将指令根据优先级和创建时间排序 - * - * @param instructions - */ - private void sortInst(List instructions) { - instructions.sort((t1, t2) -> { - //优先级从大到小 - int i = t2.getPriority().compareTo(t1.getPriority()); - //如果优先级相等 - if (i == 0) { - //时间从早到晚 - i = t1.getCreate_time().compareTo(t2.getCreate_time()); - } - return i; - }); - } - - - @Override - public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("prohibitInWarehouse", this.prohibitInWarehouse); - jo.put("prohibitOutWarehouse", this.prohibitOutWarehouse); - jo.put("stopReceiveTask", this.stopReceiveTask); - jo.put("is_click", true); - jo.put("driver_type", "double_station_stacker"); - return jo; - } - - @Override - public void setDeviceStatus(JSONObject data) { - if (ObjectUtil.isNotEmpty(data)) { - //监控大屏下发作业命令清警-5、召回-7、急停-8 - Integer toCommand = data.getInteger("toCommand"); - if (toCommand != null) { - Map map = new HashMap<>(); - map.put("to_command", toCommand); - this.writing(map); - } - //ACS监控大屏设置禁止入库、禁止出库、停止接收任务 - Boolean prohibitInWarehouse = data.getBoolean("prohibitInWarehouse"); - this.prohibitInWarehouse = prohibitInWarehouse; - Boolean prohibitOutWarehouse = data.getBoolean("prohibitOutWarehouse"); - this.prohibitOutWarehouse = prohibitOutWarehouse; - Boolean stopReceiveTask = data.getBoolean("stopReceiveTask"); - this.stopReceiveTask = stopReceiveTask; - } - } - - - /** - * 完成指令 - * - * @param inst - * @throws Exception - */ - public synchronized boolean finishInstruction(Instruction inst) throws Exception { - instructionService.finish(inst); - return true; - } - - public String getToParam() { - return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; - } - - public void writing(List list) { - - Map itemMap = new HashMap(); - for (int i = 0; i < list.size(); i++) { - Object ob = list.get(i); - JSONObject json = (JSONObject) JSONObject.toJSON(ob); - if (!StrUtil.isEmpty(json.getString("value"))) { - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + json.getString("code"); - itemMap.put(to_param, json.getString("value")); - } - } - logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); -// try { -// this.checkcontrol(itemMap); -// } catch (Exception e) { -// e.printStackTrace(); -// try { -// this.checkcontrol(itemMap); -// } catch (Exception e1) { -// e1.printStackTrace(); -// } -// } - } - - public void writing(Map map) { - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - Map itemMap = new LinkedHashMap<>(); - map.forEach((key, value) -> { - if (ObjectUtil.isNotEmpty(value)) { - itemMap.put(getToParam() + key, value); - } - }); - if (ObjectUtil.isNotEmpty(itemMap)) { - //this.control(itemMap); - logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); - } - } - - - /** - * 将扩展表中的字符串数据转换成集合 - * - * @param extraName - * @return - */ - @Override - public List getExtraDeviceCodes(String extraName) { - String extraValue = (String) this.getDevice().getExtraValue().get(extraName); - if (StrUtil.isEmpty(extraValue)) { - return new ArrayList<>(); - } - String devicesString = extraValue.substring(1, extraValue.length() - 1); - List devicesList = new ArrayList<>(); - String[] devices = devicesString.split(","); - for (String value : devices) { - String s = value.replace("\"", "").replace("\"", ""); - devicesList.add(s); - } - return devicesList; - } - - private void setData() { - device_code = this.getDeviceCode(); - heartbeat = this.itemProtocol.getItem_heartbeat(); - itemDeviceCode = this.itemProtocol.getItem_device_Code(); - mode = this.itemProtocol.getItem_mode(); - move = this.itemProtocol.getItem_move(); - frontCommand = this.itemProtocol.getItem_front_command(); - backCommand = this.itemProtocol.getItem_back_command(); - frontTask = this.itemProtocol.getItem_front_task(); - frontZerror = this.itemProtocol.getItem_front_ZError(); - backZerror = this.itemProtocol.getItem_back_ZError(); - frontZ = this.itemProtocol.getItem_front_z(); - frontX = this.itemProtocol.getItem_front_x(); - frontY = this.itemProtocol.getItem_front_y(); - backZ = this.itemProtocol.getItem_back_z(); - backX = this.itemProtocol.getItem_back_x(); - backY = this.itemProtocol.getItem_back_y(); - frontForkCargo = this.itemProtocol.getItem_front_forkCargo(); - backForkCargo = this.itemProtocol.getItem_back_forkCargo(); - frontForkLocation = this.itemProtocol.getItem_front_forkLocation(); - backForkLocation = this.itemProtocol.getItem_back_forkLocation(); - backForkAction = this.itemProtocol.getItem_back_forkAction(); - frontForkAction = this.itemProtocol.getItem_front_forkAction(); - special1 = this.itemProtocol.getItem_special1(); - special2 = this.itemProtocol.getItem_special2(); - storageCache = this.itemProtocol.getItem_storage_cache(); - } - - private void setLog() { - if (!itemDeviceCode.equals(lastItemDeviceCode)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(itemDeviceCode)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号item_device_code：" + lastItemDeviceCode + "->" + itemDeviceCode); - } - if (!mode.equals(lastMode)) { - requireSucess = false; - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + lastMode + "->" + mode); - } - if (!frontCommand.equals(lastFrontCommand)) { - requireSucess = false; - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontCommand)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_command：" + lastFrontCommand + "->" + frontCommand); - } - if (!backCommand.equals(lastBackCommand)) { - requireSucess = false; - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backCommand)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_command：" + lastBackCommand + "->" + backCommand); - } - if (!frontTask.equals(lastFrontTask)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontTask)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_task：" + lastFrontTask + "->" + frontTask); - } - if (!backTask.equals(lastBackTask)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backTask)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_task：" + lastBackTask + "->" + backTask); - } - if (!frontZerror.equals(lastFrontZerror)) { - if (0 != frontZerror) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontZerror)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_ZError：" + lastFrontZerror + "->" + frontZerror); - } - } - if (!backZerror.equals(lastBackZerror)) { - if (0 != backZerror) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backZerror)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_ZError：" + lastBackZerror + "->" + backZerror); - } - } - if (!backZ.equals(lastBackZ)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backZ)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_z：" + lastBackZ + "->" + backZ); - } - if (!backX.equals(lastBackX)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backX)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_x：" + lastBackX + "->" + backX); - } - if (!backY.equals(lastBackY)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backY)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_y：" + lastBackY + "->" + backY); - } - if (!frontZ.equals(lastFrontZ)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontZ)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_z：" + lastFrontZ + "->" + frontZ); - } - if (!frontX.equals(lastFrontX)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontX)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_x：" + lastFrontX + "->" + frontX); - } - if (!frontY.equals(lastFrontY)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontY)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_y：" + lastFrontY + "->" + frontY); - } - if (!move.equals(lastMove)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(move)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + lastMove + "->" + move); - } - if (!action.equals(lastAction)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(action)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + lastAction + "->" + action); - } - if (!distanceX.equals(lastDistanceX)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(distanceX)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号distancex：" + lastDistanceX + "->" + distanceX); - } - - if (!frontForkCargo.equals(lastFrontForkCargo)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontForkCargo)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_forkCargo：" + lastFrontForkCargo + "->" + frontForkCargo); - } - if (!frontForkLocation.equals(lastFrontForkLocation)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontForkLocation)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_forkLocation：" + lastFrontForkLocation + "->" + frontForkLocation); - } - if (!frontForkAction.equals(lastFrontForkAction)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(frontForkAction)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号front_forkAction：" + lastFrontForkAction + "->" + frontForkAction); - } - if (!backForkCargo.equals(lastBackForkCargo)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backForkCargo)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_forkCargo：" + lastBackForkCargo + "->" + backForkCargo); - } - if (!backForkLocation.equals(lastBackForkLocation)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backForkLocation)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_forkLocation：" + lastBackForkLocation + "->" + backForkLocation); - } - if (!backForkAction.equals(lastBackForkAction)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(backForkAction)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号back_forkAction：" + lastBackForkAction + "->" + backForkAction); - } - if (!special1.equals(lastSpecial1)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(special1)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号special1：" + lastSpecial1 + "->" + special1); - } - if (!special2.equals(lastSpecial2)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(special2)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号special2：" + lastSpecial2 + "->" + special2); - } - if (!storageCache.equals(lastStorageCache)) { - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(storageCache)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号storage_cache：" + lastStorageCache + "->" + storageCache); - } - } - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/ItemProtocol.java deleted file mode 100644 index a70f38f..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/ItemProtocol.java +++ /dev/null @@ -1,623 +0,0 @@ -package org.nl.acs.device_driver.conveyor.double_station_stacker; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - /** - * 心跳 - */ - public static String item_heartbeat = "heartbeat"; - - /** - * 堆垛机号 - */ - public static String item_deviceCode = "deviceCode"; - - /** - * 工作模式 - */ - public static String item_mode = "mode"; - - /** - * 行走动作信号 - */ - public static String item_action = "action"; - - - /** - * 前叉行走排号 - */ - public static String item_front_z = "front_z"; - /** - * 前叉行走列号 - */ - public static String item_front_x = "front_x"; - /** - * 前叉行走层号 - */ - public static String item_front_y = "front_y"; - - /** - * 后叉行走排号 - */ - public static String item_back_z = "back_z"; - - /** - * 后叉行走列号 - */ - public static String item_back_x = "back_x"; - - /** - * 后叉行走层号 - */ - public static String item_back_y = "back_y"; - - /** - * 行走开关信号 - */ - public static String item_move = "move"; - - - /** - * 行走激光数值 - */ - public static String item_distancex = "distancex"; - - - /** - * 特殊开关量1 - */ - public static String item_special1 = "special1"; - /** - * 特殊开关量2 - */ - public static String item_special2 = "special2"; - - /** - * 水箱和消防缓存位有无货 - */ - public static String item_storage_cache = "storage_cache"; - - /** - * 速度（转/分钟） - */ - public static String item_stacker_rpm = "stacker_rpm"; - /** - * 电流 - */ - public static String item_stacker_electricCurrent = "stacker_electricCurrent"; - /** - * 轴工作时间（小时） - */ - public static String item_stacker_workingHours = "stacker_workingHours"; - /** - * 轴运行次数 - */ - public static String item_stacker_runingTime = "stacker_runingTime"; - - /** - * 心跳 - */ - public static String item_to_heartbeat = "to_heartbeat"; - - /** - * 堆垛机号 - */ - public static String item_to_device_code = "to_device_code"; - /** - * 轴运行次数 - */ - public static String item_to_command = "to_command"; - /** - * 物料类型 - */ - public static String item_to_type = "to_type"; - /** - * 任务号 - */ - public static String item_to_task = "to_task"; - /** - * 作业排 - */ - public static String item_to_z = "to_z"; - /** - * 作业列 - */ - public static String item_to_x = "to_x"; - /** - * 作业层 - */ - public static String item_to_y = "to_y"; - /** - * 托盘号 - */ - public static String item_to_trayCode = "to_trayCode"; - - - /** - * 堆垛机主体报警 - */ - public static String item_stacker_error = "stackerError"; - - /** - * 前叉作业状态 - */ - public static String item_front_command = "front_command"; - - /** - * 前叉任务号 - */ - public static String item_front_task = "front_task"; - - /** - * 前叉Y轴报警（载货台） - */ - public static String item_front_YError = "front_YError"; - /** - * 前叉Z轴报警（货叉） - */ - public static String item_front_ZError = "front_ZError"; - - /** - * 前叉载货台开关信号 - */ - public static String item_front_cargoMove = "front_cargoMove"; - - /** - * 前叉载货台升降动作信号 - */ - public static String item_front_action = "front_action"; - /** - * 前叉载货台超限信号 - */ - public static String item_front_cargoError = "front_cargoError"; - /** - * 前叉载货台起升激光值 - */ - public static String item_front_distanceY = "front_distanceY"; - /** - * 前叉货叉探货信号 - */ - public static String item_front_forkCargo = "front_forkCargo"; - - /** - * 前叉货叉位置信号 - */ - public static String item_front_forkLocation = "front_forkLocation"; - /** - * 前叉货叉动作信号 - */ - public static String item_front_forkAction = "front_forkAction"; - /** - * 前叉托盘条码 - */ - public static String item_front_trayCode = "front_trayCode"; - /** - * 前叉载货台速度（转/分钟） - */ - public static String item_front_y_rpm = "front_y_rpm"; - /** - * 前叉载货台电流 - */ - public static String item_front_y_electricCurrent = "front_y_electricCurrent"; - /** - * 前叉载货台轴工作小时数 - */ - public static String item_front_y_workingHours = "front_y_workingHours"; - /** - * 前叉载货台轴运行次数 - */ - public static String item_front_y_runingTimes = "front_y_runingTimes"; - /** - * 前叉货叉速度（转/分钟） - */ - public static String item_front_z_rpm = "front_z_rpm"; - /** - * 前叉货叉电流 - */ - public static String item_front_z_electricCurrent = "front_z_electricCurrent"; - /** - * 前叉货叉轴工作时间（小时） - */ - public static String item_front_z_workingHours = "item_front_z_workingHours"; - /** - * 前叉货叉轴运行次数 - */ - public static String item_front_z_runingTimes = "front_front_z_runingTimes"; - /** - * 后叉作业状态 - */ - public static String item_back_command = "back_command"; - /** - * 后叉任务号 - */ - public static String item_back_task = "back_task"; - /** - * 后叉Y轴报警（载货台） - */ - public static String item_back_YError = "back_YError"; - /** - * 后叉Z轴报警（货叉） - */ - public static String item_back_ZError = "back_ZError"; - /** - * 后叉载货台开关信号 - */ - public static String item_back_cargoMove = "back_cargoMove"; - - /** - * 后叉载货台升降动作信号 - */ - public static String item_back_action = "back_action"; - - /** - * 后叉载货台超限信号 - */ - public static String item_back_cargoError = "back_cargoError"; - - /** - * 后叉载货台起升激光值 - */ - public static String item_back_distanceY = "back_distanceY"; - - /** - * 后叉货叉探货信号 - */ - public static String item_back_forkCargo = "back_forkCargo"; - - /** - * 后叉货叉位置信号 - */ - public static String item_back_forkLocation = "back_forkLocation"; - - /** - * 后叉货叉动作信号 - */ - public static String item_back_forkAction = "back_forkAction"; - - /** - * 后叉载货台开关信号 - */ - public static String item_back_trayCode = "back_trayCode"; - - /** - * 后叉载货台速度（转/分钟） - */ - public static String item_back_y_rpm = "back_y_rpm"; - - /** - * 后叉载货台电流 - */ - public static String item_back_y_electricCurrent = "back_y_electricCurrent"; - - /** - * 后叉载货台轴工作小时数 - */ - public static String item_back_y_workingHours = "back_y_workingHours"; - - /** - * 后叉载货台轴运行次数 - */ - public static String item_back_y_runingTimes = "back_y_runingTimes"; - - /** - * 后叉货叉速度（转/分钟） - */ - public static String item_back_z_rpm = "back_z_rpm"; - - /** - * 后叉货叉电流 - */ - public static String item_back_z_electricCurrent = "back_z_electricCurrent"; - - /** - * 后叉货叉轴工作时间（小时） - */ - public static String item_back_z_workingHours = "back_z_workingHours"; - - /** - * 后叉货叉轴运行次数 - */ - public static String item_back_z_runingTimes = "back_z_runingTimes"; - - /** - * 托盘类型 - */ - public static String item_to_container_type = "to_container_type"; - - /** - * 货叉选择 - */ - public static String item_to_chooseFork = "to_chooseFork"; - - /** - * 前叉任务号 - */ - public static String item_to_front_task = "to_front_task"; - - /** - * 前叉托盘号 - */ - public static String item_to_front_trayCode = "to_front_trayCode"; - - /** - * 后叉任务号 - */ - public static String item_to_back_task = "to_back_task"; - - /** - * 后叉托盘号 - */ - public static String item_to_back_trayCode = "to_back_trayCode"; - - - Boolean isonline; - - private DoubleStationStackerDeviceDriver driver; - - public ItemProtocol(DoubleStationStackerDeviceDriver driver) { - this.driver = driver; - } - - public Integer getItem_heartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - public Integer getItem_device_Code(){ - return this.getOpcIntegerValue(item_deviceCode); - } - public Integer getItem_mode(){ - return this.getOpcIntegerValue(item_mode); - } - - ; - - public float getItem_move() { - return this.getOpcFloatValue(item_move); - } - - - public Integer getItem_front_command(){ - return this.getOpcIntegerValue(item_front_command); - } - - public Integer getItem_back_command(){ - return this.getOpcIntegerValue(item_back_command); - } - - public Integer getItem_front_task(){ - return this.getOpcIntegerValue(item_front_task); - } - - public Integer getItem_front_ZError(){ - return this.getOpcIntegerValue(item_front_ZError); - } - - - public Integer getItem_back_ZError(){ - return this.getOpcIntegerValue(item_back_ZError); - } - - - - public Integer getItem_front_z(){ - return this.getOpcIntegerValue(item_front_z); - } - - - public Integer getItem_front_x(){ - return this.getOpcIntegerValue(item_front_x); - } - - public Integer getItem_front_y(){ - return this.getOpcIntegerValue(item_front_y); - } - - public Integer getItem_back_z(){ - return this.getOpcIntegerValue(item_front_z); - } - - - public Integer getItem_back_x(){ - return this.getOpcIntegerValue(item_front_x); - } - - public Integer getItem_back_y(){ - return this.getOpcIntegerValue(item_front_y); - } - public float getItem_special1(){ - return this.getOpcFloatValue(item_special1); - } - - public float getItem_front_forkCargo(){ - return this.getOpcFloatValue(item_front_forkCargo); - } - public float getItem_back_forkCargo(){ - return this.getOpcFloatValue(item_back_forkCargo); - } - - public float getItem_front_forkLocation(){ - return this.getOpcFloatValue(item_front_forkLocation); - } - - public float getItem_back_forkLocation(){ - return this.getOpcFloatValue(item_back_forkLocation); - } - public float getItem_front_forkAction(){ - return this.getOpcFloatValue(item_front_forkAction); - } - - public float getItem_back_forkAction(){ - return this.getOpcFloatValue(item_back_forkAction); - } - - public float getItem_special2(){ - return this.getOpcFloatValue(item_special2); - } - public float getItem_storage_cache(){ - return this.getOpcFloatValue(item_storage_cache); - } - public Integer getItem_stacker_rpm(){ - return this.getOpcIntegerValue(item_stacker_rpm); - } - public Integer getItem_stacker_electricCurrent(){ - return this.getOpcIntegerValue(item_stacker_electricCurrent); - } - public Integer getItem_stacker_workingHours(){ - return this.getOpcIntegerValue(item_stacker_workingHours); - } - public Integer getItem_stacker_runingTime(){ - return this.getOpcIntegerValue(item_stacker_runingTime); - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (value == null) { - setIsonline(false); - return "0"; - } else { - setIsonline(true); - return value; - } - } - - public int[] getOpcIntegerArrayValue(String protocol) { - int[] value = this.driver.getIntegerArrayValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return new int[20]; - } - - public float getOpcFloatValue(String protocol) { - Float value = this.driver.getDoubleValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - - - public Long getOpcLongValue(String protocol) { - Long value = this.driver.getLongValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0L; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB101.BO")); - list.add(new ItemDto(item_deviceCode, "堆垛机号", "DB101.B1")); - list.add(new ItemDto(item_mode, "工作模式", "DB101.B2")); - list.add(new ItemDto(item_stacker_error, "堆垛机主体报警", "DB101.B3")); - list.add(new ItemDto(item_move, "行走开关信号", "DB101.D4")); - list.add(new ItemDto(item_action, "行走动作信号", "DB101.B5")); - list.add(new ItemDto(item_distancex, "行走激光数值", "DB101.D6")); - list.add(new ItemDto(item_special1, "特殊开关量1", "DB101.B10")); - list.add(new ItemDto(item_special2, "特殊开关量2", "DB101.B11")); - list.add(new ItemDto(item_stacker_rpm, "速度(转/分钟)", "DB101.W12")); - list.add(new ItemDto(item_stacker_electricCurrent, "电流", "DB101.W14")); - list.add(new ItemDto(item_stacker_workingHours, "轴工作时间(小时)", "DB101.D16")); - list.add(new ItemDto(item_stacker_runingTime, "轴运行次数", "DB101.D20")); - list.add(new ItemDto(item_storage_cache, "水箱和消防缓存位有无货", "DB101.B24")); - list.add(new ItemDto(item_front_command, "前叉作业状态", "DB101.B31")); - list.add(new ItemDto(item_front_task, "前叉任务号", "DB101.D32")); - list.add(new ItemDto(item_front_YError, "前叉Y轴报警（载货台）", "DB101.B36")); - list.add(new ItemDto(item_front_ZError, "前叉Z轴报警（货叉）", "DB101.B37")); - list.add(new ItemDto(item_front_z, "前叉行走排号", "DB101.B38")); - list.add(new ItemDto(item_front_x, "前叉行走列号", "DB101.B39")); - list.add(new ItemDto(item_front_y, "前叉行走层号", "DB101.B40")); - list.add(new ItemDto(item_front_cargoMove, "前叉载货台开关信号", "DB101.B41")); - list.add(new ItemDto(item_front_action, "前叉载货台升降动作信号", "DB101.B42")); - list.add(new ItemDto(item_front_cargoError, "前叉载货台超限信号", "DB101.B43")); - list.add(new ItemDto(item_front_distanceY, "前叉载货台起升激光值", "DB101.D44")); - list.add(new ItemDto(item_front_forkCargo, "前叉货叉探货信号", "DB101.B48")); - list.add(new ItemDto(item_front_forkLocation, "前叉货叉位置信号", "DB101.B49")); - list.add(new ItemDto(item_front_forkAction, "前叉货叉动作信号", "DB101.B50")); - list.add(new ItemDto(item_front_trayCode, "前叉托盘条码", "DB101.B51.20")); - list.add(new ItemDto(item_front_y_rpm, "前叉载货台速度（转/分钟）", "DB101.W72")); - list.add(new ItemDto(item_front_y_electricCurrent, "前叉载货台电流", "DB101.W74")); - list.add(new ItemDto(item_front_y_workingHours, "前叉载货台轴工作小时数", "DB101.D76")); - list.add(new ItemDto(item_front_y_runingTimes, "前叉载货台轴运行次数", "DB101.B80")); - list.add(new ItemDto(item_front_z_rpm, "前叉货叉速度（转/分钟）", "DB101.W84")); - list.add(new ItemDto(item_front_z_electricCurrent, "前叉货叉电流", "DB101.W86")); - list.add(new ItemDto(item_front_z_workingHours, "前叉货叉轴工作时间（小时）", "DB101.D88")); - list.add(new ItemDto(item_front_z_runingTimes, "前叉货叉轴运行次数", "DB101.D92")); - list.add(new ItemDto(item_back_command, "后叉作业状态", "DB101.B101")); - list.add(new ItemDto(item_back_task, "后叉任务号", "DB101.D102")); - list.add(new ItemDto(item_back_YError, "后叉Y轴报警（载货台）", "DB101.B106")); - list.add(new ItemDto(item_back_ZError, "后叉Z轴报警（货叉）", "DB101.B107")); - list.add(new ItemDto(item_back_z, "后叉行走排号", "DB101.B108")); - list.add(new ItemDto(item_back_x, "后叉行走列号", "DB101.B109")); - list.add(new ItemDto(item_back_y, "后叉行走层号", "DB101.B110")); - list.add(new ItemDto(item_back_cargoMove, "后叉载货台开关信号", "DB101.B111")); - list.add(new ItemDto(item_back_action, "后叉载货台升降动作信号", "DB101.B112")); - list.add(new ItemDto(item_back_cargoError, "后叉载货台超限信号", "DB101.B113")); - list.add(new ItemDto(item_back_distanceY, "后叉载货台起升激光值", "DB101.D114")); - list.add(new ItemDto(item_back_forkCargo, "后叉货叉探货信号", "DB101.B118")); - list.add(new ItemDto(item_back_forkLocation, "后叉货叉位置信号", "DB101.B119")); - list.add(new ItemDto(item_back_forkAction, "后叉货叉动作信号", "DB101.B120")); - list.add(new ItemDto(item_back_y_rpm, "后叉载货台速度（转/分钟）", "DB101.W142")); - list.add(new ItemDto(item_back_y_electricCurrent, "后叉载货台电流", "DB101.W144")); - list.add(new ItemDto(item_back_y_runingTimes, "后叉载货台轴运行次数", "DB101.D150")); - list.add(new ItemDto(item_back_z_rpm, "后叉货叉速度（转/分钟）", "DB101.W154")); - list.add(new ItemDto(item_back_z_electricCurrent, "后叉货叉电流", "DB101.W156")); - list.add(new ItemDto(item_back_z_workingHours, "后叉货叉轴工作时间（小时）", "DB101.D158")); - list.add(new ItemDto(item_back_z_runingTimes, "后叉货叉轴运行次数", "DB101.D162")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_heartbeat, "心跳", "DB100.B0")); - list.add(new ItemDto(item_to_device_code, "堆垛机号", "DB100.B1")); - list.add(new ItemDto(item_to_command, "作业命令", "DB100.B2")); - list.add(new ItemDto(item_to_container_type, "托盘类型", "DB100.B3")); - list.add(new ItemDto(item_to_chooseFork, "货叉选择", "DB100.W4")); - list.add(new ItemDto(item_to_z, "作业排", "DB100.B6")); - list.add(new ItemDto(item_to_x, "作业列", "DN100.B7")); - list.add(new ItemDto(item_to_y, "作业层", "DB100.B8")); - list.add(new ItemDto(item_to_front_task, "前叉任务号", "DB100.D10")); - list.add(new ItemDto(item_to_front_trayCode, "前叉托盘号", "DB100.B14.20")); - list.add(new ItemDto(item_to_back_task, "后叉任务号", "DB100.D34")); - list.add(new ItemDto(item_to_back_trayCode, "后叉托盘号", "DB100.B38.20")); - return list; - } - - - @Override - public String toString() { - return ""; - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/CommandEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/CommandEnum.java deleted file mode 100644 index cd0cd3d..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/CommandEnum.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @author ls - * @date 2023/12/4 13:42 - */ -package org.nl.acs.device_driver.conveyor.double_station_stacker.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum CommandEnum { - /** - * 动作信号 - */ - STANDY(0,"待机"), - PICKUP(1,"取货中"), - PICKUP_COMPLETE(2,"取货完成"), - RELEASE(3,"放货中"), - UNLOAD(4,"请求卸货"), - UNLOAD_COMPLETE(5,"卸货完成"), - PICKUP_PREPARATION(6,"取货准备"), - RECALL(7,"召回"), - STOP(8,"急停"); - - private Integer status; - private String desc; - - public static String getDesc(Integer status) { - for (CommandEnum c : CommandEnum.values()) { - if (c.getStatus().equals(status)) { - return c.getDesc(); - } - } - return null; - } - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/SortEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/SortEnum.java deleted file mode 100644 index c22a895..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_station_stacker/enums/SortEnum.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * @author ls - * @date 2023/12/4 17:43 - */ -package org.nl.acs.device_driver.conveyor.double_station_stacker.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.nl.acs.common.base.CommonFinalParam; - -@Getter -@AllArgsConstructor -public enum SortEnum { - /** - * 排序 - */ - PRONT("1","正序"), - BACK("2","倒序"); - - private String code; - private String desc; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/ItemProtocol.java deleted file mode 100644 index 1704fd6..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/ItemProtocol.java +++ /dev/null @@ -1,164 +0,0 @@ -package org.nl.acs.device_driver.conveyor.siemens_conveyor; - -import cn.hutool.core.util.StrUtil; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - /** - * 心跳 - */ - public static String item_heartbeat = "heartbeat"; - /** - * 工作模式 - */ - public static String item_mode = "mode"; - /** - * 光电信号 - */ - public static String item_move = "move"; - /** - * 托盘方向 - */ - public static String item_carrier_direction = "carrier_direction"; - /** - * 报警 - */ - public static String item_error = "error"; - /** - * 任务号 - */ - public static String item_task = "task"; - - /** - * 行走列 - */ - public static String item_to_command = "to_command"; - /** - * 下发目标站 - */ - public static String item_to_target = "to_target"; - /** - * 下发托盘类型 - */ - public static String item_to_container_type = "to_container_type"; - /** - * 下发任务号 - */ - public static String item_to_task = "to_task"; - /** - * 困扎次数 - */ - public static String item_to_strap_times = "to_strap_times"; - /** - *木箱长度 - */ - public static String item_to_length = "to_length"; - /** - *木箱宽度 - */ - public static String item_to_weight = "to_weight"; - /** - *木箱高度 - */ - public static String item_to_height = "to_height"; - - - private SiemensConveyorDeviceDriver driver; - - public ItemProtocol(SiemensConveyorDeviceDriver driver) { - this.driver = driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getCarrier_direction() { - return this.getOpcIntegerValue(item_carrier_direction); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getTo_command() { - return this.getOpcIntegerValue(item_to_command); - } - - - Boolean isonline; - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - // log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - - } - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (StrUtil.isEmpty(value)) { - - } else { - return value; - } - return "0"; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB600.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB600.B2")); - list.add(new ItemDto(item_move, "光电信号", "DB600.B3")); - list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB600.B4")); - list.add(new ItemDto(item_error, "报警信号", "DB600.B6")); - list.add(new ItemDto(item_task, "任务号", "DB600.D10")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_command, "下发命令", "DB601.W2")); - list.add(new ItemDto(item_to_target, "下发目标站", "DB601.W4")); - list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB601.W6")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB601.D8")); - list.add(new ItemDto(item_to_strap_times, "困扎次数", "DB601.W12")); - list.add(new ItemDto(item_to_length, "木箱长度", "DB601.W14")); - list.add(new ItemDto(item_to_weight, "木箱宽度", "DB601.W16")); - list.add(new ItemDto(item_to_height, "木箱高度", "DB601.W18")); - return list; - } - - @Override - public String toString() { - return ""; - } - -} - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDefination.java deleted file mode 100644 index 76ee4ab..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDefination.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.nl.acs.device_driver.conveyor.siemens_conveyor; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.nl.acs.device.enums.DeviceType; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -/** - * 西门子-输送机驱动 - */ -@Service -public class SiemensConveyorDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "siemens_conveyor"; - } - - @Override - public String getDriverName() { - return "西门子-输送机驱动"; - } - - @Override - public String getDriverDescription() { - return "西门子-输送机驱动"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new SiemensConveyorDeviceDriver()).setDevice(device).setDriverDefination(this); - - } - - @Override - public Class getDeviceDriverType() { - return SiemensConveyorDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return ItemProtocol.getReadableItemDtos(); - } - - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java deleted file mode 100644 index 8f69e4f..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ /dev/null @@ -1,977 +0,0 @@ -package org.nl.acs.device_driver.conveyor.siemens_conveyor; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.AcsConfig; -import org.nl.acs.agv.server.NDCAgvService; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingRequest; -import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingResponse; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.storage_cell.domain.StorageCell; -import org.nl.acs.storage_cell.service.mapper.StorageCellMapper; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.utils.SecurityUtils; -import org.nl.config.language.LangProcess; -import org.nl.system.service.param.ISysParamService; -import org.nl.config.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 西门子-输送机驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); - @Autowired - DeviceService deviceservice = SpringContextHolder.getBean(DeviceService.class); - @Autowired - RouteLineService routelineserver = SpringContextHolder.getBean(RouteLineService.class); - @Autowired - TaskService taskserver = SpringContextHolder.getBean(TaskService.class); - @Autowired - DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class); - @Autowired - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); - @Autowired - ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); - @Autowired - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - @Autowired - NDCAgvService agvService = SpringContextHolder.getBean(NDCAgvService.class); - - private StorageCellMapper storageCellMapper; - - /** - * 当前指令 - */ - Instruction inst = null; - - /** - * 工作模式 - */ - int mode = 0; - int last_mode = 0; - /** - * 光电信号 - */ - int move = 0; - int last_move = 0; - /** - * 托盘方向 - */ - int carrier_direction = 0; - int last_carrier_direction = 0; - /** - * 报警 - */ - int error = 0; - int last_error = 0; - /** - * 任务号 - */ - int task = 0; - int last_task = 0; - int agvphase = 0; - String task_code = null; - int to_command = 0; - - int phase = 0; - int index = 0; - Boolean isonline = true; - int hasGoods = 0; - String message = null; - Boolean iserror = false; - - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - private Date require_apply_labeling_time = new Date(); - private Date require_apply_strangulation_time = new Date(); - private Date require_empty_in_time = new Date(); - private Date require_empty_out_time = new Date(); - - private int instruction_require_time_out = 3000; - //行架机械手申请任务成功标识 - boolean requireSucess = false; - boolean requireApplyLabelingSuccess = false; - boolean requireApplyLaStrangulationSuccess = false; - boolean requireEmptyInSuccess = false; - boolean requireEmptyOutSuccess = false; - boolean requiresShipDeviceUpdate = true; - private int instruction_finished_time_out; - - int branchProtocol = 0; - String inst_message; - String last_inst_message; - - /** - * 当前指令 - */ - - /** - * 暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 - */ - int flag; - - String device_code; - - String vehicle_code; - String last_vehicle_code; - - @Override - public Device getDevice() { - return this.device; - } - - - @Override - public void execute() { - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - move = this.itemProtocol.getMove(); - carrier_direction = this.itemProtocol.getCarrier_direction(); - error = this.itemProtocol.getError(); - task = this.itemProtocol.getTask(); - to_command = this.itemProtocol.getTo_command(); - if (mode != last_mode) { - if (mode == 2) { - requireSucess = false; - requireApplyLabelingSuccess = false; - requireApplyLaStrangulationSuccess = false; - requireEmptyInSuccess = false; - requireEmptyOutSuccess = false; - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记"); - } - logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); - } - if (move != last_move) { - message = null; - if (move == 0) { - inst_message = null; -// this.clearWrite(); - } - if (move == 0 && last_move == 1) { - last_vehicle_code = vehicle_code; - last_inst_message = inst_message; - if ("true".equals(this.device.getExtraValue().get("ship_device_update"))) { - this.requiresShipDeviceUpdate = false; - } - } - logServer.deviceItemValue(this.device_code, "move", String.valueOf(move)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move); - } - if (carrier_direction != last_carrier_direction) { - logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(carrier_direction)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号carrier_direction：" + last_carrier_direction + "->" + carrier_direction); - } - if (error != last_error) { - logServer.deviceItemValue(this.device_code, "error", String.valueOf(error)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error); - } - if (task != last_task) { - logServer.deviceItemValue(this.device_code, "task", String.valueOf(task)); - logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task); - } - - if (move != 0 && task > 0) { -// logServer.deviceExecuteLog(device_code, "", "", "输送线任务开始反馈任务状态,指令号:" + task); - //inst_message - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - if (inst != null) { - inst_message = "当前指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code() + " 载具号：" + inst.getVehicle_code(); - vehicle_code = inst.getVehicle_code(); - task_code = inst.getTask_code(); - if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex()) && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) { - inst.setInstruction_status(InstructionStatusEnum.BUSY.getIndex()); - inst.setExecute_device_code(this.device_code); - instructionService.update(inst); - logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈执行中状态,反馈成功,指令号:" + task); - } - if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.BUSY.getIndex())) { - if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) { - vehicle_code = inst.getVehicle_code(); - inst.setExecute_device_code(this.device_code); - finish_instruction(); - logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈完成状态,反馈成功,指令号:" + task); - } else { -// if (!StrUtil.equals(inst.getExecute_code(), this.device_code)) { -// inst.setExecute_device_code(this.device_code); -// instructionService.update(inst); -// } - } - - } - } else { -// logServer.deviceExecuteLog(device_code, "", "", "输送线任务开始反馈任务状态,反馈失败,查询不到指令号:" + task); - message = "输送线任务反馈状态,查询不到指令号:" + task + "指令已完成"; - inst_message = null; - } - } - - } catch (Exception var17) { - inst_message = var17.getMessage(); - logServer.deviceExecuteLog(this.getDevice_code(), "", "", "读取信号值时出现异常:" + var17.getMessage()); - } - -// if (!this.itemProtocol.getIsonline()) { -// this.setIsonline(false); -// this.setIserror(true); -// message = "信号量同步异常"; -// //未联机 -// } else - if (mode == 0) { - this.setIsonline(false); - message = "未联机"; - //有报警 -// } else if (error != 0) { -// this.setIsonline(false); -// this.setIserror(true); -// message = "有报警"; -// //无报警 - } else { - this.setIsonline(true); - this.setIserror(false); - if (error != 0) { - this.setIserror(true); - message = "有报警"; - } - - Instruction instruction = null; - List toInstructions; - - -// if (mode == 2 && move != 0 && task > 0) { -// //inst_message -// inst = instructionService.findByCodeFromCache(String.valueOf(task)); -// if (inst != null) { -// inst_message = "指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code() + " 载具号：" + inst.getVehicle_code(); -// if (StrUtil.equals(inst.getInstruction_status(), CommonFinalParam.ONE) && StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) { -// finish_instruction(); -// } -// if (StrUtil.equals(inst.getInstruction_status(), "0") && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) { -// inst.setInstruction_status(CommonFinalParam.ONE); -// instructionService.update(inst); -// } -// } -// } - - switch (mode) { - case 1: - log.debug("设备运转模式:等待工作"); - break; - case 2: - //申请任务 - if (move > 0 && !requireSucess) { - instruction_require(); - } - if (!requiresShipDeviceUpdate && move == 0) { - this.shipDeviceUpdate(); - } else { - this.requiresShipDeviceUpdate = true; - } - break; - case 4: - /** - * 申请捆扎 - */ - if (move > 0) { - applyLaStrangulation(); - } - break; - case 5: - /** - * 申请贴标 - */ - if (move > 0 && !requireSucess) { - applyLabeling(); - - } - break; - case 6: - //空托盘满垛入库申请 - if (move > 0 && !requireEmptyInSuccess) { - emptyIn(); - } - if (move > 0 && !requireSucess) { - instruction_require(); - } - break; - case 7: - //空盘出库申请 - if (move == 0 && !requireSucess) { - emptyOut(); - } - break; - case 8: - //申请AGV任务 - if (move == 1 && !requireSucess) { - applyAgvTask(); - } - break; - - } - } - last_mode = mode; - last_move = move; - last_carrier_direction = carrier_direction; - last_error = error; - last_task = task; - } - - private void shipDeviceUpdate() { - JSONObject param = new JSONObject() {{ - put("device_code", device_code); - }}; - - HttpResponse response = acsToWmsService.shipDeviceUpdate(param); - if (response == null || response.getStatus() == 200) { - this.requiresShipDeviceUpdate = true; - } - } - - - public boolean exe_error() { - if (this.error == 0) { - return true; - } else { - log.debug("设备报警"); - return false; - } - } - - public void clearWrite() { - - List list = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_target"); - map.put("value", "0"); - list.add(map); - Map map2 = new HashMap(); - map2.put("code", "to_task"); - map2.put("value", "0"); - list.add(map2); - Map map3 = new HashMap(); - map3.put("code", "to_command"); - map3.put("value", "0"); - list.add(map3); - Map map4 = new HashMap(); - map4.put("code", "to_strap_times"); - map4.put("value", "0"); - list.add(map4); - Map map5 = new HashMap(); - map5.put("code", "to_length"); - map5.put("value", "0"); - list.add(map5); - Map map6 = new HashMap(); - map6.put("code", "to_weight"); - map6.put("value", "0"); - list.add(map6); - Map map7 = new HashMap(); - map7.put("code", "to_height"); - map7.put("value", "0"); - list.add(map7); - this.writing(list); - message = null; - vehicle_code = null; - } - - public boolean exe_business() { - return true; - } - - public synchronized boolean finish_instruction() throws Exception { - instructionService.finish(inst); -// requireSucess = false; - return true; - } - - - - @Override - public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); - String mode = ""; - String move = ""; - String carrier_direction = ""; - if (this.getMode() == 0) { - mode = "脱机"; - } else if (this.getMode() == 1) { - mode = "单机"; - } else if (this.getMode() == 2) { - mode = "待机"; - } else if (this.getMode() == 3) { - mode = "运行中"; - } else if (this.getMode() == 4) { - mode = "申请捆扎中"; - } else if (this.getMode() == 5) { - mode = "申请贴标中"; - } else if (this.getMode() == 6) { - mode = "申请空盘入库中"; - } else if (this.getMode() == 7) { - mode = "申请空盘出库中"; - } else if (this.getMode() == 8) { - mode = "申请AGV任务中"; - } - - if (this.getMove() == 0) { - move = "无货"; - jo.put("hasGoods", false); - } else if (this.getMove() == 1) { - move = "有货"; - jo.put("hasGoods", true); - } else if (this.getMove() == 2) { - move = "有托盘有货"; - jo.put("hasGoods", true); - } - - if (this.carrier_direction == 1) { - carrier_direction = "正转"; - } else if (this.carrier_direction == 2) { - carrier_direction = "反转"; - } - String requireSucess = "0"; - if (this.requireSucess) { - requireSucess = CommonFinalParam.ONE; - } - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("carrier_direction", carrier_direction); - jo.put("task", task); - jo.put("last_task", last_task); - jo.put("task_code", task_code); - -// jo.put("barcode", barcode); -// jo.put("last_task", last_task); - jo.put("inst_message", this.inst_message); - jo.put("last_inst_message", this.last_inst_message); - jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); - jo.put("isError", this.getIserror()); - jo.put("message", LangProcess.msg(message)); - jo.put("is_click", true); - jo.put("requireSucess", requireSucess); - jo.put("driver_type", "siemens_conveyor"); - return jo; - } - - @Override - public void setDeviceStatus(JSONObject data) { - String requestSucess = data.getString("requireSucess"); - if (StrUtil.equals(requestSucess, "0")) { - this.requireSucess = false; - } else if (StrUtil.equals(requestSucess, CommonFinalParam.ONE)) { - this.requireSucess = true; - } - } - - public void writing(List list) { - - Map itemMap = new HashMap(); - for (int i = 0; i < list.size(); i++) { - Object ob = list.get(i); - JSONObject json = (JSONObject) JSONObject.toJSON(ob); - if (!StrUtil.isEmpty(json.getString("value"))) { - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + json.getString("code"); - itemMap.put(to_param, json.getString("value")); - } - } - logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); - try { - //this.checkcontrol(itemMap); - } catch (Exception e) { - e.printStackTrace(); - try { - // this.checkcontrol(itemMap); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - - } - - public void writing(String param, String value) { - - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + param; - - Map itemMap = new HashMap(); - - itemMap.put(to_param, Integer.parseInt(value)); - //this.control(itemMap); - logServer.deviceExecuteLog(device_code, "", "", "下发电气信号设备号:" + device_code + ",下发电气:" + to_param + ",下发电气值:" + value); - } - - - /** - * 请求指令 - */ - public synchronized boolean instruction_require() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - //判断是否存在起点相同 任务状态就绪的任务 - TaskDto taskdto = taskserver.findByStartCodeAndReady(device_code); - if (!ObjectUtil.isEmpty(taskdto)) { -// if (!ObjectUtils.isEmpty(instructionService.findByBarcodeFromCache(container_code))) { -// return false; -// } - //需要判断当前设备是否已经存在就绪的指令 如果存在就直接下发 不存在则创建 - Instruction inst = instructionService.findByTaskcodeAndStatus(taskdto.getTask_code()); - if (ObjectUtil.isNotEmpty(inst)) { - List list = new ArrayList(); - Map map = new HashMap(); - - if (StrUtil.isNotEmpty(taskdto.getTo_z())) { - if (StrUtil.equals(taskdto.getTo_z(), "01")) { - map.put("code", "to_target"); - map.put("value", "102"); - } else if (StrUtil.equals(taskdto.getTo_z(), "02")) { - map.put("code", "to_target"); - map.put("value", "201"); - } else if (StrUtil.equals(taskdto.getTo_z(), "03")) { - map.put("code", "to_target"); - map.put("value", "301"); - } - } - list.add(map); - Map map2 = new HashMap(); - map2.put("code", "to_task"); - map2.put("value", inst.getInstruction_code()); - list.add(map2); - Map map3 = new HashMap(); - map3.put("code", "to_command"); - map3.put("value", CommonFinalParam.ONE); - list.add(map3); - this.writing(list); - message = "下发电气任务号成功"; - requireSucess = true; - return true; - } - - // type 5 输送任务 - if (!StrUtil.equals(taskdto.getTask_type(), "5")) { - return false; - } - String taskid = taskdto.getTask_id(); - String taskcode = taskdto.getTask_code(); - String vehiclecode = taskdto.getVehicle_code(); - String priority = taskdto.getPriority(); - String start_point_code = taskdto.getStart_point_code(); - String start_device_code = taskdto.getStart_device_code(); - String route_plan_code = taskdto.getRoute_plan_code(); - String next_device_code = ""; - - /** - * 开始平均分配 - */ - String this_coevice_code = taskserver.queryAssignedByDevice(device_code, taskdto.getNext_device_code()); - if (StrUtil.isEmpty(this_coevice_code)) { - List shortPathsList = routeLineService.getShortPathLines(start_device_code, taskdto.getNext_device_code(), route_plan_code); - RouteLineDto routeLineDto = shortPathsList.get(0); - - String path = routeLineDto.getPath(); - String type = routeLineDto.getType(); - String[] str = path.split("->"); - - List pathlist = Arrays.asList(str); - int index = 0; - for (int m = 0; m < pathlist.size(); m++) { - if (pathlist.get(m).equals(start_device_code)) { - index = m + 1; - break; - } - } - next_device_code = pathlist.get(index); - } else { - next_device_code = this_coevice_code; - } - //校验路由关系 - List shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code); - if (ObjectUtils.isEmpty(shortPathsList)) { - throw new RuntimeException("路由不通!"); - } - - Device startdevice = deviceAppservice.findDeviceByCode(start_device_code); - Device nextdevice = deviceAppservice.findDeviceByCode(next_device_code); - String next_point_code; - if (StrUtil.equals(deviceAppservice.findDeviceTypeByCode(next_device_code), "storage")) { - next_point_code = taskdto.getTo_x() + "-" + taskdto.getTo_y() + "-" + taskdto.getTo_z(); - } else { - next_point_code = next_device_code; - } - Instruction instdto = new Instruction(); - instdto.setInstruction_id(IdUtil.simpleUUID()); - instdto.setRoute_plan_code(route_plan_code); - instdto.setRemark(taskdto.getRemark()); - instdto.setMaterial(taskdto.getMaterial()); - instdto.setQuantity(taskdto.getQuantity()); - instdto.setTask_id(taskid); - instdto.setTask_code(taskcode); - instdto.setVehicle_code(vehiclecode); - String now = DateUtil.now(); - instdto.setCreate_time(now); - instdto.setCreate_by(SecurityUtils.getCurrentNickName()); - instdto.setStart_device_code(start_device_code); - instdto.setNext_device_code(next_device_code); - instdto.setStart_point_code(start_point_code); - instdto.setNext_point_code(next_point_code); - instdto.setPriority(priority); - instdto.setInstruction_status(InstructionStatusEnum.READY.getIndex()); - instdto.setExecute_device_code(start_point_code); - try { - instructionService.create(instdto); - } catch (Exception e) { - e.printStackTrace(); - log.error("指令创建失败!", e.getMessage()); - return false; - } - //创建指令后修改任务状态 - taskdto.setTask_status(TaskStatusEnum.BUSY.getIndex()); - taskserver.update(taskdto); - requireSucess = true; - String next_addr = nextdevice.getExtraValue().get("address").toString(); - - List list = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_target"); - map.put("value", next_addr); - list.add(map); - Map map2 = new HashMap(); - map2.put("code", "to_task"); - map2.put("value", instdto.getInstruction_code()); - list.add(map2); - Map map3 = new HashMap(); - map3.put("code", "to_command"); - map3.put("value", CommonFinalParam.ONE); - list.add(map3); - this.writing(list); - } else { - //如果不存在则直接找对应指令 - Instruction inst = instructionService.findByDeviceCodeFromCache(this.device_code); - if (ObjectUtil.isEmpty(inst)) { - return false; - } - //当起点为行架任务的时候不需要请求下发 - if (StrUtil.equals(inst.getInstruction_type(), "6")) { - return false; - } - Device nextdevice = deviceAppservice.findDeviceByCode(inst.getNext_device_code()); - String next_addr = nextdevice.getExtraValue().get("address").toString(); - - List list = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_target"); - map.put("value", next_addr); - list.add(map); - Map map2 = new HashMap(); - map2.put("code", "to_task"); - map2.put("value", inst.getInstruction_code()); - list.add(map2); - Map map3 = new HashMap(); - map3.put("code", "to_command"); - map3.put("value", CommonFinalParam.ONE); - list.add(map3); - this.writing(list); - } - return true; - } - } - - /** - * 申请贴标 - */ - public synchronized void applyLabeling() { - Date date = new Date(); - if (date.getTime() - this.require_apply_labeling_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - this.require_apply_labeling_time = date; - String vehicle_code = ""; - if (task > 0) { - Instruction instruction = instructionService.findByCodeFromCache(String.valueOf(task)); - vehicle_code = instruction.getVehicle_code(); - } else { - logServer.deviceExecuteLog(device_code, "", "", "申请贴标电气设备任务号:" + task + "异常"); - message = "申请贴标电气设备任务号:" + task + "异常"; - throw new RuntimeException("任务号为空!"); - } - if (StrUtil.isEmpty(vehicle_code)) { - logServer.deviceExecuteLog(device_code, "", "", "申请贴标电气设备任务号:" + task + "未找到载具号"); - message = "申请贴标电气设备任务号:" + task + "未找到载具号"; - throw new RuntimeException("载具号为空!"); - } - ApplyLabelingAndBindingRequest applyLabelingAndBindingRequest = - new ApplyLabelingAndBindingRequest(); - StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper) - .eq(StorageCell::getStorage_code, this.device_code) - .one(); - String start_point_code = null; - if (!ObjectUtil.isEmpty(storageCell)) { - start_point_code = (String) storageCell.getParent_storage_code() == null ? this.device_code : (String) storageCell.getParent_storage_code(); - } - applyLabelingAndBindingRequest.setDevice_code(start_point_code); - applyLabelingAndBindingRequest.setType(CommonFinalParam.ONE); - applyLabelingAndBindingRequest.setVehicle_code(vehicle_code); - ApplyLabelingAndBindingResponse applyLabelingAndBindingResponse = acsToWmsService.applyLabelingAndBindingRequest(applyLabelingAndBindingRequest); - - if (applyLabelingAndBindingResponse.getstatus() == 200) { - message = "申请贴标成功"; - List list = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_command"); - map.put("value", "5"); - list.add(map); - this.writing(list); - this.writing(list); - message = "申请贴标下发电气信号成功"; - requireApplyLabelingSuccess = true; - } else { - message = "申请贴标失败," + applyLabelingAndBindingResponse.getMessage(); - } - } - } - - /** - * 申请捆扎 - */ - @SneakyThrows - public synchronized void applyLaStrangulation() { - Date date = new Date(); - if (date.getTime() - this.require_apply_strangulation_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - this.require_apply_strangulation_time = date; - String vehicle_code = ""; - if (task > 0) { - Instruction instruction = instructionService.findByCodeFromCache(String.valueOf(task)); - if (ObjectUtil.isEmpty(instruction)) { - message = "申请捆扎电气设备任务号:" + task + "未找到对应指令"; - return; - } - vehicle_code = instruction.getVehicle_code(); - } else { - logServer.deviceExecuteLog(device_code, "", "", "申请捆扎电气设备任务号:" + task + "异常"); - message = "申请捆扎电气设备任务号:" + task + "异常"; - return; - } - if (StrUtil.isEmpty(vehicle_code)) { - logServer.deviceExecuteLog(device_code, "", "", "申请捆扎电气设备任务号:" + task + "未找到载具号"); - message = "申请捆扎电气设备任务号:" + task + "未找到载具号"; - return; - } - ApplyLabelingAndBindingRequest applyLabelingAndBindingRequest = - new ApplyLabelingAndBindingRequest(); - StorageCell storageCell = new LambdaQueryChainWrapper<>(storageCellMapper) - .eq(StorageCell::getStorage_code, this.device_code) - .one(); - String start_point_code = null; - if (!ObjectUtil.isEmpty(storageCell)) { - start_point_code = (String) storageCell.getParent_storage_code() == null ? this.device_code : (String) storageCell.getParent_storage_code(); - } - applyLabelingAndBindingRequest.setDevice_code(start_point_code); - applyLabelingAndBindingRequest.setType("2"); - applyLabelingAndBindingRequest.setVehicle_code(vehicle_code); - ApplyLabelingAndBindingResponse applyLabelingAndBindingResponse = acsToWmsService.applyLabelingAndBindingRequest(applyLabelingAndBindingRequest); - if (applyLabelingAndBindingResponse.getstatus() == 200) { - if (ObjectUtil.isNotEmpty(applyLabelingAndBindingResponse.getData())) { - Map datas = applyLabelingAndBindingResponse.getData(); - String length = datas.get("box_length").toString(); - String width = datas.get("box_width").toString(); - String box_high = datas.get("box_high").toString(); - String bundle_times = datas.get("bundle_times").toString(); - - List list = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_length"); - map.put("value", length); - list.add(map); - Map map2 = new HashMap(); - map2.put("code", "to_weight"); - map2.put("value", width); - list.add(map2); - Map map3 = new HashMap(); - map3.put("code", "to_height"); - map3.put("value", box_high); - list.add(map3); - Map map4 = new HashMap(); - map4.put("code", "to_strap_times"); - map4.put("value", bundle_times); - list.add(map4); - Map map5 = new HashMap(); - map5.put("code", "to_command"); - map5.put("value", "4"); - list.add(map5); - this.writing(list); - message = "申请捆扎成功"; - requireSucess = true; - } else { - message = "未返回尺寸信息"; - } - - } else { - message = applyLabelingAndBindingResponse.getMessage(); - } - - } - } - - public synchronized void emptyIn() { - Date date = new Date(); - if (date.getTime() - this.require_empty_in_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - this.require_empty_in_time = date; - - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), CommonFinalParam.ONE)) { - message = "申请空盘入库任务中..."; - - if (taskserver.querySameOriginTask(this.device_code) > 0) { - message = "已存在空盘出库任务不再请求"; - return; - } - - JSONObject apply = new JSONObject(); - apply.put("device_code", device_code); - apply.put("type", "2"); - String str = acsToWmsService.applyTaskToWms(apply); - JSONObject jo = JSON.parseObject(str); - if (ObjectUtil.isEmpty(jo)) { - message = "申请空盘入库接口不通"; - requireEmptyInSuccess = true; - } else { - if (jo.getInteger("status") == 200) { - message = "申请空盘入库成功"; - requireEmptyInSuccess = true; - } else { - requireEmptyInSuccess = true; - message = "申请空盘入库失败，" + jo.get("message").toString(); - } - } - - } - } - } - - public synchronized void applyAgvTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - this.instruction_require_time = date; - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), CommonFinalParam.ONE)) { - Instruction instruction = instructionService.findByCode(String.valueOf(task)); - if (ObjectUtil.isEmpty(instruction)) { - message = "指令号" + task + "未找到对应指令"; - return; - } - if (StrUtil.isEmpty(instruction.getVehicle_code())) { - message = "指令号" + task + "未找到对应木箱号"; - return; - } - message = "申请AGV搬运任务中..."; - JSONObject apply = new JSONObject(); - apply.put("device_code", device_code); - apply.put("type", "4"); - apply.put("vehicle_code", instruction.getVehicle_code()); - String str = acsToWmsService.applyTaskToWms(apply); - JSONObject jo = JSON.parseObject(str); - if (ObjectUtil.isEmpty(jo)) { - message = "申请AGV搬运任务接口不通"; - requireSucess = true; - } else { - if (jo.getInteger("status") == 200) { - message = "申请AGV搬运任务成功"; - requireSucess = true; - } else { - requireSucess = true; - message = "申请AGV搬运任务失败," + jo.get("message").toString(); - } - } - - } - } - } - - public synchronized void emptyOut() { - Date date = new Date(); - if (date.getTime() - this.require_empty_out_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - this.require_empty_out_time = date; - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), CommonFinalParam.ONE)) { - if (taskserver.querySameDestinationTask(this.device_code) > 0) { - message = "已存在空盘出库任务不再请求"; - return; - } - message = "申请空盘出库任务中..."; - JSONObject apply = new JSONObject(); - apply.put("device_code", device_code); - apply.put("type", "3"); - String str = acsToWmsService.applyTaskToWms(apply); - JSONObject jo = JSON.parseObject(str); - if (ObjectUtil.isEmpty(jo)) { - message = "申请空盘出库接口不通"; - requireSucess = true; - } else { - if (jo.getInteger("status") == 200) { - message = "申请空盘出库成功"; - requireSucess = true; - } else { - requireSucess = true; - message = "申请空盘出库失败," + jo.get("message").toString(); - } - } - - } - } - } - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java deleted file mode 100644 index 5a3a077..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDefination.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.nl.acs.device_driver.one_conveyor.scanner_weight_conveyor; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class ConveyorWithScannerWeightDefination implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "conveyor_with_scanner_weight"; - } - - @Override - public String getDriverName() { - return "输送线工位-带扫码称重"; - } - - @Override - public String getDriverDescription() { - return "输送线工位-带扫码称重"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new ConveyorWithScannerWeightDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return ConveyorWithScannerWeightDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return ItemProtocol.getReadableItemDtos(); - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java deleted file mode 100644 index 96bc3c0..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ /dev/null @@ -1,653 +0,0 @@ -package org.nl.acs.device_driver.one_conveyor.scanner_weight_conveyor; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.service.DeviceExtraService; -import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.FeedLmsRealFailed; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.enums.StorageTypeEnum; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.history.ErrorUtil; -import org.nl.acs.history.service.DeviceErrorLogService; -import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.impl.RouteLineServiceImpl; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.enums.TaskTypeEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.utils.SecurityUtils; -import org.nl.config.SpringContextHolder; -import org.nl.config.language.LangProcess; -import org.nl.config.lucene.service.LuceneExecuteLogService; -import org.nl.config.lucene.service.dto.LuceneLogDto; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; - -/** - * 输送线工位-带扫码称重 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, FeedLmsRealFailed { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - - DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineServiceImpl.class); - - DeviceExtraService deviceExtraService = SpringContextHolder.getBean(DeviceExtraServiceImpl.class); - - DeviceErrorLogService errorLogServer = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); - - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class); - - DeviceAppService deviceAppservice = SpringContextHolder.getBean(DeviceAppService.class); - - LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean(LuceneExecuteLogService.class); - //工作模式 - int mode = 0; - int last_mode = 0; - //光电信号 - int move = 0; - int last_move = 0; - //动作信号 - int action = 0; - int last_action = 0; - //报警信号 - int error = 0; - int last_error = 0; - //任务号 - int task = 0; - int last_task = 0; - - - int heartbeat = 0; - int last_heartbeat = 0; - int to_command = 0; - int last_to_command = 0; - - int to_target = 0; - int last_to_target = 0; - - int to_task = 0; - int last_to_task = 0; - - int to_container_type = 0; - int last_to_container_type = 0; - - //托盘类型 - int container_type = 0; - int last_container_type = 0; - - - - - //行架任务号 - int hj_task = 0; - int last_hj_task = 0; - - //重量 - int weight = 0; - int last_weight = 0; - - //托盘条码 - String barcode = null; - String last_barcode = null; - - - //子卷条码 - String material_barcode = null; - String last_material_barcode = null; - - //数量 - int qty = 0; - int last_qty = 0; - - //托盘方向 - int carrier_direction = 0; - int last_carrier_direction = 0; - - Boolean isonline = true; - int hasGoods = 0; - String message = null; - Boolean iserror = false; - private Date instruction_update_time = new Date(); - private Date require_apply_strangulation_time = new Date(); - private int instruction_update_time_out = 1000; - Integer heartbeat_tag; - private Date instruction_require_time = new Date(); - - private int instruction_require_time_out = 3000; - //行架机械手申请任务成功标识 - boolean requireSucess = false; - - private int instruction_finished_time_out; - - int branchProtocol = 0; - private String error_type = "hxhj_error_type"; - - //暂定 0就绪 1请求取货 2取货完成 3请求放货 4放货完成 5取货完成离开 6放货完成离开 7请求进入区域 8请求离开区域 - int flag; - - String device_code; - - //当前指令 - Instruction inst = null; - - //0 无任务执行 1更新指令状态 2下发电气信号 3允许取货 允许放货 5放货完成 - int now_steps_type = 0; - String notCreateTaskMessage = ""; - String notCreateInstMessage = ""; - String feedMessage = ""; - String inst_message; - String task_code = null; - String vehicle_code; - - - List getDeviceCodeList = null; - - List putDeviceCodeList = null; - - - @Override - public Device getDevice() { - return this.device; - } - - @Override - public void execute() { - try { - device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); - move = this.itemProtocol.getMove(); - action = this.itemProtocol.getAction(); - error = this.itemProtocol.getError(); - task = this.itemProtocol.getTask(); - heartbeat = this.itemProtocol.getHeartbeat(); - to_command = this.itemProtocol.getTo_command(); - to_target = this.itemProtocol.getTo_target(); - to_task = this.itemProtocol.getTo_task(); - to_container_type = this.itemProtocol.getTo_container_type(); - container_type = this.itemProtocol.getContainer_type(); - carrier_direction = this.itemProtocol.getCarrier_direction(); - qty = this.itemProtocol.getQty(); - weight = this.itemProtocol.getWeight(); - barcode = this.itemProtocol.getBarcode(); - material_barcode = this.itemProtocol.getMaterialBarcode(); - - if (mode != last_mode) { - JSONObject param = new JSONObject(); - param.put("device_code", this.device_code); - param.put("mode", Math.min(mode, 3)); - param.put("device_name", this.getDevice().getDevice_name()); - param.put("device_type", CommonFinalParam.ONE); - requireSucess = false; - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess); - logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); - } - if (move != 0 && task > 0) { - - update_instruction_status(); - } - - } catch (Exception e) { - logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + Arrays.toString(e.getStackTrace())); - - } - - if (mode == 0) { - this.setIsonline(false); - //有报警 - } else if (error != 0) { - this.setIserror(true); - message = "one_mode5"; - //申请异常位任务 - applyErrorTask(); - } else { - this.setIsonline(true); - this.setIserror(false); - message = ""; - Instruction instruction = null; - List toInstructions; - //木箱入库申请入库任务 - if (mode == 6 && !requireSucess){ - applyIn(StorageTypeEnum.BOX_IN.getType()); - } - - //子卷入库申请入库任务 - if (mode == 7 && !requireSucess){ - applyIn(StorageTypeEnum.STORAGE.getType()); - } - - //申请入库指令、异常位指令 - if (mode == 2 && move == 1 && !requireSucess) { - boolean res = instruction_require(); - if (res) { - notCreateInstMessage = ""; - notCreateTaskMessage = ""; - feedMessage = ""; - } - } else { - if (mode == 2) { - //if (!requireSucess) { - String remark = "";; - if (mode != 2) { - remark = remark + "universal_remark2"; - } - if (move != 0) { - remark = remark + "universal_remark3"; - } - if (task != 0) { - remark = remark + LangProcess.msg("universal_remark4"); - - if (ObjectUtil.isNotEmpty(this.inst)) { - this.inst = null; - } - } - if (requireSucess) { - remark = remark + LangProcess.msg("universal_remark5"); - - } - this.setNotCreateTaskMessage(remark); - //} - } - } - - } - last_mode = mode; - last_move = move; - last_action = action; - last_error = error; - last_task = task; - last_heartbeat = heartbeat; - last_to_task = to_task; - last_to_command = to_command; - last_to_target = to_target; - last_hj_task = hj_task; - last_container_type = container_type; - last_carrier_direction = carrier_direction; - last_qty = qty; - last_weight = weight; - last_barcode = barcode; - } - - private void applyErrorTask() { - Date date = new Date(); - if (date.getTime() - this.require_apply_strangulation_time.getTime() - < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - try { - JSONObject param = new JSONObject(); - param.put("device_code", device_code); - param.put("vehicle_code", barcode); - param.put("material_barcode", material_barcode); - param.put("type", StorageTypeEnum.ERROR.getType()); - LuceneLogDto logDto = LuceneLogDto.builder() - .device_code(device_code) - .content("木箱入库申请异常位任务,参数:" + param) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto); - HttpResponse response = acsToWmsService.shipDeviceUpdate(param); - if (response == null || response.getStatus() == 200) { - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("木箱入库申请异常位任务,接口返回:" + response.body()) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto2); - } - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - private void applyIn(String type) { - Date date = new Date(); - if (date.getTime() - this.require_apply_strangulation_time.getTime() - < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - try { - JSONObject param = new JSONObject(); - param.put("device_code", device_code); - param.put("vehicle_code", barcode); - param.put("material_barcode", material_barcode); - param.put("type", type); - LuceneLogDto logDto = LuceneLogDto.builder() - .device_code(device_code) - .content("申请空托盘出入库,参数:" + param) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto); - String response = acsToWmsService.applyTwo(param); - JSONObject jo = JSON.parseObject(response); - if (response == null || jo.getInteger("status") == 200) { - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("木箱入库申请入库任务,参数,接口返回:" + jo) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto2); - this.requireSucess = true; - }else { - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("木箱入库申请入库任务,返回参数:" + jo.getString("body")) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto2); - } - } - catch (Exception e) { - e.printStackTrace(); - } - } - } - - /** - * 更新指令状态 - */ - public synchronized void update_instruction_status() throws Exception { - Date date = new Date(); - if (date.getTime() - this.instruction_update_time.getTime() < (long) this.instruction_update_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_update_time_out); - - } else { - this.instruction_update_time = date; - inst = checkInst(); - if (inst != null) { - inst_message = "当前指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code() + " 载具号：" + inst.getVehicle_code(); - vehicle_code = inst.getVehicle_code(); - task_code = inst.getTask_code(); - if (StrUtil.equals(inst.getInstruction_status(), "0") && StrUtil.equals(this.getDeviceCode(), inst.getStart_device_code())) { - inst.setInstruction_status("1"); - inst.setExecute_device_code(this.device_code); - instructionService.update(inst); - logServer.deviceExecuteLog(device_code, "", "", "纸箱入库输送线任务开始反馈执行中状态,反馈成功,指令号:" + task + ",载具号:" + inst.getVehicle_code()); - } - if (StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.BUSY.getIndex()) || StrUtil.equals(inst.getInstruction_status(), InstructionStatusEnum.READY.getIndex())) { - if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) { - inst.setExecute_device_code(this.device_code); - if (mode == 2) { - finish_instruction(); - } - logServer.deviceExecuteLog(device_code, "", "", "纸箱入库输送线任务开始反馈完成状态,反馈成功,指令号:" + task + ",载具号:" + inst.getVehicle_code()); - } else { - - } - } - } else { -// message = "输送线任务反馈状态,查询不到指令号:" + task +"指令已完成"; - inst_message = null; - } - - } - } - - /** - * 请求指令 - */ - public synchronized boolean instruction_require() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - //判断是否存在起点相同 任务状态就绪的任务 - TaskDto taskdto = taskserver.findByStartCodeAndReady(device_code); - if (!ObjectUtil.isEmpty(taskdto)) { - - String taskid = taskdto.getTask_id(); - String taskcode = taskdto.getTask_code(); - String vehiclecode = taskdto.getVehicle_code(); - String priority = taskdto.getPriority(); - Instruction instdto = new Instruction(); - if (TaskTypeEnum.AGV_Task.getIndex().equals(taskdto.getTask_type())){ - String route_plan_code = taskdto.getRoute_plan_code(); - - List shortPathsList = routeLineService.getShortPathLines(taskdto.getStart_device_code(), taskdto.getNext_device_code(), route_plan_code); - if (CollectionUtil.isEmpty(shortPathsList)){ - return false; - } - RouteLineDto routeLineDto = shortPathsList.get(0); - String path = routeLineDto.getPath(); - String[] str = path.split("->"); - List pathlist = Arrays.asList(str); - Integer start = 0; - String start_device_code = pathlist.get(start); - String next_device_code = pathlist.get(start+1); - packageInstrcutData(instdto, taskdto, taskid, taskcode, vehiclecode, priority,start_device_code,next_device_code); - }else { - - - packageInstrcutData(instdto, taskdto, taskid, taskcode, vehiclecode, priority,taskdto.getStart_device_code(),taskdto.getNext_device_code()); - } - try { - instructionService.create(instdto); - } catch (Exception e) { - e.printStackTrace(); - log.error("指令创建失败!", e.getMessage()); - return false; - } - Device nextdevice = deviceAppservice.findDeviceByCode(taskdto.getNext_device_code()); - - //创建指令后修改任务状态 - taskdto.setTask_status(TaskStatusEnum.BUSY.getIndex()); - taskserver.update(taskdto); - String next_addr = nextdevice.getExtraValue().get("address").toString(); - - List list = new ArrayList(); - Map map = new HashMap(); - map.put("code", "to_target"); - map.put("value", next_addr); - list.add(map); - Map map2 = new HashMap(); - map2.put("code", "to_task"); - map2.put("value", instdto.getInstruction_code()); - list.add(map2); - Map map3 = new HashMap(); - map3.put("code", "to_command"); - map3.put("value", "1"); - list.add(map3); - this.writing(list); - requireSucess = true; - while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString() - , instdto.getInstruction_code())) { - this.writing(list); - logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号"); - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - if (ObjectUtil.isEmpty(taskserver.findByCode(taskdto.getTask_code()))) { - requireSucess = false; - return false; - } - } - } - return true; - } - } - - private void packageInstrcutData(Instruction instdto, TaskDto taskdto, String taskid, String taskcode, String vehiclecode, String priority,String startCode, String endCode) { - instdto.setInstruction_id(IdUtil.simpleUUID()); - instdto.setRoute_plan_code(taskdto.getRoute_plan_code()); - instdto.setRemark(taskdto.getRemark()); - instdto.setMaterial(taskdto.getMaterial()); - instdto.setQuantity(taskdto.getQuantity()); - instdto.setTask_id(taskid); - instdto.setTask_code(taskcode); - instdto.setVehicle_code(vehiclecode); - String now = DateUtil.now(); - instdto.setCreate_time(now); - instdto.setCreate_by(SecurityUtils.getCurrentNickName()); - instdto.setStart_device_code(startCode); - instdto.setNext_device_code(endCode); - instdto.setStart_point_code(startCode); - instdto.setNext_point_code(endCode); - instdto.setPriority(priority); - instdto.setInstruction_status("0"); - instdto.setExecute_device_code(device_code); - instdto.setInstruction_type(taskdto.getTask_type()); - } - - - public void writing(List list) { - -// Map itemMap = new HashMap(); -// for (int i = 0; i < list.size(); i++) { -// Object ob = list.get(i); -// JSONObject json = (JSONObject) JSONObject.toJSON(ob); -// if (!StrUtil.isEmpty(json.getString("value"))) { -// String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() -// + "." + json.getString("code"); -// itemMap.put(to_param, json.getString("value")); -// } -// } -// logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); -// try { -// this.checkcontrol(itemMap); -// } catch (Exception e) { -// e.printStackTrace(); -// try { -// this.checkcontrol(itemMap); -// } catch (Exception e1) { -// e1.printStackTrace(); -// } -// } - - } - public synchronized boolean finish_instruction() throws Exception { - instructionService.finish(inst); - return true; - } - - @Override - public JSONObject getDeviceStatusName() { - JSONObject jo = new JSONObject(); - String mode = ""; - String move = ""; - String action = ""; - String walk_y = ""; - if (this.getMode() == 0) { - mode = LangProcess.msg("universal_off-line"); - } else if (this.getMode() == 1) { - mode = LangProcess.msg("universal_stand-alone"); - } else if (this.getMode() == 2) { - mode = LangProcess.msg("universal_standby"); - } else if (this.getMode() == 3) { - mode = LangProcess.msg("universal_operation"); - }else if (this.getMode() == 6) { - mode = LangProcess.msg("one_mode1"); - } - - - if (this.getMove() == 0) { - move = LangProcess.msg("universal_no"); - jo.put("hasGoods", false); - } else if (this.getMove() == 1) { - move = LangProcess.msg("universal_yes"); - jo.put("hasGoods", true); - } else if (this.getMove() == 2) { - move = LangProcess.msg("universal_two_yes"); - jo.put("hasGoods", true); - } - - - String requireSucess = "0"; - if (this.requireSucess) { - requireSucess = "1"; - } - jo.put("requireSucess", requireSucess); - - - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("task", task); - jo.put("isOnline", this.getIsonline()); - jo.put("error", this.getError()); - jo.put("isError", this.getIserror()); - jo.put("message", LangProcess.msg(message)); - jo.put("notCreateTaskMessage", notCreateTaskMessage); - jo.put("notCreateInstMessage", notCreateInstMessage); - jo.put("feedMessage", LangProcess.msg(feedMessage)); - jo.put("driver_type", "siemens_conveyor"); - jo.put("is_click", true); - return jo; - } - - @Override - public void setDeviceStatus(JSONObject data) { - String requestSucess = data.getString("requireSucess"); - if (StrUtil.equals(requestSucess, "0")) { - this.requireSucess = false; - } else if (StrUtil.equals(requestSucess, "1")) { - this.requireSucess = true; - } - } - - @Override - public JSONObject feedLmsRealFailedInfo() { - JSONObject jo = new JSONObject(); - jo.put("device_code", this.getDevice().getDevice_code()); - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("fault_code", String.valueOf(error)); - jo.put("fault_info", ErrorUtil.getDictDetail(error_type, String.valueOf(this.getError()))); - jo.put("fault_type", error_type); - return jo; - } - - - public Instruction checkInst() { - if (ObjectUtil.isNotEmpty(this.inst)) { - if (this.task > 0) { - if (this.inst.getInstruction_code().equals(String.valueOf(this.task))) { - return this.inst; - } else { - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - return inst; - } - } - } else { - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - return inst; - } - return null; - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java deleted file mode 100644 index d13d403..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java +++ /dev/null @@ -1,209 +0,0 @@ -package org.nl.acs.device_driver.one_conveyor.scanner_weight_conveyor; - -import cn.hutool.core.util.StrUtil; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - /** - * 心跳 - */ - public static String item_heartbeat = "heartbeat"; - /** - * 工作模式 - */ - public static String item_mode = "mode"; - /** - * 光电信号 - */ - public static String item_move = "move"; - /** - * 动作信号 - */ - public static String item_action = "action"; - /** - * 报警 - */ - public static String item_error = "error"; - /** - * 数量 - */ - public static String item_qty = "qty"; - /** - * 任务号 - */ - public static String item_task = "task"; - - /** - * 载具类型 - */ - public static String item_container_type="container_type"; - /** - * 托盘方向 - */ - public static String item_carrier_direction="carrier_direction"; - - - /** - * 托盘条码 - */ - public static String item_barcode = "barcode"; - - /** - * 子卷条码 - */ - public static String item_material_barcode = "material_barcode"; - /** - * 重量 - */ - public static String item_weight = "weight"; - - - /** - * 下发命令 - */ - public static String item_to_command = "to_command"; - /** - * 下发目标站 - */ - public static String item_to_target = "to_target"; - /** - * 下发任务号 - */ - public static String item_to_task = "to_task"; - /** - * 下发托盘类型 - */ - public static String item_to_container_type = "to_container_type"; - - private ConveyorWithScannerWeightDeviceDriver driver; - - public ItemProtocol(ConveyorWithScannerWeightDeviceDriver driver){ - this.driver=driver; - } - - public int getHeartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public int getMode() { - return this.getOpcIntegerValue(item_mode); - } - - public int getMove() { - return this.getOpcIntegerValue(item_move); - } - - public int getAction() { - return this.getOpcIntegerValue(item_action); - } - - public int getError() { - return this.getOpcIntegerValue(item_error); - } - - public int getTask() { - return this.getOpcIntegerValue(item_task); - } - - public int getQty(){ - return this.getOpcIntegerValue(item_qty); - } - - public int getCarrier_direction(){ - return this.getOpcIntegerValue(item_carrier_direction); - } - - - public String getBarcode() { - return this.getOpcStringValue(item_barcode); - } - - public String getMaterialBarcode() { - return this.getOpcStringValue(item_material_barcode); - } - - public int getWeight(){ - return this.getOpcIntegerValue(item_weight); - } - public int getTo_task() { - return this.getOpcIntegerValue(item_to_task); - } - - public int getTo_command() { - return this.getOpcIntegerValue(item_to_command); - } - - public int getTo_target() { - return this.getOpcIntegerValue(item_to_target); - } - - public int getContainer_type(){ - return this.getOpcIntegerValue(item_container_type); - } - - public int getTo_container_type(){ - return this.getOpcIntegerValue(item_to_container_type); - } - - - Boolean isonline; - - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (StrUtil.isBlank(value)) { - //throw new BusinessException("{} : {}", new Object[]{protocol, DeviceErrorProtocol.getMessage(10000)}); - - } else { - return value; - } - return "0"; - } - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - // log.error(this.getDriver().getDeviceCode() + ":protocol " + protocol + " 信号同步异常!"); - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB1.B0")); - list.add(new ItemDto(item_mode, "工作模式", "DB1.B1")); - list.add(new ItemDto(item_move, "光电信号", "DB1.B2")); - list.add(new ItemDto(item_action, "动作信号", "DB1.B3")); - list.add(new ItemDto(item_error, "报警信号", "DB1.B5")); - list.add(new ItemDto(item_task, "任务号", "DB1.D6")); - list.add(new ItemDto(item_container_type, "托盘类型", "DB1.B7")); - list.add(new ItemDto(item_carrier_direction, "托盘方向", "DB1.B8")); - list.add(new ItemDto(item_qty, "数量", "DB1.B9")); - list.add(new ItemDto(item_weight, "重量", "DB1.B10")); - list.add(new ItemDto(item_barcode, "托盘条码", "DB602.STRING1.50")); - list.add(new ItemDto(item_material_barcode, "子卷条码", "DB601.STRING1.50")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList<>(); - list.add(new ItemDto(item_to_command, "下发命令", "DB2.W0")); - list.add(new ItemDto(item_to_target, "下发目标站", "DB2.W4")); - list.add(new ItemDto(item_to_task, "下发任务号", "DB2.D6")); - list.add(new ItemDto(item_to_container_type, "下发托盘类型", "DB2.W8")); - return list; - } - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java deleted file mode 100644 index da8557f..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java +++ /dev/null @@ -1,470 +0,0 @@ -package org.nl.acs.device_driver.stacker.standard_stacker; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import java.util.ArrayList; -import java.util.List; - -@Slf4j -@Data -public class ItemProtocol { - - /** - * 心跳 - */ - public static String item_heartbeat = "heartbeat"; - - /** - * 堆垛机号 - */ - public static String item_deviceCode = "deviceCode"; - - /** - * 工作模式 - */ - public static String item_mode = "mode"; - - /** - * 作业状态 - */ - public static String item_command = "command"; - - /** - * 任务号 - */ - public static String item_task = "task"; - - /** - * y轴报警(载货台) - */ - public static String item_error = "error"; - - /** - * 行走排号 - */ - public static String item_z = "z"; - - /** - * 行走列 - */ - public static String item_x = "x"; - - /** - * 行走层号 - */ - public static String item_y = "y"; - - /** - * 行走开关信号 - */ - public static String item_move = "move"; - - /** - * 载货台开关信号 - */ - public static String item_cargoMove = "cargoMove"; - - /** - * 行走动作信号 - */ - public static String item_action = "action"; - - /** - * 行走激光数值 - */ - public static String item_distancex = "distancex"; - - /** - * 起升激光数值 - */ - public static String item_distancey = "distancey"; - - /** - * 载货台超限信号 - */ - public static String item_cargoError = "cargoError"; - - /** - * 货叉探货信号 - */ - public static String item_forkCargo = "forkCargo"; - - /** - * 货叉位置信号 - */ - public static String item_forkLocation = "forkLocation"; - - /** - * 货叉动作信号 - */ - public static String item_forkAction = "forkAction"; - /** - * 特殊开关量1 - */ - public static String item_special1 = "special1"; - /** - * 特殊开关量2 - */ - public static String item_special2 = "special2"; - /** - * 托盘条码 - */ - public static String item_trayCode = "trayCode"; - /** - * 水箱和消防缓存位有无货 - */ - public static String item_storage_cache = "storage_cache"; - /** - * 速度（转/分钟） - */ - public static String item_stacker_rpm = "stacker_rpm"; - /** - * 电流 - */ - public static String item_stacker_electricCurrent = "stacker_electric Current"; - - /** - * 轴运行次数 - */ - public static String item_stacker_runing_time = "stacker_runing time"; - /** - * 轴工作时间（小时） - */ - public static String item_stacker_workingHours = "stacker_workingHours"; - /** - * 载货台速度（转/分钟） - */ - public static String item_cargo_rpm = "cargo_rpm"; - /** - * 载货台电流 - */ - public static String item_cargo_electric_Current = "cargo_electric Current"; - /** - * 载货台轴工作小时数 - */ - public static String item_cargo_workingHours = "cargo_workingHours"; - /** - * 载货台轴运行次数 - */ - public static String item_cargo_runingTimes = "cargo_runingTimes"; - /** - * 货叉速度（转/分钟 - */ - public static String item_fork_rpm = "fork_rpm"; - /** - * 货叉电流 - */ - public static String item_fork_electric_Current = "fork_electric Current"; - - /** - * 货叉轴工作时间（小时 - */ - public static String item_fork_workingHours = "fork_workingHours"; - /** - * 货叉轴运行次数 - */ - public static String item_fork_runingTimes = "fork_runingTimes"; - - /** - * 心跳 - */ - public static String item_to_heartbeat = "to_heartbeat"; - - /** - * 堆垛机号 - */ - public static String item_to_device_code = "to_device_code"; - /** - * 轴运行次数 - */ - public static String item_to_command = "to_command"; - /** - * 物料类型 - */ - public static String item_to_type = "to_type"; - /** - * 任务号 - */ - public static String item_to_task = "to_task"; - /** - * 作业排 - */ - public static String item_to_z = "to_z"; - /** - * 作业列 - */ - public static String item_to_x = "to_x"; - /** - * 作业层 - */ - public static String item_to_y = "to_y"; - /** - * 托盘号 - */ - public static String item_to_trayCode = "to_trayCode"; - - - Boolean isonline; - - private StandardStackerDeviceDriver driver; - - public ItemProtocol(StandardStackerDeviceDriver driver) { - this.driver = driver; - } - - public Integer getItem_heartbeat() { - return this.getOpcIntegerValue(item_heartbeat); - } - - public Integer getItem_deviceCode() { - return this.getOpcIntegerValue(item_deviceCode); - } - - public Integer getItem_mode() { - return this.getOpcIntegerValue(item_mode); - } - - ; - - public Integer getItem_command() { - return this.getOpcIntegerValue(item_command); - } - - public Integer getItem_task() { - return this.getOpcIntegerValue(item_task); - } - - public Integer getItem_error() { - return this.getOpcIntegerValue(item_error); - } - - public Integer getItem_z() { - return this.getOpcIntegerValue(item_z); - } - - public Integer getItem_x() { - return this.getOpcIntegerValue(item_x); - } - - public Integer getItem_y() { - return this.getOpcIntegerValue(item_y); - } - - public float getItem_move() { - return this.getOpcFloatValue(item_move); - } - - public float getItem_cargoMove() { - return this.getOpcFloatValue(item_cargoMove); - } - - public float getItem_action() { - return this.getOpcFloatValue(item_action); - } - - public Integer getItem_distancex() { - return this.getOpcIntegerValue(item_distancex); - } - - public Integer getItem_distancey() { - return this.getOpcIntegerValue(item_distancey); - } - - public float getItem_cargoError() { - return this.getOpcFloatValue(item_cargoError); - } - - public float getItem_forkCargo() { - return this.getOpcFloatValue(item_forkCargo); - } - - public float getItem_forkLocation() { - return this.getOpcFloatValue(item_forkLocation); - } - - public float getItem_forkAction() { - return this.getOpcFloatValue(item_forkAction); - } - - public float getItem_special1() { - return this.getOpcFloatValue(item_special1); - } - - public float getItem_special2() { - return this.getOpcFloatValue(item_special2); - } - - public int[] getItem_trayCode() { - return this.getOpcIntegerArrayValue(item_trayCode); - } - - public float getItem_storage_cache() { - return this.getOpcFloatValue(item_storage_cache); - } - - public Integer getItem_stacker_rpm() { - return this.getOpcIntegerValue(item_stacker_rpm); - } - - public Integer getItem_stacker_electricCurrent() { - return this.getOpcIntegerValue(item_stacker_electricCurrent); - } - - public Integer getItem_stacker_workingHours() { - return this.getOpcIntegerValue(item_stacker_workingHours); - } - - public Integer getItem_stacker_runing_time() { - return this.getOpcIntegerValue(item_stacker_runing_time); - } - - public Integer getItem_cargo_rpm() { - return this.getOpcIntegerValue(item_cargo_rpm); - } - - public Integer getItem_cargo_electric_Current() { - return this.getOpcIntegerValue(item_cargo_electric_Current); - } - - public Integer getItem_cargo_workingHours() { - return this.getOpcIntegerValue(item_cargo_workingHours); - } - - public Integer getItem_cargo_runingTimes() { - return this.getOpcIntegerValue(item_cargo_runingTimes); - } - - public Integer getItem_fork_rpm() { - return this.getOpcIntegerValue(item_fork_rpm); - } - - public Integer getItem_fork_electric_Current() { - return this.getOpcIntegerValue(item_fork_electric_Current); - } - - public Integer getItem_fork_workingHours() { - return this.getOpcIntegerValue(item_fork_workingHours); - } - - public Integer getItem_fork_runingTimes() { - return this.getOpcIntegerValue(item_fork_runingTimes); - } - - - public int getOpcIntegerValue(String protocol) { - Integer value = this.driver.getIntegeregerValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - - public String getOpcStringValue(String protocol) { - String value = this.driver.getStringValue(protocol); - if (value == null) { - setIsonline(false); - return "0"; - } else { - setIsonline(true); - return value; - } - } - - public int[] getOpcIntegerArrayValue(String protocol) { - int[] value = this.driver.getIntegerArrayValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return new int[20]; - } - - public float getOpcFloatValue(String protocol) { - Float value = this.driver.getDoubleValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0; - } - - - public Long getOpcLongValue(String protocol) { - Long value = this.driver.getLongValue(protocol); - if (value == null) { - setIsonline(false); - } else { - setIsonline(true); - return value; - } - return 0L; - } - - public static List getReadableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_heartbeat, "心跳", "DB101.BO")); - list.add(new ItemDto(item_deviceCode, "堆垛机号", "DB101.B1")); - list.add(new ItemDto(item_mode, "工作模式", "DB101.B2")); - list.add(new ItemDto(item_command, "作业状态", "DB101.B3")); - list.add(new ItemDto(item_task, "任务号", "DB101.D4")); - list.add(new ItemDto(item_error, "Y轴报警(载货台)", "DB101.B8")); - list.add(new ItemDto(item_z, "行走排号", "DB101.B9")); - list.add(new ItemDto(item_x, "行走列号", "DB101.B10")); - list.add(new ItemDto(item_y, "行走层号", "DB101.B11")); - list.add(new ItemDto(item_move, "行走开关信号", "DB101.B12")); - list.add(new ItemDto(item_cargoMove, "载货台开关信号", "DB101.B13")); - list.add(new ItemDto(item_action, "行走动作信号", "DB101.B14")); - list.add(new ItemDto(item_distancex, "行走激光数值", "DB101.D16")); - list.add(new ItemDto(item_distancey, "起升激光数值", "DB101.D20")); - list.add(new ItemDto(item_cargoError, "载货台超限信号", "DB101.B24")); - list.add(new ItemDto(item_forkCargo, "货叉探货信号", "DB101.B25")); - list.add(new ItemDto(item_forkLocation, "货叉位置信号", "DB101.B26")); - list.add(new ItemDto(item_forkAction, "货叉动作信号", "DB101.B27")); - list.add(new ItemDto(item_special1, "特殊开关量1", "DB101.B28")); - list.add(new ItemDto(item_special2, "特殊开关量2", "DB101.B29")); - list.add(new ItemDto(item_trayCode, "托盘条码", "DB101.B30.20")); - list.add(new ItemDto(item_storage_cache, "水箱和消防缓存位有无货", "DB101.B50")); - list.add(new ItemDto(item_stacker_rpm, "速度(转/分钟)", "DB101.W52")); - list.add(new ItemDto(item_stacker_electricCurrent, "电流", "DB101.W54")); - list.add(new ItemDto(item_stacker_workingHours, "轴工作时间(小时)", "DB101.D56")); - list.add(new ItemDto(item_stacker_runing_time, "轴运行次数", "DB101.D60")); - list.add(new ItemDto(item_cargo_rpm, "载货台速度(转/分钟)", "DB101.W64")); - list.add(new ItemDto(item_cargo_electric_Current, "载货台电流", "DB101.W66")); - list.add(new ItemDto(item_cargo_workingHours, "载货台轴工作小时数", "DB101.D68")); - list.add(new ItemDto(item_cargo_runingTimes, "载货台轴运行次数", "DB101.D72")); - list.add(new ItemDto(item_fork_rpm, "货叉速度(转/分钟)", "DB101.W76")); - list.add(new ItemDto(item_fork_electric_Current, "货叉电流", "DB101.W78")); - list.add(new ItemDto(item_fork_workingHours, "货叉轴工作时间(小时)", "DB101.D80")); - list.add(new ItemDto(item_fork_runingTimes, "货叉轴运行次数", "DB101.D84")); - return list; - } - - public static List getWriteableItemDtos() { - ArrayList list = new ArrayList(); - list.add(new ItemDto(item_to_heartbeat, "心跳", "DB100.B0")); - list.add(new ItemDto(item_to_device_code, "堆垛机号", "DB100.B1")); - list.add(new ItemDto(item_to_command, "作业命令", "DB100.B2")); - list.add(new ItemDto(item_to_type, "物料类型", "DB100.B3")); - list.add(new ItemDto(item_to_task, "任务号", "DB100.D4")); - list.add(new ItemDto(item_to_z, "作业排", "DB100.B8")); - list.add(new ItemDto(item_to_x, "作业列", "DB100.B9")); - list.add(new ItemDto(item_to_y, "作业层", "DB100.B10")); - list.add(new ItemDto(item_to_trayCode, "托盘号", "DB100.B11.20")); - return list; - } - - - @Override - public String toString() { - return ""; - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandarStirageErroEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandarStirageErroEnum.java deleted file mode 100644 index d9e033b..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandarStirageErroEnum.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.nl.acs.device_driver.stacker.standard_stacker; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum StandarStirageErroEnum { - FILL("1", "入库货位满"), - - VOIDANCE("2", "出库货位空"), - - BLOCK_OUT("3", "取货潜货位阻挡"), - - BLOCK_IN("4", "放货潜货位阻挡"); - /** - * 索引 - */ - private String type; - /** - * 编码 - */ - private String value; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java deleted file mode 100644 index 272925e..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ /dev/null @@ -1,1136 +0,0 @@ -package org.nl.acs.device_driver.stacker.standard_stacker; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import lombok.Data; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.checkerframework.common.value.qual.StringVal; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceExtraService; -import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; -import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver; -import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; -import org.nl.acs.history.service.DeviceErrorLogService; -import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.impl.RouteLineServiceImpl; -import org.nl.acs.task.domain.Task; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.utils.RedisUtils; -import org.nl.config.SpringContextHolder; -import org.nl.config.language.LangProcess; -import org.nl.config.lucene.service.LuceneExecuteLogService; -import org.nl.config.lucene.service.dto.LuceneLogDto; -import org.springframework.beans.factory.annotation.Autowired; - -import java.util.*; -import java.util.regex.Pattern; - -/** - * 单工位堆垛机驱动 - */ -@Slf4j -@Data -@RequiredArgsConstructor -public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor { - protected ItemProtocol itemProtocol = new ItemProtocol(this); - @Autowired - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - @Autowired - TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl"); - @Autowired - InstructionService instructionService = SpringContextHolder.getBean("instructionServiceImpl"); - @Autowired - DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - @Autowired - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineServiceImpl.class); - @Autowired - DeviceExtraService deviceExtraService = SpringContextHolder.getBean(DeviceExtraServiceImpl.class); - @Autowired - DeviceErrorLogService errorLogServer = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); - - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); - - LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); - - public static final String REDIS_MOVE_BOX = "MOVE:MOVE_TASK"; - - @Autowired - private RedisUtils redisUtils; - - /** - * 禁止入库 - */ - private boolean prohibitInWarehouse = false; - /** - * 禁止出库 - */ - private boolean prohibitOutWarehouse = false; - /** - * 停止接收任务 - */ - private boolean stopReceiveTask = false; - - /** - * 心跳 - */ - Integer heartbeat = 0; - Integer last_heartbeat = 0; - /** - * 堆垛机号 - */ - Integer item_deviceCode = 0; - Integer last_item_deviceCode = 0; - /** - * 工作模式 - */ - Integer mode = 0; - Integer last_mode = 0; - /** - * 作业状态 - */ - Integer command = 0; - Integer last_command = 0; - /** - * 任务号 - */ - Integer task = 0; - Integer last_task = 0; - /** - * y轴报警(载货台) - */ - Integer error = 0; - Integer last_error = 0; - /** - * 行走排号 - */ - Integer z = 0; - Integer last_z = 0; - /** - * 行走列 - */ - Integer x = null; - Integer last_x = null; - /** - * 行走层号 - */ - Integer y = 0; - Integer last_y = 0; - /** - * 行走开关信号 - */ - Float move = 0F; - Float last_move = 0F; - /** - * 载货台开关信号 - */ - Float cargoMove = 0F; - Float last_cargoMove = 0F; - /** - * 行走动作信号 - */ - Float action = 0F; - Float last_action = 0F; - /** - * 行走激光数值 - */ - Integer distancex = 0; - Integer last_distancex = 0; - /** - * 起升激光数值 - */ - Integer distancey = 0; - Integer last_distancey = 0; - /** - * 载货台超限信号 - */ - Float cargoError = 0F; - Float last_cargoError = 0F; - /** - * 货叉探货信号 - */ - Float forkCargo = 0F; - Float last_forkCargo = 0F; - /** - * 货叉位置信号 - */ - Float forkLocation = 0F; - Float last_forkLocation = 0F; - /** - * 货叉动作信号 - */ - Float forkAction = 0F; - Float last_forkAction = 0F; - /** - * 特殊开关量1 - */ - Float special1 = 0F; - Float last_special1 = 0F; - /** - * 特殊开关量2 - */ - Float special2 = 0F; - Float last_special2 = 0F; - /** - * 托盘条码 - */ - int[] trayCode; - int[] last_trayCode; - /** - * 水箱和消防缓存位有无货 - */ - Float storage_cache = 0F; - Float last_storage_cache = 0F; - /** - * 速度（转/分钟） - */ - Integer stacker_rpm = 0; - Integer last_stacker_rpm = 0; - /** - * 电流 - */ - Integer stacker_electricCurrent = 0; - Integer last_stacker_electricCurrent = 0; - /** - * 轴运行次数 - */ - Integer stacker_runing_time = 0; - Integer last_stacker_runing_time = 0; - /** - * 轴工作时间（小时） - */ - Integer stacker_workingHours = 0; - Integer last_stacker_workingHours = 0; - /** - * 载货台速度（转/分钟） - */ - Integer cargo_rpm = 0; - Integer last_cargo_rpm = 0; - /** - * 载货台电流 - */ - Integer cargo_electric_Current = 0; - Integer last_cargo_electric_Current = 0; - /** - * 载货台轴工作小时数 - */ - Integer cargo_workingHour = 0; - Integer last_cargo_workingHour = 0; - /** - * 载货台轴运行次数 - */ - Integer cargo_runingTimes = 0; - Integer last_cargo_runingTimes = 0; - /** - * 货叉速度（转/分钟 - */ - Integer fork_rpm = 0; - Integer last_fork_rpm = 0; - /** - * 货叉电流 - */ - Integer fork_electric_Current = 0; - Integer last_fork_electric_Current = 0; - /** - * 货叉轴工作时间（小时 - */ - Integer fork_workingHours = 0; - Integer last_fork_workingHours = 0; - /** - * 货叉轴运行次数 - */ - Integer fork_runingTimes = 0; - Integer last_fork_runingTimes = 0; - - String message = null; - - String device_code = null; - - String notCreateInstMessage = null; - - private int instruction_require_time_out = 3000; - private int instruction_update_time_out = 3000; - private Date instruction_require_time = new Date(); - private Date instruction_update_time = new Date(); - List getDeviceCodeList = null; - List putDeviceCodeList = null; - - /** - * 请求成功标记 - */ - Boolean requireSucess = false; - - /** - * 当前指令 - */ - Instruction inst = null; - - - - - @Override - public Device getDevice() { - return this.device; - } - - @Override - public void execute() throws Exception { - try { - device_code = this.getDeviceCode(); - heartbeat = this.itemProtocol.getItem_heartbeat(); - item_deviceCode = this.itemProtocol.getItem_deviceCode(); - mode = this.itemProtocol.getItem_mode(); - command = this.itemProtocol.getItem_command(); - task = this.itemProtocol.getItem_task(); - error = this.itemProtocol.getItem_error(); - z = this.itemProtocol.getItem_z(); - x = this.itemProtocol.getItem_x(); - y = this.itemProtocol.getItem_y(); - move = this.itemProtocol.getItem_move(); - cargoMove = this.itemProtocol.getItem_cargoMove(); - action = this.itemProtocol.getItem_action(); - distancex = this.itemProtocol.getItem_distancex(); - distancey = this.itemProtocol.getItem_distancey(); - cargoError = this.itemProtocol.getItem_cargoError(); - forkCargo = this.itemProtocol.getItem_forkCargo(); - forkLocation = this.itemProtocol.getItem_forkLocation(); - forkAction = this.itemProtocol.getItem_forkAction(); - special1 = this.itemProtocol.getItem_special1(); - special2 = this.itemProtocol.getItem_special2(); - trayCode = this.itemProtocol.getItem_trayCode(); - storage_cache = this.itemProtocol.getItem_storage_cache(); - - - - // 更新指令状态 - if (mode == 3 && task > 0) { - Date date = new Date(); - if (date.getTime() - this.instruction_update_time.getTime() < (long) this.instruction_update_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_update_time_out); - - } else { - this.instruction_update_time = date; - //更改指令状态 - if (task > 0) { - Instruction inst = checkInst(); - if (inst != null) { - if (StrUtil.equals(inst.getInstruction_status(), "0")) { - inst.setInstruction_status(CommonFinalParam.ONE); - inst.setExecute_device_code(this.device_code); - instructionService.update(inst); - } - } - } - } - } - - } catch (Exception var17) { - var17.printStackTrace(); - logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)); - } - - - if (mode != 3 || requireSucess) { - message = "one_message7"; - - } else if (error != 0) { - message = "universal_message3"; - //指定库位满入 - if (error == 5) { - applyUpdatePointCode(StandarStirageErroEnum.FILL.getType()); - } - //空出 - if (error == 6) { - applyUpdatePointCode(StandarStirageErroEnum.VOIDANCE.getType()); - } - - //浅货位有货 - if (error == 16) { - //放货 - if (cargoMove == 1) { - applyUpdatePointCode(StandarStirageErroEnum.BLOCK_OUT.getType()); - } else if (cargoMove == 0) { - //取货 - applyUpdatePointCode(StandarStirageErroEnum.BLOCK_IN.getType()); - } - } - } else { - - List list = new ArrayList(); - switch (command) { - case 0: - boolean b = applyTask(); - if (b) { - requireSucess = true; - } - break; - case 1: - message = "universal_delivery"; - break; - case 2: - message = "universal_completed"; - Instruction instruction = checkInst(); - if (ObjectUtil.isEmpty(instruction)){ - message = "universal_message4"; - break; - } - String next_device_code = instruction.getNext_device_code(); - Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); - if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.conveyor.name())) { - if (ObjectUtil.isNotEmpty(nextDevice.getExtraValue().get("z"))) { - Map map = new HashMap(); - map.put("code", "to_x"); - map.put("value", nextDevice.getExtraValue().get("z")); - list.add(map); - } - if (ObjectUtil.isNotEmpty(nextDevice.getExtraValue().get("x"))) { - Map map = new HashMap<>(); - map.put("code", "to_z"); - map.put("value", nextDevice.getExtraValue().get("x")); - list.add(map); - } - if (ObjectUtil.isNotEmpty(nextDevice.getExtraValue().get("y"))) { - Map map = new HashMap<>(); - map.put("code", "to_y"); - map.put("value", nextDevice.getExtraValue().get("y")); - list.add(map); - } - } - if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.storage.name())) { - String pattern = "\\d+"; - Pattern compile = Pattern.compile(pattern); - Map map = new HashMap<>(); - map.put("code", "to_y"); - map.put("value", inst.getTo_z()); - list.add(map); - if (inst.getTo_x().length() > 1 && !compile.matcher(inst.getTo_x()).matches()) { - String substring = inst.getTo_x().substring(1); - Map map1 = new HashMap<>(); - map1.put("code", "to_z"); - map1.put("value", substring); - list.add(map1); - } else { - Map map2 = new HashMap<>(); - map2.put("code", "to_z"); - map2.put("value", inst.getTo_x()); - list.add(map2); - } - Map map3 = new HashMap<>(); - map3.put("code", "to_x"); - map3.put("value", inst.getTo_y()); - list.add(map3); - } - Map map4 = new HashMap<>(); - map4.put("code", "to_command"); - map4.put("value", 2); - list.add(map4); - requireSucess = true; - break; - case 3: - message = "universal_releasing"; - break; - case 4: - message = "one_message1"; - Instruction instruction1 = checkInst(); - String next_device_code1 = instruction1.getNext_device_code(); - Device nextDevice1 = deviceAppService.findDeviceByCode(next_device_code1); - if (ObjectUtil.isNotNull(instruction1)) { - //指令为执行 - SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; - if (nextDevice1.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) nextDevice1.getDeviceDriver(); - if (siemensConveyorDeviceDriver.getMode() != 2 || siemensConveyorDeviceDriver.getMove() == 1) { - notCreateInstMessage = "未下发电气信号原因->输送线-货架对接位:" + siemensConveyorDeviceDriver.getDevice_code() + - "有货或未联机,无法下发指令!指令号:" + inst.getInstruction_code(); - return; - } - } - Map map = new HashMap<>(); - map.put("code", "to_command"); - map.put("value", 4); - list.add(map); - } - requireSucess = true; - break; - case 5: - message = "universal_releasing_completed"; - Map map = new HashMap<>(); - map.put("code", "to_command"); - map.put("value", 5); - list.add(map); - Instruction inst = checkInst(); - try { - finish_instruction(inst); -// if (ObjectUtil.isNotEmpty(redisUtils.get(REDIS_MOVE_BOX))){ -// String taskRedis = redisUtils.get(REDIS_MOVE_BOX).toString(); -// task = Integer.valueOf(taskRedis); -// Instruction instOld = checkInst(); -// List list1 = new ArrayList(); -// pakageCommand(list1, taskRedis); -// pakagePlc(instOld, list1); -// if (ObjectUtil.isNotNull(list1)) { -// this.writing(list1); -// } -// } -// list.remove(0); - } catch (Exception e) { - e.printStackTrace(); - } - requireSucess = true; - break; - case 6: - message = "one_message2"; - Map map1 = new HashMap<>(); - map1.put("code", "to_command"); - map1.put("value", 6); - list.add(map1); - requireSucess = true; - break; - case 7: - message = "one_message3"; - Map map2 = new HashMap<>(); - map2.put("code", "to_command"); - map2.put("value", 7); - list.add(map2); - requireSucess = true; - break; - case 8: - message = "one_message4"; - Map map3 = new HashMap<>(); - map3.put("code", "to_command"); - map3.put("value", 8); - list.add(map3); - requireSucess = true; - break; - default: - message = "one_message5"; - requireSucess = true; - break; - } - if (ObjectUtil.isNotNull(list)) { - this.writing(list); - } - - } - last_heartbeat = heartbeat; - last_item_deviceCode = item_deviceCode; - last_mode = mode; - last_command = command; - last_task = task; - last_error = error; - last_z = z; - last_x = x; - last_y = y; - last_move = move; - last_cargoMove = cargoMove; - last_action = action; - last_distancex = distancex; - last_distancey = distancey; - last_cargoError = cargoError; - last_forkCargo = forkCargo; - last_forkLocation = forkLocation; - last_forkAction = forkAction; - last_special1 = special1; - last_special2 = special2; - last_trayCode = trayCode; - last_storage_cache = storage_cache; - /*last_stacker_rpm = stacker_rpm; - last_stacker_electricCurrent = stacker_electricCurrent; - last_stacker_runing_time = stacker_runing_time; - last_stacker_workingHours = stacker_workingHours; - last_cargo_rpm = cargo_rpm; - last_cargo_electric_Current = cargo_electric_Current; - last_cargo_workingHour = cargo_workingHour; - last_cargo_runingTimes = cargo_runingTimes; - last_fork_rpm = fork_rpm; - last_fork_electric_Current = fork_electric_Current; - last_fork_workingHours = fork_workingHours; - last_fork_runingTimes = fork_runingTimes;*/ - } - - /** - * 申请更新点位 - * @param type - */ - private void applyUpdatePointCode(String type) { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return; - } else { - Instruction instruction = instructionService.findByCode(String.valueOf(task)); - if (ObjectUtil.isEmpty(instruction)){ - message = "one_message9"; - return; - } - JSONObject param = new JSONObject(); - param.put("task_code", instruction.getTask_code()); - param.put("task_id", instruction.getTask_id()); - param.put("type", type); - String response = acsToWmsService.applyUpdatePointCode(param); - JSONObject jo = JSON.parseObject(response); - if (StrUtil.isNotEmpty(jo.getString("body")) || jo.getInteger("status") == 200) { - try { - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("申请更新点位,参数,接口返回:" + jo) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto2); - String poinCode = jo.getString("point_code"); - if (StrUtil.isNotEmpty(poinCode)) { - String[] split = poinCode.split("-"); - Device point = deviceAppService.findDeviceByCode(split[0]); - if (ObjectUtil.isEmpty(point)) { - message = "one_message18"; - } - if (type.equals(StandarStirageErroEnum.VOIDANCE.getType())) { - updateData1(poinCode, instruction, point, split); - pakageData(point, split); - } - if (type.equals(StandarStirageErroEnum.BLOCK_IN.getType()) || type.equals(StandarStirageErroEnum.FILL.getType())) { - updateData2(poinCode, instruction, point, split); - pakageData(point, split); - } - } - if (StrUtil.isNotEmpty(jo.getString("task_id"))) { - //取货潜货位阻挡做完移库任务 - if (type.equals(StandarStirageErroEnum.BLOCK_OUT.getType())) { - //存缓存 - redisUtils.set(REDIS_MOVE_BOX, task); - TaskDto taskId = taskserver.findById(jo.getString("task_id")); - if (ObjectUtil.isNotEmpty(taskId)) { - String poinCodeMove = taskId.getStart_point_code(); - String[] split = poinCodeMove.split("-"); - Device point = deviceAppService.findDeviceByCode(split[0]); - pakageData(point, split); - } - } - } - }catch (Exception e){ - this.requireSucess = true; - e.printStackTrace(); - } - - this.requireSucess = true; - } else { - LuceneLogDto logDto2 = LuceneLogDto.builder() - .device_code(device_code) - .content("申请更新点位,返回参数:" + jo.getString("body")) - .build(); - luceneExecuteLogService.deviceExecuteLog(logDto2); - } - } - } - - private void pakageData( Device point, String[] split) { - List list = new ArrayList(); - String x = point.getExtraValue().get("x").toString(); - String y = split[1]; - String z = split[2]; - HashMap map1 = new HashMap(); - map1.put("code", "to_x"); - map1.put("value", y); - list.add(map1); - HashMap map2 = new HashMap(); - map2.put("code", "to_y"); - map2.put("value", z); - list.add(map2); - HashMap map3 = new HashMap(); - map3.put("code", "to_z"); - map3.put("value", x); - list.add(map3); - if (ObjectUtil.isNotEmpty(list)) { - this.writing(list); - } - } - - private void updateData2(String poinCode, Instruction instruction, Device point, String[] split) { - Instruction instructionUpdate = checkInst(); - TaskDto taskUpdate = new TaskDto(); - instructionUpdate.setNext_point_code(poinCode); - instructionUpdate.setNext_device_code(split[0]); - taskUpdate.setNext_point_code(poinCode); - taskUpdate.setNext_device_code(split[0]); - taskUpdate.setTask_id(instructionUpdate.getTask_id()); - pakageData2(instruction, instructionUpdate, point, split, taskUpdate); - instructionService.update(instructionUpdate); - taskserver.update(taskUpdate); - } - - private void updateData1(String poinCode, Instruction instruction, Device point, String[] split) { - Instruction instructionUpdate = checkInst(); - TaskDto taskUpdate = new TaskDto(); - instructionUpdate.setStart_point_code(poinCode); - instructionUpdate.setStart_device_code(split[0]); - taskUpdate.setStart_point_code(poinCode); - taskUpdate.setStart_device_code(split[0]); - taskUpdate.setTask_id(instructionUpdate.getTask_id()); - pakageData1(instruction, instructionUpdate, point, split, taskUpdate); - //更新缓存数据库 - instructionService.update(instructionUpdate); - taskserver.update(taskUpdate); - } - - private void pakageData1(Instruction instruction, Instruction instructionUpdate, Device starPoint, String[] split, TaskDto taskUpdate) { - instructionUpdate.setFrom_x(starPoint.getExtraValue().get("x").toString()); - instructionUpdate.setFrom_y(split[1]); - instructionUpdate.setFrom_z(split[2]); - instructionUpdate.setInstruction_code(String.valueOf(task)); - taskUpdate.setFrom_x(starPoint.getExtraValue().get("x").toString()); - taskUpdate.setFrom_y(split[1]); - taskUpdate.setFrom_z(split[2]); - taskUpdate.setTask_code(instruction.getTask_code()); - - } - - - private void pakageData2(Instruction instruction, Instruction instructionUpdate, Device starPoint, String[] split, TaskDto taskUpdate) { - instructionUpdate.setTo_x(starPoint.getExtraValue().get("x").toString()); - instructionUpdate.setTo_y(split[1]); - instructionUpdate.setTo_z(split[2]); - instructionUpdate.setInstruction_code(String.valueOf(task)); - taskUpdate.setTo_x(starPoint.getExtraValue().get("x").toString()); - taskUpdate.setTo_y(split[1]); - taskUpdate.setTo_z(split[2]); - taskUpdate.setTask_code(instruction.getTask_code()); - } - - - - /** - * 申请任务 - * - * @param - */ - public synchronized boolean applyTask() { - Date date = new Date(); - if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_require_time_out); - return false; - } else { - this.instruction_require_time = date; - //输入:指令类型多种\ 指令状态多种\ - Instruction instruction1 = new Instruction(); - instruction1.setInstruction_status("0"); - List instructions = instructionService.findByDeviceCodes(instruction1, false); - if (CollUtil.isEmpty(instructions) || instructions.size() < 1) { - return false; - } - List instructionList = new ArrayList<>(); - for (Instruction instruction : instructions) { - List routeLineDtos = routeLineService.selectDeviceCodeList(instruction.getStart_device_code()); - if (CollUtil.isEmpty(routeLineDtos) || routeLineDtos.size() < 1) { - message = "one_message6"; - logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->" - + this.device_code + "的路由"); - continue; - } - for (RouteLineDto routeLineDto : routeLineDtos) { - if (this.getDeviceCode().equals(routeLineDto.getNext_device_code())) { - List routeLineDtoList = routeLineService.selectDeviceCodeList(this.getDeviceCode()); - if (CollUtil.isEmpty(routeLineDtos) || routeLineDtos.size() < 1) { - message = "one_message6"; - logServer.deviceExecuteLog(this.device_code, "", "", "没有" + instruction.getStart_device_code() + "->" - + this.device_code + "的路由"); - continue; - } - for (RouteLineDto routeLinedto : routeLineDtoList) { - if (instruction.getNext_device_code().equals(routeLinedto.getNext_device_code())) { - instructionList.add(instruction); - } - } - } - } - } - if (CollUtil.isEmpty(instructionList) || instructionList.size() < 1) { - return false; - } - instructionList = this.sortInst(instructionList); - inst = instructionList.get(0); - //指令未执行 - if (StrUtil.equals(inst.getInstruction_status(), "0")) { - String start_device_code = inst.getStart_device_code(); - Device startDevice = deviceAppService.findDeviceByCode(start_device_code); - BeltConveyorDeviceDriver beltConveyorDeviceDriver; - if (startDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { - beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) startDevice.getDeviceDriver(); - if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 0) { - notCreateInstMessage = "未下发电气信号原因->输送线-货架对接位:" + beltConveyorDeviceDriver.getDevice_code() + - "无货或未联机,无法下发指令!指令号:" + inst.getInstruction_code(); - return false; - } - } - List list = new ArrayList(); - - pakageCommand(list, inst.getInstruction_code()); - if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.conveyor.name())) { - if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("z"))) { - HashMap map4 = new HashMap(); - map4.put("code", "to_x"); - map4.put("value", startDevice.getExtraValue().get("z")); - list.add(map4); - } - if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("x"))) { - HashMap map5 = new HashMap(); - map5.put("code", "to_z"); - map5.put("value", startDevice.getExtraValue().get("x")); - list.add(map5); - } - if (ObjectUtil.isNotEmpty(startDevice.getExtraValue().get("y"))) { - HashMap map6 = new HashMap(); - map6.put("code", "to_y"); - map6.put("value", startDevice.getExtraValue().get("y")); - list.add(map6); - } - } - if (StrUtil.equals(startDevice.getDevice_type(), DeviceType.storage.name())) { - pakagePlc(inst, list); - } - if (ObjectUtil.isNotEmpty(list)) { - this.writing(list); - } - - } - } - return true; - } - - private void pakagePlc(Instruction inst, List list) { - HashMap map4 = new HashMap(); - map4.put("code", "to_y"); - map4.put("value", inst.getFrom_z()); - list.add(map4); - if (inst.getFrom_x().length() > 1) { - String substring = inst.getFrom_x().substring(1); - HashMap map5 = new HashMap(); - map5.put("code", "to_z"); - map5.put("value", substring); - list.add(map5); - } else { - HashMap map6 = new HashMap(); - map6.put("code", "to_z"); - map6.put("value", inst.getFrom_x()); - list.add(map6); - } - HashMap map7 = new HashMap(); - map7.put("code", "to_x"); - map7.put("value", inst.getFrom_y()); - list.add(map7); - } - - private void pakageCommand( List list, String inst) { - HashMap map1 = new HashMap(); - map1.put("code", "to_device_code"); - map1.put("value", this.getDevice().getAddress()); - list.add(map1); - HashMap map2 = new HashMap(); - map2.put("code", "to_command"); - map2.put("value", 1); - list.add(map2); - HashMap map3 = new HashMap(); - map3.put("code", "to_task"); - map3.put("value", inst); - list.add(map3); - } - - /** - * 将指令根据优先级和创建时间排序 - * - * @param instructions - * @return - */ - private List sortInst(List instructions) { - Collections.sort(instructions, (t1, t2) -> { - //优先级从大到小 - int i = t2.getPriority().compareTo(t1.getPriority()); - //如果优先级相等 - if (i == 0) { - //时间从早到晚 - i = t1.getCreate_time().compareTo(t2.getCreate_time()); - } - return i; - }); - return instructions; - } - - /** - * 更新指令状态 - */ - public synchronized void update_instruction_status() throws Exception { - Date date = new Date(); - if (date.getTime() - this.instruction_update_time.getTime() < (long) this.instruction_update_time_out) { - log.trace("触发时间因为小于{}毫秒，而被无视", this.instruction_update_time_out); - - } else { - this.instruction_update_time = date; - //更改指令状态 - if (task > 0) { - //inst_message - Instruction inst = checkInst(); - if (inst != null) { - if (StrUtil.equals(inst.getInstruction_status(), "0")) { - inst.setInstruction_status(CommonFinalParam.ONE); - inst.setExecute_device_code(this.device_code); - instructionService.update(inst); - } - } - } - List list = new ArrayList(); - HashMap map = new HashMap(); - //取货完成 - if (command == 2) { - map.put("to_command", 2); - } - //请求卸货(申请卸货) - if (command == 4) { - Instruction instruction = checkInst(); - if (ObjectUtil.isNotNull(instruction)) { - //指令为执行 - String next_device_code = instruction.getNext_device_code(); - Device startDevice = deviceAppService.findDeviceByCode(next_device_code); - SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; - if (startDevice.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) startDevice.getDeviceDriver(); - if (siemensConveyorDeviceDriver.getMode() != 2 || siemensConveyorDeviceDriver.getMove() == 1) { - notCreateInstMessage = "未下发电气信号原因->输送线-货架对接位:" + siemensConveyorDeviceDriver.getDevice_code() + - "有货或未联机,无法下发指令!指令号:" + inst.getInstruction_code(); - return; - } - } - map.put("to_command", 3); - } - } - //放货完成 - if (command == 5) { - map.put("to_command", 5); - try { - finish_instruction(inst); - } catch (Exception e) { - e.printStackTrace(); - } - } - //取货准备(回库台位) - if (command == 6) { - map.put("to_command", 6); - } - //召回 - if (command == 7) { - map.put("to_command", 7); - } - //急停 - if (command == 8) { - map.put("to_command", 8); - } - if (ObjectUtil.isNotEmpty(map)) { - list.add(map); - this.writing(list); - } - } - - } - - - @Override - public JSONObject getDeviceStatusName() throws Exception { - JSONObject jo = new JSONObject(); - String mode = ""; - String move = ""; - if (this.getMode() == 0) { - mode = LangProcess.msg("universal_off-line"); - } else if (this.getMode() == 1) { - mode = LangProcess.msg("universal_stand-alone"); - } else if (this.getMode() == 2) { - mode = LangProcess.msg("universal_standby"); - } else if (this.getMode() == 3) { - mode = LangProcess.msg("universal_operation"); - } - - if (this.getMove() == 0) { - move = LangProcess.msg("universal_no"); - jo.put("hasGoods", false); - } else if (this.getMove() == 1) { - move = LangProcess.msg("universal_yes"); - jo.put("hasGoods", true); - } - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("is_click", true); - String requireSucess = "0"; - if (this.requireSucess) { - requireSucess = "1"; - } - jo.put("mode", mode); - jo.put("move", move); - jo.put("action", action); - jo.put("task", task); - jo.put("error", this.getError()); - jo.put("message", LangProcess.msg(message)); - jo.put("prohibitInWarehouse", this.prohibitInWarehouse); - jo.put("prohibitOutWarehouse", this.prohibitOutWarehouse); - jo.put("stopReceiveTask", this.stopReceiveTask); - jo.put("requireSucess", requireSucess); - jo.put("driver_type", "standard_stacker"); - jo.put("notCreateInstMessage", notCreateInstMessage); - return jo; - } - - @Override - public void setDeviceStatus(JSONObject data) { - String requestSucess = data.getString("requireSucess"); - if (StrUtil.equals(requestSucess, "0")) { - this.requireSucess = false; - } else if (StrUtil.equals(requestSucess, CommonFinalParam.ONE)) { - this.requireSucess = true; - } - //监控大屏下发作业命令清警-5、召回-7、急停-8 - Integer toCommand = data.getInteger("toCommand"); - if (toCommand != null) { - Map map = new HashMap<>(); - map.put("to_command", toCommand); - this.writing(map); - } - //ACS监控大屏设置禁止入库、禁止出库、停止接收任务 - Boolean prohibitInWarehouse = data.getBoolean("prohibitInWarehouse"); - this.prohibitInWarehouse = prohibitInWarehouse; - Boolean prohibitOutWarehouse = data.getBoolean("prohibitOutWarehouse"); - this.prohibitOutWarehouse = prohibitOutWarehouse; - Boolean stopReceiveTask = data.getBoolean("stopReceiveTask"); - this.stopReceiveTask = stopReceiveTask; - } - - - public void writing(List list) { - - Map itemMap = new HashMap(); - for (int i = 0; i < list.size(); i++) { - Object ob = list.get(i); - JSONObject json = (JSONObject) JSONObject.toJSON(ob); - if (!StrUtil.isEmpty(json.getString("value"))) { - String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() - + "." + json.getString("code"); - itemMap.put(to_param, json.getString("value")); - } - } - logServer.deviceExecuteLog(device_code, "", "", "下发电气信号:" + itemMap); - try { - //this.checkcontrol(itemMap); - } catch (Exception e) { - e.printStackTrace(); - try { - // this.checkcontrol(itemMap); - } catch (Exception e1) { - e1.printStackTrace(); - } - } - - } - - /** - * 完成指令 - * - * @param inst - * @return - * @throws Exception - */ - public synchronized boolean finish_instruction(Instruction inst) throws Exception { - instructionService.finish(inst); - return true; - } - - public String getToParam() { - return this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code() + "."; - } - - /** - * 多个信号一起下发电气 - * - * @param map - */ - public void writing(Map map) { - DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl"); - Map itemMap = new LinkedHashMap<>(); - map.forEach((key, value) -> { - if (ObjectUtil.isNotEmpty(value)) { - itemMap.put(getToParam() + key, value); - } - }); - if (ObjectUtil.isNotEmpty(itemMap)) { - //this.control(itemMap); - logServer.deviceExecuteLog(this.getDevice().getDevice_code(), "", "", "下发多个电气信号:" + itemMap); - } - } - - public List sortTask(List taskDtos) { - Collections.sort(taskDtos, new Comparator() { - @Override - public int compare(TaskDto t1, TaskDto t2) { - //优先级从大到小 - int i = t2.getPriority().compareTo(t1.getPriority()); - //如果优先级相等 - if (i == 0) { - //时间从早到晚 - i = t1.getCreate_time().compareTo(t2.getCreate_time()); - } - return i; - } - }); - return taskDtos; - } - - - /** - * 将扩展表中的字符串数据转换成集合 - */ - @Override - public List getExtraDeviceCodes(String extraName) { - String extraValue = (String) this.getDevice().getExtraValue().get(extraName); - if (StrUtil.isEmpty(extraValue)) { - return new ArrayList<>(); - } - String devicesString = extraValue.substring(1, extraValue.length() - 1); - List devicesList = new ArrayList<>(); - String[] devices = devicesString.split(","); - for (int i = 0; i < devices.length; i++) { - String s = devices[i].replace("\"", "").replace("\"", ""); - devicesList.add(s); - } - return devicesList; - } - - public Instruction checkInst() { - if (ObjectUtil.isNotEmpty(this.inst)) { - if (this.task > 0) { - if (this.inst.getInstruction_code().equals(String.valueOf(this.task))) { - return this.inst; - } else { - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - return inst; - } - } - } else { - inst = instructionService.findByCodeFromCache(String.valueOf(task)); - return inst; - } - return null; - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/ItemProtocol.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/ItemProtocol.java deleted file mode 100644 index 3f278e3..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/ItemProtocol.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.nl.acs.device_driver.xx; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; - -import org.nl.acs.device_driver.BaseTagsDataReader; - -import java.util.List; -import java.util.ArrayList; - -public enum ItemProtocol implements BaseTagsDataReader.KeyProvider { - HEARTBEAT("heartbeat", "心跳", "DB81.B10"), - MODE("mode", "工作模式", "DB81.B1"), - MOVE("move", "光电信号", "DB81.B2"), - ACTION("action", "动作信号", "DB81.B3"), - ERROR("error", "报警信号", "DB81.B4"), - NUMS("nums", "数量", "DB81.DBD8[3]"), - TO_COMMAND("toCommand", "下发作业命令", "DB71.W0"), - TO_TARGET("toTarget", "下发目标站", "DB71.W2"), - TO_TASK("toTask", "下发任务号", "DB71.D4"); - - private final String key; - private final String description; - private final String address; - - ItemProtocol(String key, String description, String address) { - this.key = key; - this.description = description; - this.address = address; - } - - @Override - public String getKey() { - return this.key; - } - - public String getDescription() { - return description; - } - - public String getAddress() { - return address; - } - - public static List getReadableItemDtos() { - List list = new ArrayList<>(); - for (ItemProtocol prop : values()) { - if (!prop.getKey().contains("to")) { - list.add(new ItemDto(prop.getKey(), prop.getDescription(), prop.getAddress())); - } - } - return list; - } - - public static List getWriteableItemDtos() { - List list = new ArrayList<>(); - for (ItemProtocol prop : values()) { - if (prop.getKey().contains("to")) { - list.add(new ItemDto(prop.getKey(), prop.getDescription(), prop.getAddress())); - } - } - return list; - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/XxDefinition.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/XxDefinition.java deleted file mode 100644 index 76ef265..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/XxDefinition.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.nl.acs.device_driver.xx; - -import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination; -import org.springframework.stereotype.Service; - -import java.util.LinkedList; -import java.util.List; - -@Service -public class XxDefinition implements OpcDeviceDriverDefination { - @Override - public String getDriverCode() { - return "xx_device_xx"; - } - - @Override - public String getDriverName() { - return "xxxxName"; - } - - @Override - public String getDriverDescription() { - return "xxxxName"; - } - - @Override - public DeviceDriver getDriverInstance(Device device) { - return (new XxxxDeviceDriver()).setDevice(device).setDriverDefination(this); - } - - @Override - public Class getDeviceDriverType() { - return XxxxDeviceDriver.class; - } - - @Override - public List getFitDeviceTypes() { - List types = new LinkedList(); - types.add(DeviceType.conveyor); - return types; - } - - @Override - public List getReadableItemDtos() { - return ItemProtocol.getReadableItemDtos(); - } - - @Override - public List getWriteableItemDtos() { - return ItemProtocol.getWriteableItemDtos(); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/XxxxDeviceDriver.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/XxxxDeviceDriver.java deleted file mode 100644 index ac1c263..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/xx/XxxxDeviceDriver.java +++ /dev/null @@ -1,162 +0,0 @@ -package org.nl.acs.device_driver.xx; - -import com.alibaba.fastjson.JSONObject; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.*; -import org.nl.acs.device_driver.driver.*; -import org.nl.acs.monitor.DeviceStageMonitor; -import org.nl.config.SpringContextHolder; -import org.nl.acs.device_driver.BaseTagsDataReader; -import org.nl.config.lucene.service.LuceneExecuteLogService; -import org.nl.config.lucene.service.dto.LuceneLogDto; -import java.util.Date; - -@Slf4j -@Getter -@Setter -@RequiredArgsConstructor -public class XxxxDeviceDriver extends AbstractOpcDeviceDriver implements - DeviceDriver, - ExecutableDeviceDriver, - RouteableDeviceDriver, - DeviceStageMonitor, - StandardRequestMethod, - BaseTagsDataReader { - - private final LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); - - /** - * 心跳 - */ - private int heartbeat = 0; - private int lastHeartbeat = 0; - /** - * 工作模式 - */ - private Integer mode = 0; - private Integer lastMode = 0; - /** - * 光电信号 - */ - private byte move = 0; - private byte lastMove = 0; - /** - * 动作信号 - */ - private Byte action = 0; - private Byte lastAction = 0; - /** - * 报警信号 - */ - private long error = 0; - private long lastError = 0; - /** - * 数量 - */ - private int[] nums; - private int[] lastNums; - /** - * 下发作业命令 - */ - private float[] toCommand; - private float[] lastToCommand; - /** - * 下发目标站 - */ - private String[] toTarget; - private String[] lastToTarget; - /** - * 下发任务号 - */ - private Boolean toTask; - private Boolean lastToTask; - /** - * 当前设备编号 - */ - private String currentDeviceCode; - - /** - * 消息 - */ - private String message; - - /** - * 请求标记 - */ - boolean requireSuccess = false; - - /** - * 请求时间 - */ - private Date requireTime = new Date(); - - /** - * 请求间隔时间 - */ - private long requireTimeOut = 3000L; - - /** - * 设备异常标记 - */ - private boolean isError = false; - - @Override - public Device getDevice() { - return this.device; - } - - @Override - public & KeyProvider, T> T getOpcValue(E item, Class fieldClassType) { - return (T) this.getValue(item.getKey()); - } - - @Override - public void setLog(String key, Object newValue, Object oldValue) { - logService.deviceExecuteLog(new LuceneLogDto(this.currentDeviceCode, "自动线程读取信号:" + key + ",由" + oldValue + "->" + newValue)); - } - - @Override - public void execute() { - this.currentDeviceCode = this.getDeviceCode(); - this.loadAssignData(currentDeviceCode, ItemProtocol.class); - } - - @Override - public void executeLogic() { - if (Boolean.FALSE.equals(this.getOnline())) { - this.message = "设备离线"; - } else if (this.mode == 0) { - this.message = "设备未联机"; - } else if (this.error != 0) { - this.message = "设备报警"; - this.isError = true; - } else { - this.isError = false; - this.message = ""; - //编写业务逻辑方法 - } - } - - @Override - public JSONObject getDeviceStatusName() throws Exception { - JSONObject jo = new JSONObject(); - jo.put("device_code", this.currentDeviceCode); - jo.put("device_name", this.getDevice().getDevice_name()); - jo.put("driver_type", "xx_device_xx"); - jo.put("is_click", false); - jo.put("message", this.message); - jo.put("isOnline", this.online); - jo.put("isError", this.isError); - return jo; - } - - @Override - public void setDeviceStatus(JSONObject data) { - - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/AcsToLmsApplyTaskTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/AcsToLmsApplyTaskTypeEnum.java deleted file mode 100644 index 54f9458..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/AcsToLmsApplyTaskTypeEnum.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.acs.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum AcsToLmsApplyTaskTypeEnum { - LABEL_BIND("1", "捆轧贴标"), - - AGV("2", "AGV任务"); - /** - * 索引 - */ - private String type; - /** - * 编码 - */ - private String value; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/RequestSucessEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/RequestSucessEnum.java deleted file mode 100644 index a25e5b6..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/RequestSucessEnum.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.acs.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum RequestSucessEnum { - YES("1", "是"), - - NO("0", "否"); - /** - * 状态 - */ - private String type; - /** - * 描述 - */ - private String value; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/VolumeTwoTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/VolumeTwoTypeEnum.java deleted file mode 100644 index 164a3c7..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/VolumeTwoTypeEnum.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.acs.enums; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum VolumeTwoTypeEnum { - - TOW("1", "2点取放任务"), - - FOUR("2", "4点任务，取放满卷后取放空架子任务"); - /** - * 索引 - */ - private String type; - /** - * 编码 - */ - private String value; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsHttpUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsHttpUtil.java new file mode 100644 index 0000000..81d95d5 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsHttpUtil.java @@ -0,0 +1,61 @@ +package org.nl.acs.ext; + +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import org.nl.config.SpringContextHolder; +import org.nl.config.lucene.service.LuceneExecuteLogService; +import org.nl.config.lucene.service.dto.LuceneLogDto; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +public class LmsHttpUtil { + + private static final RequestAdapter LMS_REQUEST_ADAPTER = new LmsRequestAdapter(); + private static final ResponseAdapter LMS_RESPONSE_ADAPTER = new LmsResponseAdapter(); + + public static UnifiedResponse sendPostRequest(String path, W requestParam, Class type) { + String url = LMS_REQUEST_ADAPTER.getUrl() + path; + LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); + try { + String body = HttpRequest + .post(url) + .setConnectionTimeout(5000) + .body(JSON.toJSONString(requestParam)) + .execute() + .body(); + LuceneLogDto luceneLogDto = new LuceneLogDto(url, requestParam.toString(), body, JSONObject.parseObject(body).getString("status"), body); + logService.interfaceExecuteLog(luceneLogDto); + return LMS_RESPONSE_ADAPTER.adapt(body, type); + } catch (Exception e) { + LuceneLogDto luceneLogDto = new LuceneLogDto(url, requestParam.toString(), e.getMessage(), "400", e.getMessage()); + logService.interfaceExecuteLog(luceneLogDto); + return new UnifiedResponse<>(false, e.getMessage()); + } + } + + + public static UnifiedResponse sendGetRequest(String path, W requestParam, Class type) { + String url = LMS_REQUEST_ADAPTER.getUrl() + path; + LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); + try { + String body = HttpRequest + .get(LMS_REQUEST_ADAPTER.getUrl() + path) + .setConnectionTimeout(5000) + .body(JSON.toJSONString(requestParam)) + .execute() + .body(); + LuceneLogDto luceneLogDto = new LuceneLogDto(url, requestParam.toString(), body, JSONObject.parseObject(body).getString("status"), body); + logService.interfaceExecuteLog(luceneLogDto); + return LMS_RESPONSE_ADAPTER.adapt(body, type); + } catch (Exception e) { + LuceneLogDto luceneLogDto = new LuceneLogDto(url, requestParam.toString(), e.getMessage(), "400", e.getMessage()); + logService.interfaceExecuteLog(luceneLogDto); + return new UnifiedResponse<>(false, e.getMessage()); + } + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsRequestAdapter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsRequestAdapter.java new file mode 100644 index 0000000..69bfd7e --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsRequestAdapter.java @@ -0,0 +1,19 @@ +package org.nl.acs.ext; + + +import org.nl.acs.AcsConfig; +import org.nl.config.SpringContextHolder; +import org.nl.system.service.param.ISysParamService; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +public class LmsRequestAdapter implements RequestAdapter { + @Override + public String getUrl() { + ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); + return paramService.findByCode(AcsConfig.WMSURL).getValue(); + } +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsResponseAdapter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsResponseAdapter.java new file mode 100644 index 0000000..bc064fc --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/LmsResponseAdapter.java @@ -0,0 +1,24 @@ +package org.nl.acs.ext; + + +import com.alibaba.fastjson.JSONObject; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +public class LmsResponseAdapter implements ResponseAdapter { + @Override + public UnifiedResponse adapt(String responseBody, Class type) { + JSONObject jsonResponse = JSONObject.parseObject(responseBody); + boolean isSuccess = jsonResponse.getInteger("status") == 200; + String message = jsonResponse.getString("message"); + if (type != null) { + T data = JSONObject.toJavaObject(jsonResponse.getJSONObject("data"), type); + return new UnifiedResponse<>(isSuccess, message, data); + } + return new UnifiedResponse<>(isSuccess, message); + } + +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesHttpUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesHttpUtil.java new file mode 100644 index 0000000..6d55fd6 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesHttpUtil.java @@ -0,0 +1,60 @@ +package org.nl.acs.ext; + +import cn.hutool.http.HttpRequest; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import org.nl.config.SpringContextHolder; +import org.nl.config.lucene.service.LuceneExecuteLogService; +import org.nl.config.lucene.service.dto.LuceneLogDto; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +public class MesHttpUtil { + + private static final RequestAdapter MES_REQUEST_ADAPTER = new MesRequestAdapter(); + private static final ResponseAdapter MES_RESPONSE_ADAPTER = new MesResponseAdapter(); + + public static UnifiedResponse sendPostRequest(String path, W requestParam, Class type) { + String url = MES_REQUEST_ADAPTER.getUrl() + path; + LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); + try { + String body = HttpRequest + .post(MES_REQUEST_ADAPTER.getUrl() + path) + .setConnectionTimeout(5000) + .body(JSON.toJSONString(requestParam)) + .execute() + .body(); + LuceneLogDto luceneLogDto = new LuceneLogDto(url, requestParam.toString(), body, JSONObject.parseObject(body).getString("code"), body); + logService.interfaceExecuteLog(luceneLogDto); + return MES_RESPONSE_ADAPTER.adapt(body, type); + } catch (Exception e) { + LuceneLogDto luceneLogDto = new LuceneLogDto(url, requestParam.toString(), e.getMessage(), "400", e.getMessage()); + logService.interfaceExecuteLog(luceneLogDto); + return new UnifiedResponse<>(false, e.getMessage()); + } + } + + public static UnifiedResponse sendGetRequest(String path, W requestParam, Class type) { + String url = MES_REQUEST_ADAPTER.getUrl() + path; + LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class); + try { + String body = HttpRequest + .get(MES_REQUEST_ADAPTER.getUrl() + path) + .setConnectionTimeout(5000) + .body(JSON.toJSONString(requestParam)) + .execute() + .body(); + LuceneLogDto luceneLogDto = new LuceneLogDto(url, requestParam.toString(), body, JSONObject.parseObject(body).getString("code"), body); + logService.interfaceExecuteLog(luceneLogDto); + return MES_RESPONSE_ADAPTER.adapt(body, type); + } catch (Exception e) { + LuceneLogDto luceneLogDto = new LuceneLogDto(url, requestParam.toString(), e.getMessage(), "400", e.getMessage()); + logService.interfaceExecuteLog(luceneLogDto); + return new UnifiedResponse<>(false, e.getMessage()); + } + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesRequestAdapter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesRequestAdapter.java new file mode 100644 index 0000000..596e98e --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesRequestAdapter.java @@ -0,0 +1,21 @@ +package org.nl.acs.ext; + +import org.nl.acs.AcsConfig; +import org.nl.config.SpringContextHolder; +import org.nl.system.service.param.ISysParamService; + +import java.util.Map; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +public class MesRequestAdapter implements RequestAdapter{ + @Override + public String getUrl() { + ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); + return paramService.findByCode(AcsConfig.WMSURL).getValue(); + } + +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesResponseAdapter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesResponseAdapter.java new file mode 100644 index 0000000..988a9cd --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/MesResponseAdapter.java @@ -0,0 +1,24 @@ +package org.nl.acs.ext; + + +import com.alibaba.fastjson.JSONObject; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +public class MesResponseAdapter implements ResponseAdapter { + @Override + public UnifiedResponse adapt(String responseBody, Class type) { + JSONObject jsonResponse = JSONObject.parseObject(responseBody); + boolean isSuccess = jsonResponse.getInteger("code") == 0; + String message = jsonResponse.getString("msg"); + if (type != null) { + T data = JSONObject.toJavaObject(jsonResponse.getJSONObject("data"), type); + return new UnifiedResponse<>(isSuccess, message, data); + } + return new UnifiedResponse<>(isSuccess, message); + } + +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/RequestAdapter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/RequestAdapter.java new file mode 100644 index 0000000..9324e1f --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/RequestAdapter.java @@ -0,0 +1,12 @@ +package org.nl.acs.ext; + +import java.util.Map; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +public interface RequestAdapter { + String getUrl(); +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/ResponseAdapter.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/ResponseAdapter.java new file mode 100644 index 0000000..b366224 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/ResponseAdapter.java @@ -0,0 +1,11 @@ +package org.nl.acs.ext; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/22 + */ +public interface ResponseAdapter { + UnifiedResponse adapt(String responseBody, Class type); +} + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/UnifiedResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/UnifiedResponse.java new file mode 100644 index 0000000..97365c2 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/UnifiedResponse.java @@ -0,0 +1,36 @@ +package org.nl.acs.ext; + + +public class UnifiedResponse { + private boolean success; + private String message; + private T data; + + public UnifiedResponse(boolean success, String message, T data) { + this.success = success; + this.message = message; + this.data = data; + } + + public UnifiedResponse(boolean success, String message) { + this.success = success; + this.message = message; + } + + public boolean isSuccess() { + return this.success; + } + + public String getMessage() { + return this.message; + } + + public T getData() { + return this.data; + } + + public void setData(T data) { + this.data = data; + } +} + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java index f8736f0..6512070 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java @@ -10,6 +10,8 @@ import org.nl.acs.common.base.CommonFinalParam; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.common.exception.BadRequestException; import org.nl.config.language.LangProcess; +import org.nl.config.lucene.service.LuceneExecuteLogService; +import org.nl.config.lucene.service.dto.LuceneLogDto; import org.nl.system.service.param.ISysParamService; import org.nl.config.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; @@ -21,10 +23,8 @@ import org.nl.system.service.param.impl.SysParamServiceImpl; public class AcsUtil { - public static String notifyAcs(String api, W requestParam) { - DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); - ; + LuceneExecuteLogService logServer = SpringContextHolder.getBean(LuceneExecuteLogService.class);; ISysParamService paramService = SpringContextHolder.getBean(SysParamServiceImpl.class); //判断是否连接立库WCS系统 String isConnect = paramService.findByCode("is_connect_liKu_Wcs").getValue(); @@ -40,6 +40,7 @@ public class AcsUtil { .execute() .body(); log.info("下发立库任务返回参数:{}", body); + logServer.interfaceExecuteLog(new LuceneLogDto(liKu_wcs_url + api, JSON.toJSONString(requestParam), body, "200", JSON.toJSONString(requestParam))); return body; } catch (Exception e) { JSONObject result = new JSONObject(); @@ -47,6 +48,7 @@ public class AcsUtil { result.put("code", CommonFinalParam.ONE); result.put("comment", e.getMessage()); log.info("下发立库任务异常返回参数:{}", String.valueOf(result)); + logServer.interfaceExecuteLog(new LuceneLogDto(liKu_wcs_url + api, JSON.toJSONString(requestParam), JSON.toJSONString(result), "400", JSON.toJSONString(requestParam))); return String.valueOf(result); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java index 1f3b511..876089c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/LmsUtil.java @@ -6,7 +6,6 @@ import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.config.SpringContextHolder; import org.nl.system.service.param.ISysParamService; import org.nl.system.service.param.impl.SysParamServiceImpl; @@ -18,8 +17,6 @@ import org.nl.system.service.param.impl.SysParamServiceImpl; public class LmsUtil { public static String notifyAcs(String api, W requestParam) { - DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); - ; ISysParamService paramService = SpringContextHolder.getBean(SysParamServiceImpl.class); //判断是否连接立库WCS系统 String isConnect = paramService.findByCode("hasWms").getValue(); @@ -29,23 +26,19 @@ public class LmsUtil { result.put("message", "参数配置表中-hasWms为:0"); log.info("请求LMS异常返回参数:{}", String.valueOf(result)); return String.valueOf(result); - //throw new BadRequestException("参数配置表中-hasWms为:0"); } String liKu_wcs_url = paramService.findByCode("wmsurl").getValue(); try { -// log.info("请求LMS参数:{}", JSON.toJSONString(requestParam)); String body = HttpRequest .post(liKu_wcs_url + api).setConnectionTimeout(3000) .body(JSON.toJSONString(requestParam)) .execute() .body(); -// log.info("请求LMS参数返回参数:{}", body); return body; } catch (Exception e) { JSONObject result = new JSONObject(); result.put("code", "500"); result.put("message", e.getMessage()); -// log.info("请求LMS异常返回参数:{}", String.valueOf(result)); return String.valueOf(result); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applySignalStaus/ApplySignalStatusRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applySignalStaus/ApplySignalStatusRequest.java deleted file mode 100644 index 1474925..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applySignalStaus/ApplySignalStatusRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.applySignalStaus; - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseRequest; - -@Data -public class ApplySignalStatusRequest extends BaseRequest { - - /** - * 光电信号 0无货 1有货 - */ - private String move; - - /** - * 载具类型 - */ - private String vehicle_type; - - /** - * 是否允许 0不允许 1允许 - */ - private String action; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applySignalStaus/ApplySignalStatusResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applySignalStaus/ApplySignalStatusResponse.java deleted file mode 100644 index 8cd5ec7..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applySignalStaus/ApplySignalStatusResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.applySignalStaus; - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseResponse; - -@Data -public class ApplySignalStatusResponse extends BaseResponse { - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyDeviceDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyDeviceDto.java deleted file mode 100644 index 4547f54..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyDeviceDto.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.applyTask; - -import lombok.Data; - -@Data -public class ApplyDeviceDto { - - /** - * 设备编码 - */ - private String device_code; - - /** - * 数量 - */ - private String qty; - - /** - * 载具号 - */ - private String vehicle_code; - - /** - * 载具类型 - */ - private String vehicle_type; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskRequest.java deleted file mode 100644 index 62f908d..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskRequest.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.applyTask; - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseRequest; -import org.nl.acs.ext.wms.data.PalletizeDto; - -import java.util.List; - -@Data -public class ApplyTaskRequest extends BaseRequest { - - /** - * 载具号 - */ - private String vehicle_code; - - /** - * 载具类型 - */ - private String vehicle_type; - - /** - * 重量 - */ - private String weight; - - /** - * 碾次 - */ - private String mix_mum; - - /** - * 工单号 - */ - private String order_code; - - /** - * 物料 - */ - private String material_code; - - /** - * 数量 - */ - private String qty; - - /** - * 砖型 - */ - private PalletizeDto palletizeDto; - - /** - * 关联设备属性 - */ - private List list; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java deleted file mode 100644 index b8645c3..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.applyTask; - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseResponse; - -@Data -public class ApplyTaskResponse extends BaseResponse { - - /** - * 是否静置完成 1完成 - */ - private String is_standing_finish; - - /** - * 是否优先包装 - */ - private String is_package; - - /** - * 碾次 - */ - private String mix_num; - - private String weight; - - /** - * 贴标新鲜 - */ - private String label_message; - - /** - * 是否码满规定托盘数 - */ - private int is_satisfy; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackSplitPalletStation/feedBackSplitPalletStationRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackSplitPalletStation/feedBackSplitPalletStationRequest.java deleted file mode 100644 index 32e4909..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackSplitPalletStation/feedBackSplitPalletStationRequest.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.feedBackSplitPalletStation; - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseRequest; - -@Data -public class feedBackSplitPalletStationRequest extends BaseRequest { - - /** - * 取货点位 - */ - private String get_station; - - /** - * 放货点位 - */ - private String put_station; - - - /** - * 取货点位载具号 - */ - private String get_station_vehicle_code; - - - /** - * 放货点位载具号 - */ - private String put_station_vehicle_code; - - /** - * 取货点当前数量 - */ - private String get_station_qty; - - /** - * 放货点当前数量 - */ - private String put_station_qty; - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackSplitPalletStation/feedBackSplitPalletStationResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackSplitPalletStation/feedBackSplitPalletStationResponse.java deleted file mode 100644 index 3e6f688..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/feedBackSplitPalletStation/feedBackSplitPalletStationResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.feedBackSplitPalletStation; - -import org.nl.acs.ext.wms.data.BaseResponse; - -public class feedBackSplitPalletStationResponse extends BaseResponse { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeRequest.java deleted file mode 100644 index 6ab62d3..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeRequest.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.getVehicle; - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseRequest; - -@Data -public class GetPalletizeRequest extends BaseRequest { - - /** - * 载具号 - */ - private String vehicle_code; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeResponse.java deleted file mode 100644 index c1883c2..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/getVehicle/GetPalletizeResponse.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.getVehicle; - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseResponse; -import org.nl.acs.ext.wms.data.PalletizeDto; - -@Data -public class GetPalletizeResponse extends BaseResponse { - - private PalletizeDto palletizeDto; - - /** - * 刚托盘上的砖块数量 - */ - private int material_qty; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabRequest.java deleted file mode 100644 index 927f6d3..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabRequest.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.grab; - - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseRequest; - -/** - * 反馈单次抓取 - */ -@Data -public class GrabRequest extends BaseRequest { - - /** - * 抓取位 - */ - private String get_station; - - /** - * 放置位 - */ - private String put_station; - - /** - * 是否合格 - */ - private String is_qualified; - - /** - * 激光标刻码 - */ - private String laser_marking_code; - - - /** - * 碾次 - */ - private String grinding_number; - - /** - * 高度1 - */ - private String height1; - - /** - * 高度2 - */ - private String height2; - - /** - * 高度3 - */ - private String height3; - - /** - * 高度4 - */ - private String height4; - - /** - * 宽度1 - */ - private String width1; - - /** - * 宽度2 - */ - private String width2; - - /** - * 长度 - */ - private String len; - - /** - * 体积 - */ - private String volume; - - /** - * 平面度 - */ - private String flatness; - - /** - * 缺陷个数 - */ - private String unqualified_qty; - - /** - * 重量 - */ - private String weight; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabResponse.java deleted file mode 100644 index 43b9dc7..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab/GrabResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.grab; - -import org.nl.acs.ext.wms.data.BaseResponse; - -public class GrabResponse extends BaseResponse { - - -} - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab_place_station/GrabPlaceStationRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab_place_station/GrabPlaceStationRequest.java deleted file mode 100644 index 604e698..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab_place_station/GrabPlaceStationRequest.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.grab_place_station; - - -import lombok.Data; -import org.nl.acs.ext.wms.data.BaseRequest; - -/** - * 当前抓取放置工位切换 - */ -@Data -public class GrabPlaceStationRequest extends BaseRequest { - - /** - * 抓取位 - */ - private String get_station; - - /** - * 放置位 - */ - private String put_station; - - /** - * 取货点位载具号 - */ - private String get_station_vehicle_code; - - - /** - * 放货点位载具号 - */ - private String put_station_vehicle_code; - - /** - * 取货点当前数量 - */ - private String get_station_qty; - - /** - * 放货点当前数量 - */ - private String put_station_qty; - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab_place_station/GrabPlaceStationResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab_place_station/GrabPlaceStationResponse.java deleted file mode 100644 index b5c7c24..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/grab_place_station/GrabPlaceStationResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.nl.acs.ext.wms.data.AcsToWmsData.grab_place_station; - -import org.nl.acs.ext.wms.data.BaseResponse; - - -public class GrabPlaceStationResponse extends BaseResponse { - - -} - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyGreenFoilButtonRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyGreenFoilButtonRequest.java deleted file mode 100644 index 584ca0c..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyGreenFoilButtonRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class ApplyGreenFoilButtonRequest extends BaseRequest { - private String vehicle_code; - private String device_code; - /** - * 4-确认下卷（生成AGV取空取满放空放满任务） - * 5-送空收卷棍（生成AGV取空放空的任务） - * 6-末次下卷（取满放满任务） - * 7-允许下卷（允许AGV进入） - * 8-允许离开（允许AGV离开） - * 9-取消任务 - */ - private String type; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyGreenFoilButtonResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyGreenFoilButtonResponse.java deleted file mode 100644 index d5b55a1..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyGreenFoilButtonResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class ApplyGreenFoilButtonResponse extends BaseResponse { - - private Map data = new HashMap(); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyLabelingAndBindingRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyLabelingAndBindingRequest.java deleted file mode 100644 index 3d90b79..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyLabelingAndBindingRequest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class ApplyLabelingAndBindingRequest extends BaseRequest { - private String vehicle_code; - private String device_code; - /** - * 1:贴标申请 - * 2:捆扎申请 - * 3:烘箱 - */ - private String type; - - private String weight; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyLabelingAndBindingResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyLabelingAndBindingResponse.java deleted file mode 100644 index d6c0c88..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyLabelingAndBindingResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class ApplyLabelingAndBindingResponse extends BaseResponse { - - private Map data = new HashMap(); - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyManipulatorActionRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyManipulatorActionRequest.java deleted file mode 100644 index bb907e3..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyManipulatorActionRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class ApplyManipulatorActionRequest extends BaseRequest { - private String vehicle_code; - private String device_code; - - - /** - * 行架任务号 - */ - private String task_code; - - /** - * 任务id - */ - private String task_id; - - /** - * 重量 - */ - private String weight; - - /** - * 位置 1-左 2-右 - */ - private String direction; - - /** - * 气涨轴编号 - */ - private String qzz_no; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyManipulatorActionResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyManipulatorActionResponse.java deleted file mode 100644 index 59ed819..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyManipulatorActionResponse.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class ApplyManipulatorActionResponse extends BaseResponse{ - private Map data = new HashMap(); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyPlugPullSitResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyPlugPullSitResponse.java deleted file mode 100644 index 8554c01..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyPlugPullSitResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class ApplyPlugPullSitResponse extends BaseResponse { - private Map data = new HashMap(); - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyPlugPullSiteRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyPlugPullSiteRequest.java deleted file mode 100644 index 7dd8969..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/ApplyPlugPullSiteRequest.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class ApplyPlugPullSiteRequest extends BaseRequest { - private String vehicle_code; - private String device_code; - /** - * 1-申请套管 - * 2-套管完成 - * 3-拔轴完成 - * 4-申请拔轴 - * 5-缓存线已满，生成行架任务 - */ - private String type; - - /** - * 行架任务号 - */ - private String task_code; - - /** - * 纸管1重量 - */ - private String weight1; - - /** - * 纸管1规格 - */ - private String material1; - - /** - * 纸管2规格 - */ - private String material2; - - /** - * 纸管2重量 - */ - private String weight2; - - - /** - * 条码 - */ - private String barcode; - - /** - * 尺寸 3,6寸 - */ - private String size; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/BlankingButtonRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/BlankingButtonRequest.java deleted file mode 100644 index 3582449..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/BlankingButtonRequest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class BlankingButtonRequest extends BaseRequest { - private String vehicle_code; - private String device_code; - /** - * 1-表处下满料请求 - * 2-表处上空轴请求 - * 6-取消任务 - */ - private String type; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/BlankingButtonResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/BlankingButtonResponse.java deleted file mode 100644 index ed56075..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/BlankingButtonResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import java.util.HashMap; -import java.util.Map; - -public class BlankingButtonResponse extends BaseResponse{ - private Map data = new HashMap(); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/GetWasteFoilWeightRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/GetWasteFoilWeightRequest.java deleted file mode 100644 index e76b1b6..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/GetWasteFoilWeightRequest.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class GetWasteFoilWeightRequest extends BaseRequest { - private String device_code; - - /** - * 1-称重完成 - * 2-称重确认完成 - * 3-取消称重 - * 4-申请任务 - */ - private String type; - - - /** - * 当前重量 - */ - private String currentWeight; - - /** - * 上次重量 - */ - private String lastWeight; - - /** - * 重量差 - */ - private String weightGap; - - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/GetWasteFoilWeightResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/GetWasteFoilWeightResponse.java deleted file mode 100644 index 0b124b7..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/GetWasteFoilWeightResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.nl.acs.ext.wms.data; - -public class GetWasteFoilWeightResponse extends BaseResponse{ -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/JsonUtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/JsonUtl.java deleted file mode 100644 index 241edc3..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/JsonUtl.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.type.TypeFactory; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - -public class JsonUtl { - private static ObjectMapper objectMapper = null; - private static ObjectMapper objectMapperLog = null; - - private JsonUtl() { - } - - private static ObjectMapper init() { - ObjectMapper objectMapper = new ObjectMapper(); - SimpleModule simpleModule = new SimpleModule(); -// simpleModule.addSerializer(Enum.class, new EnumSerializer()); -// simpleModule.addSerializer(Date.class, new DateSerializer()); -// simpleModule.addDeserializer(Enum.class, new EnumDeserializer()); -// simpleModule.addDeserializer(Date.class, new DateDeserializers.DateDeserializer()); - objectMapper.registerModule(simpleModule); - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - return objectMapper; - } - - public static ObjectMapper getInstance() { - if (objectMapper == null) { - Class var0 = JsonUtl.class; - synchronized (JsonUtl.class) { - if (objectMapper == null) { - objectMapper = init(); - } - } - } - - return objectMapper; - } - - public static ObjectMapper getInstanceLog() { - if (objectMapperLog == null) { - Class var0 = JsonUtl.class; - synchronized (JsonUtl.class) { - if (objectMapperLog == null) { - objectMapperLog = init(); - objectMapperLog.setSerializationInclusion(Include.NON_NULL); - } - } - } - - return objectMapperLog; - } - - public static ObjectMapper getObjectMapper() { - return getInstance(); - } - - public static String parse(Object object) throws RuntimeException { - try { - return getObjectMapper().writeValueAsString(object); - } catch (JsonProcessingException var2) { - throw new RuntimeException(var2); - } - } - - public static String parseWithoutException(Object object) { - try { - return parse(object); - } catch (Exception var2) { - return null; - } - } - - public static String parseLog(Object object) { - try { - return getInstanceLog().writeValueAsString(object); - } catch (Exception var2) { - return null; - } - } - - public static T format(String json, Class clazz) throws RuntimeException { - try { - return getObjectMapper().readValue(json, clazz); - } catch (IOException var3) { - throw new RuntimeException(var3); - } - } - - public static List formatList(String json, Class clazz) throws RuntimeException { - try { - JavaType type = getObjectMapper().getTypeFactory().constructParametricType(List.class, new Class[]{clazz}); - return (List) getObjectMapper().readValue(json, type); - } catch (IOException var3) { - throw new RuntimeException(var3); - } - } - - public static Map formatMap(String json, Class clazzKey, Class clazzValue) throws RuntimeException { - try { - JavaType type = getObjectMapper().getTypeFactory().constructParametricType(Map.class, new Class[]{clazzKey, clazzValue}); - return (Map) getObjectMapper().readValue(json, type); - } catch (IOException var4) { - throw new RuntimeException(var4); - } - } - - public static List> formatListTwo(String json, Class clazz) throws RuntimeException { - try { - TypeFactory typeFactory = getObjectMapper().getTypeFactory(); - JavaType type = typeFactory.constructParametrizedType(List.class, List.class, new Class[]{clazz}); - type = typeFactory.constructParametrizedType(List.class, List.class, new JavaType[]{type}); - return (List) getObjectMapper().readValue(json, type); - } catch (IOException var4) { - throw new RuntimeException(var4); - } - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/LiKuApplyTakResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/LiKuApplyTakResponse.java deleted file mode 100644 index 7385548..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/LiKuApplyTakResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class LiKuApplyTakResponse extends BaseResponse { - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/LiKuApplyTaskRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/LiKuApplyTaskRequest.java deleted file mode 100644 index 4ff16f7..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/LiKuApplyTaskRequest.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class LiKuApplyTaskRequest extends BaseRequest { - private String vehicle_code; - private String device_code; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PalletizeDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PalletizeDto.java deleted file mode 100644 index 7e81ac7..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PalletizeDto.java +++ /dev/null @@ -1,228 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -/** - * @Author: lyd - * @Description: 垛型参数 - * @Date: 2023/7/18 - */ -@Data -public class PalletizeDto { - /** - * 产品编号 - */ - private String product_code; - /** - * A长边 - */ - private String AlongSide; - /** - * B短边 - */ - private String BshortSide; - /** - * H梯形高 - */ - private String Htrapezoidal; - /** - * W厚度 - */ - private String Wthickness; - /** - * 当前垛盘数 - */ - private String tray_qty; - /** - * 垛盘高度 - */ - private String tray_high; - /** - * 垛型类别 - */ - private String crib_category; - /** - * 码垛X1行 - */ - private String palletX1_line; - /** - * 码垛Y1列 - */ - private String palletY1_row; - /** - * 码垛A1角度 - */ - private String palletA1_angle; - /** - * 码垛X2行 - */ - private String palletX2_line; - /** - * 码垛Y2列 - */ - private String palletY2_row; - /** - * 码垛A2角度 - */ - private String palletA2_angle; - /** - * 码垛X3行 - */ - private String palletX3_line; - /** - * 码垛Y3列 - */ - private String palletY3_row; - /** - * 码垛A3角度 - */ - private String palletA3_angle; - /** - * 压垛X1行 - */ - private String pressCribX1_line; - /** - * 压垛Y1列 - */ - private String pressCribY1_row; - /** - * 压垛A1角度 - */ - private String pressCribA1_angle; - /** - * 压垛X2行 - */ - private String pressCribX2_line; - /** - * 压垛Y2列 - */ - private String pressCribY2_row; - /** - * 压垛A2角度 - */ - private String pressCribA2_angle; - /** - * 压垛X3行 - */ - private String pressCribX3_line; - /** - * 压垛Y3列 - */ - private String pressCribY3_row; - /** - * 压垛A3角度 - */ - private String pressCribA3_angle; - /** - * Z轴偏移 - */ - private String Zoffset; - /** - * 码垛层数 - */ - private String pallet_layerQty; - /** - * 压垛层数 - */ - private String pressCrib_layerQty; - /** - * 码层X1间隔 - */ - private String codeLayerX1_interval; - /** - * 码层Y1间隔 - */ - private String codeLayerY1_interval; - /** - * 码层X2间隔 - */ - private String codeLayerX2_interval; - /** - * 码层Y2间隔 - */ - private String codeLayerY2_interval; - /** - * 码层X3间隔 - */ - private String codeLayerX3_interval; - /** - * 码层Y3间隔 - */ - private String codeLayerY3_interval; - /** - * 码层X1偏移 - */ - private String codeLayerX1_offset; - /** - * 码层Y1偏移 - */ - private String codeLayerY1_offset; - /** - * 码层X2偏移 - */ - private String codeLayerX2_offset; - /** - * 码层Y2偏移 - */ - private String codeLayerY2_offset; - /** - * 码层X3偏移 - */ - private String codeLayerX3_offset; - /** - * 码层Y3偏移 - */ - private String codeLayerY3_offset; - /** - * 压层X1间隔 - */ - private String pressLayerX1_interval; - /** - * 压层Y1间隔 - */ - private String pressLayerY1_interval; - /** - * 压层X2间隔 - */ - private String pressLayerX2_interval; - /** - * 压层Y2间隔 - */ - private String pressLayerY2_interval; - /** - * 压层X3间隔 - */ - private String pressLayerX3_interval; - /** - * 压层Y3间隔 - */ - private String pressLayerY3_interval; - /** - * 压层X1偏移 - */ - private String pressLayerX1_offset; - /** - * 压层Y1偏移 - */ - private String pressLayerY1_offset; - /** - * 压层X2偏移 - */ - private String pressLayerX2_offset; - /** - * 压层Y2偏移 - */ - private String pressLayerY2_offset; - /** - * 压层X3偏移 - */ - private String pressLayerX3_offset; - /** - * 压层Y3偏移 - */ - private String pressLayerY3_offset; - /** - * 工具坐标 - */ - private String tool_coordinate; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutActionRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutActionRequest.java deleted file mode 100644 index da78c34..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutActionRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -import java.util.Map; - -@Data -public class PutActionRequest extends BaseRequest { - - /** - * 设备号 - */ - String device_code; - - /** - * - */ - String code; - - /** - * - */ - String value; - - /** - * 扩展属性 - */ - Map params; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutActionResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutActionResponse.java deleted file mode 100644 index 4ade8e8..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutActionResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.nl.acs.ext.wms.data; - -public class PutActionResponse extends BaseResponse { - - /** - * 结果 200成功 - */ - private int status; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutWeightActionRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutWeightActionRequest.java deleted file mode 100644 index adedf77..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutWeightActionRequest.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -import java.util.Map; - -@Data -public class PutWeightActionRequest extends BaseRequest { - /** - * 设备号 - */ - String device_code; - - /** - * - */ - String code; - - /** - * - */ - String value; - - /** - * 扩展属性 - */ - Map params; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutWeightActionResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutWeightActionResponse.java deleted file mode 100644 index 0c6045c..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/PutWeightActionResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.nl.acs.ext.wms.data; - -public class PutWeightActionResponse extends BaseResponse{ -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/UpdateLKTaskRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/UpdateLKTaskRequest.java deleted file mode 100644 index 971a601..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/UpdateLKTaskRequest.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.nl.acs.ext.wms.data; - -import lombok.Data; - -@Data -public class UpdateLKTaskRequest extends BaseRequest { - - /** - * 任务标识 - */ - private String ext_task_id; - - /** - * 任务编号 - */ - private String task_code; - - /** - * 载具号 - */ - String vehicle_code; - - /** - * 立库任务类型 - */ - String dtl_type; - - /** - * 类型 - */ - String type; - - /** - * 原库位 - */ - String srcLocation; - - /** - * 新库位 - */ - String destLocation; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/UpdateLKTaskResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/UpdateLKTaskResponse.java deleted file mode 100644 index f6db1eb..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/UpdateLKTaskResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.nl.acs.ext.wms.data; - -public class UpdateLKTaskResponse extends BaseResponse { - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/ApplyLabelingAndBindingRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/ApplyLabelingAndBindingRequest.java deleted file mode 100644 index 8714eb6..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/ApplyLabelingAndBindingRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -import lombok.Data; - -@Data -public class ApplyLabelingAndBindingRequest extends BaseRequest { - private String vehicle_code; - private String device_code; - private Integer task_code; - /** - * 1:贴标、捆扎申请 - * 2:烘箱 - * 3:开盖 - */ - private String type; - - private String weight; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/ApplyLabelingAndBindingResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/ApplyLabelingAndBindingResponse.java deleted file mode 100644 index 15d6882..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/ApplyLabelingAndBindingResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -import lombok.Data; - -import java.util.HashMap; -import java.util.Map; - -@Data -public class ApplyLabelingAndBindingResponse extends BaseResponse { - - private Map data = new HashMap(); - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/JsonUtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/JsonUtl.java deleted file mode 100644 index 27ad59a..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/JsonUtl.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.type.TypeFactory; - -import java.io.IOException; -import java.util.List; -import java.util.Map; - -public class JsonUtl { - private static ObjectMapper objectMapper = null; - private static ObjectMapper objectMapperLog = null; - - private JsonUtl() { - } - - private static ObjectMapper init() { - ObjectMapper objectMapper = new ObjectMapper(); - SimpleModule simpleModule = new SimpleModule(); -// simpleModule.addSerializer(Enum.class, new EnumSerializer()); -// simpleModule.addSerializer(Date.class, new DateSerializer()); -// simpleModule.addDeserializer(Enum.class, new EnumDeserializer()); -// simpleModule.addDeserializer(Date.class, new DateDeserializers.DateDeserializer()); - objectMapper.registerModule(simpleModule); - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - return objectMapper; - } - - public static ObjectMapper getInstance() { - if (objectMapper == null) { - Class var0 = JsonUtl.class; - synchronized (JsonUtl.class) { - if (objectMapper == null) { - objectMapper = init(); - } - } - } - - return objectMapper; - } - - public static ObjectMapper getInstanceLog() { - if (objectMapperLog == null) { - Class var0 = JsonUtl.class; - synchronized (JsonUtl.class) { - if (objectMapperLog == null) { - objectMapperLog = init(); - objectMapperLog.setSerializationInclusion(Include.NON_NULL); - } - } - } - - return objectMapperLog; - } - - public static ObjectMapper getObjectMapper() { - return getInstance(); - } - - public static String parse(Object object) throws RuntimeException { - try { - return getObjectMapper().writeValueAsString(object); - } catch (JsonProcessingException var2) { - throw new RuntimeException(var2); - } - } - - public static String parseWithoutException(Object object) { - try { - return parse(object); - } catch (Exception var2) { - return null; - } - } - - public static String parseLog(Object object) { - try { - return getInstanceLog().writeValueAsString(object); - } catch (Exception var2) { - return null; - } - } - - public static T format(String json, Class clazz) throws RuntimeException { - try { - return getObjectMapper().readValue(json, clazz); - } catch (IOException var3) { - throw new RuntimeException(var3); - } - } - - public static List formatList(String json, Class clazz) throws RuntimeException { - try { - JavaType type = getObjectMapper().getTypeFactory().constructParametricType(List.class, new Class[]{clazz}); - return (List) getObjectMapper().readValue(json, type); - } catch (IOException var3) { - throw new RuntimeException(var3); - } - } - - public static Map formatMap(String json, Class clazzKey, Class clazzValue) throws RuntimeException { - try { - JavaType type = getObjectMapper().getTypeFactory().constructParametricType(Map.class, new Class[]{clazzKey, clazzValue}); - return (Map) getObjectMapper().readValue(json, type); - } catch (IOException var4) { - throw new RuntimeException(var4); - } - } - - public static List> formatListTwo(String json, Class clazz) throws RuntimeException { - try { - TypeFactory typeFactory = getObjectMapper().getTypeFactory(); - JavaType type = typeFactory.constructParametrizedType(List.class, List.class, new Class[]{clazz}); - type = typeFactory.constructParametrizedType(List.class, List.class, new JavaType[]{type}); - return (List) getObjectMapper().readValue(json, type); - } catch (IOException var4) { - throw new RuntimeException(var4); - } - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/LiKuApplyTakResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/LiKuApplyTakResponse.java deleted file mode 100644 index 3a6c6d8..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/LiKuApplyTakResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -import lombok.Data; - -@Data -public class LiKuApplyTakResponse extends BaseResponse { - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/LiKuApplyTaskRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/LiKuApplyTaskRequest.java deleted file mode 100644 index 1463af0..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/LiKuApplyTaskRequest.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -import lombok.Data; - -@Data -public class LiKuApplyTaskRequest extends BaseRequest { - private String vehicle_code; - private String device_code; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/PutActionRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/PutActionRequest.java deleted file mode 100644 index 0c0f5a4..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/PutActionRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -import lombok.Data; - -import java.util.Map; - -@Data -public class PutActionRequest extends BaseRequest { - - /** - * 设备号 - */ - String device_code; - - /** - * - */ - String code; - - /** - * - */ - String value; - - /** - * 扩展属性 - */ - Map params; - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/PutActionResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/PutActionResponse.java deleted file mode 100644 index 0a428b5..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/PutActionResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -public class PutActionResponse extends BaseResponse { - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/UpdateLKTaskRequest.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/UpdateLKTaskRequest.java deleted file mode 100644 index c146134..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/UpdateLKTaskRequest.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -import lombok.Data; - -@Data -public class UpdateLKTaskRequest extends BaseRequest { - - /** - * 任务标识 - */ - private String ext_task_id; - - /** - * 任务编号 - */ - private String task_code; - - /** - * 载具号 - */ - String vehicle_code; - - /** - * 立库任务类型 - */ - String dtl_type; - - /** - * 类型 - */ - String type; - - /** - * 原库位 - */ - String srcLocation; - - /** - * 新库位 - */ - String destLocation; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/UpdateLKTaskResponse.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/UpdateLKTaskResponse.java deleted file mode 100644 index fb827ab..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/UpdateLKTaskResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.nl.acs.ext.wms.data.one; - -public class UpdateLKTaskResponse extends BaseResponse { - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java index 2633e1c..5569da2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToLiKuController.java @@ -8,7 +8,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.liKuData.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; -import org.nl.acs.enums.InterfaceLogType; import org.nl.common.logging.annotation.Log; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java index 51cd40a..f51cd04 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java @@ -3,7 +3,6 @@ package org.nl.acs.ext.wms.rest; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -46,18 +45,6 @@ public class AcsToWmsController { } - @PostMapping("/feedbackAgvStatus") - @Log("反馈AGV设备状态") - public ResponseEntity feedbackAgvStatus(@RequestBody String device_code, String error, String error_message) { - return new ResponseEntity<>(acstowmsService.feedbackAgvStatus(device_code, error, error_message), HttpStatus.OK); - } - - @PostMapping("/feedbackAgv") - @Log("反馈AGV设备信息") - public ResponseEntity feedbackAgv(@RequestBody JSONArray from) { - return new ResponseEntity<>(acstowmsService.feedbackAgv(from), HttpStatus.OK); - } - } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java index 4952f73..cb4c1c6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java @@ -3,14 +3,11 @@ package org.nl.acs.ext.wms.rest; import cn.dev33.satoken.annotation.SaIgnore; -import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.ext.wms.data.PutWeightActionRequest; import org.nl.acs.ext.wms.data.one.CancelTaskRequest; -import org.nl.acs.ext.wms.data.one.CreateTaskRequest; import org.nl.acs.ext.wms.service.WmsToAcsService; //import org.nl.modules.logging.InterfaceLogType; import org.nl.common.logging.annotation.Log; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index 13097c7..edc2973 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -1,186 +1,22 @@ package org.nl.acs.ext.wms.service; -import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.ext.wms.data.*; -import org.nl.acs.ext.wms.data.one.*; -import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingRequest; -import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingResponse; -import org.nl.acs.ext.wms.data.one.BaseRequest; -import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.ext.UnifiedResponse; public interface AcsToWmsService { + public UnifiedResponse applyTaskToWms(JSONObject jo); /** * 向WMS反馈任务状态 * @param arr * @return */ - public HttpResponse feedbackTaskStatusToWms(JSONArray arr); + public UnifiedResponse feedbackTaskStatusToWms(JSONArray arr); - /** - * 请求任务 - * @param address - * @param task_id - * @param vehicle_code - * @return - */ - public String requestTaskAgain(String address, String task_id, String vehicle_code); - - /** - * 反馈AGV设备状态 - * - * @param device_code - * @param error - * @param error_message - * @return - */ - HttpResponse feedbackAgvStatus(String device_code, String error, String error_message); - - /** - * 反馈AGV设备信息 - * - * @param from - * @return - */ - HttpResponse feedbackAgv(JSONArray from); - - - /** - * 请求开门或关门 - * - * @param device_code - * @param status - * @return - */ - HttpResponse applyOpenOrCloseDoor(String device_code, String status); - - /** - * 查询自动门状态 - * - * @param - * @returna - */ - HttpResponse queryDoorsStatus(); - - - /** - * 申请捆扎、贴标 - * - * @param param - * @return - */ - ApplyLabelingAndBindingResponse applyLabelingAndBindingRequest(ApplyLabelingAndBindingRequest param); - - - /** - * 输送线有货变成无货时向lms请求 - * @param param - * @return - */ - HttpResponse shipDeviceUpdate(JSONObject param); - - - /** - * 二期入库申请任务 - * @param param - * @return - */ - String applyTwo(JSONObject param); - - /** - * 二期发货申请任务 - * @param param - * @return - */ - String applySendOutTwo(JSONObject param); - - - /** - * 二期发货申请捆扎、贴标 - * @param param - * @return - */ - String deviceApplyTwo(JSONObject param); - String applyTowToOne(JSONObject param); - /** - * 反馈AGV取放货状态 - * - * @param from - * @return - */ - HttpResponse feedAgvTaskStatus(JSONArray from); - - /** - * ACS向WMS申请任务 - */ - String applyTaskToWms(JSONObject jo); - - /** - * ACS向WMS反馈任务状态 - * @param arr - * @return - */ - HttpResponse feedTaskStatus(JSONArray arr); - - /** - * ACS向WMS反馈任务状态 - * @param request - * @return - */ - String notify(BaseRequest request); - - /** - * 向WMS申请生箔按钮任务 - * @param param - * @return - */ - ApplyGreenFoilButtonResponse applyGreenFoilButtonTask(ApplyGreenFoilButtonRequest param); - - /** - * 向WMS申请表处机下料位按钮任务 - * @param param - * @return - */ - BlankingButtonResponse applyBlankButtonTask(BlankingButtonRequest param); - - /** - * 向lms申请反馈 - * @param param - * @return - */ - ApplyManipulatorActionResponse applyManipulatorActionRequest(ApplyManipulatorActionRequest param); - - /** - * 向lms申请套管工位请求 - * @param param - * @return - */ - ApplyPlugPullSitResponse applyPlugPullSiteRequest(ApplyPlugPullSiteRequest param); - - - /** - * 查询站点有无货状态 - * @param inst - * @return - */ - JSONObject queryStationState(Instruction inst); - - void sendDeviceStatus(JSONObject param); - - - String applyUpdatePointCode(JSONObject param); - - /** - * 向lms反馈废箔重量 - * @param param - * @return - */ - GetWasteFoilWeightResponse feedbackWeight(GetWasteFoilWeightRequest param); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java index 9009333..3cc5a7b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java @@ -1,13 +1,9 @@ package org.nl.acs.ext.wms.service; -import com.alibaba.fastjson.JSONObject; -import org.nl.acs.ext.wms.data.PutWeightActionRequest; -import org.nl.acs.ext.wms.data.PutWeightActionResponse; import org.nl.acs.ext.wms.data.one.*; import java.util.List; -import java.util.Map; public interface WmsToAcsService { /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index bfe2862..49546e6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -1,654 +1,40 @@ package org.nl.acs.ext.wms.service.impl; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; -import cn.hutool.http.HttpResponse; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializerFeature; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.AcsConfig; import org.nl.acs.address.service.AddressService; import org.nl.acs.address.service.dto.AddressDto; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.ext.wms.LmsUtil; +import org.nl.acs.ext.LmsHttpUtil; +import org.nl.acs.ext.UnifiedResponse; import org.nl.acs.ext.wms.RetryableUtil; -import org.nl.acs.ext.wms.data.*; -import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskRequest; -import org.nl.acs.ext.wms.data.AcsToWmsData.applyTask.ApplyTaskResponse; -import org.nl.acs.ext.wms.data.one.*; -import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingRequest; -import org.nl.acs.ext.wms.data.one.ApplyLabelingAndBindingResponse; -import org.nl.acs.ext.wms.data.one.BaseRequest; 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.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; import org.nl.config.lucene.service.LuceneExecuteLogService; -import org.nl.config.lucene.service.dto.LuceneLogDto; import org.nl.system.service.param.ISysParamService; -import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import java.util.Map; -import java.util.concurrent.CompletableFuture; @Service @RequiredArgsConstructor @Slf4j public class AcsToWmsServiceImpl implements AcsToWmsService { @Autowired - ISysParamService paramService; - - @Autowired - DeviceService deviceService; - - @Autowired - AddressService addressService; - - @Autowired - TaskService taskService; - - @Autowired - DeviceExecuteLogService logServer; - - @Autowired - private LuceneExecuteLogService luceneLogService; - - @Autowired - private RetryableUtil retryableUtil; - - public String token; - - - private String log_file_type = "log_file_type"; - private String log_type = "ACS请求LMS"; - - - @Override - public String applyTaskToWms(JSONObject jo) { - try { - MDC.put(log_file_type, log_type); - log.info("applyTaskToWms-----输入参数{}", jo); - String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("applyTaskToWms"); - String url = wmsurl + addressDto.getMethods_url(); - HttpResponse result2 = null; - try { - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(jo)) - .execute(); - } catch (Exception e) { - String msg = e.getMessage(); - log.info("applyTaskToWms-----输出参数{}", msg); - //网络不通 - } - if(ObjectUtil.isEmpty(result2)){ - log.info("applyTaskToWms-----输出参数{}", "返回结果为空"); - return null; - } - String type = ""; - if (result2.getStatus() == 200) { - type = "info"; - } else { - type = "error"; - } - log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), - JSON.toJSONString(jo), String.valueOf(result2.body()), "ACS向LMS申请生箔按钮任务"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - return result2.body(); - - } finally { - MDC.remove(log_file_type); - } - - } - - @Override - public HttpResponse feedbackTaskStatusToWms(JSONArray arr) { - return null; - } - - @Override - public String requestTaskAgain(String address, String task_id, String vehicle_code) { - return null; - } + private AddressService addressService; @Override - public HttpResponse feedbackAgvStatus(String device_code, String error, String error_message) { - return null; + public UnifiedResponse applyTaskToWms(JSONObject jo) { + AddressDto addressDto = addressService.findByCode("applyTaskToWms"); + return LmsHttpUtil.sendPostRequest(addressDto.getMethods_url(), jo, null); } @Override - public HttpResponse feedbackAgv(JSONArray from) { - return null; - } - - - @Override - public HttpResponse applyOpenOrCloseDoor(String device_code, String status) { - return null; - } - - @Override - public HttpResponse queryDoorsStatus() { - return null; - } - - @Override - public ApplyLabelingAndBindingResponse applyLabelingAndBindingRequest(ApplyLabelingAndBindingRequest param) { - return null; - } - - @Override - public HttpResponse shipDeviceUpdate(JSONObject param) { - return null; - } - - @Override - public String applyTwo(JSONObject param) { - try { - MDC.put(log_file_type, log_type); - log.info("applyTaskToWms-----输入参数{}", param); - String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("applyTwo"); - String url = wmsurl + addressDto.getMethods_url(); - HttpResponse result2 = null; - try { - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(param)) - .execute(); - } catch (Exception e) { - String msg = e.getMessage(); - log.info("applyTaskToWms-----输出参数{}", msg); - //网络不通 - } - if(ObjectUtil.isEmpty(result2)){ - log.info("applyTaskToWms-----输出参数{}", "返回结果为空"); - return null; - } - String type = ""; - if (result2.getStatus() == 200) { - type = "info"; - } else { - type = "error"; - } - log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), - JSON.toJSONString(param), String.valueOf(result2.body()), "二期入库申请任务"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - return result2.body(); - - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public String applySendOutTwo(JSONObject param) { - try { - MDC.put(log_file_type, log_type); - log.info("applyTaskToWms-----输入参数{}", param); - String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("applySendOutTwo"); - String url = wmsurl + addressDto.getMethods_url(); - HttpResponse result2 = null; - try { - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(param)) - .execute(); - } catch (Exception e) { - String msg = e.getMessage(); - log.info("applyTaskToWms-----输出参数{}", msg); - //网络不通 - } - if(ObjectUtil.isEmpty(result2)){ - log.info("applyTaskToWms-----输出参数{}", "返回结果为空"); - return null; - } - String type = ""; - if (result2.getStatus() == 200) { - type = "info"; - } else { - type = "error"; - } - log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), - JSON.toJSONString(param), String.valueOf(result2.body()), "二期发货申请任务"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - return result2.body(); - - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public String deviceApplyTwo(JSONObject param) { - try { - MDC.put(log_file_type, log_type); - log.info("applyTaskToWms-----输入参数{}", param); - String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("deviceApplyTwo"); - String url = wmsurl + addressDto.getMethods_url(); - HttpResponse result2 = null; - try { - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(param)) - .execute(); - } catch (Exception e) { - String msg = e.getMessage(); - log.info("applyTaskToWms-----输出参数{}", msg); - //网络不通 - } - if(ObjectUtil.isEmpty(result2)){ - log.info("applyTaskToWms-----输出参数{}", "返回结果为空"); - return null; - } - String type = ""; - if (result2.getStatus() == 200) { - type = "info"; - } else { - type = "error"; - } - log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), - JSON.toJSONString(param), String.valueOf(result2.body()), "二期发货申请捆扎、贴标"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - return result2.body(); - - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public String applyTowToOne(JSONObject param) { - try { - MDC.put(log_file_type, log_type); - log.info("applyTaskToWms-----输入参数{}", param); - String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("sendProductToFirstFloor"); - String url = wmsurl + addressDto.getMethods_url(); - HttpResponse result2 = null; - try { - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(param)) - .execute(); - } catch (Exception e) { - String msg = e.getMessage(); - log.info("applyTaskToWms-----输出参数{}", msg); - //网络不通 - } - if(ObjectUtil.isEmpty(result2)){ - log.info("applyTaskToWms-----输出参数{}", "返回结果为空"); - return null; - } - String type = ""; - if (result2.getStatus() == 200) { - type = "info"; - } else { - type = "error"; - } - log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), - JSON.toJSONString(param), String.valueOf(result2.body()), "二期发货申请捆扎、贴标"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - return result2.body(); - - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public HttpResponse feedAgvTaskStatus(JSONArray from) { - return null; - } - - - - - @Override - public HttpResponse feedTaskStatus(JSONArray data) { - //feedTaskStatus - try { - MDC.put(log_file_type, log_type); - String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - - String task_code = ""; - for (int i = 0; i < data.size(); i++) { - JSONObject json = (JSONObject) data.get(i); - task_code = json.getString("task_code"); - } - TaskDto taskDto = taskService.findByCode(task_code); - String vehicle_code = taskDto.getVehicle_code(); - - HttpResponse result2 = null; - log.info("feedbackTaskStatusToWms-----请求参数{}", data.toString()); - - AddressDto addressDto = addressService.findByCode("feedTaskStatus"); - String methods_url = addressDto.getMethods_url(); - try { - result2 = HttpRequest.post(wmsurl + methods_url) - .header("Authorization", token).body(String.valueOf(data)) - .execute(); -// //System.out.println(result2); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 -// //System.out.println(msg); - log.info("feedbackTaskStatusToWms-----输出参数{}", msg); - CompletableFuture.runAsync(() -> { - retryableUtil.retryable(wmsurl + methods_url, JSON.toJSONString(data), token); - }); - - } - - - String type = ""; - if (result2.getStatus() == 200) { - type = "info"; - } else { - type = "error"; - } - - JSONObject jo = JSONObject.parseObject(result2.body()); - log.info("feedbackTaskStatusToWms-----输出参数{}", jo.toString()); - return result2; - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public String notify(BaseRequest request) { - return null; - } - - @Override - public ApplyGreenFoilButtonResponse applyGreenFoilButtonTask(ApplyGreenFoilButtonRequest param) { - try { - MDC.put(log_file_type, log_type); - ApplyGreenFoilButtonResponse applyGreenFoilButtonResponse = new ApplyGreenFoilButtonResponse(); - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { - String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("applyGreenFoilButtonTask"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - log.info("ApplyGreenFoilButtonRequest----请求参数{}", param); - try { -// String result = ""; - String result = HttpRequest.post(url) - .body(JSON.toJSONString(param)) - .execute().body(); - JSONObject jsonObject = JSONObject.parseObject(result); - log.info("ApplyGreenFoilButtonResponse----返回参数{}", result); - applyGreenFoilButtonResponse = JSONObject.toJavaObject(jsonObject, ApplyGreenFoilButtonResponse.class); - } catch (Exception e) { - JSONObject map = new JSONObject(); - map.put("status", 400); - map.put("message", e.getMessage()); - return JSONObject.toJavaObject(map, ApplyGreenFoilButtonResponse.class); - } - LuceneLogDto luceneLogDto = new LuceneLogDto("ApplyGreenFoilButtonRequest", String.valueOf(applyGreenFoilButtonResponse.getCode()), - JSON.toJSONString(param), String.valueOf(applyGreenFoilButtonResponse.getMessage()), "ACS向LMS申请生箔按钮任务"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - } - return applyGreenFoilButtonResponse; - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public BlankingButtonResponse applyBlankButtonTask(BlankingButtonRequest param) { - try { - MDC.put(log_file_type, log_type); - BlankingButtonResponse blankingButtonResponse = new BlankingButtonResponse(); - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { - String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("applyButtonTask"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - log.info("BlankingButtonRequest----请求参数{}", param); - try { -// String result = ""; - String result = HttpRequest.post(url) - .body(JSON.toJSONString(param)) - .execute().body(); - JSONObject jsonObject = JSONObject.parseObject(result); - log.info("BlankingButtonResponse----返回参数{}", result); - blankingButtonResponse = JSONObject.toJavaObject(jsonObject, BlankingButtonResponse.class); - } catch (Exception e) { - JSONObject map = new JSONObject(); - map.put("status", 400); - map.put("message", e.getMessage()); - return JSONObject.toJavaObject(map, BlankingButtonResponse.class); - } - LuceneLogDto luceneLogDto = new LuceneLogDto("BlankingButtonRequest", String.valueOf(blankingButtonResponse.getCode()), - JSON.toJSONString(param), String.valueOf(blankingButtonResponse.getMessage()), "ACS向LMS申请表处下料位按钮任务"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - } - return blankingButtonResponse; - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public ApplyPlugPullSitResponse applyPlugPullSiteRequest(ApplyPlugPullSiteRequest param) { - log.info("向LMS申请反馈,请求参数{}",param); - try { - MDC.put(log_file_type, log_type); - ApplyPlugPullSitResponse applyPlugPullSitResponse = new ApplyPlugPullSitResponse(); - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { - String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("applyPlugPullSiteRequest"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - log.info("ApplyPlugPullSiteRequest----请求参数:{}", JSONObject.toJSONString(param)); - try { -// String result = ""; - String result = HttpRequest.post(url) - .body(JSON.toJSONString(param)) - .execute().body(); - JSONObject jsonObject = JSONObject.parseObject(result); - log.info("ApplyPlugPullSitResponse----返回参数{}", result); - applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class); - } catch (Exception e) { - JSONObject map = new JSONObject(); - map.put("status", 400); - map.put("message", e.getMessage()); - return JSONObject.toJavaObject(map, ApplyPlugPullSitResponse.class); - } - LuceneLogDto luceneLogDto = new LuceneLogDto("ApplyPlugPullSiteRequest", String.valueOf(applyPlugPullSitResponse.getCode()), - JSON.toJSONString(param), String.valueOf(applyPlugPullSitResponse.getMessage()), "ACS向LMS申请套管"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - } - return applyPlugPullSitResponse; - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public ApplyManipulatorActionResponse applyManipulatorActionRequest(ApplyManipulatorActionRequest param) { - log.info("向LMS申请反馈,请求参数{}", param); - try { - MDC.put(log_file_type, log_type); - ApplyManipulatorActionResponse applyManipulatorActionResponse = new ApplyManipulatorActionResponse(); - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { - String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("applyManipulatorAction"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - log.info("ApplyManipulatorActionRequest----请求参数:{}", JSONObject.toJSONString(param)); - try { -// String result = ""; - String result = HttpRequest.post(url) - .body(JSON.toJSONString(param)) - .execute().body(); - JSONObject jsonObject = JSONObject.parseObject(result); - log.info("ApplyManipulatorActionResponse----返回参数{}", result); - applyManipulatorActionResponse = JSONObject.toJavaObject(jsonObject, ApplyManipulatorActionResponse.class); - } catch (Exception e) { - JSONObject map = new JSONObject(); - map.put("status", 400); - map.put("message", e.getMessage()); - return JSONObject.toJavaObject(map, ApplyManipulatorActionResponse.class); - } - LuceneLogDto luceneLogDto = new LuceneLogDto("ApplyManipulatorActionRequest", String.valueOf(applyManipulatorActionResponse.getCode()), - JSON.toJSONString(param), String.valueOf(applyManipulatorActionResponse), "ACS向LMS申请反馈"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - } - return applyManipulatorActionResponse; - } finally { - MDC.remove(log_file_type); - - } - } - - @Override - public GetWasteFoilWeightResponse feedbackWeight(GetWasteFoilWeightRequest param) { - log.info("向LMS申请反馈,请求参数{}", param); - try { - MDC.put(log_file_type, log_type); - GetWasteFoilWeightResponse getWasteFoilWeightResponse = new GetWasteFoilWeightResponse(); - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { - String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("feedbackWeight"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - log.info("GetWasteFoilWeightRequest----请求参数:{}", JSONObject.toJSONString(param)); - try { -// String result = ""; - String result = HttpRequest.post(url) - .body(JSON.toJSONString(param)) - .execute().body(); - JSONObject jsonObject = JSONObject.parseObject(result); - log.info("GetWasteFoilWeightResponse----返回参数{}", result); - getWasteFoilWeightResponse = JSONObject.toJavaObject(jsonObject, GetWasteFoilWeightResponse.class); - } catch (Exception e) { - JSONObject map = new JSONObject(); - map.put("status", 400); - map.put("message", e.getMessage()); - return JSONObject.toJavaObject(map, GetWasteFoilWeightResponse.class); - } - LuceneLogDto luceneLogDto = new LuceneLogDto("GetWasteFoilWeightRequest", String.valueOf(getWasteFoilWeightResponse.getCode()), - JSON.toJSONString(param), String.valueOf(getWasteFoilWeightResponse), "ACS向LMS申请反馈"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - } - return getWasteFoilWeightResponse; - } finally { - MDC.remove(log_file_type); - - } - } - - - @Override - public JSONObject queryStationState(Instruction inst) { - try { - String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("gccQueryStationState"); - String uri = wmsurl + addressDto.getMethods_url() + "?StartStationCode=" + inst.getStart_point_code() + "&EndStationCode=" + inst.getNext_point_code(); - - log.info("gccQueryStationState - 请求路径{}", uri); - String responseBody = HttpRequest - .get(uri) - .execute() - .body(); - log.info("gccQueryStationState - 响应参数{}", responseBody); - JSONObject jsonObject = JSONObject.parseObject(responseBody); - LuceneLogDto luceneLogDto = new LuceneLogDto("gccQueryStationState", String.valueOf(jsonObject.get("code")), - JSON.toJSONString("StartStationCode=" + inst.getStart_point_code() + "&EndStationCode=" + inst.getNext_point_code()), - String.valueOf(jsonObject), "ACS查询站点有无货状态"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - return JSONObject.parseObject(responseBody); - } catch (Exception e) { - JSONObject result = new JSONObject(); - result.put("status", HttpStatus.BAD_REQUEST.value()); - result.put("message", e.getMessage()); - return result; - } - } - @Override -// @Async - public void sendDeviceStatus(JSONObject param) { - try { - MDC.put(log_file_type, log_type); - - if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { - String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("sendDeviceStatus"); - String methods_url = addressDto.getMethods_url(); - String url = wmsUrl + methods_url; - log.info("sendDeviceStatus - 请求参数 {}", param); - HttpResponse response = HttpRequest - .post(url) - .body(param.toString()) - .execute(); - log.info("sendDeviceStatus - 返回参数 {}", response.body()); - } - } catch (Throwable ignored) { - - } finally { - MDC.remove(log_file_type); - } - } - - @Override - public String applyUpdatePointCode(JSONObject param) { - try { - MDC.put(log_file_type, log_type); - log.info("applyTaskToWms-----输入参数{}", param); - String wmsurl = paramService.findByCode(AcsConfig.WMSURL).getValue(); - AddressDto addressDto = addressService.findByCode("deviceApplyExceptional"); - String url = wmsurl + addressDto.getMethods_url(); - HttpResponse result2 = null; - try { - result2 = HttpRequest.post(url) - .header("Authorization", token) - .body(String.valueOf(param)) - .execute(); - } catch (Exception e) { - String msg = e.getMessage(); - log.info("applyTaskToWms-----输出参数{}", msg); - //网络不通 - } - if (ObjectUtil.isEmpty(result2)) { - log.info("applyTaskToWms-----输出参数{}", "返回结果为空"); - return null; - } - String type = ""; - if (result2.getStatus() == 200) { - type = "info"; - } else { - type = "error"; - } - log.info("applyTaskToWms-----输出参数{}", result2.body()); - LuceneLogDto luceneLogDto = new LuceneLogDto("applyTaskToWms", String.valueOf(result2.getStatus()), - JSON.toJSONString(param), String.valueOf(result2.body()), "申请更新点位"); - luceneLogService.interfaceExecuteLog(luceneLogDto); - return result2.body(); - - } finally { - MDC.remove(log_file_type); - } + public UnifiedResponse feedbackTaskStatusToWms(JSONArray arr) { + AddressDto addressDto = addressService.findByCode("feedTaskStatus"); + return LmsHttpUtil.sendPostRequest(addressDto.getMethods_url(), arr, null); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java index cac2530..950ce23 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java @@ -8,8 +8,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.address.service.AddressService; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device.device.domain.Device; import org.nl.acs.ext.wms.RespUtil; import org.nl.acs.ext.wms.liKuData.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; @@ -18,8 +17,8 @@ import org.nl.acs.ext.wms.service.LiKuToAcsService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl; import org.nl.acs.task.enums.TaskStatusEnum; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; @@ -286,31 +285,8 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { String type = requestParam.getType(); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); Device device = appService.findDeviceByCode(device_code); - SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; JSONObject result = new JSONObject(); result.put("code", "0"); - if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); - if (StrUtil.equals(type, CommonFinalParam.ONE)) { - if ((siemensConveyorDeviceDriver.getMode() == 2 || siemensConveyorDeviceDriver.getMode() == 7) && siemensConveyorDeviceDriver.getMove() == 0) { - result.put("result", "true"); - result.put("comment", ""); - } else { - result.put("result", "false"); - result.put("comment", "当前设备光电信号:" + siemensConveyorDeviceDriver.getMove() + ",工作模式:" + siemensConveyorDeviceDriver.getMode()); - } - } else if (StrUtil.equals(type, "2")) { - List list = new ArrayList(); - Map map = new HashMap(); - map.put("to_command", "3"); - list.add(map); - siemensConveyorDeviceDriver.writing(list); - - result.put("result", "true"); - result.put("comment", ""); - } - - } log.info("请求放空盘-----输出参数{}", result); return RespUtil.getResp(result.toString(), new DeviceStatusResponse()); } finally { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index fadffb8..9f8e348 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -10,14 +10,13 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver; +import org.nl.acs.device.device.domain.Device; import org.nl.acs.ext.wms.data.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.ext.wms.service.WmsToAcsService; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.storage_cell.domain.StorageCell; import org.nl.acs.storage_cell.service.mapper.StorageCellMapper; import org.nl.acs.task.service.TaskService; @@ -75,7 +74,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { // } for (int i = 0; i < datas.size(); i++) { String data = datas.get(i).toString(); - CreateTaskRequest request = JsonUtl.format(data, CreateTaskRequest.class); + CreateTaskRequest request = JSON.parseObject(data, CreateTaskRequest.class); String paper_array = request.getPaper_array(); String ext_task_id = request.getExt_task_id(); String task_code = request.getTask_code(); @@ -220,22 +219,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { } if (StrUtil.equals(task_type, "5")) { - Device device = deviceAppService.findDeviceByCode(next_device_code); - SiemensConveyorDeviceDriver siemensConveyorDeviceDriver; - if (device.getDeviceDriver() instanceof SiemensConveyorDeviceDriver) { - siemensConveyorDeviceDriver = (SiemensConveyorDeviceDriver) device.getDeviceDriver(); - if (ObjectUtil.equal("true", siemensConveyorDeviceDriver.getExtraValue().get("inspect_in_stock"))) { - if (siemensConveyorDeviceDriver.getMove() == 1) { - JSONObject json = new JSONObject(); - json.put("task_code", task_code); - json.put("ext_task_id", ext_task_id); - json.put("message", "终点" + siemensConveyorDeviceDriver.getDevice_code() + "有货无法生成任务"); - errArr.add(json); - continue; - } - } - } - if (taskserver.querySameDeviceReadyTask(start_device_code, next_device_code, "0") > 1) { JSONObject json = new JSONObject(); json.put("task_code", task_code); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java index 3699e3e..c52ad32 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/ErrorUtil.java @@ -6,7 +6,6 @@ import org.nl.config.SpringContextHolder; import org.nl.config.language.LangProcess; import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; -import org.nl.system.service.dict.dto.DictDetailDto; import org.nl.system.service.dict.impl.SysDictServiceImpl; import java.util.Comparator; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/DeviceErrorLogService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/DeviceErrorLogService.java index 9415241..f41b648 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/DeviceErrorLogService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/DeviceErrorLogService.java @@ -1,7 +1,7 @@ package org.nl.acs.history.service; -import org.nl.acs.common.base.CommonService; +import org.nl.acs.common.base.service.CommonService; import org.nl.acs.history.domain.AcsDeviceErrorLog; import org.nl.acs.history.service.dto.DeviceErrorLogDto; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/impl/DeviceErrorLogServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/impl/DeviceErrorLogServiceImpl.java index 2e4b7d1..b1f1ad9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/impl/DeviceErrorLogServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/impl/DeviceErrorLogServiceImpl.java @@ -3,26 +3,21 @@ package org.nl.acs.history.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -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.Wrappers; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; -import org.nl.acs.common.base.impl.CommonServiceImpl; +import org.nl.acs.common.base.service.impl.CommonServiceImpl; import org.nl.acs.history.domain.AcsDeviceErrorLog; import org.nl.acs.history.service.DeviceErrorLogService; import org.nl.acs.history.service.dto.DeviceErrorLogDto; import org.nl.acs.history.service.mapper.AcsDeviceErrorLogMapper; -import org.nl.acs.task.domain.Task; import org.nl.acs.utils.PageUtil; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/mapper/AcsDeviceErrorLogMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/mapper/AcsDeviceErrorLogMapper.java index 007ec6e..1bf2f1a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/mapper/AcsDeviceErrorLogMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/history/service/mapper/AcsDeviceErrorLogMapper.java @@ -1,6 +1,6 @@ package org.nl.acs.history.service.mapper; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.nl.acs.history.domain.AcsDeviceErrorLog; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java index a7ad9d0..2a59590 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/InstructionComparator.java @@ -1,11 +1,9 @@ package org.nl.acs.instruction; -import cn.hutool.core.util.StrUtil; import org.nl.acs.instruction.domain.Instruction; import java.text.SimpleDateFormat; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; + /** * @author 20220102CG\noblelift */ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java index 8b9bdbf..b7d7b56 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/domain/InstructionMybatis.java @@ -1,6 +1,6 @@ package org.nl.acs.instruction.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java index 5a7a516..8515e2d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/rest/InstructionController.java @@ -1,12 +1,9 @@ package org.nl.acs.instruction.rest; import cn.dev33.satoken.annotation.SaIgnore; -import cn.hutool.core.util.ObjectUtil; import org.nl.common.logging.annotation.Log; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.InstructionDto; -import org.nl.acs.instruction.service.dto.InstructionQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -18,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java index 96384d4..48f1800 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -5,7 +5,7 @@ import org.nl.acs.instruction.domain.InstructionMybatis; import org.nl.acs.instruction.service.dto.InstructionDto; import org.nl.acs.instruction.service.dto.InstructionQueryParam; 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.instruction.domain.Instruction; import org.springframework.data.domain.Pageable; @@ -453,4 +453,91 @@ public interface InstructionService extends CommonService { */ Boolean querySameNextDeviceCodeInstByOut(String nextDeviceCode); + + /** + * 用于优先入库策略时 + * 根据堆垛机前叉或后叉关联输送线设备， + * 查询其对应的起点指令信息 + * + * @param start_device_code_list + * @return + */ + List findReadyInstByStartDeviceCode(List start_device_code_list, String noY); + + + /** + * 用于优先出库策略 + * 根据关联的前叉或后叉可达输送线设备 + * 并且指令的起点不是前叉或后叉的禁止列 + * 然后根据指令终点查询就绪状态下的出库指令 + * + * @param next_device_code_list + * @param noY + * @return + */ + List findReadyInstByNextDeviceCode(List next_device_code_list, String noY); + + /** + * 用于时间顺序出入库策略 + * 查询前叉或后叉可达设备的指令信息 + * + * @param device_code_list + * @param noY + * @return + */ + List findReadyInstByDeviceCode(List device_code_list, String noY); + + + /** + * 用于优先入库策略和时间顺序策略 + * 主要是根据前叉指令排列层信息及前叉指令起点关联设备 + * 一般是入库时根据指令起点查询是否可组成双叉指令 + * + * @param frontInst + * @param link_device_code + * @param noY + * @return + */ + Instruction findReadyInstByStartDeviceCode(Instruction frontInst, String link_device_code, String noY); + + + /** + * @param linkDeviceCode + * @param noY + * @return + */ + Instruction findReadyInstByLinkDeviceCodeAndStartDeviceCode(String linkDeviceCode, String noY); + + Instruction findReadyInstByLinkDeviceCodeAndNextDeviceCode(String linkDeviceCode, String noY); + + /** + * 用于优先出库策略和时间顺序策略 -出库 + * 主要是根据前叉指令的排列层、前叉指令终点的关联设备，查询后叉指令信息 + * 用来组成双叉指令 + * + * @param frontInst + * @param link_device_code + * @param noY + * @return + */ + Instruction findReadyInstByNextDeviceCode(Instruction frontInst, String link_device_code, String noY); + + + /** + * 根据起点查询就绪状态下指令 + * 主要用于出库输送线 + * + * @param start_device_code + * @return + */ + Instruction findReadyInst(String start_device_code); + + + Instruction findReadyInstByEnd(String next_device_code); + + Instruction findReadyInstByVehicleCode(String vehicleCode); + + Instruction findBusyInstByNextDeviceCode(String getLinkDeviceCode); + + Instruction findByVehicleCodeFromCache(String barcode); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionQueryParam.java index 4305043..084bb75 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionQueryParam.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/dto/InstructionQueryParam.java @@ -4,12 +4,6 @@ import lombok.Builder; import lombok.Getter; import lombok.Setter; -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - /** * @author jiaolm * @date 2023-05-09 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index df90691..a5ac22e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -1,7 +1,7 @@ package org.nl.acs.instruction.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -12,7 +12,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -25,16 +24,14 @@ import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.agv.server.XianGongAgvService; import org.nl.acs.auto.initial.ApplicationAutoInitial; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device.service.impl.DeviceServiceImpl; -import org.nl.acs.device_driver.DeviceDriver; -import org.nl.acs.device_driver.DeviceDriverDefination; -import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; -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_inspect_site.StandardInspectSiteDeviceDriver; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.enums.DeviceType; +import org.nl.acs.device.device.service.DeviceService; +import org.nl.acs.device.device.service.impl.DeviceServiceImpl; +import org.nl.acs.device.driver.DeviceDriver; +import org.nl.acs.device.driver.DeviceDriverDefination; +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.ext.wms.liKuData.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; import org.nl.acs.instruction.domain.InstructionMybatis; @@ -43,8 +40,8 @@ import org.nl.acs.instruction.service.dto.InstructionDto; import org.nl.acs.instruction.service.dto.InstructionQueryParam; import org.nl.acs.limit_regional.server.LimitRegionalService; import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.route.service.impl.RouteLineServiceImpl; @@ -54,8 +51,9 @@ import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; 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.task.service.mapper.TaskMapper; +import org.nl.acs.utils.StringUtil; import org.nl.common.exception.BadRequestException; import org.nl.acs.utils.ConvertUtil; import org.nl.common.utils.FileUtil; @@ -76,6 +74,8 @@ import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.regex.Pattern; @@ -360,17 +360,21 @@ public class InstructionServiceImpl extends CommonServiceImpl instructionMybatis = instructionMapper.selectList(Wrappers.lambdaQuery(InstructionMybatis.class) + .eq(InstructionMybatis::getTask_code, dto.getTask_code())); + if (CollUtil.isNotEmpty(instructionMybatis) && instructionMybatis.stream().anyMatch(inst -> inst.getStart_device_code() + .equals(start_device_code))) { return; } } @@ -432,10 +436,8 @@ public class InstructionServiceImpl extends CommonServiceImpl shortPathsList = @@ -459,19 +461,19 @@ public class InstructionServiceImpl extends CommonServiceImpl(taskMapper) - .eq(Task::getTask_id, insttaskid) + .eq(Task::getTask_id, dto.getTask_id()) .one(); // =0 则不用再次请求 if (StrUtil.equals(task.getRequest_again(), "0")) { - if(StrUtil.equals(task.getTask_type(),"8")){ - //中转为空 - if(StrUtil.isEmpty(task.getPut_device_code())){ - if (StrUtil.equals(task.getNext_device_code(), instnextdevice)) { - taskService.finish(task.getTask_id()); - } else { - finishAndCreateNextInst(ConvertUtil.convert(ins, Instruction.class)); - } - } else { - if (StrUtil.equals(task.getNext_device_code(), instnextdevice)) { - finishAndCreateHXInst(ConvertUtil.convert(ins, Instruction.class)); - } else if (StrUtil.equals(task.getPut_device_code(), instnextdevice)) { - taskService.finish(task.getTask_id()); - } - } - + if (StrUtil.equals(task.getNext_device_code(), inst_next_device_code)) { + taskService.finish(task.getTask_id()); } else { - if (StrUtil.equals(task.getNext_device_code(), instnextdevice)) { - taskService.finish(task.getTask_id()); - } else { - finishAndCreateNextInst(ConvertUtil.convert(ins, Instruction.class)); - } + finishAndCreateNextInst(ConvertUtil.convert(ins, Instruction.class)); } } - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class); - Device device = appService.findDeviceByCode(instnextdevice); + Device device = deviceAppService.findDeviceByCode(inst_next_device_code); if (device == null) { log.debug("地址对应设备未找到"); return; } - - removeByCodeFromCache(dto.getInstruction_code()); - // this.reload(); } @Override @@ -1649,27 +1621,6 @@ public class InstructionServiceImpl extends CommonServiceImpl> list = new ArrayList<>(); - Map map = new HashMap<>(); - map.put("code", "to_target"); - map.put("value", nextDevice.getExtraValue().get("address").toString()); - list.add(map); - Map map2 = new HashMap<>(); - map2.put("code", "to_task"); - map2.put("value", inst.getInstruction_code()); - list.add(map2); - Map map3 = new HashMap<>(); - map3.put("code", "to_command"); - map3.put("value", CommonFinalParam.ONE); - list.add(map3); - ((SiemensConveyorDeviceDriver) startDeviceDriver).writing(list); - } } @Override @@ -1809,9 +1760,7 @@ public class InstructionServiceImpl extends CommonServiceImpl findReadyInstByStartDeviceCode(List start_device_code_list, String noY) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> start_device_code_list.contains(inst.getStart_device_code())) + .filter(inst -> ObjectUtil.isNotEmpty(inst.getTo_y()) && !noY.contains(String.valueOf(Integer.parseInt(inst.getTo_y())))) + .sorted(Comparator.comparing(Instruction::getPriority) + .thenComparing(inst -> LocalDateTime.parse(inst.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .collect(Collectors.toList()); + } + + @Override + public List findReadyInstByNextDeviceCode(List next_device_code_list, String noY) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> next_device_code_list.contains(inst.getNext_device_code())) + .filter(inst -> ObjectUtil.isNotEmpty(inst.getFrom_y()) && !noY.contains(String.valueOf(Integer.parseInt(inst.getFrom_y())))) + .sorted(Comparator.comparing(Instruction::getPriority) + .thenComparing(inst -> LocalDateTime.parse(inst.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .collect(Collectors.toList()); + } + + @Override + public List findReadyInstByDeviceCode(List device_code_list, String noY) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> (device_code_list.contains(inst.getStart_device_code()) && ObjectUtil.isNotEmpty(inst.getTo_y()) && !noY.contains(inst.getTo_y())) || (device_code_list.contains(inst.getNext_device_code()) && ObjectUtil.isNotEmpty(inst.getFrom_y()) && !noY.contains(inst.getFrom_y()))) + .sorted(Comparator.comparing(Instruction::getPriority) + .thenComparing(inst -> LocalDateTime.parse(inst.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .collect(Collectors.toList()); + } + + @Override + public Instruction findReadyInstByStartDeviceCode(Instruction frontInst, String link_device_code, String noY) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> inst.getStart_device_code().equals(link_device_code)) + .filter(inst -> ObjectUtil.isNotEmpty(inst.getTo_y()) && !noY.contains(inst.getTo_y())) + .filter(inst -> Integer.parseInt(StringUtil.handleString(inst.getTo_x())) == Integer.parseInt(StringUtil.handleString(frontInst.getTo_x()))) + .filter(inst -> (Integer.parseInt(frontInst.getTo_y()) / 4 == Integer.parseInt(inst.getTo_y()) / 4) && (((Integer.parseInt(frontInst.getTo_y()) % 4) + (Integer.parseInt(inst.getTo_y()) % 4) == 2) || (Integer.parseInt(frontInst.getTo_y()) % 4) + (Integer.parseInt(inst.getTo_y()) % 4) == 4)) + .filter(inst -> Integer.parseInt(inst.getTo_z()) == Integer.parseInt(frontInst.getTo_z())) + .sorted(Comparator.comparing(Instruction::getPriority) + .thenComparing(inst -> LocalDateTime.parse(inst.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .findFirst().orElse(null); + } + + @Override + public Instruction findReadyInstByLinkDeviceCodeAndStartDeviceCode(String linkDeviceCode, String noY) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> inst.getStart_device_code().equals(linkDeviceCode)) + .filter(inst -> StrUtil.isNotBlank(inst.getTo_y()) && StrUtil.isNotBlank(noY) && !noY.contains(String.valueOf(Integer.parseInt(inst.getTo_y())))) + .sorted(Comparator.comparing(Instruction::getPriority) + .thenComparing(inst -> LocalDateTime.parse(inst.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .findFirst() + .orElse(null); + } + + @Override + public Instruction findReadyInstByLinkDeviceCodeAndNextDeviceCode(String linkDeviceCode, String noY) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> inst.getNext_device_code().equals(linkDeviceCode)) + .filter(inst -> StrUtil.isNotBlank(inst.getFrom_y()) && StrUtil.isNotBlank(noY) && !noY.contains(String.valueOf(Integer.parseInt(inst.getFrom_y())))) + .sorted(Comparator.comparing(Instruction::getPriority) + .thenComparing(inst -> LocalDateTime.parse(inst.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .findFirst() + .orElse(null); + } + + @Override + public Instruction findReadyInstByNextDeviceCode(Instruction frontInst, String link_device_code, String noY) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> inst.getNext_device_code().equals(link_device_code)) + .filter(inst -> ObjectUtil.isNotEmpty(inst.getFrom_y()) && !noY.contains(inst.getFrom_y())) + .filter(inst -> Integer.parseInt(StringUtil.handleString(inst.getFrom_x())) == Integer.parseInt(StringUtil.handleString(frontInst.getFrom_x()))) + .filter(inst -> (Integer.parseInt(frontInst.getFrom_y()) / 4 == Integer.parseInt(inst.getFrom_y()) / 4) && (((Integer.parseInt(frontInst.getFrom_y()) % 4) + (Integer.parseInt(inst.getFrom_y()) % 4) == 2) || (Integer.parseInt(frontInst.getFrom_y()) % 4) + (Integer.parseInt(inst.getFrom_y()) % 4) == 4)) + .filter(inst -> Integer.parseInt(inst.getFrom_z()) == Integer.parseInt(frontInst.getFrom_z())) + .sorted(Comparator.comparing(Instruction::getPriority) + .thenComparing(inst -> LocalDateTime.parse(inst.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .findFirst().orElse(null); + } + + @Override + public Instruction findReadyInst(String start_device_code) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> inst.getStart_device_code().equals(start_device_code)) + .findFirst().orElse(null); + } + + @Override + public Instruction findReadyInstByEnd(String next_device_code) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> inst.getNext_device_code().equals(next_device_code)) + .findFirst().orElse(null); + } + + @Override + public Instruction findReadyInstByVehicleCode(String vehicleCode) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.READY.getIndex())) + .filter(inst -> inst.getVehicle_code().equals(vehicleCode)) + .findFirst().orElse(null); + } + + @Override + public Instruction findBusyInstByNextDeviceCode(String getLinkDeviceCode) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getInstruction_status().equals(InstructionStatusEnum.BUSY.getIndex())) + .filter(inst -> inst.getNext_device_code().equals(getLinkDeviceCode)) + .findFirst() + .orElse(null); + } + + @Override + public Instruction findByVehicleCodeFromCache(String barcode) { + return Optional.ofNullable(this.instructions) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(inst -> inst.getVehicle_code().equals(barcode)) + .findFirst() + .orElse(null); + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/mapper/InstructionMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/mapper/InstructionMapper.java index dfc18bf..492b13e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/mapper/InstructionMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/mapper/InstructionMapper.java @@ -5,7 +5,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; import org.nl.acs.instruction.domain.InstructionMybatis; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.nl.acs.instruction.domain.Instruction; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/domain/LabelingTemplate.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/domain/LabelingTemplate.java index dee5c0a..f2d039d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/domain/LabelingTemplate.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/domain/LabelingTemplate.java @@ -1,6 +1,6 @@ package org.nl.acs.labeling_template.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/rest/LabelingTemplateController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/rest/LabelingTemplateController.java index 504b5f2..99be6a0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/rest/LabelingTemplateController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/rest/LabelingTemplateController.java @@ -1,7 +1,6 @@ package org.nl.acs.labeling_template.rest; import org.nl.common.logging.annotation.Log; -import org.nl.acs.labeling_template.domain.LabelingTemplate; import org.nl.acs.labeling_template.service.LabelingTemplateService; import org.nl.acs.labeling_template.service.dto.LabelingTemplateDto; import org.nl.acs.labeling_template.service.dto.LabelingTemplateQueryParam; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/LabelingTemplateService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/LabelingTemplateService.java index f1c36a2..3bbfda5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/LabelingTemplateService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/LabelingTemplateService.java @@ -1,7 +1,7 @@ package org.nl.acs.labeling_template.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.labeling_template.domain.LabelingTemplate; import org.nl.acs.labeling_template.service.dto.LabelingTemplateDto; import org.nl.acs.labeling_template.service.dto.LabelingTemplateQueryParam; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateDto.java index d370922..f90e222 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateDto.java @@ -8,9 +8,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Date; -import java.sql.Timestamp; - /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateQueryParam.java index 52919cb..760d240 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateQueryParam.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/dto/LabelingTemplateQueryParam.java @@ -3,12 +3,6 @@ package org.nl.acs.labeling_template.service.dto; import lombok.Getter; import lombok.Setter; -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - /** * @author jiaolm * @date 2023-05-09 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/impl/LabelingTemplateServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/impl/LabelingTemplateServiceImpl.java index 9e0ef61..8b392bf 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/impl/LabelingTemplateServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/impl/LabelingTemplateServiceImpl.java @@ -4,7 +4,7 @@ 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.labeling_template.domain.LabelingTemplate; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/mapper/LabelingTemplateMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/mapper/LabelingTemplateMapper.java index f01c789..4a0e87a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/mapper/LabelingTemplateMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/labeling_template/service/mapper/LabelingTemplateMapper.java @@ -1,6 +1,6 @@ package org.nl.acs.labeling_template.service.mapper; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.nl.acs.labeling_template.domain.LabelingTemplate; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java index c434f92..0058a35 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/LimitRegionalService.java @@ -1,13 +1,11 @@ package org.nl.acs.limit_regional.server; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.common.base.CommonService; +import org.nl.acs.common.base.service.CommonService; import org.nl.acs.limit_regional.domain.LimitRegional; import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import java.util.List; import java.util.Map; import java.util.TreeSet; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java index 4dfabaf..dafa984 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/impl/LimitRegionalServiceImpl.java @@ -5,23 +5,16 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.device.domain.Device; +import org.nl.acs.common.base.service.impl.CommonServiceImpl; import org.nl.acs.limit_regional.domain.LimitRegional; import org.nl.acs.limit_regional.server.LimitRegionalService; import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; import org.nl.acs.limit_regional.server.mapper.LimitRegionalMapper; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.utils.ConvertUtil; -import org.nl.acs.utils.PageUtil; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; @@ -34,8 +27,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; import java.util.*; -import static sun.audio.AudioDevice.device; - @Service @AllArgsConstructor @Slf4j diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/mapper/LimitRegionalMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/mapper/LimitRegionalMapper.java index 3a4a7d2..373d35a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/mapper/LimitRegionalMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/limit_regional/server/mapper/LimitRegionalMapper.java @@ -1,8 +1,6 @@ package org.nl.acs.limit_regional.server.mapper; -import org.apache.ibatis.annotations.Mapper; -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.device.domain.Device; +import org.nl.acs.common.base.mapper.CommonMapper; import org.nl.acs.limit_regional.domain.LimitRegional; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java index 91f2921..a4faadc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/domain/Log.java @@ -1,6 +1,6 @@ package org.nl.acs.log.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/LogService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/LogService.java index 91e072c..e2d9cf7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/LogService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/LogService.java @@ -1,7 +1,7 @@ //package org.nl.acs.log.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.log.domain.Log; //import org.nl.acs.log.service.dto.LogDto; //import org.nl.acs.log.service.dto.LogQueryParam; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogDto.java index 72935df..e852d52 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogDto.java @@ -8,9 +8,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Date; -import java.sql.Timestamp; - /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogQueryParam.java index 83e0a5e..283d59c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogQueryParam.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/dto/LogQueryParam.java @@ -3,12 +3,6 @@ package org.nl.acs.log.service.dto; import lombok.Getter; import lombok.Setter; -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - /** * @author jiaolm * @date 2023-05-09 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/LogServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/LogServiceImpl.java index 6dd85a4..e4273e8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/LogServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/impl/LogServiceImpl.java @@ -4,7 +4,7 @@ //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.log.domain.Log; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/mapper/LogMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/mapper/LogMapper.java index ee0249f..73358ef 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/mapper/LogMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/log/service/mapper/LogMapper.java @@ -1,6 +1,6 @@ package org.nl.acs.log.service.mapper; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.nl.acs.log.domain.Log; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/domain/Materialbase.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/domain/Materialbase.java index ddf6e1e..a267f7d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/domain/Materialbase.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/domain/Materialbase.java @@ -1,6 +1,6 @@ package org.nl.acs.materialbase.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java index f5b7cdc..2ddc82b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/rest/MaterialbaseController.java @@ -1,7 +1,6 @@ package org.nl.acs.materialbase.rest; import org.nl.common.logging.annotation.Log; -import org.nl.acs.materialbase.domain.Materialbase; import org.nl.acs.materialbase.service.MaterialbaseService; import org.nl.acs.materialbase.service.dto.MaterialbaseDto; import org.nl.acs.materialbase.service.dto.MaterialbaseQueryParam; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/MaterialbaseService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/MaterialbaseService.java index 1d5f43d..e6df113 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/MaterialbaseService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/MaterialbaseService.java @@ -1,7 +1,7 @@ package org.nl.acs.materialbase.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.materialbase.domain.Materialbase; import org.nl.acs.materialbase.service.dto.MaterialbaseDto; import org.nl.acs.materialbase.service.dto.MaterialbaseQueryParam; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseDto.java index 1884875..da5d344 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseDto.java @@ -9,9 +9,6 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; import java.io.Serializable; -import java.util.Date; -import java.sql.Timestamp; - /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseQueryParam.java index e3eec01..ebc0671 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseQueryParam.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/dto/MaterialbaseQueryParam.java @@ -3,12 +3,6 @@ package org.nl.acs.materialbase.service.dto; import lombok.Getter; import lombok.Setter; -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - /** * @author jiaolm * @date 2023-05-09 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java index 1c76ee7..e1f8c7b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/impl/MaterialbaseServiceImpl.java @@ -4,7 +4,7 @@ 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.materialbase.domain.Materialbase; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/mapper/MaterialbaseMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/mapper/MaterialbaseMapper.java index 4793869..fb79aea 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/mapper/MaterialbaseMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/materialbase/service/mapper/MaterialbaseMapper.java @@ -1,6 +1,6 @@ package org.nl.acs.materialbase.service.mapper; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.nl.acs.materialbase.domain.Materialbase; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java index d29eef4..02d0a13 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/monitor/service/impl/DeviceStageMonitorServiceImpl.java @@ -5,10 +5,10 @@ import com.alibaba.fastjson.JSONArray; 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.monitor.DeviceStageMonitor; import org.nl.acs.monitor.service.DeviceStageMonitorService; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.service.DeviceAppService; import org.springframework.stereotype.Service; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerManageService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerManageService.java deleted file mode 100644 index 0426284..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerManageService.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.nl.acs.opc; - -import org.nl.acs.opc.service.dto.OpcServerManageDto; - -import java.util.Map; - -/** - * @author 20220102CG\noblelift - */ -public interface OpcServerManageService { - /** - * 查询所有opc服务器 - * - * @return - */ - Map queryAllServerMap(); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerService.java deleted file mode 100644 index e0f0a7c..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerService.java +++ /dev/null @@ -1,51 +0,0 @@ -//package org.nl.acs.opc; -// -//import org.nl.acs.device_driver.driver.ItemValue; -// -///** -// * @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); -//} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java deleted file mode 100644 index 6ddc792..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java +++ /dev/null @@ -1,245 +0,0 @@ -//package org.nl.acs.opc; -// -//import cn.hutool.core.util.StrUtil; -//import org.jinterop.dcom.common.JIException; -//import org.nl.acs.auto.initial.ApplicationAutoInitial; -//import org.nl.acs.device_driver.driver.ItemValue; -//import org.nl.acs.opc.service.dto.OpcServerManageDto; -//import org.openscada.opc.lib.common.NotConnectedException; -//import org.openscada.opc.lib.da.Group; -//import org.openscada.opc.lib.da.Server; -//import org.openscada.opc.lib.da.UnknownGroupException; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.stereotype.Service; -// -//import java.net.UnknownHostException; -//import java.util.Collections; -//import java.util.HashMap; -//import java.util.Iterator; -//import java.util.Map; -// -///** -// * @author ldjun -// * @version 1.0 -// * @date 2023年02月01日 11:27 -// * @desc desc -// */ -//@Service -//public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoInitial { -// -// private static final Logger log = LoggerFactory.getLogger(OpcServerServiceImpl.class); -// @Autowired -// OpcServerManageService opcServerManageService; -// Map opcServerManageDtos = new HashMap(); -// Map servers = Collections.synchronizedMap(new HashMap()); -// Map groups = Collections.synchronizedMap(new HashMap()); -// -// public OpcServerServiceImpl() { -// } -// -// /** -// * 加载opc服务，启动opc线程 -// * -// * @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(); -// -// while (var1.hasNext()) { -// OpcServerManageDto dto = (OpcServerManageDto) var1.next(); -// -// try { -// OpcServerServiceImpl.this.getServer(dto.getOpc_code()); -// OpcServerServiceImpl.log.info("加载opc server {}", dto.getOpc_code()); -// } catch (Exception var4) { -// OpcServerServiceImpl.log.warn("启动无法载入servers", var4); -// } -// } -// }); -// t.start(); -// } -// } -// -// @Override -// public synchronized void reload() { -// this.opcServerManageDtos = this.opcServerManageService.queryAllServerMap(); -// this.opcServerManageDtos = Collections.synchronizedMap(this.opcServerManageDtos); -// } -// -// @Override -// public synchronized Group getServer(String code) { -// synchronized (this.buildLock(code)) { -// Group group = null; -// group = (Group) this.groups.get(code); -// if (group != null) { -// label68: -// { -// Group var10000; -// try { -// if (!group.isActive()) { -// break label68; -// } -// -// var10000 = group; -// } catch (JIException var14) { -// log.error(code, var14); -// break label68; -// } -// -// return var10000; -// } -// } -// -// Server server = (Server) this.servers.get(code); -// boolean needcreate = false; -// String groupName = code; -// if (server == null) { -// needcreate = true; -// } else { -// try { -// group = server.findGroup(groupName); -// } catch (UnknownHostException | JIException | UnknownGroupException | NotConnectedException | -// IllegalArgumentException var13) { -// log.error(code, var13); -// needcreate = true; -// } -// } -// -// if (needcreate) { -// OpcServerManageDto dto = (OpcServerManageDto) this.opcServerManageDtos.get(code); -// if (dto == null) { -// throw new RuntimeException(code + "不存在"); -// } -// -//// if (server!=null){ -//// server.disconnect(); -//// server=null; -//// } -// -// if (server == null) { -// server = OpcServerUtl.getServerWithOutException(dto.getOpc_host(), StrUtil.trim(dto.getCls_id()), dto.getUser(), dto.getPassword(), StrUtil.trim(dto.getDomain())); -// } -// -// try { -// group = server.addGroup(groupName); -// } catch (Exception var12) { -// this.clearServer(code); -// ThreadUtl.sleep(5000L); -// log.warn("获取opc出错重新获取", code, var12); -// server = OpcServerUtl.getServerWithOutException(dto.getOpc_host(), StrUtil.trim(dto.getCls_id()), dto.getUser(), dto.getPassword(), StrUtil.trim(dto.getDomain())); -// try { -// group = server.addGroup(groupName); -// } catch (Exception var11) { -// throw new RuntimeException(var12); -// } -// } -// -// this.servers.put(code, server); -// this.groups.put(code, group); -// } -// -// return group; -// } -// } -// -// @Override -// public Group getServerByNewConn(String code) { -// synchronized (this.buildLock(code)) { -// -// Server server = (Server) this.servers.get(code); -// if (server != null) { -// this.clearServer(code); -// } -// -// OpcServerManageDto dto = (OpcServerManageDto) this.opcServerManageDtos.get(code); -// if (dto == null) { -// throw new RuntimeException(code + "不存在"); -// } -// -//// if (server == null) { -// server = OpcServerUtl.getServerWithOutException(dto.getOpc_host(), StrUtil.trim(dto.getCls_id()), dto.getUser(), dto.getPassword(), StrUtil.trim(dto.getDomain())); -//// } -// String groupName = code; -// Group group = null; -// -// try { -// group = server.addGroup(groupName); -// } catch (Exception var12) { -// this.clearServer(code); -// ThreadUtl.sleep(2000L); -// log.warn("获取opc出错重新获取", code, var12); -// server = OpcServerUtl.getServerWithOutException(dto.getOpc_host(), StrUtil.trim(dto.getCls_id()), dto.getUser(), dto.getPassword(), StrUtil.trim(dto.getDomain())); -// try { -// group = server.addGroup(groupName); -// } catch (Exception var11) { -// throw new RuntimeException(var12); -// } -// } -// -// this.servers.put(code, server); -// this.groups.put(code, group); -// return group; -// } -// } -// -// @Override -// public synchronized void clearServer(String code) { -// try { -// Server server = (Server) this.servers.get(code); -// if (server != null) { -// server.disconnect(); -// } -// -// } catch (Exception e) { -// e.printStackTrace(); -// log.error("清理server异常,", e.getMessage()); -// } -// -// this.servers.remove(code); -// this.groups.remove(code); -// } -// -// @Override -// public void writeInteger(String code, ItemValue... values) { -// try { -// Group group = this.getServer(code); -// OpcUtl.writeValue(group, values); -// } catch (Exception var4) { -// this.clearServer(code); -// log.warn("写入出错opc server {} 重新加载", code, var4); -// ThreadUtl.sleep(5000L); -// throw var4; -// } -// } -// -// @Override -// public void writeIntegerByNewConn(String code, ItemValue... values) { -// try { -// Group group = this.getServerByNewConn(code); -// OpcUtl.writeValue(group, values); -// } catch (Exception var4) { -// this.clearServer(code); -// log.info("写入出错opc server {} 重新加载", code, var4); -// ThreadUtl.sleep(1000L); -// throw var4; -// } -// } -// -// private String buildLock(String key) { -// if (StrUtil.isEmpty(key)) { -// key = ""; -// } -// StringBuilder builder = new StringBuilder(); -// builder.append("OpcServerService."); -// builder.append(key); -// String lock = builder.toString().intern(); -// return lock; -// } -//} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerUtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerUtl.java deleted file mode 100644 index 32692f2..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcServerUtl.java +++ /dev/null @@ -1,24 +0,0 @@ -//package org.nl.acs.opc; -// -//import cn.hutool.core.util.StrUtil; -//import org.openscada.opc.lib.da.Server; -// -///** -// * @author 20220102CG\noblelift -// */ -//public class OpcServerUtl { -// -// public static synchronized Server getServerWithOutException(String host, String clsid, String user, String password, -// String domain) { -// if (!StrUtil.isEmpty(host) && !StrUtil.isEmpty(clsid) && !StrUtil.isEmpty(user)) { -// if (domain == null) { -// domain = ""; -// } -// return OpcUtl.getServer(host, clsid, user, password, domain); -//// return OpcUtl.getAutoServer(host, clsid, user, password, domain); -// } else { -// return null; -// } -// } -// -//} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java deleted file mode 100644 index 1b44521..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java +++ /dev/null @@ -1,293 +0,0 @@ -//package org.nl.acs.opc; -// -//import cn.hutool.core.util.NumberUtil; -//import lombok.extern.slf4j.Slf4j; -//import org.jinterop.dcom.common.JIException; -//import org.jinterop.dcom.core.*; -//import org.nl.acs.device_driver.driver.ItemValue; -//import org.nl.common.exception.BadRequestException; -// -//import org.nl.config.language.LangProcess; -//import org.openscada.opc.lib.common.ConnectionInformation; -//import org.openscada.opc.lib.da.*; -// -//import java.util.ArrayList; -//import java.util.Iterator; -//import java.util.List; -//import java.util.Map; -//import java.util.concurrent.Executors; -// -///** -// * @author 20220102CG\noblelift -// */ -//@Slf4j -//public class OpcUtl { -// private static int timeout = 1 * 60 * 1000; -// private static String key = "rpc.socketTimeout"; -// -// static { -// checkTimeout(); -// } -// -// public static void checkTimeout() { -// if (Integer.getInteger(key, 0).intValue() != timeout) { -// System.setProperty(key, String.valueOf(timeout)); -// } -// -// } -// -// -// public static void writeValue(Group group, WriteRequest... requests) throws BadRequestException { -// try { -// Map e = null; -// try { -// e = group.write(requests); -// group.write(requests); -// } catch (Exception e1) { -// try { -// e = group.write(requests); -// } catch (Exception e2) { -// e = group.write(requests); -// } -// } -// -// boolean is_success = true; -// StringBuilder message = new StringBuilder(); -// Iterator arg4 = e.keySet().iterator(); -// -// while (arg4.hasNext()) { -// Item item = (Item) arg4.next(); -// Integer integer = (Integer) e.get(item); -// if (integer.intValue() != 0) { -// if (is_success) { -// is_success = false; -// } -// -// message.append(item.getId()); -// message.append(":error code:"); -// message.append(integer); -// message.append("; "); -// } -// } -// -// if (!is_success) { -// // throw new BusinessException(message.toString()); -// System.out.println("下发信号失败：" + message.toString()); -// System.out.println("下发信号失败原因：" + message.toString()); -// log.info("下发信号失败：" + message.toString()); -// throw new BadRequestException(message.toString()); -// } -// } catch (JIException arg7) { -// log.info("下发信号失败：" + arg7.getMessage()); -// System.out.println("下发信号失败原因：" + arg7.getMessage()); -// throw new BadRequestException(arg7.toString()); -// } -// } -// -// public static void writeValue(Group group, ItemValue... values) throws BadRequestException { -// try { -// if (values != null && values.length > 0) { -// List ws = new ArrayList(); -// ItemValue[] var3 = values; -// int var4 = values.length; -// -// for (int var5 = 0; var5 < var4; ++var5) { -// ItemValue value = var3[var5]; -// Item item = group.addItem(value.getItem_code()); -// ws.add(new WriteRequest(item, getVariant(value.getItem_value()))); -// } -// -// writeValue(group, (WriteRequest[]) ws.toArray(new WriteRequest[0])); -// } -// -// } catch (AddFailedException | JIException var8) { -// throw new BadRequestException(var8.toString()); -// } -// } -// -// public static JIVariant getVariant(Object object) { -// if (object instanceof Integer) { -// return getIntegerVariant((Integer) object); -// } else if (object instanceof String) { -// return getStringVariant((String) object); -// } else if (object instanceof byte[]) { -// return getByteArrayVariant((byte[]) ((byte[]) object)); -// } else if (object instanceof Byte[]) { -// return getByteArrayVariant((Byte[]) ((Byte[]) object)); -// } else if (object instanceof Boolean) { -// return new JIVariant((Boolean) object); -// } else if (object instanceof int[]) { -// return getByteArrayVariantxx((int[]) ((int[]) object)); -// } else if (object instanceof Integer[]) { -// JIArray array = new JIArray((Integer) object, false); -// JIVariant value = new JIVariant(array); -// return value; -// } else if (object instanceof JIVariant) { -// return (JIVariant) object; -// } else { -// throw new BadRequestException(LangProcess.msg("error_checkTypes", "int,string,byte[]")); -// } -// } -// -// public static Object getValue(Item item, ItemState itemState) throws BadRequestException { -// if (NumberUtil.compare(itemState.getQuality(), Short.valueOf(QualityTypeValue.OPC_QUALITY_GOOD)) != 0) { -// if (item != null) { -// log.debug("value is not good {} : {}", item.getId(), itemState.getQuality()); -//// throw new BadRequestException("值不健康进行重连!"); -// } else { -// log.debug("value is not good {}", itemState.getQuality()); -// } -// -// return null; -// } else { -// JIVariant value = itemState.getValue(); -// return getValue(value, item.getId()); -// } -// } -// -// public static Object getValue(JIVariant jiVariant, String id) throws BadRequestException { -// try { -// Object e = jiVariant.getObject(); -// if (e instanceof IJIUnsigned) { -// return Integer.valueOf(((IJIUnsigned) e).getValue().intValue()); -// } else if (e instanceof Boolean) { -// return jiVariant.getObjectAsBoolean() ? Integer.valueOf(1) : Integer.valueOf(0); -// } else if (e instanceof JIString) { -// return ((JIString) e).getString(); -// } else if (!(e instanceof JIArray)) { -// if (e instanceof Integer) { -// return jiVariant.getObject(); -// } else if (e instanceof Short) { -// return jiVariant.getObject(); -// } else if (e instanceof Float) { -// return jiVariant.getObject(); -// } else { -// System.err.println(id + "不明类型" + e.getClass()); -// if (jiVariant.getType() == 0) { -// System.err.println("因类型为emtpy 返回 null"); -// return null; -// } else if (jiVariant.getType() == 1) { -// System.err.println("因类型为null 返回 null"); -// return null; -// } else { -// return jiVariant.getObject(); -// } -// } -// } else { -// Class clazz = ((JIArray) e).getArrayClass(); -// int[] r; -// int i; -// if (JIUnsignedByte.class.isAssignableFrom(clazz)) { -// JIUnsignedByte[] arg7 = (JIUnsignedByte[]) ((JIUnsignedByte[]) ((JIArray) e).getArrayInstance()); -// r = new int[arg7.length]; -// -// for (i = 0; i < arg7.length; ++i) { -// r[i] = arg7[i].getValue().byteValue(); -// } -// -// return r; -// } else if (!JIUnsignedShort.class.isAssignableFrom(clazz)) { -// System.err.println(id + "不明类型"); -// if (jiVariant.getType() == 0) { -// System.err.println("因类型为emtpy 返回 null"); -// return null; -// } else if (jiVariant.getType() == 1) { -// System.err.println("因类型为null 返回 null"); -// return null; -// } else { -// return ((JIArray) e).getArrayInstance(); -// } -// } else { -// JIUnsignedShort[] array = (JIUnsignedShort[]) ((JIUnsignedShort[]) ((JIArray) e) -// .getArrayInstance()); -// r = new int[array.length]; -// -// for (i = 0; i < array.length; ++i) { -// r[i] = array[i].getValue().intValue(); -// } -// -// return r; -// } -// } -// } catch (JIException e) { -// throw new BadRequestException(e.getMessage()); -// } -// } -// -// -// public static Server getServer(String host, String clsid, String user, String password, String domain) -// throws BadRequestException { -// checkTimeout(); -// Server server = null; -// -// try { -// server = new Server(getConnection(host, clsid, user, password, domain), -// Executors.newSingleThreadScheduledExecutor()); -// server.connect(); -// return server; -// } catch (Exception e) { -// throw new BadRequestException(e.getMessage()); -// } -// } -// -// public static Server getAutoServer(String host, String clsid, String user, String password, String domain) throws BadRequestException { -// checkTimeout(); -// Server server = null; -// server = new Server(getConnection(host, clsid, user, password, domain), Executors.newSingleThreadScheduledExecutor()); -// AutoReconnectController autoReconnectController = new AutoReconnectController(server); -// autoReconnectController.connect(); -// return server; -// } -// -// public static ConnectionInformation getConnection(String host, String clsid, String user, String password, -// String domain) { -// ConnectionInformation connection = new ConnectionInformation(); -// connection.setHost(host); -// connection.setClsid(clsid); -// connection.setUser(user); -// connection.setPassword(password); -// connection.setDomain(domain); -// return connection; -// } -// -// public static JIVariant getByteArrayVariantxx(int[] bytes) { -// Integer[] byte_Data = new Integer[bytes.length]; -// -// for (int i = 0; i < bytes.length; ++i) { -// byte_Data[i] = bytes[i]; -// } -// -// JIArray array = new JIArray(byte_Data, false); -// JIVariant value = new JIVariant(array); -// return value; -// } -// -// public static JIVariant getIntegerVariant(Integer integer) { -// return new JIVariant(integer); -// } -// -// public static JIVariant getStringVariant(String string) { -// return new JIVariant(string); -// } -// -// public static JIVariant getByteArrayVariant(byte[] bytes) { -// Byte[] byte_Data = new Byte[bytes.length]; -// -// for (int i = 0; i < bytes.length; ++i) { -// byte_Data[i] = bytes[i]; -// } -// -// JIArray array = new JIArray(byte_Data, false); -// JIVariant value = new JIVariant(array); -// return value; -// } -// -// public static JIVariant getByteArrayVariant(Byte[] bytes) { -// JIArray array = new JIArray(bytes, false); -// JIVariant value = new JIVariant(array); -// return value; -// } -// -// -//} -// diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/QualityTypeValue.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/QualityTypeValue.java deleted file mode 100644 index 62df4c5..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/QualityTypeValue.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.nl.acs.opc; - -/** - * @author 20220102CG\noblelift - */ -public class QualityTypeValue { - public static short OPC_QUALITY_GOOD = 192; - public static short OPC_QUALITY_LOCAL_OVERRIDE = 216; - public static short OPC_QUALITY_UNCERTAIN = 64; - public static short OPC_QUALITY_LAST_USABLE = 68; - public static short OPC_QUALITY_SENSOR_CAL = 80; - public static short OPC_QUALITY_EGU_EXCEEDED = 84; - public static short OPC_QUALITY_SUB_NORMAL = 88; - public static short OPC_QUALITY_BAD = 0; - public static short OPC_QUALITY_CONFIG_ERROR = 4; - public static short OPC_QUALITY_NOT_CONNECTED = 8; - public static short OPC_QUALITY_DEVICE_FAILURE = 12; - public static short OPC_QUALITY_LAST_KNOWN = 20; - public static short OPC_QUALITY_COMM_FAILURE = 24; - public static short OPC_QUALITY_OUT_OF_SERVICE = 28; - public static short OPC_QUALITY_SENSOR_FAILURE = 16; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ThreadUtl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ThreadUtl.java deleted file mode 100644 index c2e51c0..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/ThreadUtl.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.acs.opc; - -/** - * @author ldjun - * @version 1.0 - * @date 2023年02月01日 11:28 - * @desc desc - */ -public class ThreadUtl { - private ThreadUtl() { - } - - public static void sleep(long times) throws RuntimeException { - try { - Thread.sleep(times); - } catch (InterruptedException var3) { - throw new RuntimeException(var3); - } - } -} - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcConfig.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcConfig.java index 44eccaa..2d2dd77 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.opc.opc; /** * @author 20220102CG\noblelift diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcItemDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcItemDto.java similarity index 98% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcItemDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcItemDto.java index e392778..a3c10eb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcItemDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcItemDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.opc.opc; import lombok.Data; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcStartTag.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcStartTag.java similarity index 80% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcStartTag.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcStartTag.java index c782740..509ac11 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcStartTag.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/OpcStartTag.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.opc.opc; /** * @author 20220102CG\noblelift diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/WcsConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/WcsConfig.java similarity index 94% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/WcsConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/WcsConfig.java index bf2a718..bd301a9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/WcsConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/WcsConfig.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc; +package org.nl.acs.opc.opc; /** * @author 20220102CG\noblelift diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/domain/Opc.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/domain/Opc.java index 6661f7d..2833b01 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/Opc.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/domain/Opc.java @@ -1,6 +1,6 @@ -package org.nl.acs.opc.domain; +package org.nl.acs.opc.opc.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/domain/OpcPlc.java similarity index 95% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/domain/OpcPlc.java index 91e7f43..5dc6161 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/domain/OpcPlc.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/domain/OpcPlc.java @@ -1,6 +1,6 @@ -package org.nl.acs.opc.domain; +package org.nl.acs.opc.opc.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/rest/OpcController.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/rest/OpcController.java index 77e24aa..7669d17 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/rest/OpcController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/rest/OpcController.java @@ -1,9 +1,9 @@ -package org.nl.acs.opc.rest; +package org.nl.acs.opc.opc.rest; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.acs.opc.service.OpcService; -import org.nl.acs.opc.service.dto.OpcDto; +import org.nl.acs.opc.opc.service.OpcService; +import org.nl.acs.opc.opc.service.dto.OpcDto; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/OpcService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/OpcService.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/OpcService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/OpcService.java index 87e2a0c..b7dde66 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/OpcService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/OpcService.java @@ -1,12 +1,12 @@ -package org.nl.acs.opc.service; +package org.nl.acs.opc.opc.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.acs.opc.domain.Opc; +import org.nl.acs.opc.opc.domain.Opc; import org.nl.acs.common.base.PageInfo; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.opc.service.dto.OpcQueryParam; +import org.nl.acs.common.base.service.CommonService; +import org.nl.acs.opc.opc.service.dto.OpcDto; +import org.nl.acs.opc.opc.service.dto.OpcQueryParam; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcDto.java similarity index 92% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcDto.java index e87744e..f644e34 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.dto; +package org.nl.acs.opc.opc.service.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,8 +8,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Date; -import java.sql.Timestamp; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcPlcDto.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcPlcDto.java index 1c662f2..24e72d1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcPlcDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.dto; +package org.nl.acs.opc.opc.service.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,9 +8,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Date; -import java.sql.Timestamp; - /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcPlcQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcPlcQueryParam.java new file mode 100644 index 0000000..2d00876 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcPlcQueryParam.java @@ -0,0 +1,14 @@ +package org.nl.acs.opc.opc.service.dto; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author jiaolm + * @date 2023-05-09 + */ +@Getter +@Setter +public class OpcPlcQueryParam { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcQueryParam.java new file mode 100644 index 0000000..298fe0d --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcQueryParam.java @@ -0,0 +1,14 @@ +package org.nl.acs.opc.opc.service.dto; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author jiaolm + * @date 2023-05-09 + */ +@Getter +@Setter +public class OpcQueryParam { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcServerManageDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcServerManageDto.java similarity index 97% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcServerManageDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcServerManageDto.java index 7acf41e..b1a4db9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcServerManageDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/dto/OpcServerManageDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.dto; +package org.nl.acs.opc.opc.service.dto; /** * @author 20220102CG\noblelift diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/impl/OpcServiceImpl.java similarity index 96% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/impl/OpcServiceImpl.java index ca2437b..5e9ecd3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/impl/OpcServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/impl/OpcServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.opc.service.impl; +package org.nl.acs.opc.opc.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -11,20 +11,20 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.opc.domain.OpcPlc; -import org.nl.acs.opc.service.mapper.OpcPlcMapper; +import org.nl.acs.opc.opc.domain.OpcPlc; +import org.nl.acs.opc.opc.service.mapper.OpcPlcMapper; 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.FileUtil; import org.nl.acs.utils.PageUtil; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.opc.service.OpcService; -import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.opc.service.dto.OpcQueryParam; -import org.nl.acs.opc.service.mapper.OpcMapper; +import org.nl.acs.opc.opc.domain.Opc; +import org.nl.acs.opc.opc.service.OpcService; +import org.nl.acs.opc.opc.service.dto.OpcDto; +import org.nl.acs.opc.opc.service.dto.OpcQueryParam; +import org.nl.acs.opc.opc.service.mapper.OpcMapper; import org.nl.common.utils.SecurityUtils; import org.nl.config.language.LangProcess; import org.springframework.stereotype.Service; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/mapper/OpcMapper.java similarity index 56% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/mapper/OpcMapper.java index 85be5f9..02b7ca1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/mapper/OpcMapper.java @@ -1,7 +1,7 @@ -package org.nl.acs.opc.service.mapper; +package org.nl.acs.opc.opc.service.mapper; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.opc.opc.domain.Opc; +import org.nl.acs.common.base.mapper.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcPlcMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/mapper/OpcPlcMapper.java similarity index 56% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcPlcMapper.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/mapper/OpcPlcMapper.java index 4390c5b..6480dd1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/mapper/OpcPlcMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opc/service/mapper/OpcPlcMapper.java @@ -1,7 +1,7 @@ -package org.nl.acs.opc.service.mapper; +package org.nl.acs.opc.opc.service.mapper; -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.opc.domain.OpcPlc; +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.opc.opc.domain.OpcPlc; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opcServerManageServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opcServerManageServiceImpl.java deleted file mode 100644 index a4ad211..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/opcServerManageServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.nl.acs.opc; - - -import com.alibaba.fastjson.JSONArray; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.nl.acs.opc.domain.Opc; -import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.opc.service.dto.OpcServerManageDto; -import org.nl.acs.opc.service.mapper.OpcMapper; -import org.nl.acs.utils.ConvertUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -/** - * @author 20220102CG\noblelift - */ -@Service -public class opcServerManageServiceImpl implements OpcServerManageService { - - @Autowired - OpcMapper opcMapper; - - @Override - public Map queryAllServerMap() { - List opcServers = this.queryAll(); - Map result = new HashMap(); - Iterator var3 = opcServers.iterator(); - - while (var3.hasNext()) { - OpcServerManageDto opcServer = (OpcServerManageDto) var3.next(); - result.put(opcServer.getOpc_code(), opcServer); - } - - return result; - } - - public List queryAll() { - //return this.opcServerRepository.queryAll(OpcServerManageDto.class); - //OPC表【acs_opc】 -// JSONArray arr = WQLObject.getWQLObject("acs_opc").query().getResultJSONArray(0); -// -// return arr.toJavaList(OpcServerManageDto.class); - - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - return ConvertUtil.convertList(opcMapper.selectList(wrapper), OpcServerManageDto.class); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/rest/OpcPlcController.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/rest/OpcPlcController.java index 1fa0c7e..d353aca 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/rest/OpcPlcController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/rest/OpcPlcController.java @@ -1,9 +1,9 @@ -package org.nl.acs.plc.rest; +package org.nl.acs.opc.plc.rest; import org.nl.common.logging.annotation.Log; -import org.nl.acs.plc.service.OpcPlcService; -import org.nl.acs.opc.service.dto.OpcPlcDto; -import org.nl.acs.opc.service.dto.OpcPlcQueryParam; +import org.nl.acs.opc.plc.service.OpcPlcService; +import org.nl.acs.opc.opc.service.dto.OpcPlcDto; +import org.nl.acs.opc.opc.service.dto.OpcPlcQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/service/OpcPlcService.java similarity index 88% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/service/OpcPlcService.java index 8cdad9d..84cf7f3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/OpcPlcService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/service/OpcPlcService.java @@ -1,10 +1,10 @@ -package org.nl.acs.plc.service; +package org.nl.acs.opc.plc.service; -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.opc.domain.OpcPlc; -import org.nl.acs.opc.service.dto.OpcPlcDto; -import org.nl.acs.opc.service.dto.OpcPlcQueryParam; +import org.nl.acs.opc.opc.domain.OpcPlc; +import org.nl.acs.opc.opc.service.dto.OpcPlcDto; +import org.nl.acs.opc.opc.service.dto.OpcPlcQueryParam; import org.springframework.data.domain.Pageable; import java.util.List; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/service/impl/OpcPlcServiceImpl.java similarity index 93% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/service/impl/OpcPlcServiceImpl.java index d969ae1..0913fe5 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/plc/service/impl/OpcPlcServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/plc/service/impl/OpcPlcServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.plc.service.impl; +package org.nl.acs.opc.plc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -6,12 +6,12 @@ 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.opc.domain.OpcPlc; -import org.nl.acs.opc.service.dto.OpcPlcDto; -import org.nl.acs.opc.service.dto.OpcPlcQueryParam; -import org.nl.acs.opc.service.mapper.OpcPlcMapper; -import org.nl.acs.plc.service.OpcPlcService; +import org.nl.acs.common.base.service.impl.CommonServiceImpl; +import org.nl.acs.opc.opc.domain.OpcPlc; +import org.nl.acs.opc.opc.service.dto.OpcPlcDto; +import org.nl.acs.opc.opc.service.dto.OpcPlcQueryParam; +import org.nl.acs.opc.opc.service.mapper.OpcPlcMapper; +import org.nl.acs.opc.plc.service.OpcPlcService; import org.nl.acs.utils.ConvertUtil; import org.nl.acs.utils.PageUtil; import org.springframework.data.domain.Pageable; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcQueryParam.java deleted file mode 100644 index dda5913..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcPlcQueryParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.acs.opc.service.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * @author jiaolm - * @date 2023-05-09 - */ -@Getter -@Setter -public class OpcPlcQueryParam { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcQueryParam.java deleted file mode 100644 index 0cda8b5..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/service/dto/OpcQueryParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.acs.opc.service.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * @author jiaolm - * @date 2023-05-09 - */ -@Getter -@Setter -public class OpcQueryParam { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/domain/Produceshiftorder.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/domain/ProduceShiftOrder.java similarity index 88% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/domain/Produceshiftorder.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/domain/ProduceShiftOrder.java index a42440e..adb3aa7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/domain/Produceshiftorder.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/domain/ProduceShiftOrder.java @@ -1,6 +1,6 @@ -package org.nl.acs.produceshiftorder.domain; +package org.nl.acs.produce_shift_order.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; @@ -30,8 +30,8 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -@TableName("acs_produceshiftorder") -public class Produceshiftorder extends CommonModel implements Serializable { +@TableName("acs_produce_shift_order") +public class ProduceShiftOrder extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; @@ -104,7 +104,7 @@ public class Produceshiftorder extends CommonModel implements @NotBlank private String is_deleted; - public void copyFrom(Produceshiftorder source) { + public void copyFrom(ProduceShiftOrder source) { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/domain/Produceshiftorderdetail.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/domain/ProduceShiftOrderDetail.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/domain/Produceshiftorderdetail.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/domain/ProduceShiftOrderDetail.java index e7fd706..d491c56 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/domain/Produceshiftorderdetail.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/domain/ProduceShiftOrderDetail.java @@ -1,6 +1,6 @@ -package org.nl.acs.produceshiftorderdetail.domain; +package org.nl.acs.produce_shift_order.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; @@ -30,8 +30,8 @@ import java.io.Serializable; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -@TableName("acs_produceshiftorderdetail") -public class Produceshiftorderdetail extends CommonModel implements Serializable { +@TableName("acs_produce_shift_order_detail") +public class ProduceShiftOrderDetail extends CommonModel implements Serializable { private static final long serialVersionUID = 1L; @@ -152,7 +152,7 @@ public class Produceshiftorderdetail extends CommonModel(produceshiftorderService.queryAll(query, pageable), HttpStatus.OK); } @@ -39,7 +38,7 @@ public class ProduceshiftorderController { @Log("新增工单") //@PreAuthorize("@el.check('produceshiftorder:add')") - public ResponseEntity create(@Validated @RequestBody ProduceshiftorderDto resources) { + public ResponseEntity create(@Validated @RequestBody ProduceShiftOrderDto resources) { return new ResponseEntity<>(produceshiftorderService.insert(resources), HttpStatus.CREATED); } @@ -47,7 +46,7 @@ public class ProduceshiftorderController { @Log("修改工单") //@PreAuthorize("@el.check('produceshiftorder:edit')") - public ResponseEntity update(@Validated @RequestBody ProduceshiftorderDto resources) { + public ResponseEntity update(@Validated @RequestBody ProduceShiftOrderDto resources) { produceshiftorderService.updateById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -66,7 +65,7 @@ public class ProduceshiftorderController { @GetMapping(value = "/download") //@PreAuthorize("@el.check('produceshiftorder:list')") - public void download(HttpServletResponse response, ProduceshiftorderQueryParam query) throws IOException { + public void download(HttpServletResponse response, ProduceShiftOrderQueryParam query) throws IOException { produceshiftorderService.download(produceshiftorderService.queryAll(query), response); }*/ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/rest/ProduceshiftorderdetailController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/rest/ProduceShiftOrderDetailController.java similarity index 72% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/rest/ProduceshiftorderdetailController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/rest/ProduceShiftOrderDetailController.java index d1bd020..3b43e62 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/rest/ProduceshiftorderdetailController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/rest/ProduceShiftOrderDetailController.java @@ -1,10 +1,9 @@ -package org.nl.acs.produceshiftorderdetail.rest; +package org.nl.acs.produce_shift_order.rest; +import org.nl.acs.produce_shift_order.service.ProduceShiftOrderDetailService; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderDetailDto; import org.nl.common.logging.annotation.Log; -import org.nl.acs.produceshiftorderdetail.domain.Produceshiftorderdetail; -import org.nl.acs.produceshiftorderdetail.service.ProduceshiftorderdetailService; -import org.nl.acs.produceshiftorderdetail.service.dto.ProduceshiftorderdetailDto; -import org.nl.acs.produceshiftorderdetail.service.dto.ProduceshiftorderdetailQueryParam; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderDetailQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -23,15 +22,15 @@ import java.util.Set; @RequiredArgsConstructor @RequestMapping("/api/produceshiftorderdetail") -public class ProduceshiftorderdetailController { +public class ProduceShiftOrderDetailController { - private final ProduceshiftorderdetailService produceshiftorderdetailService; + private final ProduceShiftOrderDetailService produceshiftorderdetailService; @GetMapping @Log("查询工单明细") //@PreAuthorize("@el.check('produceshiftorderdetail:list')") - public ResponseEntity query(ProduceshiftorderdetailQueryParam query, Pageable pageable) { + public ResponseEntity query(ProduceShiftOrderDetailQueryParam query, Pageable pageable) { return new ResponseEntity<>(produceshiftorderdetailService.queryAll(query, pageable), HttpStatus.OK); } @@ -39,7 +38,7 @@ public class ProduceshiftorderdetailController { @Log("新增工单明细") //@PreAuthorize("@el.check('produceshiftorderdetail:add')") - public ResponseEntity create(@Validated @RequestBody ProduceshiftorderdetailDto resources) { + public ResponseEntity create(@Validated @RequestBody ProduceShiftOrderDetailDto resources) { return new ResponseEntity<>(produceshiftorderdetailService.insert(resources), HttpStatus.CREATED); } @@ -47,7 +46,7 @@ public class ProduceshiftorderdetailController { @Log("修改工单明细") //@PreAuthorize("@el.check('produceshiftorderdetail:edit')") - public ResponseEntity update(@Validated @RequestBody ProduceshiftorderdetailDto resources) { + public ResponseEntity update(@Validated @RequestBody ProduceShiftOrderDetailDto resources) { produceshiftorderdetailService.updateById(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -66,7 +65,7 @@ public class ProduceshiftorderdetailController { @GetMapping(value = "/download") //@PreAuthorize("@el.check('produceshiftorderdetail:list')") - public void download(HttpServletResponse response, ProduceshiftorderdetailQueryParam query) throws IOException { + public void download(HttpServletResponse response, ProduceShiftOrderDetailQueryParam query) throws IOException { produceshiftorderdetailService.download(produceshiftorderdetailService.queryAll(query), response); }*/ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/ProduceshiftorderdetailService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/ProduceShiftOrderDetailService.java similarity index 54% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/ProduceshiftorderdetailService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/ProduceShiftOrderDetailService.java index 994df80..1358d22 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/ProduceshiftorderdetailService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/ProduceShiftOrderDetailService.java @@ -1,10 +1,10 @@ -package org.nl.acs.produceshiftorderdetail.service; +package org.nl.acs.produce_shift_order.service; import org.nl.acs.common.base.PageInfo; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.produceshiftorderdetail.domain.Produceshiftorderdetail; -import org.nl.acs.produceshiftorderdetail.service.dto.ProduceshiftorderdetailDto; -import org.nl.acs.produceshiftorderdetail.service.dto.ProduceshiftorderdetailQueryParam; +import org.nl.acs.common.base.service.CommonService; +import org.nl.acs.produce_shift_order.domain.ProduceShiftOrderDetail; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderDetailDto; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderDetailQueryParam; import org.springframework.data.domain.Pageable; import java.util.List; @@ -14,7 +14,7 @@ import java.util.Set; * @author jiaolm * @date 2023-05-09 */ -public interface ProduceshiftorderdetailService extends CommonService { +public interface ProduceShiftOrderDetailService extends CommonService { static final String CACHE_KEY = "produceshiftorderdetail"; @@ -23,45 +23,45 @@ public interface ProduceshiftorderdetailService extends CommonService + * @return PageInfo */ - PageInfo queryAll(ProduceshiftorderdetailQueryParam query, Pageable pageable); + PageInfo queryAll(ProduceShiftOrderDetailQueryParam query, Pageable pageable); /** * 查询所有数据不分页 * * @param query 条件参数 - * @return List + * @return List */ - List queryAll(ProduceshiftorderdetailQueryParam query); + List queryAll(ProduceShiftOrderDetailQueryParam query); /** * 根据id查询 * @param id * @return */ - Produceshiftorderdetail getById(String id); + ProduceShiftOrderDetail getById(String id); /** * 根据id查询 * @param id * @return */ - ProduceshiftorderdetailDto findById(String id); + ProduceShiftOrderDetailDto findById(String id); /** * 插入一条新数据。 * @param resources * @return */ - int insert(ProduceshiftorderdetailDto resources); + int insert(ProduceShiftOrderDetailDto resources); /** * 根据id修改 * @param resources * @return */ - int updateById(ProduceshiftorderdetailDto resources); + int updateById(ProduceShiftOrderDetailDto resources); /** * 根据id删除 @@ -83,5 +83,5 @@ public interface ProduceshiftorderdetailService extends CommonService all, HttpServletResponse response) throws IOException; + // void download(List all, HttpServletResponse response) throws IOException; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/ProduceshiftorderService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/ProduceShiftOrderService.java similarity index 57% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/ProduceshiftorderService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/ProduceShiftOrderService.java index 62696ac..58ed48e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/ProduceshiftorderService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/ProduceShiftOrderService.java @@ -1,10 +1,10 @@ -package org.nl.acs.produceshiftorder.service; +package org.nl.acs.produce_shift_order.service; import org.nl.acs.common.base.PageInfo; -import org.nl.acs.common.base.CommonService; -import org.nl.acs.produceshiftorder.domain.Produceshiftorder; -import org.nl.acs.produceshiftorder.service.dto.ProduceshiftorderDto; -import org.nl.acs.produceshiftorder.service.dto.ProduceshiftorderQueryParam; +import org.nl.acs.common.base.service.CommonService; +import org.nl.acs.produce_shift_order.domain.ProduceShiftOrder; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderDto; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderQueryParam; import org.springframework.data.domain.Pageable; import java.util.List; @@ -14,7 +14,7 @@ import java.util.Set; * @author jiaolm * @date 2023-05-09 */ -public interface ProduceshiftorderService extends CommonService { +public interface ProduceShiftOrderService extends CommonService { static final String CACHE_KEY = "produceshiftorder"; @@ -23,45 +23,45 @@ public interface ProduceshiftorderService extends CommonService + * @return PageInfo */ - PageInfo queryAll(ProduceshiftorderQueryParam query, Pageable pageable); + PageInfo queryAll(ProduceShiftOrderQueryParam query, Pageable pageable); /** * 查询所有数据不分页 * * @param query 条件参数 - * @return List + * @return List */ - List queryAll(ProduceshiftorderQueryParam query); + List queryAll(ProduceShiftOrderQueryParam query); /** * 根据id查询 * @param id * @return */ - Produceshiftorder getById(String id); + ProduceShiftOrder getById(String id); /** * 根据id查询 * @param id * @return */ - ProduceshiftorderDto findById(String id); + ProduceShiftOrderDto findById(String id); /** * 插入一条新数据。 * @param resources * @return */ - int insert(ProduceshiftorderDto resources); + int insert(ProduceShiftOrderDto resources); /** * 根据id修改 * @param resources * @return */ - int updateById(ProduceshiftorderDto resources); + int updateById(ProduceShiftOrderDto resources); /** * 根据id删除 @@ -83,5 +83,5 @@ public interface ProduceshiftorderService extends CommonService all, HttpServletResponse response) throws IOException; + // void download(List all, HttpServletResponse response) throws IOException; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDetailDto.java similarity index 92% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDetailDto.java index 52e82c8..a2f08c9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDetailDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.produceshiftorderdetail.service.dto; +package org.nl.acs.produce_shift_order.service.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,9 +9,6 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; import java.io.Serializable; -import java.util.Date; -import java.sql.Timestamp; - /** @@ -24,7 +21,7 @@ import java.sql.Timestamp; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -public class ProduceshiftorderdetailDto implements Serializable { +public class ProduceShiftOrderDetailDto implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDetailQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDetailQueryParam.java new file mode 100644 index 0000000..16e89f2 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDetailQueryParam.java @@ -0,0 +1,14 @@ +package org.nl.acs.produce_shift_order.service.dto; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author jiaolm + * @date 2023-05-09 + */ +@Getter +@Setter +public class ProduceShiftOrderDetailQueryParam { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDto.java similarity index 87% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderDto.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDto.java index d172d5c..b0a9d72 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderDto.java @@ -1,4 +1,4 @@ -package org.nl.acs.produceshiftorder.service.dto; +package org.nl.acs.produce_shift_order.service.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,9 +9,6 @@ import lombok.experimental.Accessors; import java.math.BigDecimal; import java.io.Serializable; -import java.util.Date; -import java.sql.Timestamp; - /** @@ -24,7 +21,7 @@ import java.sql.Timestamp; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = false) -public class ProduceshiftorderDto implements Serializable { +public class ProduceShiftOrderDto implements Serializable { private static final long serialVersionUID = 1L; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderQueryParam.java new file mode 100644 index 0000000..1f5f998 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/dto/ProduceShiftOrderQueryParam.java @@ -0,0 +1,14 @@ +package org.nl.acs.produce_shift_order.service.dto; + +import lombok.Getter; +import lombok.Setter; + +/** + * @author jiaolm + * @date 2023-05-09 + */ +@Getter +@Setter +public class ProduceShiftOrderQueryParam { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/impl/ProduceshiftorderdetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/impl/ProduceShiftOrderDetailServiceImpl.java similarity index 74% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/impl/ProduceshiftorderdetailServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/impl/ProduceShiftOrderDetailServiceImpl.java index 55a1d35..1eed60e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/impl/ProduceshiftorderdetailServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/impl/ProduceShiftOrderDetailServiceImpl.java @@ -1,17 +1,17 @@ -package org.nl.acs.produceshiftorderdetail.service.impl; +package org.nl.acs.produce_shift_order.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.produce_shift_order.service.ProduceShiftOrderDetailService; import org.nl.acs.utils.ConvertUtil; import org.nl.acs.utils.PageUtil; -import org.nl.acs.produceshiftorderdetail.domain.Produceshiftorderdetail; -import org.nl.acs.produceshiftorderdetail.service.ProduceshiftorderdetailService; -import org.nl.acs.produceshiftorderdetail.service.dto.ProduceshiftorderdetailDto; -import org.nl.acs.produceshiftorderdetail.service.dto.ProduceshiftorderdetailQueryParam; -import org.nl.acs.produceshiftorderdetail.service.mapper.ProduceshiftorderdetailMapper; +import org.nl.acs.produce_shift_order.domain.ProduceShiftOrderDetail; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderDetailDto; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderDetailQueryParam; +import org.nl.acs.produce_shift_order.service.mapper.ProduceShiftOrderDetailMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -25,46 +25,46 @@ import java.util.*; */ @Service @AllArgsConstructor -// @CacheConfig(cacheNames = ProduceshiftorderdetailService.CACHE_KEY) +// @CacheConfig(cacheNames = ProduceShiftOrderDetailService.CACHE_KEY) @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class ProduceshiftorderdetailServiceImpl extends CommonServiceImpl implements ProduceshiftorderdetailService { +public class ProduceShiftOrderDetailServiceImpl extends CommonServiceImpl implements ProduceShiftOrderDetailService { - private final ProduceshiftorderdetailMapper produceshiftorderdetailMapper; + private final ProduceShiftOrderDetailMapper produceshiftorderdetailMapper; @Override - public PageInfo queryAll(ProduceshiftorderdetailQueryParam query, Pageable pageable) { - IPage queryPage = PageUtil.toMybatisPage(pageable); - IPage page = produceshiftorderdetailMapper.selectPage(queryPage, QueryHelpMybatisPlus.getPredicate(query)); - return ConvertUtil.convertPage(page, ProduceshiftorderdetailDto.class); + public PageInfo queryAll(ProduceShiftOrderDetailQueryParam query, Pageable pageable) { + IPage queryPage = PageUtil.toMybatisPage(pageable); + IPage page = produceshiftorderdetailMapper.selectPage(queryPage, QueryHelpMybatisPlus.getPredicate(query)); + return ConvertUtil.convertPage(page, ProduceShiftOrderDetailDto.class); } @Override - public List queryAll(ProduceshiftorderdetailQueryParam query) { - return ConvertUtil.convertList(produceshiftorderdetailMapper.selectList(QueryHelpMybatisPlus.getPredicate(query)), ProduceshiftorderdetailDto.class); + public List queryAll(ProduceShiftOrderDetailQueryParam query) { + return ConvertUtil.convertList(produceshiftorderdetailMapper.selectList(QueryHelpMybatisPlus.getPredicate(query)), ProduceShiftOrderDetailDto.class); } @Override - public Produceshiftorderdetail getById(String id) { + public ProduceShiftOrderDetail getById(String id) { return produceshiftorderdetailMapper.selectById(id); } @Override - public ProduceshiftorderdetailDto findById(String id) { - return ConvertUtil.convert(getById(id), ProduceshiftorderdetailDto.class); + public ProduceShiftOrderDetailDto findById(String id) { + return ConvertUtil.convert(getById(id), ProduceShiftOrderDetailDto.class); } @Override @Transactional(rollbackFor = Exception.class) - public int insert(ProduceshiftorderdetailDto resources) { - Produceshiftorderdetail entity = ConvertUtil.convert(resources, Produceshiftorderdetail.class); + public int insert(ProduceShiftOrderDetailDto resources) { + ProduceShiftOrderDetail entity = ConvertUtil.convert(resources, ProduceShiftOrderDetail.class); return produceshiftorderdetailMapper.insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public int updateById(ProduceshiftorderdetailDto resources) { - Produceshiftorderdetail entity = ConvertUtil.convert(resources, Produceshiftorderdetail.class); + public int updateById(ProduceShiftOrderDetailDto resources) { + ProduceShiftOrderDetail entity = ConvertUtil.convert(resources, ProduceShiftOrderDetail.class); int ret = produceshiftorderdetailMapper.updateById(entity); // delCaches(resources.id); return ret; @@ -98,9 +98,9 @@ public class ProduceshiftorderdetailServiceImpl extends CommonServiceImpl all, HttpServletResponse response) throws IOException { + public void download(List all, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (ProduceshiftorderdetailDto produceshiftorderdetail : all) { + for (ProduceShiftOrderDetailDto produceshiftorderdetail : all) { Map map = new LinkedHashMap<>(); map.put("工单明细编码", produceshiftorderdetail.getOrderdetailCode()); map.put("工单明细类型", produceshiftorderdetail.getOrderdetailType()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/impl/ProduceShiftOrderServiceImpl.java similarity index 66% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/impl/ProduceshiftorderServiceImpl.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/impl/ProduceShiftOrderServiceImpl.java index 71a2b4e..f498b31 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/impl/ProduceshiftorderServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/impl/ProduceShiftOrderServiceImpl.java @@ -1,17 +1,17 @@ -package org.nl.acs.produceshiftorder.service.impl; +package org.nl.acs.produce_shift_order.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.produce_shift_order.service.ProduceShiftOrderService; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderDto; import org.nl.acs.utils.ConvertUtil; import org.nl.acs.utils.PageUtil; -import org.nl.acs.produceshiftorder.domain.Produceshiftorder; -import org.nl.acs.produceshiftorder.service.ProduceshiftorderService; -import org.nl.acs.produceshiftorder.service.dto.ProduceshiftorderDto; -import org.nl.acs.produceshiftorder.service.dto.ProduceshiftorderQueryParam; -import org.nl.acs.produceshiftorder.service.mapper.ProduceshiftorderMapper; +import org.nl.acs.produce_shift_order.domain.ProduceShiftOrder; +import org.nl.acs.produce_shift_order.service.dto.ProduceShiftOrderQueryParam; +import org.nl.acs.produce_shift_order.service.mapper.ProduceShiftOrderMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -25,46 +25,46 @@ import java.util.*; */ @Service @AllArgsConstructor -// @CacheConfig(cacheNames = ProduceshiftorderService.CACHE_KEY) +// @CacheConfig(cacheNames = ProduceShiftOrderService.CACHE_KEY) @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class ProduceshiftorderServiceImpl extends CommonServiceImpl implements ProduceshiftorderService { +public class ProduceShiftOrderServiceImpl extends CommonServiceImpl implements ProduceShiftOrderService { - private final ProduceshiftorderMapper produceshiftorderMapper; + private final ProduceShiftOrderMapper produceshiftorderMapper; @Override - public PageInfo queryAll(ProduceshiftorderQueryParam query, Pageable pageable) { - IPage queryPage = PageUtil.toMybatisPage(pageable); - IPage page = produceshiftorderMapper.selectPage(queryPage, QueryHelpMybatisPlus.getPredicate(query)); - return ConvertUtil.convertPage(page, ProduceshiftorderDto.class); + public PageInfo queryAll(ProduceShiftOrderQueryParam query, Pageable pageable) { + IPage queryPage = PageUtil.toMybatisPage(pageable); + IPage page = produceshiftorderMapper.selectPage(queryPage, QueryHelpMybatisPlus.getPredicate(query)); + return ConvertUtil.convertPage(page, ProduceShiftOrderDto.class); } @Override - public List queryAll(ProduceshiftorderQueryParam query) { - return ConvertUtil.convertList(produceshiftorderMapper.selectList(QueryHelpMybatisPlus.getPredicate(query)), ProduceshiftorderDto.class); + public List queryAll(ProduceShiftOrderQueryParam query) { + return ConvertUtil.convertList(produceshiftorderMapper.selectList(QueryHelpMybatisPlus.getPredicate(query)), ProduceShiftOrderDto.class); } @Override - public Produceshiftorder getById(String id) { + public ProduceShiftOrder getById(String id) { return produceshiftorderMapper.selectById(id); } @Override - public ProduceshiftorderDto findById(String id) { - return ConvertUtil.convert(getById(id), ProduceshiftorderDto.class); + public ProduceShiftOrderDto findById(String id) { + return ConvertUtil.convert(getById(id), ProduceShiftOrderDto.class); } @Override @Transactional(rollbackFor = Exception.class) - public int insert(ProduceshiftorderDto resources) { - Produceshiftorder entity = ConvertUtil.convert(resources, Produceshiftorder.class); + public int insert(ProduceShiftOrderDto resources) { + ProduceShiftOrder entity = ConvertUtil.convert(resources, ProduceShiftOrder.class); return produceshiftorderMapper.insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public int updateById(ProduceshiftorderDto resources) { - Produceshiftorder entity = ConvertUtil.convert(resources, Produceshiftorder.class); + public int updateById(ProduceShiftOrderDto resources) { + ProduceShiftOrder entity = ConvertUtil.convert(resources, ProduceShiftOrder.class); int ret = produceshiftorderMapper.updateById(entity); // delCaches(resources.id); return ret; @@ -98,9 +98,9 @@ public class ProduceshiftorderServiceImpl extends CommonServiceImpl all, HttpServletResponse response) throws IOException { + public void download(List all, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (ProduceshiftorderDto produceshiftorder : all) { + for (ProduceShiftOrderDto produceshiftorder : all) { Map map = new LinkedHashMap<>(); map.put("工单编码", produceshiftorder.getOrderCode()); map.put("设备编码", produceshiftorder.getDeviceCode()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/mapper/ProduceShiftOrderDetailMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/mapper/ProduceShiftOrderDetailMapper.java new file mode 100644 index 0000000..f679d1a --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/mapper/ProduceShiftOrderDetailMapper.java @@ -0,0 +1,14 @@ +package org.nl.acs.produce_shift_order.service.mapper; + +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.produce_shift_order.domain.ProduceShiftOrderDetail; +import org.springframework.stereotype.Repository; + +/** + * @author jiaolm + * @date 2023-05-09 + */ +@Repository +public interface ProduceShiftOrderDetailMapper extends CommonMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/mapper/ProduceShiftOrderMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/mapper/ProduceShiftOrderMapper.java new file mode 100644 index 0000000..3bfb572 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produce_shift_order/service/mapper/ProduceShiftOrderMapper.java @@ -0,0 +1,14 @@ +package org.nl.acs.produce_shift_order.service.mapper; + +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.produce_shift_order.domain.ProduceShiftOrder; +import org.springframework.stereotype.Repository; + +/** + * @author jiaolm + * @date 2023-05-09 + */ +@Repository +public interface ProduceShiftOrderMapper extends CommonMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderQueryParam.java deleted file mode 100644 index 9efc05d..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/dto/ProduceshiftorderQueryParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.acs.produceshiftorder.service.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * @author jiaolm - * @date 2023-05-09 - */ -@Getter -@Setter -public class ProduceshiftorderQueryParam { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/mapper/ProduceshiftorderMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/mapper/ProduceshiftorderMapper.java deleted file mode 100644 index ad86d93..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorder/service/mapper/ProduceshiftorderMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.nl.acs.produceshiftorder.service.mapper; - -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.produceshiftorder.domain.Produceshiftorder; -import org.springframework.stereotype.Repository; - -/** - * @author jiaolm - * @date 2023-05-09 - */ -@Repository -public interface ProduceshiftorderMapper extends CommonMapper { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailQueryParam.java deleted file mode 100644 index 2444f47..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/dto/ProduceshiftorderdetailQueryParam.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.acs.produceshiftorderdetail.service.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - -/** - * @author jiaolm - * @date 2023-05-09 - */ -@Getter -@Setter -public class ProduceshiftorderdetailQueryParam { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/mapper/ProduceshiftorderdetailMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/mapper/ProduceshiftorderdetailMapper.java deleted file mode 100644 index 66cc0ed..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/produceshiftorderdetail/service/mapper/ProduceshiftorderdetailMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.nl.acs.produceshiftorderdetail.service.mapper; - -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.produceshiftorderdetail.domain.Produceshiftorderdetail; -import org.springframework.stereotype.Repository; - -/** - * @author jiaolm - * @date 2023-05-09 - */ -@Repository -public interface ProduceshiftorderdetailMapper extends CommonMapper { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java index 11c7c71..2329be9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLine.java @@ -1,6 +1,6 @@ package org.nl.acs.route.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java index a67a464..9293999 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RouteLoc.java @@ -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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java index b0de341..0376f87 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/domain/RoutePlan.java @@ -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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java index f45ca7b..658b030 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLineController.java @@ -3,7 +3,6 @@ package org.nl.acs.route.rest; import org.nl.common.logging.annotation.Log; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.route.service.dto.RouteLineQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -16,7 +15,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.sql.SQLException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java index 78f7b6b..532c7d3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RouteLocController.java @@ -5,7 +5,6 @@ package org.nl.acs.route.rest; import lombok.RequiredArgsConstructor; import org.nl.acs.route.service.RouteLocService; import org.nl.acs.route.service.dto.RouteLocDto; -import org.nl.acs.route.service.dto.RouteLocQueryParam; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java index a152f83..de9994b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/rest/RoutePlanController.java @@ -5,7 +5,6 @@ package org.nl.acs.route.rest; import lombok.RequiredArgsConstructor; import org.nl.acs.route.service.RoutePlanService; import org.nl.acs.route.service.dto.RoutePlanDto; -import org.nl.acs.route.service.dto.RoutePlanQueryParam; import org.nl.common.logging.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLineService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLineService.java index 88bc0ff..775389a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLineService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLineService.java @@ -2,7 +2,7 @@ package org.nl.acs.route.service; import com.alibaba.fastjson.JSONArray; 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.route.domain.RouteLine; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.route.service.dto.RouteLineQueryParam; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLocService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLocService.java index 337d4a2..77a227d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLocService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RouteLocService.java @@ -3,7 +3,7 @@ package org.nl.acs.route.service; import org.nl.acs.route.domain.RouteLoc; import org.nl.acs.route.service.dto.RouteLocDto; import org.nl.acs.route.service.dto.RouteLocQueryParam; -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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RoutePlanService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RoutePlanService.java index 42dfd17..a5a2baa 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RoutePlanService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/RoutePlanService.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray; import org.nl.acs.route.domain.RoutePlan; import org.nl.acs.route.service.dto.RoutePlanDto; import org.nl.acs.route.service.dto.RoutePlanQueryParam; -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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java index b9aff96..ec5635b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java @@ -15,18 +15,18 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp import lombok.AllArgsConstructor; import org.nl.acs.auto.initial.ApplicationAutoInitial; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device.service.dto.DeviceDto; -import org.nl.acs.device.service.mapper.DeviceMapper; -import org.nl.acs.device_driver.RouteableDeviceDriver; -import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.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.driver.RouteableDeviceDriver; +import org.nl.acs.device.device.service.DeviceAppService; import org.nl.acs.route.service.RoutePlanService; import org.nl.acs.route.service.dto.RoutePlanDto; 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.FileUtil; @@ -336,7 +336,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl getShortPathLines(String device_code, String next_device_code, String plan_code) { - List list = this.routeLines.get(plan_code); + List list = this.routeLines.get(plan_code); List result = new ArrayList<>(); Iterator iterator = list.iterator(); while (iterator.hasNext()) { @@ -630,8 +630,8 @@ public class RouteLineServiceImpl extends CommonServiceImpl newresult = (List) result.stream().sorted(Comparator.comparing(RouteLineDto::getWeights)).collect(Collectors.toList()); - return newresult; + List newResult = result.stream().sorted(Comparator.comparing(RouteLineDto::getWeights)).collect(Collectors.toList()); + return newResult; } @Override diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java index 8ae806f..3ceebb7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLocServiceImpl.java @@ -15,7 +15,7 @@ import org.nl.acs.route.service.dto.RouteLocQueryParam; import org.nl.acs.route.service.mapper.RouteLocMapper; 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.FileUtil; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java index 7695b5a..426d7d2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RoutePlanServiceImpl.java @@ -17,7 +17,7 @@ import org.nl.acs.route.service.dto.RoutePlanQueryParam; import org.nl.acs.route.service.mapper.RoutePlanMapper; 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.FileUtil; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLineMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLineMapper.java index a87ca08..aaf39ae 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLineMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLineMapper.java @@ -4,7 +4,7 @@ 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.route.domain.RouteLine; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLocMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLocMapper.java index 6d24b02..213506f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLocMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RouteLocMapper.java @@ -1,7 +1,7 @@ package org.nl.acs.route.service.mapper; import org.nl.acs.route.domain.RouteLoc; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RoutePlanMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RoutePlanMapper.java index 268a997..f05703a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RoutePlanMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/mapper/RoutePlanMapper.java @@ -1,7 +1,7 @@ package org.nl.acs.route.service.mapper; import org.nl.acs.route.domain.RoutePlan; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/ClientUDWReceive.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/ClientUDWReceive.java index f9c7e68..52e42a8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/ClientUDWReceive.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/socket/ClientUDWReceive.java @@ -1,8 +1,8 @@ package org.nl.acs.socket; import cn.hutool.core.util.StrUtil; -import org.nl.acs.udw.UnifiedDataAccessor; -import org.nl.acs.udw.UnifiedDataAccessorFactory; +import org.nl.acs.udw.mqttUdw.TagDataAccessor; +import org.nl.acs.udw.mqttUdw.factory.TagsDataAccessorFactory; import org.nl.common.exception.BadRequestException; import org.nl.config.language.LangProcess; import org.slf4j.Logger; @@ -32,7 +32,7 @@ public class ClientUDWReceive implements Runnable { @Override public void run() { try { - UnifiedDataAccessor accessor_value = UnifiedDataAccessorFactory.getAccessor(SocketConfig.udw_unit_key); + TagDataAccessor accessor_value = TagsDataAccessorFactory.getTagsAccessor(SocketConfig.udw_unit_key); while (true) { ByteArrayOutputStream os = new ByteArrayOutputStream(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java index ab18a3e..91931a2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/domain/StorageCell.java @@ -1,6 +1,6 @@ package org.nl.acs.storage_cell.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java index 07b0de5..b26d548 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/rest/StorageCellController.java @@ -1,10 +1,8 @@ package org.nl.acs.storage_cell.rest; import org.nl.common.logging.annotation.Log; -import org.nl.acs.storage_cell.domain.StorageCell; import org.nl.acs.storage_cell.service.StorageCellService; import org.nl.acs.storage_cell.service.dto.StorageCellDto; -import org.nl.acs.storage_cell.service.dto.StorageCellQueryParam; import org.springframework.data.domain.Pageable; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; @@ -16,7 +14,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Map; -import java.util.Set; /** * @author jiaolm diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/StorageCellService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/StorageCellService.java index f0dfe63..a827013 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/StorageCellService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/StorageCellService.java @@ -1,7 +1,7 @@ package org.nl.acs.storage_cell.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.storage_cell.domain.StorageCell; import org.nl.acs.storage_cell.service.dto.StorageCellDto; import org.nl.acs.storage_cell.service.dto.StorageCellQueryParam; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java index 3ef167a..ba3a6a7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellDto.java @@ -8,9 +8,6 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; -import java.util.Date; -import java.sql.Timestamp; - /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellQueryParam.java index ffcbf22..83dc6b3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellQueryParam.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/dto/StorageCellQueryParam.java @@ -3,12 +3,6 @@ package org.nl.acs.storage_cell.service.dto; import lombok.Getter; import lombok.Setter; -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - /** * @author jiaolm * @date 2023-05-09 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java index 6075262..9fdf0a1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/impl/StorageCellServiceImpl.java @@ -13,7 +13,7 @@ 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.common.exception.BadRequestException; import org.nl.acs.utils.ConvertUtil; import org.nl.common.utils.FileUtil; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/mapper/StorageCellMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/mapper/StorageCellMapper.java index 36e339d..08d514e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/mapper/StorageCellMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/storage_cell/service/mapper/StorageCellMapper.java @@ -3,7 +3,7 @@ package org.nl.acs.storage_cell.service.mapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.nl.acs.storage_cell.domain.StorageCell; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java index 73cc690..843b081 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/Task.java @@ -1,6 +1,6 @@ package org.nl.acs.task.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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java index b5f2523..66dabed 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/domain/TaskFeedback.java @@ -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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java index 7e307e2..4a08c7f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskStatusEnum.java @@ -1,6 +1,5 @@ package org.nl.acs.task.enums; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java index 5db07ed..fc3fc1a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/enums/TaskTypeEnum.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; import lombok.Getter; + /** * @author 20220102CG\noblelift */ @@ -12,23 +13,9 @@ import lombok.Getter; public enum TaskTypeEnum { /** * 任务类型 - */ - Raw_Foil_AGV_Task("1", "1", "生箔AGV任务"), - Cutting_AGV_Task("2", "2", "分切AGV任务"), - Standard_AGV_Task("3", "3", "普通AGV任务"), - Forklift_AGV_Task("4", "4", "叉车AGV任务"), - Conveyor_Task("5", "5", "输送线任务"), - Truss_Task("6", "6", "行架任务"), - AGV_Task("7", "7", "立库任务"), - - Oven_Truss_Task("8", "8", "烘箱行架任务"), - - Inner_Truss_Task("9", "9", "内包间行架任务"), - - Stacker_Task("11", "11", "堆垛机任务"), - Box_Storage("12", "12", "木箱入库行架任务"), - Box_Package("13", "13", "装箱入库行架任务"), - Return_Good("14", "14", "退货入库任务"); + */ + Stacker_Task("1", "1", "堆垛机任务"), + AGV_TASK("2", "2", "AGV任务"); /** @@ -50,6 +37,7 @@ public enum TaskTypeEnum { /** * 构造方法 + * * @param index * @param code * @param name diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/rest/TaskScreenController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskScreenController.java similarity index 90% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/rest/TaskScreenController.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskScreenController.java index 57eb3b7..7e57c59 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/rest/TaskScreenController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskScreenController.java @@ -1,8 +1,8 @@ -package org.nl.acs.taskscreen.rest; +package org.nl.acs.task.rest; -import org.nl.acs.taskscreen.service.TaskScreenService; +import org.nl.acs.task.service.TaskScreenService; import org.nl.common.logging.annotation.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskFeedbackService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskFeedbackService.java index 2be1d0f..c8067e0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskFeedbackService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskFeedbackService.java @@ -3,7 +3,7 @@ package org.nl.acs.task.service; import org.nl.acs.task.domain.TaskFeedback; import org.nl.acs.task.service.dto.TaskFeedbackDto; import org.nl.acs.task.service.dto.TaskFeedbackQueryParam; -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; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/TaskScreenService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskScreenService.java similarity index 85% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/TaskScreenService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskScreenService.java index 4bd50a7..55d25eb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/service/TaskScreenService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskScreenService.java @@ -1,9 +1,9 @@ -package org.nl.acs.taskscreen.service; +package org.nl.acs.task.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.acs.device.domain.Device; +import org.nl.acs.device.device.domain.Device; /** * @author tuqiang diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java index ce84c90..ccf4060 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java @@ -3,7 +3,7 @@ package org.nl.acs.task.service; import com.alibaba.fastjson.JSONObject; import org.nl.acs.instruction.domain.Instruction; 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.task.domain.Task; import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.task.service.dto.TaskQueryParam; @@ -50,6 +50,7 @@ public interface TaskService extends CommonService { /** * 根据设备号和任务状态查询 + * * @param device_code * @return */ @@ -185,6 +186,7 @@ public interface TaskService extends CommonService { /** * 根绝状态查询缓存 + * * @param task_status * @return */ @@ -383,10 +385,13 @@ public interface TaskService extends CommonService { /** * 根据起点设备编号查询当前是否有就绪任务 * - * @param device_code + * @param start_device_code * @return */ - TaskDto findByStartCodeAndReady(String device_code); + TaskDto findReadyByStartDeviceCode(String start_device_code); + + + TaskDto findReadyByVehicleCode(String vehicleCode); /** @@ -452,7 +457,7 @@ public interface TaskService extends CommonService { * @param * @return */ - Integer querySameDeviceReadyTask(String start_device,String next_device,String status); + Integer querySameDeviceReadyTask(String start_device, String next_device, String status); /** @@ -511,4 +516,28 @@ public interface TaskService extends CommonService { */ TaskDto findByTaskCode(String task_code); + TaskDto findReadyTaskByNextDeviceCode(String next_device_code); + + List findReadyTaskByXDeviceCode(List xDeviceCodeList, String noY); + + TaskDto findReadyTaskByFrontTask(TaskDto frontTaskDto, List xDeviceCodeList, String backNoY); + + /** + * 移库任务根据前叉任务信息，查找后叉可以一起取放的任务信息 + * + * @param frontTask + * @param backNoY + * @return + */ + TaskDto findAllBindTask(TaskDto frontTask, String backNoY); + + /** + * 移库任务根据前叉任务信息，查找后叉可以一起取的任务信息 + * + * @param frontTask + * @param backNoY + * @return + */ + TaskDto findFrontBindTask(TaskDto frontTask, String backNoY); + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java index a5df0d0..8c718a6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/dto/TaskQueryParam.java @@ -4,12 +4,6 @@ package org.nl.acs.task.service.dto; import lombok.Getter; import lombok.Setter; -import java.util.List; -import java.util.Date; - -import org.nl.common.annotation.Query; -import org.springframework.format.annotation.DateTimeFormat; - /** * @author jiaolm * @date 2023-05-09 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java index 3fb65c4..cbac3f6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskFeedbackServiceImpl.java @@ -21,7 +21,7 @@ import org.nl.acs.task.service.dto.TaskFeedbackQueryParam; import org.nl.acs.task.service.mapper.TaskFeedbackMapper; 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.FileUtil; @@ -277,7 +277,8 @@ public class TaskFeedbackServiceImpl extends CommonServiceImpl impleme @Override public List queryTaskByDeviceCodeAndStatus2(String device_code) { List list = new ArrayList<>(); - Iterator iterator = tasks.iterator(); - while (iterator.hasNext()) { - TaskDto task = iterator.next(); - if (task.getStart_device_code().equals(device_code) - && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { - Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code()); - if (ObjectUtil.isNotEmpty(instruction)) { - list.add(task); - } - } else { - if (StrUtil.equals(task.getTask_type(), TaskTypeEnum.Inner_Truss_Task.getIndex()) && StrUtil.isNotEmpty(task.getPut_device_code())) { - Instruction instruction = instructionService.findByDeviceCodeFromCache(task.getNext_device_code()); - if (ObjectUtil.isNotEmpty(instruction)) { - if (StrUtil.equals(instruction.getStart_device_code(), device_code)) { - list.add(task); - } - } - } - } - } +// Iterator iterator = tasks.iterator(); +// while (iterator.hasNext()) { +// TaskDto task = iterator.next(); +// if (task.getStart_device_code().equals(device_code) +// && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) { +// Instruction instruction = instructionService.findByTaskcodeAndStatus(task.getTask_code()); +// if (ObjectUtil.isNotEmpty(instruction)) { +// list.add(task); +// } +// } else { +// if (StrUtil.equals(task.getTask_type(), TaskTypeEnum.Inner_Truss_Task.getIndex()) && StrUtil.isNotEmpty(task.getPut_device_code())) { +// Instruction instruction = instructionService.findByDeviceCodeFromCache(task.getNext_device_code()); +// if (ObjectUtil.isNotEmpty(instruction)) { +// if (StrUtil.equals(instruction.getStart_device_code(), device_code)) { +// list.add(task); +// } +// } +// } +// } +// } return list; } @@ -455,10 +455,10 @@ public class TaskServiceImpl extends CommonServiceImpl impleme && StrUtil.equals(task.getTask_status(), TaskStatusEnum.BUSY.getIndex())) .filter(task -> instructionService.findByTaskcodeAndStatus(task.getTask_code()) != null) .collect(Collectors.toList()); - if(CollUtil.isEmpty(collect)){ + if (CollUtil.isEmpty(collect)) { tasks.forEach( - task ->{ - if(TASK_TYPE.equals(task.getTask_type()) && StrUtil.isNotEmpty(task.getPut_device_code())){ + task -> { + if (TASK_TYPE.equals(task.getTask_type()) && StrUtil.isNotEmpty(task.getPut_device_code())) { Instruction instruction = instructionService.findByDeviceCodeFromCache(task.getNext_device_code()); if (ObjectUtil.isNotEmpty(instruction)) { if (StrUtil.equals(instruction.getStart_device_code(), device_code)) { @@ -1067,9 +1067,18 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override - public TaskDto findByStartCodeAndReady(String device_code) { + public TaskDto findReadyByStartDeviceCode(String start_device_code) { + Optional optionalTask = tasks.stream() + .filter(task -> StrUtil.equals(task.getStart_device_code(), start_device_code) + && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) + .findFirst(); + return optionalTask.orElse(null); + } + + @Override + public TaskDto findReadyByVehicleCode(String vehicleCode) { Optional optionalTask = tasks.stream() - .filter(task -> StrUtil.equals(task.getStart_device_code(), device_code) + .filter(task -> StrUtil.equals(task.getVehicle_code(), vehicleCode) && StrUtil.equals(task.getTask_status(), TaskStatusEnum.READY.getIndex())) .findFirst(); return optionalTask.orElse(null); @@ -1535,6 +1544,18 @@ public class TaskServiceImpl extends CommonServiceImpl impleme return null; } + @Override + public TaskDto findReadyTaskByNextDeviceCode(String next_device_code) { + return Optional.ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(taskDto -> TaskStatusEnum.READY.getIndex().equals(taskDto.getTask_status())) + .filter(taskDto -> taskDto.getNext_device_code().equals(next_device_code)) + .sorted(Comparator.comparing(TaskDto::getPriority) + .thenComparing(taskDto -> LocalDateTime.parse(taskDto.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .findFirst() + .orElse(null); + } /** @@ -1577,7 +1598,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme JSONArray ja = new JSONArray(); ja.add(feed_jo); //TODO 有需要根据上位系统反馈的信息再做进一步处理 - acstowmsService.feedTaskStatus(ja); + acstowmsService.feedbackTaskStatusToWms(ja); } } @@ -1608,5 +1629,80 @@ public class TaskServiceImpl extends CommonServiceImpl impleme } } + @Override + public List findReadyTaskByXDeviceCode(List xDeviceCodeList, String noY) { + return Optional.ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(taskDto -> xDeviceCodeList.contains(taskDto.getStart_device_code())) + .filter(taskDto -> xDeviceCodeList.contains(taskDto.getNext_device_code())) + .filter(taskDto -> StrUtil.isNotEmpty(noY) && StrUtil.isNotBlank(taskDto.getFrom_y()) && StrUtil.isNotBlank(taskDto.getTo_y()) && !noY.contains(String.valueOf(Integer.parseInt(taskDto.getFrom_y()))) && !noY.contains(String.valueOf(Integer.parseInt(taskDto.getTo_y())))) + .sorted(Comparator.comparing(TaskDto::getPriority) + .thenComparing(taskDto -> LocalDateTime.parse(taskDto.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .collect(Collectors.toList()); + } + + @Override + public TaskDto findReadyTaskByFrontTask(TaskDto frontTaskDto, List xDeviceCodeList, String backNoY) { + return Optional.ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(taskDto -> xDeviceCodeList.contains(taskDto.getStart_device_code())) + .filter(taskDto -> xDeviceCodeList.contains(taskDto.getNext_device_code())) + .filter(taskDto -> StrUtil.isNotEmpty(backNoY) && !backNoY.contains(String.valueOf(Integer.parseInt(taskDto.getFrom_y()))) && !backNoY.contains(String.valueOf(Integer.parseInt(taskDto.getTo_y())))) + .filter(taskDto -> Integer.parseInt(frontTaskDto.getFrom_x()) == Integer.parseInt(taskDto.getFrom_x())) + .filter(taskDto -> Integer.parseInt(frontTaskDto.getFrom_z()) == Integer.parseInt(taskDto.getFrom_z())) + .filter(taskDto -> Integer.parseInt(frontTaskDto.getTo_x()) == Integer.parseInt(taskDto.getTo_x())) + .filter(taskDto -> Integer.parseInt(frontTaskDto.getTo_z()) == Integer.parseInt(taskDto.getTo_z())) + .filter(taskDto -> (Integer.parseInt(frontTaskDto.getTo_y()) / 4 == Integer.parseInt(taskDto.getTo_y()) / 4) && (((Integer.parseInt(frontTaskDto.getTo_y()) % 4) + (Integer.parseInt(taskDto.getTo_y()) % 4) == 2) || (Integer.parseInt(frontTaskDto.getTo_y()) % 4) + (Integer.parseInt(taskDto.getTo_y()) % 4) == 4)) + .filter(taskDto -> (Integer.parseInt(frontTaskDto.getFrom_y()) / 4 == Integer.parseInt(taskDto.getFrom_y()) / 4) && (((Integer.parseInt(frontTaskDto.getFrom_y()) % 4) + (Integer.parseInt(taskDto.getFrom_y()) % 4) == 2) || (Integer.parseInt(frontTaskDto.getFrom_y()) % 4) + (Integer.parseInt(taskDto.getFrom_y()) % 4) == 4)) + .findFirst() + .orElse(null); + } + + @Override + public TaskDto findAllBindTask(TaskDto frontTask, String backNoY) { + String front_task_code = frontTask.getTask_code(); + String front_from_x = frontTask.getFrom_x(); + String front_from_y = frontTask.getFrom_y(); + String front_from_z = frontTask.getFrom_z(); + String front_to_x = frontTask.getTo_x(); + String front_to_y = frontTask.getTo_y(); + String front_to_z = frontTask.getTo_z(); + return Optional.ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(taskDto -> !taskDto.getTask_code().equals(front_task_code)) + .filter(taskDto -> taskDto.getFrom_x().equals(front_from_x) && taskDto.getFrom_z().equals(front_from_z)) + .filter(taskDto -> taskDto.getTo_x().equals(front_to_x) && taskDto.getTo_z().equals(front_to_z)) + .filter(taskDto -> StrUtil.isNotBlank(backNoY) && StrUtil.isNotBlank(taskDto.getFrom_y()) && StrUtil.isNotBlank(taskDto.getTo_y()) && !backNoY.contains(String.valueOf(Integer.parseInt(taskDto.getFrom_y()))) && !backNoY.contains(String.valueOf(Integer.parseInt(taskDto.getTo_y())))) + .filter(taskDto -> (Integer.parseInt(front_to_y) / 4 == Integer.parseInt(taskDto.getTo_y()) / 4) && (((Integer.parseInt(front_to_y) % 4) + (Integer.parseInt(taskDto.getTo_y()) % 4) == 2) || (Integer.parseInt(front_to_y) % 4) + (Integer.parseInt(taskDto.getTo_y()) % 4) == 4)) + .filter(taskDto -> (Integer.parseInt(front_from_y) / 4 == Integer.parseInt(taskDto.getFrom_y()) / 4) && (((Integer.parseInt(front_from_y) % 4) + (Integer.parseInt(taskDto.getFrom_y()) % 4) == 2) || (Integer.parseInt(front_from_y) % 4) + (Integer.parseInt(taskDto.getFrom_y()) % 4) == 4)) + .sorted(Comparator.comparing(TaskDto::getPriority) + .thenComparing(taskDto -> LocalDateTime.parse(taskDto.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .findFirst() + .orElse(null); + } + @Override + public TaskDto findFrontBindTask(TaskDto frontTask, String backNoY) { + String front_task_code = frontTask.getTask_code(); + String front_from_x = frontTask.getFrom_x(); + String front_from_y = frontTask.getFrom_y(); + String front_from_z = frontTask.getFrom_z(); + String front_to_x = frontTask.getTo_x(); + String front_to_y = frontTask.getTo_y(); + String front_to_z = frontTask.getTo_z(); + return Optional.ofNullable(this.tasks) + .orElse(new CopyOnWriteArrayList<>()) + .stream() + .filter(taskDto -> !taskDto.getTask_code().equals(front_task_code)) + .filter(taskDto -> taskDto.getFrom_x().equals(front_from_x) && taskDto.getFrom_z().equals(front_from_z)) + .filter(taskDto -> StrUtil.isNotBlank(backNoY) && StrUtil.isNotBlank(taskDto.getFrom_y()) && StrUtil.isNotBlank(taskDto.getTo_y()) && !backNoY.contains(String.valueOf(Integer.parseInt(taskDto.getFrom_y()))) && !backNoY.contains(String.valueOf(Integer.parseInt(taskDto.getTo_y())))) + .filter(taskDto -> (Integer.parseInt(front_from_y) / 4 == Integer.parseInt(taskDto.getFrom_y()) / 4) && (((Integer.parseInt(front_from_y) % 4) + (Integer.parseInt(taskDto.getFrom_y()) % 4) == 2) || (Integer.parseInt(front_from_y) % 4) + (Integer.parseInt(taskDto.getFrom_y()) % 4) == 4)) + .sorted(Comparator.comparing(TaskDto::getPriority) + .thenComparing(taskDto -> LocalDateTime.parse(taskDto.getCreate_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) + .findFirst() + .orElse(null); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskFeedbackMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskFeedbackMapper.java index 868f442..8a9f26a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskFeedbackMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskFeedbackMapper.java @@ -1,7 +1,7 @@ package org.nl.acs.task.service.mapper; import org.nl.acs.task.domain.TaskFeedback; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.springframework.stereotype.Repository; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskMapper.java index e591f78..fd88c8d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskMapper.java @@ -1,6 +1,6 @@ package org.nl.acs.task.service.mapper; -import org.nl.acs.common.base.CommonMapper; +import org.nl.acs.common.base.mapper.CommonMapper; import org.nl.acs.task.domain.Task; import org.springframework.stereotype.Repository; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskScreenMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskScreenMapper.java new file mode 100644 index 0000000..7d32d41 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/mapper/TaskScreenMapper.java @@ -0,0 +1,15 @@ +package org.nl.acs.task.service.mapper; + + +import org.nl.acs.common.base.mapper.CommonMapper; +import org.nl.acs.device.device.domain.Device; +import org.springframework.stereotype.Repository; + + +/** + * @author tuqiang + */ +@Repository +public interface TaskScreenMapper extends CommonMapper { + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/mapper/TaskScreenMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/mapper/TaskScreenMapper.java deleted file mode 100644 index 0138e5d..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/taskscreen/mapper/TaskScreenMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.nl.acs.taskscreen.mapper; - - -import org.nl.acs.common.base.CommonMapper; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.domain.DeviceAssigned; -import org.nl.common.base.BaseMapper; -import org.springframework.stereotype.Repository; - - -/** - * @author tuqiang - */ -@Repository -public interface TaskScreenMapper extends CommonMapper { - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UdwConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/TagConfig.java similarity index 77% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UdwConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/TagConfig.java index f44e6df..3b86754 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UdwConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/TagConfig.java @@ -3,13 +3,13 @@ package org.nl.acs.udw; /** * @author 20220102CG\noblelift */ -public class UdwConfig { +public class TagConfig { /** * 历史记录最大数量 */ public static int max_history_length = 10; - public UdwConfig() { + public TagConfig() { } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedData.java deleted file mode 100644 index a82edec..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedData.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.acs.udw; - -import lombok.Data; - -import java.util.Date; - -/** - * @author 20220102CG\noblelift - */ -@Data -public class UnifiedData { - private Object value; - private Date last_modify_date; - - public UnifiedData() { - this.last_modify_date = new Date(); - } - - public UnifiedData(Object value) { - this.value = value; - this.last_modify_date = new Date(); - } - - public void changeValue(Object value) { - this.value = value; - this.last_modify_date = new Date(); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessor.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessor.java deleted file mode 100644 index 0a8d2ac..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessor.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.nl.acs.udw; - -import java.util.List; - -/** - * @author 20220102CG\noblelift - */ -public interface UnifiedDataAccessor { - /** - * 获取所有key - * - * @return List - */ - List getAllKey(); - - /** - * 获取值 - * - * @param key key - * @return Object - */ - Object getValue(String key); - - /** - * 设置值 - * - * @param key key - * @param value value - */ - void setValue(String key, Object value); - - /** - * 删除值 - * @param key - */ - void removeValue(String key); - - /** - * 获取统一数据 - * - * @param key key - * @return UnifiedData - */ - UnifiedData getUnifiedData(String key); - - /** - * 获取历史数据 - * - * @param key key - * @return List - */ - List getHistoryUnifiedData(String key); - - /** - * 设置值 - * - * @param key key - * @param value value - */ - void setValueWithPersistence(String key, Object value); -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessorFactory.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessorFactory.java deleted file mode 100644 index d050563..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAccessorFactory.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.nl.acs.udw; - -import org.nl.acs.udw.service.impl.UnifiedDataAccessorImpl; -import org.nl.acs.udw.service.impl.UnifiedDataAppServiceImpl; - -/** - * @author 20220102CG\noblelift - */ -public class UnifiedDataAccessorFactory { - public UnifiedDataAccessorFactory() { - } - - public static UnifiedDataAppService getUnifiedDataAppService() { - return UnifiedDataAppServiceImpl.getInstance(); - } - - public static UnifiedDataAccessor getAccessor(String unified_key) { - UnifiedDataAccessorImpl accessor = new UnifiedDataAccessorImpl(); - accessor.setUnifiedKey(unified_key); - accessor.setUnifiedDataService(getUnifiedDataAppService()); - return accessor; - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAppService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAppService.java deleted file mode 100644 index 4f55faf..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/UnifiedDataAppService.java +++ /dev/null @@ -1,113 +0,0 @@ -package org.nl.acs.udw; - -import cn.hutool.core.util.ObjectUtil; -import org.nl.acs.udw.service.impl.UnifiedDataUnit; - -import java.util.List; - -/** - * @author 20220102CG\noblelift - */ -public interface UnifiedDataAppService { - /** - * 获取所有的key - * - * @return - */ - List getAllUnifiedKey(); - - /** - * 根据key获取数据单元 - * - * @param key - * @return - */ - UnifiedDataUnit getUnifiedDataUnit(String key); - - /** - * 获取数据单元 - * @param var1 - * @param var2 - * @return - */ - UnifiedData getUnifiedData(String var1, String var2); - - /** - * 获取数据值 - * @param var1 - * @param var2 - * @return - */ - Object getValue(String var1, String var2); - - /** - * 设置数据值 - * @param var1 - * @param var2 - * @param var3 - */ - void setValue(String var1, String var2, Object var3); - - /** - * 设置数据值，不记录日志 - * @param var1 - * @param var2 - * @param var3 - */ - void setValueNoLog(String var1, String var2, Object var3); - - /** - * 获取历史数据 - * @param var1 - * @param var2 - * @return List getHistoryUnifiedData(String var1, String var2); - - /** - * 获取所有数据key - * @param var1 - * @return List - */ - List getAllDataKey(String var1); - - /** - * 删除数据 - * @param var1 - * @param var2 - */ - void removeValue(String var1, String var2); - - /**' - * 设置数据值，不记录日志 - * @param var1 - * @param var2 - * @param var3 - */ - void setValueWithPersistenceNoLog(String var1, String var2, Object var3); - - /** - * 设置数据值，记录日志 - * @param var1 - * @param var2 - * @param var3 - */ - void setValueWithPersistence(String var1, String var2, Object var3); - - /** - * 删除数据，记录日志 - * @param var1 - * @param var2 - */ - void removeValueWithPersistence(String var1, String var2); - - /** - * 判断两个对象是否相等 - * @param a - * @param b - * @return - */ - static boolean isEquals(Object a, Object b) { - return ObjectUtil.equal(a, b); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/dto/UdwDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/dto/UdwDto.java deleted file mode 100644 index 4f6ad6d..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/dto/UdwDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.nl.acs.udw.dto; - -import lombok.Data; - -import java.util.Date; - -/** - * 统一数据源管理 - * @author 20220102CG\noblelift - */ -@Data -public class UdwDto { - private String unified_key; - private String key; - private Object value; - private Date last_modify_date; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/ItemsDataAccessor.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/TagDataAccessor.java similarity index 51% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/ItemsDataAccessor.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/TagDataAccessor.java index 06591f3..fd35cb7 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/ItemsDataAccessor.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/TagDataAccessor.java @@ -5,10 +5,16 @@ import java.util.List; /** * @author onepiece */ -public interface ItemsDataAccessor { +public interface TagDataAccessor { List getAllKey(); Object getValue(String key); + Boolean getQ(String key); + void setValue(String key, Object value); + + void setValue(String key, Object value, Boolean q); + + void setValueWithPersistence(String key, Object value); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/ItemsProcessService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/TagProcessorService.java similarity index 50% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/ItemsProcessService.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/TagProcessorService.java index 5ed1f10..d9a6d6c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/ItemsProcessService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/TagProcessorService.java @@ -1,14 +1,14 @@ package org.nl.acs.udw.mqttUdw; -import org.nl.acs.udw.mqttUdw.service.ItemData; -import org.nl.acs.udw.mqttUdw.service.ItemUnit; +import org.nl.acs.udw.mqttUdw.service.TagData; +import org.nl.acs.udw.mqttUdw.service.TagUnit; import java.util.List; /** * @author onepiece */ -public interface ItemsProcessService { +public interface TagProcessorService { /** * 获取所有的key * @@ -22,13 +22,19 @@ public interface ItemsProcessService { * @param key * @return */ - ItemUnit getItemUnit(String key); + TagUnit getTagUnit(String key); - ItemData getItemData(String var1, String var2); + TagData getTagData(String var1, String var2); Object getValue(String var1, String var2); void setValue(String var1, String var2, Object var3); + void setVaule(String unified_key, String key,Object value, Boolean q); + List getAllDataKey(String var1); + + void setValueWithPersistence(String var1, String var2, Object var3); + + Boolean getQ(String unified_key, String key); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/ItemDataAccessorFactory.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/ItemDataAccessorFactory.java deleted file mode 100644 index 0d8e63d..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/ItemDataAccessorFactory.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.nl.acs.udw.mqttUdw.factory; - -import org.nl.acs.udw.mqttUdw.ItemsDataAccessor; -import org.nl.acs.udw.mqttUdw.service.ItemsDataAccessorImpl; - -/** - * @author onepiece - */ -public class ItemDataAccessorFactory { - - private static final ItemsDataAccessorImpl itemsDataAccessor = new ItemsDataAccessorImpl(); - - public static ItemsDataAccessor getItemsDataAccessor(String unified_key) { - itemsDataAccessor.setUnifiedKey(unified_key); - itemsDataAccessor.setItemsProcess(ItemsProcessServiceFactory.getItemsUnifyProcess()); - return itemsDataAccessor; - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/ItemsProcessServiceFactory.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/ItemsProcessServiceFactory.java deleted file mode 100644 index 1f05a86..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/ItemsProcessServiceFactory.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.nl.acs.udw.mqttUdw.factory; - -import org.nl.acs.udw.mqttUdw.ItemsProcessService; -import org.nl.acs.udw.mqttUdw.service.ItemsProcessImpl; - -/** - * @author onepiece - */ -public class ItemsProcessServiceFactory { - - private static final ItemsProcessService itemsProcess = new ItemsProcessImpl(); - - - public static ItemsProcessService getItemsUnifyProcess() { - return itemsProcess; - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/TagProcessorFactory.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/TagProcessorFactory.java new file mode 100644 index 0000000..175d3c5 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/TagProcessorFactory.java @@ -0,0 +1,17 @@ +package org.nl.acs.udw.mqttUdw.factory; + +import org.nl.acs.udw.mqttUdw.TagProcessorService; +import org.nl.acs.udw.mqttUdw.service.TagProcessorImpl; + +/** + * @author onepiece + */ +public class TagProcessorFactory { + + private static final TagProcessorService TAGS_PROCESSOR = new TagProcessorImpl(); + + + public static TagProcessorService getTagsProcessor() { + return TAGS_PROCESSOR; + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/TagsDataAccessorFactory.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/TagsDataAccessorFactory.java new file mode 100644 index 0000000..24f95eb --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/factory/TagsDataAccessorFactory.java @@ -0,0 +1,18 @@ +package org.nl.acs.udw.mqttUdw.factory; + +import org.nl.acs.udw.mqttUdw.TagDataAccessor; +import org.nl.acs.udw.mqttUdw.service.TagDataAccessorImpl; + +/** + * @author onepiece + */ +public class TagsDataAccessorFactory { + + private static final TagDataAccessorImpl TAGS_ACCESSOR = new TagDataAccessorImpl(); + + public static TagDataAccessor getTagsAccessor(String unified_key) { + TAGS_ACCESSOR.setUnifiedKey(unified_key); + TAGS_ACCESSOR.setItemsProcess(TagProcessorFactory.getTagsProcessor()); + return TAGS_ACCESSOR; + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemData.java deleted file mode 100644 index 78d3f90..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemData.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.acs.udw.mqttUdw.service; - -import lombok.Data; - -import java.util.Date; - -/** - * @author onepiece - */ -@Data -public class ItemData { - private Object value; - private Date last_modify_date; - - public ItemData() { - this.last_modify_date = new Date(); - } - - public ItemData(Object value) { - this.value = value; - this.last_modify_date = new Date(); - } - - public void changeValue(Object value) { - this.value = value; - this.last_modify_date = new Date(); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemsDataAccessorImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemsDataAccessorImpl.java deleted file mode 100644 index ce03739..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemsDataAccessorImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.nl.acs.udw.mqttUdw.service; - -import org.nl.acs.udw.mqttUdw.ItemsDataAccessor; -import org.nl.acs.udw.mqttUdw.ItemsProcessService; - -import java.util.List; - -/** - * @author onepiece - */ -public class ItemsDataAccessorImpl implements ItemsDataAccessor { - - private String unified_key; - private ItemsProcessService itemsProcess; - - - public void setUnifiedKey(String unified_key) { - this.unified_key = unified_key; - } - - public void setItemsProcess(ItemsProcessService itemsProcess) { - this.itemsProcess = itemsProcess; - } - - @Override - public List getAllKey() { - return this.itemsProcess.getAllDataKey(this.unified_key); - } - - @Override - public Object getValue(String key) { - return this.itemsProcess.getValue(this.unified_key, key); - } - - @Override - public void setValue(String key, Object value) { - this.itemsProcess.setValue(this.unified_key, key, value); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemsProcessImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemsProcessImpl.java deleted file mode 100644 index 937ffc6..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemsProcessImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.nl.acs.udw.mqttUdw.service; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.udw.UdwConfig; -import org.nl.acs.udw.UnifiedDataAppService; -import org.nl.acs.udw.mqttUdw.ItemsProcessService; -import org.nl.common.exception.BadRequestException; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * @author onepiece - */ -@Slf4j -public class ItemsProcessImpl implements ItemsProcessService { - private Map factory = new ConcurrentHashMap<>(); - - public ItemsProcessImpl() { - } - - - @Override - public List getAllUnifiedKey() { - return new ArrayList(this.factory.keySet()); - } - - @Override - public ItemUnit getItemUnit(String unified_key) { - ItemUnit itemUnit = this.factory.get(unified_key); - return itemUnit == null ? null : itemUnit; - } - - @Override - public List getAllDataKey(String unified_key) { - ItemUnit itemUnit = (ItemUnit) this.factory.get(unified_key); - if (itemUnit == null) { - return new ArrayList(); - } else { - Map storage = itemUnit.getStorage(); - return new ArrayList(storage.keySet()); - } - } - - @Override - public ItemData getItemData(String unified_key, String key) { - ItemUnit itemUnit = this.getItemUnit(unified_key); - if (itemUnit == null) { - return null; - } else { - Map storage = itemUnit.getStorage(); - return (ItemData) storage.get(key); - } - } - - @Override - public Object getValue(String unified_key, String key) { - ItemData itemData = this.getItemData(unified_key, key); - return itemData == null ? null : itemData.getValue(); - } - - - @Override - public void setValue(String unified_key, String key, Object value) { - this.setValue(unified_key, key, value, false, true); - } - - - public synchronized void setValue(String unified_key, String key, Object value, boolean save, boolean is_log) { - if (unified_key == null) { - throw new BadRequestException(""); - //throw new BusinessException(SystemMessage.cant_be_empty, new Object[]{"unified_key"}); - } else if (key == null) { - throw new BadRequestException(""); - //throw new BusinessException(SystemMessage.cant_be_empty, new Object[]{"key"}); - } else { - if (!this.factory.containsKey(unified_key)) { - this.factory.put(unified_key, new ItemUnit(unified_key)); - } - - ItemUnit itemUnit = (ItemUnit) this.factory.get(unified_key); - Map storage = itemUnit.getStorage(); - if (!storage.containsKey(key)) { - storage.put(key, new ItemData()); - } - - ItemData itemData = (ItemData) storage.get(key); - if (!UnifiedDataAppService.isEquals(itemData.getValue(), value)) { - Map> history = itemUnit.getHistory(); - List historyItemDatas = (List) history.get(key); - if (historyItemDatas == null) { - history.put(key, new ArrayList()); - } - - ItemData historyData = new ItemData(); - historyData.setLast_modify_date(itemData.getLast_modify_date()); - historyData.setValue(itemData.getValue()); - - while (((List) history.get(key)).size() > UdwConfig.max_history_length) { - ((List) history.get(key)).remove(UdwConfig.max_history_length); - } - - ((List) history.get(key)).add(0, historyData); - Object oldvalue = itemData.getValue(); - itemData.changeValue(value); - if (save) { - /*PersistenceService persistenceService = PersistenceServiceFactory.getPersistenceService(); - persistenceService.saveData(unified_key, key, StringUtl.getString(value)); - if (is_log) { - this.businessLogger.setResource(unified_key, unified_key); - this.businessLogger.setMaterial(key, key); - this.businessLogger.setContainer(StringUtl.getString(value)); - this.businessLogger.log("统一数据源中: unit: {}, key: {}, 值: {} 更改为 {}。", new Object[]{unified_key, key, oldvalue, value}); - }*/ - } - - if (is_log && key != null && !key.endsWith("heartbeat") && !key.endsWith("distancex") && !key.endsWith("distancey") && !key.endsWith("Xwz") && !key.endsWith("Ywz") && !key.endsWith("Zwz")) { - log.trace("统一数据源中: unit: {}, key: {}, 值: {} 更改为 {}。", new Object[]{unified_key, key, oldvalue, value}); - } - } - - } - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagData.java new file mode 100644 index 0000000..b8105f9 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagData.java @@ -0,0 +1,47 @@ +package org.nl.acs.udw.mqttUdw.service; + +import lombok.Data; + +import java.util.Date; + +/** + * @author onepiece + */ +@Data +public class TagData { + private Object value; + private Boolean q; + private Date last_modify_date; + + public TagData() { + this.last_modify_date = new Date(); + } + + + public TagData(Object value) { + this.value = value; + this.last_modify_date = new Date(); + } + + public TagData(Object value, Boolean q) { + this.value = value; + this.q = q; + this.last_modify_date = new Date(); + } + + public void changeQ(Boolean q) { + this.q = q; + this.last_modify_date = new Date(); + } + + public void changeValue(Object value) { + this.value = value; + this.last_modify_date = new Date(); + } + + public void changeValue(Object value, Boolean q) { + this.value = value; + this.q = q; + this.last_modify_date = new Date(); + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagDataAccessorImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagDataAccessorImpl.java new file mode 100644 index 0000000..490e96e --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagDataAccessorImpl.java @@ -0,0 +1,54 @@ +package org.nl.acs.udw.mqttUdw.service; + +import org.nl.acs.udw.mqttUdw.TagDataAccessor; +import org.nl.acs.udw.mqttUdw.TagProcessorService; + +import java.util.List; + +/** + * @author onepiece + */ +public class TagDataAccessorImpl implements TagDataAccessor { + + private String unified_key; + private TagProcessorService tagProcess; + + + public void setUnifiedKey(String unified_key) { + this.unified_key = unified_key; + } + + public void setItemsProcess(TagProcessorService tagProcess) { + this.tagProcess = tagProcess; + } + + @Override + public List getAllKey() { + return this.tagProcess.getAllDataKey(this.unified_key); + } + + @Override + public Object getValue(String key) { + return this.tagProcess.getValue(this.unified_key, key); + } + + @Override + public Boolean getQ(String key) { + return this.tagProcess.getQ(this.unified_key, key); + } + + @Override + public void setValue(String key, Object value) { + this.tagProcess.setValue(this.unified_key, key, value); + } + + @Override + public void setValue(String key, Object value, Boolean q) { + this.tagProcess.setVaule(this.unified_key, key, value, q); + } + + @Override + public void setValueWithPersistence(String key, Object value) { + this.tagProcess.setValueWithPersistence(this.unified_key, key, value); + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagProcessorImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagProcessorImpl.java new file mode 100644 index 0000000..84206e9 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagProcessorImpl.java @@ -0,0 +1,165 @@ +package org.nl.acs.udw.mqttUdw.service; + +import cn.hutool.core.util.ObjectUtil; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.udw.TagConfig; +import org.nl.acs.udw.mqttUdw.TagProcessorService; +import org.nl.common.exception.BadRequestException; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @author onepiece + */ +@Slf4j +public class TagProcessorImpl implements TagProcessorService { + private Map factory = new ConcurrentHashMap<>(); + + public TagProcessorImpl() { + } + + + @Override + public List getAllUnifiedKey() { + return new ArrayList(this.factory.keySet()); + } + + @Override + public TagUnit getTagUnit(String unified_key) { + TagUnit tagUnit = this.factory.get(unified_key); + return tagUnit == null ? null : tagUnit; + } + + @Override + public List getAllDataKey(String unified_key) { + TagUnit tagUnit = (TagUnit) this.factory.get(unified_key); + if (tagUnit == null) { + return new ArrayList(); + } else { + Map storage = tagUnit.getStorage(); + return new ArrayList(storage.keySet()); + } + } + + @Override + public void setValueWithPersistence(String unified_key, String key, Object value) { + this.setValue(unified_key, key, value, true, true); + } + + @Override + public TagData getTagData(String unified_key, String key) { + TagUnit tagUnit = this.getTagUnit(unified_key); + if (tagUnit == null) { + return null; + } else { + Map storage = tagUnit.getStorage(); + return (TagData) storage.get(key); + } + } + + @Override + public Object getValue(String unified_key, String key) { + TagData tagData = this.getTagData(unified_key, key); + return tagData == null ? null : tagData.getValue(); + } + + @Override + public Boolean getQ(String unified_key, String key) { + TagData tagData = this.getTagData(unified_key, key); + return tagData == null ? null : tagData.getQ(); + } + + @Override + public void setValue(String unified_key, String key, Object value) { + this.setValue(unified_key, key, value, false, true); + } + + @Override + public void setVaule(String unified_key, String key, Object value, Boolean q) { + this.setVaule(unified_key, key, value, q); + } + + public synchronized void setValue(String unified_key, String key, Object value, Boolean q) { + if (unified_key != null && key != null) { + if (!this.factory.containsKey(unified_key)) { + this.factory.put(unified_key, new TagUnit(unified_key)); + } + TagUnit tagUnit = this.factory.get(unified_key); + Map storage = tagUnit.getStorage(); + if (!storage.containsKey(key)) { + storage.put(key, new TagData()); + } + TagData tagData = storage.get(key); + if (!ObjectUtil.equals(tagData.getValue(), value) || !ObjectUtil.equals(tagData.getQ(), q)) { + Map> history = tagUnit.getHistory(); + List historyTagDatas = history.get(key); + if (historyTagDatas == null) { + history.put(key, new ArrayList()); + } + TagData historyData = new TagData(); + historyData.setLast_modify_date(tagData.getLast_modify_date()); + historyData.setValue(tagData.getValue()); + historyData.setQ(q); + while ((history.get(key)).size() > TagConfig.max_history_length) { + history.get(key).remove(TagConfig.max_history_length); + } + history.get(key).add(0, historyData); + Object oldValue = tagData.getValue(); + tagData.changeValue(value, q); + //log.trace("统一数据源中: unit: {}, key: {}, 值: {} 更改为 {}。", new Object[]{unified_key, key, oldValue, value}); + } + } else { + log.error("统一数据源失败,{},{},{},{}", unified_key, key, value, q); + } + } + + + public synchronized void setValue(String unified_key, String key, Object value, boolean save, boolean is_log) { + if (unified_key == null) { + throw new BadRequestException(""); + //throw new BusinessException(SystemMessage.cant_be_empty, new Object[]{"unified_key"}); + } else if (key == null) { + throw new BadRequestException(""); + //throw new BusinessException(SystemMessage.cant_be_empty, new Object[]{"key"}); + } else { + if (!this.factory.containsKey(unified_key)) { + this.factory.put(unified_key, new TagUnit(unified_key)); + } + + TagUnit tagUnit = (TagUnit) this.factory.get(unified_key); + Map storage = tagUnit.getStorage(); + if (!storage.containsKey(key)) { + storage.put(key, new TagData()); + } + + TagData tagData = (TagData) storage.get(key); + if (!ObjectUtil.equals(tagData.getValue(), value)) { + Map> history = tagUnit.getHistory(); + List historyItemDatas = (List) history.get(key); + if (historyItemDatas == null) { + history.put(key, new ArrayList()); + } + + TagData historyData = new TagData(); + historyData.setLast_modify_date(tagData.getLast_modify_date()); + historyData.setValue(tagData.getValue()); + + while (((List) history.get(key)).size() > TagConfig.max_history_length) { + ((List) history.get(key)).remove(TagConfig.max_history_length); + } + + ((List) history.get(key)).add(0, historyData); + Object oldvalue = tagData.getValue(); + tagData.changeValue(value); + if (is_log && key != null && !key.endsWith("heartbeat") && !key.endsWith("distancex") && !key.endsWith("distancey") && !key.endsWith("Xwz") && !key.endsWith("Ywz") && !key.endsWith("Zwz")) { + log.trace("统一数据源中: unit: {}, key: {}, 值: {} 更改为 {}。", new Object[]{unified_key, key, oldvalue, value}); + } + } + + } + } + +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemUnit.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagUnit.java similarity index 55% rename from nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemUnit.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagUnit.java index eb986e1..2cbc215 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/ItemUnit.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/mqttUdw/service/TagUnit.java @@ -10,12 +10,12 @@ import java.util.concurrent.ConcurrentHashMap; * @author onepiece */ @Data -public class ItemUnit { +public class TagUnit { private String unifiedKey; - private Map storage = new ConcurrentHashMap<>(); - private Map> history = new ConcurrentHashMap<>(); + private Map storage = new ConcurrentHashMap<>(); + private Map> history = new ConcurrentHashMap<>(); - public ItemUnit(String unifiedKey) { + public TagUnit(String unifiedKey) { this.unifiedKey = unifiedKey; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java deleted file mode 100644 index 4e2c77e..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/rest/UdwManagerController.java +++ /dev/null @@ -1,45 +0,0 @@ - -package org.nl.acs.udw.rest; - - -import cn.dev33.satoken.annotation.SaIgnore; - - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.udw.service.UdwManageService; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * @author 20220102CG\noblelift - */ -@RestController -@RequiredArgsConstructor - -@RequestMapping("/api/udw") -@Slf4j -public class UdwManagerController { - - private final UdwManageService udwManageService; - -// @GetMapping -// @Log("查询内存点位") -// -// @SaIgnore -// public ResponseEntity query(@RequestParam JSONObject whereJson) { -// return new ResponseEntity<>(udwManageService.queryByConditions(whereJson), HttpStatus.OK); -// } - - @GetMapping - - @SaIgnore - //@PreAuthorize("@el.check('device:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(udwManageService.queryAll(whereJson, page), HttpStatus.OK); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/UdwManageService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/UdwManageService.java deleted file mode 100644 index f5defbf..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/UdwManageService.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.nl.acs.udw.service; - -import com.alibaba.fastjson.JSONObject; -import org.nl.acs.udw.dto.UdwDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** - * @author 20220102CG\noblelift - */ -public interface UdwManageService { - /** - * 根据条件查询 - * - * @param where - * @return - */ - List queryByConditions(JSONObject where); - - /** - * 查询数据分页 - * - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java deleted file mode 100644 index c48f892..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java +++ /dev/null @@ -1,158 +0,0 @@ -package org.nl.acs.udw.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import org.nl.acs.udw.UnifiedData; -import org.nl.acs.udw.UnifiedDataAccessorFactory; -import org.nl.acs.udw.dto.UdwDto; -import org.nl.acs.udw.service.UdwManageService; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * @author 20220102CG\noblelift - */ -@Service -public class UdwManagerServiceImpl implements UdwManageService { - - public UdwManagerServiceImpl() { - } - - @Override - public List queryByConditions(JSONObject where) { - String unified_key = null; - String keys = null; - - UnifiedDataUnit unifiedDataUnit = UnifiedDataAccessorFactory.getUnifiedDataAppService().getUnifiedDataUnit(unified_key); - if (unifiedDataUnit == null) { - return null; - } else { - String key; - UdwDto udwDto; - Map storage; - ArrayList udwDtos; - Iterator var14; - if (keys != null) { - storage = unifiedDataUnit.getStorage(); - udwDtos = new ArrayList(); - var14 = storage.keySet().iterator(); - - while (var14.hasNext()) { - key = (String) var14.next(); - if (key.indexOf(keys) != -1) { - udwDto = new UdwDto(); - udwDto.setUnified_key(unified_key); - udwDto.setKey(key); - udwDto.setValue(((UnifiedData) storage.get(key)).getValue()); - udwDtos.add(udwDto); - } - } - - return udwDtos; - } else { - storage = unifiedDataUnit.getStorage(); - udwDtos = new ArrayList(); - var14 = storage.keySet().iterator(); - - while (var14.hasNext()) { - key = (String) var14.next(); - udwDto = new UdwDto(); - udwDto.setUnified_key(unified_key); - udwDto.setKey(key); - udwDto.setValue(((UnifiedData) storage.get(key)).getValue()); - udwDtos.add(udwDto); - } - - return udwDtos; - } - } - } - - @Override - public Map queryAll(Map whereJson, Pageable page) { - - String unified_key = (String) whereJson.get("unified_key"); - String keys = (String) whereJson.get("code"); - if (StrUtil.isEmpty(unified_key)) { - unified_key = "opc_value"; - } -// String unified_key = (String) whereJson.get("unified_key"); -// String code = (String) whereJson.get("code"); - -// unified_key = whereJson.get("key").toString(); -// keys = whereJson.get("value").toString(); - - - //[[{"column":"unified_key","value":"cached","compareType":"equals","columnType":"object"}]] - UnifiedDataUnit unifiedDataUnit = UnifiedDataAccessorFactory.getUnifiedDataAppService().getUnifiedDataUnit(unified_key); - if (unifiedDataUnit == null) { - return null; - } else { - String key; - UdwDto udwDto; - Map storage; - ArrayList udwDtos; - Iterator var14; - if (keys != null) { - storage = unifiedDataUnit.getStorage(); - udwDtos = new ArrayList(); - var14 = storage.keySet().iterator(); - - while (var14.hasNext()) { - key = (String) var14.next(); - if (key.indexOf(keys) != -1) { - udwDto = new UdwDto(); - udwDto.setUnified_key(unified_key); - udwDto.setKey(key); - udwDto.setValue(((UnifiedData) storage.get(key)).getValue()); - udwDtos.add(udwDto); - } - } - - Integer currentPageNumber = page.getPageNumber() + 1; - Integer pageMaxSize = page.getPageSize(); - - List orderbyDtoList = (List) udwDtos.stream().skip((currentPageNumber - 1) * pageMaxSize) - .limit(pageMaxSize) - .collect(Collectors.toList()); - - JSONObject jo = new JSONObject(); - jo.put("content", orderbyDtoList); - jo.put("totalElements", udwDtos.size()); - - return jo; - } else { - storage = unifiedDataUnit.getStorage(); - udwDtos = new ArrayList(); - var14 = storage.keySet().iterator(); - - while (var14.hasNext()) { - key = (String) var14.next(); - udwDto = new UdwDto(); - udwDto.setUnified_key(unified_key); - udwDto.setKey(key); - udwDto.setValue(((UnifiedData) storage.get(key)).getValue()); - udwDtos.add(udwDto); - } - Integer currentPageNumber = page.getPageNumber() + 1; - Integer pageMaxSize = page.getPageSize(); - - List orderbyDtoList = (List) udwDtos.stream().skip((currentPageNumber - 1) * pageMaxSize) - .limit(pageMaxSize) - .collect(Collectors.toList()); - - JSONObject jo = new JSONObject(); - jo.put("content", orderbyDtoList); - jo.put("totalElements", udwDtos.size()); - - return jo; - } - } - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAccessorImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAccessorImpl.java deleted file mode 100644 index c810105..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAccessorImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.nl.acs.udw.service.impl; - -import org.nl.acs.udw.UnifiedData; -import org.nl.acs.udw.UnifiedDataAccessor; -import org.nl.acs.udw.UnifiedDataAppService; - -import java.util.List; - -/** - * @author 20220102CG\noblelift - */ -public class UnifiedDataAccessorImpl implements UnifiedDataAccessor { - private String unified_key; - private UnifiedDataAppService unifiedDataAppService; - - public UnifiedDataAccessorImpl() { - } - - public void setUnifiedKey(String unified_key) { - this.unified_key = unified_key; - } - - public void setUnifiedDataService(UnifiedDataAppService unifiedDataService) { - this.unifiedDataAppService = unifiedDataService; - } - - @Override - public List getAllKey() { - return this.unifiedDataAppService.getAllDataKey(this.unified_key); - } - - @Override - public Object getValue(String key) { - return this.unifiedDataAppService.getValue(this.unified_key, key); - } - - @Override - public void setValue(String key, Object value) { - this.unifiedDataAppService.setValue(this.unified_key, key, value); - } - - @Override - public void removeValue( String key) { - this.unifiedDataAppService.removeValue(this.unified_key, key); - } - - @Override - public void setValueWithPersistence(String key, Object value) { - this.unifiedDataAppService.setValueWithPersistence(this.unified_key, key, value); - } - - @Override - public UnifiedData getUnifiedData(String key) { - return this.unifiedDataAppService.getUnifiedData(this.unified_key, key); - } - - @Override - public List getHistoryUnifiedData(String key) { - return this.unifiedDataAppService.getHistoryUnifiedData(this.unified_key, key); - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAppServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAppServiceImpl.java deleted file mode 100644 index d56062c..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAppServiceImpl.java +++ /dev/null @@ -1,200 +0,0 @@ -package org.nl.acs.udw.service.impl; - -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.udw.UdwConfig; -import org.nl.acs.udw.UnifiedData; -import org.nl.acs.udw.UnifiedDataAppService; -import org.nl.common.exception.BadRequestException; - -import java.util.*; - -/** - * @author 20220102CG\noblelift - */ -@Slf4j -public class UnifiedDataAppServiceImpl implements UnifiedDataAppService { - public static UnifiedDataAppService unifiedDataAppService; - private Map factory = Collections.synchronizedMap(new HashMap()); - - private UnifiedDataAppServiceImpl() { - } - - public static UnifiedDataAppService getInstance() { - if (unifiedDataAppService == null) { - Class var0 = UnifiedDataAppServiceImpl.class; - synchronized (UnifiedDataAppServiceImpl.class) { - if (unifiedDataAppService == null) { - unifiedDataAppService = new UnifiedDataAppServiceImpl(); - } - } - } - return unifiedDataAppService; - } - - @Override - public List getAllUnifiedKey() { - return new ArrayList(this.factory.keySet()); - } - - @Override - public UnifiedDataUnit getUnifiedDataUnit(String unified_key) { - UnifiedDataUnit dataUnit = (UnifiedDataUnit) this.factory.get(unified_key); - return dataUnit == null ? null : dataUnit; - } - - @Override - public List getAllDataKey(String unified_key) { - UnifiedDataUnit dataUnit = (UnifiedDataUnit) this.factory.get(unified_key); - if (dataUnit == null) { - return new ArrayList(); - } else { - Map storage = dataUnit.getStorage(); - return new ArrayList(storage.keySet()); - } - } - - @Override - public UnifiedData getUnifiedData(String unified_key, String key) { - UnifiedDataUnit dataUnit = this.getUnifiedDataUnit(unified_key); - if (dataUnit == null) { - return null; - } else { - Map storage = dataUnit.getStorage(); - return (UnifiedData) storage.get(key); - } - } - - @Override - public Object getValue(String unified_key, String key) { - UnifiedData unifiedData = this.getUnifiedData(unified_key, key); - return unifiedData == null ? null : unifiedData.getValue(); - } - - @Override - public void removeValueWithPersistence(String unified_key, String key) { - UnifiedDataUnit dataUnit = this.getUnifiedDataUnit(unified_key); - if (dataUnit != null) { - Map storage = dataUnit.getStorage(); - if (storage.containsKey(key)) { - storage.remove(key); - } - - Map> history = dataUnit.getHistory(); - if (history.containsKey(key)) { - history.remove(key); - } - - /*PersistenceService persistenceService = PersistenceServiceFactory.getPersistenceService(); - persistenceService.deleteData(unified_key, key);*/ - } - } - - @Override - public void removeValue(String unified_key, String key) { - UnifiedDataUnit dataUnit = this.getUnifiedDataUnit(unified_key); - if (dataUnit != null) { - Map storage = dataUnit.getStorage(); - if (storage.containsKey(key)) { - storage.remove(key); - } - - Map> history = dataUnit.getHistory(); - if (history.containsKey(key)) { - history.remove(key); - } - - if (history.size() == 0) { - this.factory.remove(unified_key); - } - - } - } - - @Override - public void setValueNoLog(String unified_key, String key, Object value) { - this.setValue(unified_key, key, value, false, false); - } - - @Override - public void setValue(String unified_key, String key, Object value) { - this.setValue(unified_key, key, value, false, true); - } - - @Override - public void setValueWithPersistenceNoLog(String unified_key, String key, Object value) { - this.setValue(unified_key, key, value, true, false); - } - - @Override - public void setValueWithPersistence(String unified_key, String key, Object value) { - this.setValue(unified_key, key, value, true, true); - } - - public synchronized void setValue(String unified_key, String key, Object value, boolean save, boolean is_log) { - if (unified_key == null) { - throw new BadRequestException(""); - //throw new BusinessException(SystemMessage.cant_be_empty, new Object[]{"unified_key"}); - } else if (key == null) { - throw new BadRequestException(""); - //throw new BusinessException(SystemMessage.cant_be_empty, new Object[]{"key"}); - } else { - if (!this.factory.containsKey(unified_key)) { - this.factory.put(unified_key, new UnifiedDataUnit(unified_key)); - } - - UnifiedDataUnit dataUnit = (UnifiedDataUnit) this.factory.get(unified_key); - Map storage = dataUnit.getStorage(); - if (!storage.containsKey(key)) { - storage.put(key, new UnifiedData()); - } - - UnifiedData unifiedData = (UnifiedData) storage.get(key); - if (!UnifiedDataAppService.isEquals(unifiedData.getValue(), value)) { - Map> history = dataUnit.getHistory(); - List historyunifiedData = (List) history.get(key); - if (historyunifiedData == null) { - history.put(key, new ArrayList()); - } - - UnifiedData historydata = new UnifiedData(); - historydata.setLast_modify_date(unifiedData.getLast_modify_date()); - historydata.setValue(unifiedData.getValue()); - - while (((List) history.get(key)).size() > UdwConfig.max_history_length) { - ((List) history.get(key)).remove(UdwConfig.max_history_length); - } - - ((List) history.get(key)).add(0, historydata); - Object oldvalue = unifiedData.getValue(); - unifiedData.changeValue(value); - if (save) { - /*PersistenceService persistenceService = PersistenceServiceFactory.getPersistenceService(); - persistenceService.saveData(unified_key, key, StringUtl.getString(value)); - if (is_log) { - this.businessLogger.setResource(unified_key, unified_key); - this.businessLogger.setMaterial(key, key); - this.businessLogger.setContainer(StringUtl.getString(value)); - this.businessLogger.log("统一数据源中: unit: {}, key: {}, 值: {} 更改为 {}。", new Object[]{unified_key, key, oldvalue, value}); - }*/ - } - - if (is_log && key != null && !key.endsWith("heartbeat") && !key.endsWith("distancex") && !key.endsWith("distancey") && !key.endsWith("Xwz") && !key.endsWith("Ywz") && !key.endsWith("Zwz")) { - log.trace("统一数据源中: unit: {}, key: {}, 值: {} 更改为 {}。", new Object[]{unified_key, key, oldvalue, value}); - } - } - - } - } - - @Override - public List getHistoryUnifiedData(String unified_key, String key) { - UnifiedDataUnit dataUnit = this.getUnifiedDataUnit(unified_key); - if (dataUnit == null) { - return new ArrayList(); - } else { - Map> history = dataUnit.getHistory(); - List result = (List) history.get(key); - return (List) (result == null ? new ArrayList() : result); - } - } -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataUnit.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataUnit.java deleted file mode 100644 index 5937238..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataUnit.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.nl.acs.udw.service.impl; - -import lombok.Data; -import org.nl.acs.udw.UnifiedData; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author 20220102CG\noblelift - */ -@Data -public class UnifiedDataUnit { - private String unifiedKey; - private Map storage = Collections.synchronizedMap(new HashMap()); - private Map> history = Collections.synchronizedMap(new HashMap()); - - public UnifiedDataUnit(String unifiedKey) { - this.unifiedKey = unifiedKey; - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java index 1f91b58..590db39 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java @@ -7,8 +7,8 @@ //import lombok.extern.slf4j.Slf4j; //import org.jinterop.dcom.common.JIException; //import org.jinterop.dcom.core.JIVariant; -//import org.nl.acs.device.device_driver.standard_inspect.ItemDto; -//import org.nl.acs.device.device_driver.standard_inspect.ItemProtocol; +//import org.nl.acs.device.driver.ItemDto; +//import org.nl.acs.device.aa.device_driver.standard_inspect.ItemProtocol; //import org.nl.acs.opc.OpcUtl; //import org.nl.acs.opc.domain.Opc; //import org.nl.acs.opc.service.mapper.OpcMapper; @@ -70,7 +70,7 @@ // Iterator it = strings.keySet().iterator(); // while (it.hasNext()) { // String key = (String) it.next(); -// Item byteItem = group.addItem(key); +// Tag byteItem = group.addItem(key); // Object o = strings.get(key); // if (o == null || "".equals(o)) { // break; @@ -106,7 +106,7 @@ // HashMap map = new HashMap(); // try { // Group group = server.addGroup(); -// Map items = new LinkedHashMap(); +// Map items = new LinkedHashMap(); // Iterator is = itemString.iterator(); // // while (is.hasNext()) { @@ -118,12 +118,12 @@ // } // } // -// Map itemStatus = group.read(true, (Item[]) items.values().toArray(new Item[0])); -// Set keySet = itemStatus.keySet(); +// Map itemStatus = group.read(true, (Tag[]) items.values().toArray(new Tag[0])); +// Set keySet = itemStatus.keySet(); // Iterator it = keySet.iterator(); // // while (it.hasNext()) { -// Item key = (Item) it.next(); +// Tag key = (Tag) it.next(); // Object value = OpcUtl.getValue(key, (ItemState) itemStatus.get(key)); // map.put(key.getId(), value); // } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/StringUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/StringUtil.java new file mode 100644 index 0000000..94e2e09 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/StringUtil.java @@ -0,0 +1,19 @@ +package org.nl.acs.utils; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/25 + */ +public class StringUtil { + /** + * @param x + * @return + */ + public static String handleString(String x) { + if (x != null) { + return x.replaceAll("^[^0-9]+", ""); + } + return x; + } +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/driver/ExcelTemplateCreator.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/generator_template/ExcelTemplateCreator.java similarity index 91% rename from nladmin-system/nlsso-server/src/main/java/org/nl/config/driver/ExcelTemplateCreator.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/config/generator_template/ExcelTemplateCreator.java index 59a8b5d..b50f156 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/driver/ExcelTemplateCreator.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/generator_template/ExcelTemplateCreator.java @@ -1,9 +1,9 @@ -package org.nl.config.driver; +package org.nl.config.generator_template; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.nl.acs.device.enums.DeviceType; +import org.nl.acs.device.device.enums.DeviceType; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -75,7 +75,7 @@ public class ExcelTemplateCreator { Cell dataCell = row.createCell(1); dataCell.setCellStyle(unlockedCellStyle); if ("packagePath".equals(headers1[i])) { - dataCell.setCellValue("org.nl.acs.device_driver.xx"); + dataCell.setCellValue("org.nl.acs.device.driver.xxDeviceType.xx"); } else if ("definitionClassName".equals(headers1[i])) { dataCell.setCellValue("XxDefinition"); } else if ("definitionDriverCode".equals(headers1[i])) { @@ -104,12 +104,15 @@ public class ExcelTemplateCreator { sheet2.setDefaultRowHeightInPoints(30); // 下拉列表的选项 - String[] fieldTypes = {"int", "Integer", "byte", "Byte", "short", "Short", - "long", "Long", "float", "Float", "double", "Double", - "boolean", "Boolean", "String", - "int[]", "Integer[]", "byte[]", "Byte[]", "short[]", "Short[]", - "long[]", "Long[]", "float[]", "Float[]", "double[]", "Double[]", - "boolean[]", "Boolean[]", "String[]"}; + String[] fieldTypes = + {"int", "Integer", "byte", "Byte", + "short", "Short", "long", "Long", + "float", "Float", "double", "Double", + "boolean", "Boolean", "String", "int[]", + "Integer[]", "byte[]", "Byte[]", "short[]", + "Short[]", "long[]", "Long[]", "float[]", "Float[]", + "double[]", "Double[]", "boolean[]", "Boolean[]", "String[]" + }; DataValidationHelper sheet2ValidationHelper = sheet2.getDataValidationHelper(); DataValidationConstraint sheet2constraint = sheet2ValidationHelper.createExplicitListConstraint(fieldTypes); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/driver/GeneratorDriverTemplate.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/generator_template/GeneratorDriverTemplate.java similarity index 82% rename from nladmin-system/nlsso-server/src/main/java/org/nl/config/driver/GeneratorDriverTemplate.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/config/generator_template/GeneratorDriverTemplate.java index dcb6756..0e7e705 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/driver/GeneratorDriverTemplate.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/generator_template/GeneratorDriverTemplate.java @@ -1,11 +1,14 @@ -package org.nl.config.driver; +package org.nl.config.generator_template; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; @@ -16,7 +19,7 @@ import java.util.*; */ public class GeneratorDriverTemplate { - private static final List FIELDS = Arrays.asList("boolean", "Boolean", "int[]", "Integer[]", "byte[]", "Byte[]", "short[]", "Short[]", "long[]", "Long[]", "float[]", "Float[]", "double[]", "Double[]", "char[]", "Character[]", "boolean[]", "Boolean[]", "String[]"); + private static final List FIELDS = Arrays.asList("String", "boolean", "Boolean", "int[]", "Integer[]", "byte[]", "Byte[]", "short[]", "Short[]", "long[]", "Long[]", "float[]", "Float[]", "double[]", "Double[]", "char[]", "Character[]", "boolean[]", "Boolean[]", "String[]"); public static void generateClass(MultipartFile file) { if (file.isEmpty()) { @@ -32,7 +35,8 @@ public class GeneratorDriverTemplate { String deviceDriver = buildDeviceDriver(config, parseDriverField(enumSheet)); String definition = buildStationDefinition(config); - String basePath = "nlsso-server/src/main/java"; + String moduleRootPath = getModuleRootPath(GeneratorDriverTemplate.class); + String basePath = moduleRootPath + "/src/main/java"; String packagePath = config.get("packagePath").replace('.', '/'); String outputPath = basePath + "/" + packagePath; @@ -58,12 +62,10 @@ public class GeneratorDriverTemplate { .append("import lombok.RequiredArgsConstructor;\n") .append("import lombok.Setter;\n") .append("import lombok.extern.slf4j.Slf4j;\n") - .append("import org.nl.acs.device.domain.Device;\n") - .append("import org.nl.acs.device_driver.*;\n") - .append("import org.nl.acs.device_driver.driver.*;\n") + .append("import org.nl.acs.device.device.domain.Device;\n") + .append("import org.nl.acs.device.driver.*;\n") .append("import org.nl.acs.monitor.DeviceStageMonitor;\n") .append("import org.nl.config.SpringContextHolder;\n") - .append("import org.nl.acs.device_driver.BaseTagsDataReader;\n") .append("import org.nl.config.lucene.service.LuceneExecuteLogService;\n") .append("import org.nl.config.lucene.service.dto.LuceneLogDto;\n") .append("import java.util.Date;\n\n") @@ -77,14 +79,29 @@ public class GeneratorDriverTemplate { .append(" RouteableDeviceDriver,\n") .append(" DeviceStageMonitor,\n") .append(" StandardRequestMethod,\n") - .append(" BaseTagsDataReader {\n\n") + .append(" DeviceDriverBaseReader {\n\n") .append(" private final LuceneExecuteLogService logService = SpringContextHolder.getBean(LuceneExecuteLogService.class);\n\n"); driverFields.forEach((filedName, value) -> classBuilder.append(" /**\n") .append(" * ").append(value.get("description")).append("\n") .append(" */\n") - .append(" private ").append(value.get("fieldType")).append(" ").append(convertToCamelCase(filedName)).append(FIELDS.contains(value.get("fieldType")) ? "" : " = ").append(value.get("fieldType").equals("String") ? "" : FIELDS.contains(value.get("fieldType")) ? "" : 0).append(";\n") - .append(" private ").append(value.get("fieldType")).append(" ").append("last").append(capitalizeFirstLetter(convertToCamelCase(filedName))).append(FIELDS.contains(value.get("fieldType")) ? "" : " = ").append(value.get("fieldType").equals("String") ? "" : FIELDS.contains(value.get("fieldType")) ? "" : 0).append(";\n") + .append(" private ") + .append(value.get("fieldType")) + .append(" ") + //.append(convertToCamelCase(filedName)) + .append(filedName) + .append(FIELDS.contains(value.get("fieldType")) ? "" : " = ") + .append(value.get("fieldType").equals("String") ? "" : FIELDS.contains(value.get("fieldType")) ? "" : 0) + .append(";\n") + .append(" private ") + .append(value.get("fieldType")) + .append(" ") + .append("last") + //.append(capitalizeFirstLetter(convertToCamelCase(filedName))) + .append(capitalizeOnlyFirstLetter(filedName)) + .append(FIELDS.contains(value.get("fieldType")) ? "" : " = ") + .append(value.get("fieldType").equals("String") ? "" : FIELDS.contains(value.get("fieldType")) ? "" : 0) + .append(";\n") ); classBuilder.append(" /**\n") .append(" * 当前设备编号\n") @@ -101,7 +118,7 @@ public class GeneratorDriverTemplate { .append(" /**\n") .append(" * 请求时间\n") .append(" */\n") - .append(" private Date requireTime = new Date();\n\n") + .append(" private long requireTime = System.currentTimeMillis();\n\n") .append(" /**\n") .append(" * 请求间隔时间\n") .append(" */\n") @@ -124,12 +141,12 @@ public class GeneratorDriverTemplate { .append(" }\n\n") .append(" @Override\n") .append(" public void execute() {\n") - .append(" this.currentDeviceCode = this.getDeviceCode();\n") + .append(" this.currentDeviceCode = this.getDevice().getDevice_code();\n") .append(" this.loadAssignData(currentDeviceCode, ItemProtocol.class);\n") .append(" }\n\n") .append(" @Override\n") .append(" public void executeLogic() {\n") - .append(" if (Boolean.FALSE.equals(this.getOnline())) {\n") + .append(" if (!this.online) {\n") .append(" this.message = \"设备离线\";\n") .append(driverFields.containsKey("mode") ? " } else if (this.mode == 0) {\n" : "") .append(driverFields.containsKey("mode") ? " this.message = \"设备未联机\";\n" : "") @@ -163,14 +180,14 @@ public class GeneratorDriverTemplate { } public static String buildStationDefinition(Map config) { - StringBuilder classBuilder = new StringBuilder(); + StringBuilder classBuilder = new StringBuilder(); classBuilder.append("package ").append(config.get("packagePath")).append(";\n\n") - .append("import org.nl.acs.device.device_driver.standard_inspect.ItemDto;\n") - .append("import org.nl.acs.device.domain.Device;\n") - .append("import org.nl.acs.device.enums.DeviceType;\n") - .append("import org.nl.acs.device_driver.DeviceDriver;\n") - .append("import org.nl.acs.device_driver.defination.OpcDeviceDriverDefination;\n") + .append("import org.nl.acs.device.driver.ItemDto;\n") + .append("import org.nl.acs.device.device.domain.Device;\n") + .append("import org.nl.acs.device.device.enums.DeviceType;\n") + .append("import org.nl.acs.device.driver.DeviceDriver;\n") + .append("import org.nl.acs.device.driver.OpcDeviceDriverDefination;\n") .append("import org.springframework.stereotype.Service;\n\n") .append("import java.util.LinkedList;\n") .append("import java.util.List;\n\n") @@ -219,11 +236,11 @@ public class GeneratorDriverTemplate { public static String buildItemProtocol(Sheet sheet, Map config) { StringBuilder enumClassContent = new StringBuilder(); enumClassContent.append("package " + config.get("packagePath") + ";\n\n") - .append("import org.nl.acs.device.device_driver.standard_inspect.ItemDto;\n\n") - .append("import org.nl.acs.device_driver.BaseTagsDataReader;\n\n") + .append("import org.nl.acs.device.driver.ItemDto;\n\n") + .append("import org.nl.acs.device.driver.DeviceDriverBaseReader;\n\n") .append("import java.util.List;\n") .append("import java.util.ArrayList;\n\n") - .append("public enum ItemProtocol implements BaseTagsDataReader.KeyProvider {\n"); + .append("public enum ItemProtocol implements DeviceDriverBaseReader.KeyProvider {\n"); Iterator iterator = sheet.rowIterator(); while (iterator.hasNext()) { Row currentRow = iterator.next(); @@ -243,7 +260,8 @@ public class GeneratorDriverTemplate { enumClassContent.append(" ") .append((convertToUpperCaseSnakeCase(key))) .append("(\"") - .append(convertToCamelCase(key)) + // .append(convertToCamelCase(key)) + .append(key) .append("\", \"") .append(description) .append("\", \"") @@ -277,7 +295,7 @@ public class GeneratorDriverTemplate { .append(" public static List getReadableItemDtos() {\n") .append(" List list = new ArrayList<>();\n") .append(" for (ItemProtocol prop : values()) {\n") - .append(" if (!prop.getKey().contains(\"to\")) {\n") + .append(" if (!prop.getKey().startsWith(\"to\")) {\n") .append(" list.add(new ItemDto(prop.getKey(), prop.getDescription(), prop.getAddress()));\n") .append(" }\n") .append(" }\n") @@ -286,7 +304,7 @@ public class GeneratorDriverTemplate { .append(" public static List getWriteableItemDtos() {\n") .append(" List list = new ArrayList<>();\n") .append(" for (ItemProtocol prop : values()) {\n") - .append(" if (prop.getKey().contains(\"to\")) {\n") + .append(" if (prop.getKey().startsWith(\"to\")) {\n") .append(" list.add(new ItemDto(prop.getKey(), prop.getDescription(), prop.getAddress()));\n") .append(" }\n") .append(" }\n") @@ -358,9 +376,9 @@ public class GeneratorDriverTemplate { .append(parts[i].substring(1)); } - return camelCaseString.toString(); + return camelCaseString.toString().trim(); } - return fieldName; + return fieldName.trim(); } private static String capitalizeFirstLetter(String filedName) { @@ -382,4 +400,23 @@ public class GeneratorDriverTemplate { return filedName.substring(0, 1).toUpperCase() + filedName.substring(1); } + public static String capitalizeOnlyFirstLetter(String input) { + if (input == null || input.isEmpty()) { + return input; + } + return Character.toUpperCase(input.charAt(0)) + input.substring(1); + } + + public static String getModuleRootPath(Class clazz) { + try { + URL classLocation = clazz.getProtectionDomain().getCodeSource().getLocation(); + Path classPath = Paths.get(classLocation.toURI()); + Path moduleRootPath = classPath.getParent().getParent(); + return moduleRootPath.getFileName().toString(); + } catch (URISyntaxException e) { + e.printStackTrace(); + return "nlsso-server"; + } + } + } \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/config/LuceneAppender.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/config/LuceneAppender.java index 9e9bdcd..e926526 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/config/LuceneAppender.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/config/LuceneAppender.java @@ -95,11 +95,17 @@ public class LuceneAppender extends AppenderBase { if (ObjectUtil.isNotEmpty(luceneLogDto.getStatus_code())) { document.add(new StringField("status_code", luceneLogDto.getStatus_code(), Field.Store.YES)); } - if (ObjectUtil.isNotEmpty(luceneLogDto.getRequestparam())) { - document.add(new StringField("requestparam", luceneLogDto.getRequestparam(), Field.Store.YES)); + if (ObjectUtil.isNotEmpty(luceneLogDto.getRequest_param())) { + document.add(new StringField("request_param", luceneLogDto.getRequest_param(), Field.Store.YES)); } - if (ObjectUtil.isNotEmpty(luceneLogDto.getResponseparam())) { - document.add(new StringField("responseparam", luceneLogDto.getResponseparam(), Field.Store.YES)); + if (ObjectUtil.isNotEmpty(luceneLogDto.getResponse_param())) { + document.add(new StringField("response_param", luceneLogDto.getResponse_param(), Field.Store.YES)); + } + if (ObjectUtil.isNotEmpty(luceneLogDto.getRequest_url())) { + document.add(new StringField("request_url", luceneLogDto.getRequest_url(), Field.Store.YES)); + } + if (ObjectUtil.isNotEmpty(luceneLogDto.getDeviceLogType())) { + document.add(new StringField("deviceLogType", luceneLogDto.getDeviceLogType(), Field.Store.YES)); } document.add(new StringField("logType", luceneLogDto.getLogType(), Field.Store.YES)); document.add(new StringField("logTime", DateUtil.format(new DateTime(), "yyyy-MM-dd HH:mm:ss.SSS"), Field.Store.YES)); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/enums/DeviceLogTypeEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/enums/DeviceLogTypeEnum.java new file mode 100644 index 0000000..7ef95c5 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/enums/DeviceLogTypeEnum.java @@ -0,0 +1,19 @@ +package org.nl.config.lucene.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/4/10 + */ +@Getter +@RequiredArgsConstructor +public enum DeviceLogTypeEnum { + AUTO_THREAD("auto", "自动线程"), + MQTT("mqtt", "MQTT"); + + private final String code; + private final String name; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java index fbf7b00..fc7ef8f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/rest/LuceneController.java @@ -1,10 +1,11 @@ package org.nl.config.lucene.rest; - import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; +import org.nl.config.lucene.enums.DeviceLogTypeEnum; +import org.nl.config.lucene.enums.LogTypeEnum; import org.nl.config.lucene.service.LuceneService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -14,7 +15,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; import java.util.Map; +import java.util.stream.Collectors; @RestController @@ -27,12 +30,34 @@ public class LuceneController { private final LuceneService luceneService; - @GetMapping("/getAll") @Log("日志检索") - - //@PreAuthorize("@el.check('task:list')") public ResponseEntity get(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(luceneService.getAll(whereJson, page), HttpStatus.OK); } + + @GetMapping("/getDeviceLogType") + @Log("获取设备日志类型") + public ResponseEntity getDeviceLogType() { + return new ResponseEntity<>(Arrays.stream(DeviceLogTypeEnum.values()) + .map(type -> { + Map map = new java.util.HashMap<>(); + map.put("code", type.getCode()); + map.put("name", type.getName()); + return map; + }) + .collect(Collectors.toList()), HttpStatus.OK); + } + + @GetMapping("/getLogTypes") + @Log("获取日志类型") + public ResponseEntity get(@RequestParam Map whereJson) { + + return new ResponseEntity<>(Arrays.stream(LogTypeEnum.values()).map(logType -> { + Map map = new java.util.HashMap<>(); + map.put("logType", logType.getDesc()); + return map; + }) + .collect(Collectors.toList()), HttpStatus.OK); + } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/dto/LuceneLogDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/dto/LuceneLogDto.java index 560ad4b..e09a16d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/dto/LuceneLogDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/dto/LuceneLogDto.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.nl.config.lucene.enums.DeviceLogTypeEnum; @Data @Builder @@ -35,20 +36,17 @@ public class LuceneLogDto { /* 备注 */ private String remark; - /* 日志类型 */ - private String log_type; - /* 方法 */ private String method; /* 请求参数 */ - private String requestparam; + private String request_param; /* 响应参数 */ - private String responseparam; + private String response_param; /* 请求地址 */ - private String requesturl; + private String request_url; /* 状态码 */ private String status_code; @@ -68,6 +66,8 @@ public class LuceneLogDto { /* 修改时间 */ private String update_time; + private String deviceLogType; + public LuceneLogDto(final String opc_server_code, final String opc_plc_code, final String device_code, final String to_home, final String last_home, @@ -83,35 +83,34 @@ public class LuceneLogDto { + home; } - public LuceneLogDto(final String method, final String status, - final String requestparam, final String responseparam, final String content) { - super(); - this.content = content; - this.method = method; - this.status_code = status; - this.requestparam = requestparam; - this.responseparam = responseparam; - this.content = content; - } public LuceneLogDto(final String device_code, final String remark) { super(); this.device_code = device_code; + this.deviceLogType = DeviceLogTypeEnum.AUTO_THREAD.getCode(); this.content = "设备 [" + device_code + "] - " + remark; } - public LuceneLogDto(final LuceneLogDto dto) { + public LuceneLogDto(final String device_code, final String device_log_type, final String remark) { super(); this.device_code = device_code; - this.method = method; - + this.deviceLogType = device_log_type; this.content = "设备 [" + device_code + "] - " + remark; } + public LuceneLogDto(final String request_url, final String request_param, final String response_param, final String status_code,final String remark) { + super(); + this.request_url = request_url; + this.request_param = request_param; + this.response_param = response_param; + this.status_code = status_code; + this.content = remark; + } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneServiceImpl.java index 396718a..301fc3d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/service/impl/LuceneServiceImpl.java @@ -54,48 +54,68 @@ public class LuceneServiceImpl implements LuceneService { String startDate = (String) whereJson.get("begin_time"); String endDate = (String) whereJson.get("end_time"); - if (startDate == null){ - Calendar calendar=Calendar.getInstance(); + if (startDate == null) { + Calendar calendar = Calendar.getInstance(); calendar.set(1970, 0, 1); - startDate = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH:mm:ss.SSS"); - }else{ + startDate = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss.SSS"); + } else { startDate = getDate(startDate); } - if (endDate == null){ - endDate = DateUtil.format(new DateTime(),"yyyy-MM-dd HH:mm:ss.SSS"); + if (endDate == null) { + endDate = DateUtil.format(new DateTime(), "yyyy-MM-dd HH:mm:ss.SSS"); } else { endDate = getDate(endDate); } TermRangeQuery termRangeQuery = new TermRangeQuery("logTime", new BytesRef(startDate), new BytesRef(endDate), true, true); booleanQueryBuilder.add(termRangeQuery, BooleanClause.Occur.MUST); - if (whereJson.get("device_code") != null){ + if (whereJson.get("logType") != null) { + Query termQuery = new TermQuery(new Term("logType", (String) whereJson.get("logType"))); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); + } + if (whereJson.get("device_code") != null) { Query termQuery = new TermQuery(new Term("device_code", (String) whereJson.get("device_code"))); - booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); + } + if (whereJson.get("deviceLogType") != null) { + Query termQuery = new TermQuery(new Term("deviceLogType", (String) whereJson.get("deviceLogType"))); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - if (whereJson.get("method") != null){ + if (whereJson.get("method") != null) { Query termQuery = new TermQuery(new Term("method", (String) whereJson.get("method"))); - booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - if (whereJson.get("status_code") != null){ - Query termQuery = new TermQuery(new Term("status_code", (String) whereJson.get("status_code"))); - booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); + if (whereJson.get("task_code") != null) { + Query termQuery = new TermQuery(new Term("task_code", (String) whereJson.get("task_code"))); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - if (whereJson.get("requestparam") != null){ - WildcardQuery query = new WildcardQuery(new Term("requestparam", "*"+(String) whereJson.get("requestparam")+"*")); - booleanQueryBuilder.add(query,BooleanClause.Occur.MUST); + if (whereJson.get("instruct_code") != null) { + Query termQuery = new TermQuery(new Term("instruct_code", (String) whereJson.get("instruct_code"))); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - if (whereJson.get("responseparam") != null){ - WildcardQuery query = new WildcardQuery(new Term("responseparam", "*"+(String) whereJson.get("responseparam")+"*")); - booleanQueryBuilder.add(query,BooleanClause.Occur.MUST); + if (whereJson.get("request_url") != null) { + Query termQuery = new TermQuery(new Term("request_url", (String) whereJson.get("request_url"))); + booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } +// if (whereJson.get("status_code") != null){ +// Query termQuery = new TermQuery(new Term("status_code", (String) whereJson.get("status_code"))); +// booleanQueryBuilder.add(termQuery,BooleanClause.Occur.MUST); +// } +// if (whereJson.get("requestparam") != null){ +// WildcardQuery query = new WildcardQuery(new Term("requestparam", "*"+(String) whereJson.get("requestparam")+"*")); +// booleanQueryBuilder.add(query,BooleanClause.Occur.MUST); +// } +// if (whereJson.get("responseparam") != null){ +// WildcardQuery query = new WildcardQuery(new Term("responseparam", "*"+(String) whereJson.get("responseparam")+"*")); +// booleanQueryBuilder.add(query,BooleanClause.Occur.MUST); +// } if (whereJson.get("blurry") != null) { - WildcardQuery query = new WildcardQuery(new Term("fieldContent", "*"+(String) whereJson.get("blurry")+"*")); + WildcardQuery query = new WildcardQuery(new Term("fieldContent", "*" + (String) whereJson.get("blurry") + "*")); booleanQueryBuilder.add(query, BooleanClause.Occur.MUST); } - TopFieldCollector collector = TopFieldCollector.create(new Sort(new SortField("logTime", SortField.Type.LONG,true)), 20000, 0); + TopFieldCollector collector = TopFieldCollector.create(new Sort(new SortField("logTime", SortField.Type.LONG, true)), 20000, 0); searcher.search(booleanQueryBuilder.build(), collector); - TopDocs topDocs = collector.topDocs(pageNum*pageSize, pageSize); + TopDocs topDocs = collector.topDocs(pageNum * pageSize, pageSize); int totalSize = collector.getTotalHits(); ScoreDoc[] scoreDocs = topDocs.scoreDocs; @@ -103,14 +123,18 @@ public class LuceneServiceImpl implements LuceneService { for (ScoreDoc scoreDoc : scoreDocs) { Document doc = open.document(scoreDoc.doc); JSONObject object = new JSONObject(); - object.put("content",doc.get("fieldContent")); - object.put("device_code",doc.get("device_code")); - object.put("logTime",doc.get("logTime")); - object.put("method",doc.get("method")); - object.put("status_code",doc.get("status_code")); - object.put("requestparam",doc.get("requestparam")); - object.put("responseparam",doc.get("responseparam")); - if(doc.get("fieldContent") != null) { + object.put("content", doc.get("fieldContent")); + object.put("device_code", doc.get("device_code")); + object.put("deviceLogType", doc.get("deviceLogType")); + object.put("task_code", doc.get("task_code")); + object.put("instruct_code", doc.get("instruct_code")); + object.put("logTime", doc.get("logTime")); + object.put("method", doc.get("method")); + object.put("request_url", doc.get("request_url")); + object.put("status_code", doc.get("status_code")); + object.put("request_param", doc.get("request_param")); + object.put("response_param", doc.get("response_param")); + if (doc.get("fieldContent") != null) { list.add(object); } } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/ItemUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/ItemUtil.java deleted file mode 100644 index 68266e6..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/ItemUtil.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.nl.config.mqtt2; - -import org.nl.acs.opc.DeviceAppService; -import org.nl.config.mqtt2.msg.Item; - -import java.util.List; - -/** - * @Description TODO - * @Author Gengby - * @Date 2024/3/18 - */ -public class ItemUtil { - - /** - * 心跳item名称 - */ - private static final String HEARTBEAT = "heartbeat"; - - /** - * 获取指定符合索引 - * - * @param text itemId - * @param character 指定符合 - * @param n 第几个富豪 - * @return 索引 - */ - public static int nthIndexOf(String text, String character, int n) { - int position = -1; - do { - position = text.indexOf(character, position + 1); - } while (n-- > 1 && position != -1); - return position; - } - - public static boolean hasHeartbeat(String itemId) { - return itemId.contains(HEARTBEAT); - } - - public static void setIsOnline(DeviceAppService deviceAppService, String deviceCode, List items) { - } - -} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/config/MqttConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/MqttConfig.java similarity index 66% rename from nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/config/MqttConfig.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/MqttConfig.java index 28d295a..21e1e8c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/config/MqttConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/MqttConfig.java @@ -1,8 +1,6 @@ -package org.nl.config.mqtt2.config; +package org.nl.config.mqtt2; import lombok.Data; -import org.eclipse.paho.client.mqttv3.MqttConnectOptions; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -13,7 +11,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @ConfigurationProperties(prefix = "spring.mqtt") -@ConditionalOnProperty(name = "spring.mqtt.active", havingValue = "true") +//@ConditionalOnProperty(name = "spring.mqtt.active", havingValue = "true") @Data public class MqttConfig { @@ -35,6 +33,4 @@ public class MqttConfig { private int keepalive; - private MqttConnectOptions option; - } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/MqttService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/MqttService.java index fb05a8a..114cd90 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/MqttService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/MqttService.java @@ -9,23 +9,21 @@ import com.hivemq.client.mqtt.datatypes.MqttQos; import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient; import io.micrometer.core.instrument.util.NamedThreadFactory; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device_driver.driver.AbstractDeviceDriver; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.OpcConfig; -import org.nl.acs.opc.service.OpcService; -import org.nl.acs.opc.service.dto.OpcDto; -import org.nl.acs.opc.service.dto.OpcQueryParam; -import org.nl.acs.udw.mqttUdw.ItemsDataAccessor; -import org.nl.acs.udw.mqttUdw.factory.ItemDataAccessorFactory; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.driver.AbstractDeviceDriver; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.opc.opc.OpcConfig; +import org.nl.acs.opc.opc.service.OpcService; +import org.nl.acs.opc.opc.service.dto.OpcDto; +import org.nl.acs.opc.opc.service.dto.OpcQueryParam; +import org.nl.acs.udw.mqttUdw.TagDataAccessor; +import org.nl.acs.udw.mqttUdw.factory.TagsDataAccessorFactory; +import org.nl.config.lucene.enums.DeviceLogTypeEnum; import org.nl.config.lucene.service.LuceneExecuteLogService; import org.nl.config.lucene.service.dto.LuceneLogDto; -import org.nl.config.mqtt2.config.MqttConfig; -import org.nl.config.mqtt2.msg.Item; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; @@ -40,7 +38,7 @@ import java.util.stream.Collectors; * @author onepiece */ @Component -@ConditionalOnProperty(name = "spring.mqtt.active", havingValue = "true") +//@ConditionalOnProperty(name = "spring.mqtt.active", havingValue = "true") @ConditionalOnBean({LuceneExecuteLogService.class, DeviceAppService.class, RedisTemplate.class}) @Slf4j public class MqttService { @@ -68,7 +66,7 @@ public class MqttService { /** * 存储设备点位信息 */ - private static final ItemsDataAccessor ACCESSOR_VALUE = ItemDataAccessorFactory.getItemsDataAccessor(OpcConfig.udw_opc_value_key); + private static final TagDataAccessor ACCESSOR_VALUE = TagsDataAccessorFactory.getTagsAccessor(OpcConfig.udw_opc_value_key); /** * 发布TOPIC @@ -88,10 +86,10 @@ public class MqttService { /** * 存储Redis数据Key */ - private static final String KEY = "opc:items"; + private static final String KEY = "opc:tags"; /** - * 心跳item名称 + * 心跳tag名称 */ private static final String HEARTBEAT = "heartbeat"; @@ -142,7 +140,7 @@ public class MqttService { @PostConstruct public void init() { initTopicMap(); - loadItems(); + loadTags(); initMqttClient(); run(); } @@ -267,9 +265,9 @@ public class MqttService { private void execute(String topic, String body) { JSONObject msg = JSONObject.parseObject(body); JSONArray msgValues = msg.getJSONArray("values"); - List itemList = msgValues.toJavaList(Item.class); - Map> groupItems = itemList.stream().collect(Collectors.groupingBy(item -> item.getId().substring(0, ItemUtil.nthIndexOf(item.getId(), ".", 3)))); - groupItems.forEach((itemId, items) -> updateDeviceStatus(itemId.substring(ItemUtil.nthIndexOf(itemId, ".", 2) + 1), items)); + List tagList = msgValues.toJavaList(Tag.class); + Map> groupTags = tagList.stream().collect(Collectors.groupingBy(tag -> tag.getId().substring(0, TagsUtil.nthIndexOf(tag.getId(), ".", 3)))); + groupTags.forEach((tagId, tags) -> updateDeviceStatus(tagId.substring(TagsUtil.nthIndexOf(tagId, ".", 2) + 1), tags)); System.out.println("线程名称:'" + Thread.currentThread() + "',接收到消息" + topic + "-" + body + "-"); } @@ -277,29 +275,29 @@ public class MqttService { * 更新设备数据信息 * * @param deviceCode - * @param items + * @param tags */ - public void updateDeviceStatus(String deviceCode, List items) { - setOnline(deviceCode, items); - setValue(deviceCode, items); + public void updateDeviceStatus(String deviceCode, List tags) { + setOnline(deviceCode, tags); + setValue(deviceCode, tags); } /** * 更新设备在线状态 * * @param deviceCode - * @param items + * @param tags */ - public void setOnline(String deviceCode, List items) { - Optional heartbeatPresent = items.stream() - .filter(item -> item.getId().contains(HEARTBEAT)) - .map(Item::isQ) + public void setOnline(String deviceCode, List tags) { + Optional heartbeatPresent = tags.stream() + .filter(tag -> tag.getId().contains(HEARTBEAT)) + .map(Tag::isQ) .findFirst(); heartbeatPresent.ifPresent(q -> { Device device = deviceAppService.findDeviceByCode(deviceCode); if (device != null && device.getDeviceDriver() instanceof AbstractDeviceDriver) { AbstractDeviceDriver deviceDriver = (AbstractDeviceDriver) device.getDeviceDriver(); - if (!Objects.equals(deviceDriver.getOnline(), q)) { + if (!Objects.equals(deviceDriver.online, q)) { deviceDriver.setOnline(q); log.info("device : {}, online status: {} ", deviceCode, q); } @@ -311,13 +309,14 @@ public class MqttService { * 更新内存中的信号值 * * @param deviceCode - * @param values + * @param tagsValues */ - private void setValue(String deviceCode, List values) { - values.forEach(item -> { - if (!ObjectUtil.equals(item.getV(), ACCESSOR_VALUE.getValue(item.getId()))) { - logService.deviceExecuteLog(new LuceneLogDto(deviceCode, "MQTT上报,信号:" + item.getId() + ",由" + ACCESSOR_VALUE.getValue(item.getId()) + "->" + item.getV() + ",信号健康值:" + item.isQ())); - ACCESSOR_VALUE.setValue(item.getId(), item.getV()); + private void setValue(String deviceCode, List tagsValues) { + tagsValues.forEach(tag -> { + Object value = TagsUtil.parseValue(tag.getV()); + if (!ObjectUtil.equals(value, ACCESSOR_VALUE.getValue(tag.getId()))) { + logService.deviceExecuteLog(new LuceneLogDto(deviceCode, DeviceLogTypeEnum.MQTT.getCode(), "MQTT上报,信号:" + tag.getId() + ",由" + ACCESSOR_VALUE.getValue(tag.getId()) + "->" + value + ",信号健康值:" + tag.isQ())); + ACCESSOR_VALUE.setValue(tag.getId(), value); } }); } @@ -328,20 +327,21 @@ public class MqttService { if (mqttClient != null) { mqttClient.disconnect().thenAccept(disconnectAck -> log.info("Application Close, So MQTT client disconnected.")); } - unloadItems(); + unloadTags(); threadPool.shutdown(); } - private void loadItems() { + private void loadTags() { Map entries = redisTemplateHash.opsForHash().entries(KEY); entries.forEach((key, value) -> ACCESSOR_VALUE.setValue((String) key, value)); redisTemplateHash.delete(KEY); } - private void unloadItems() { + private void unloadTags() { List allKey = ACCESSOR_VALUE.getAllKey(); Map map = new HashMap<>(); allKey.forEach(key -> map.put(key, ACCESSOR_VALUE.getValue(key))); redisTemplateHash.opsForHash().putAll(KEY, map); } + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/msg/Item.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/Tag.java similarity index 75% rename from nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/msg/Item.java rename to nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/Tag.java index 1b7ed2f..99a8c83 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/msg/Item.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/Tag.java @@ -1,4 +1,4 @@ -package org.nl.config.mqtt2.msg; +package org.nl.config.mqtt2; import lombok.Data; @@ -8,7 +8,7 @@ import lombok.Data; * @Date 2024/3/5 */ @Data -public class Item { +public class Tag { private String id; private T v; private boolean q; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/TagsUtil.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/TagsUtil.java new file mode 100644 index 0000000..f7d5c0e --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/mqtt2/TagsUtil.java @@ -0,0 +1,87 @@ +package org.nl.config.mqtt2; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONException; +import org.nl.acs.device.device.service.DeviceAppService; + +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/3/18 + */ +public class TagsUtil { + + public static final int SCALE = 4; + + + /** + * 获取指定符合索引 + * + * @param text itemId + * @param character 指定符合 + * @param n 第几个富豪 + * @return 索引 + */ + public static int nthIndexOf(String text, String character, int n) { + int position = -1; + do { + position = text.indexOf(character, position + 1); + } while (n-- > 1 && position != -1); + return position; + } + + public static Object parseValue(Object value) { + // 处理字符串类型的值，包括数组和单个字符串 + if (value instanceof String) { + String valueStr = (String) value; + // 转换非标准JSON数组格式的字符串到标准格式 + if (!valueStr.startsWith("[") && valueStr.contains(",")) { + valueStr = "[" + valueStr + "]"; + } + // 尝试解析JSON数组 + if (valueStr.startsWith("[") && valueStr.endsWith("]")) { + try { + JSONArray jsonArray = JSON.parseArray(valueStr); + // 空数组直接返回新的空ArrayList + if (jsonArray.isEmpty()) { + return new ArrayList<>(); + } + // 针对数组中的每个元素进行处理 + return jsonArray.stream().map(element -> { + if (element instanceof Double || element instanceof Float || element instanceof BigDecimal) { + // 对Double和Float类型进行向上取整 + BigDecimal bd = new BigDecimal(element.toString()); + return bd.setScale(SCALE, RoundingMode.HALF_DOWN).doubleValue(); + } else { + // 其他类型直接返回 + return element; + } + }).collect(Collectors.toList()); + } catch (Exception e) { + // 解析失败，返回原始字符串 + return valueStr; + } + } + // 不是数组格式的字符串，直接返回 + return valueStr; + } + + // 处理数值类型，仅对Float和Double进行特殊处理 + if (value instanceof Double || value instanceof Float || value instanceof BigDecimal) { + BigDecimal bd = new BigDecimal(value.toString()); + return bd.setScale(SCALE, RoundingMode.HALF_DOWN).doubleValue(); + } + + // 对于非字符串、非浮点数类型的值，直接返回原值 + return value; + } + + +} \ No newline at end of file diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java index d77be16..0322a3d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java @@ -6,12 +6,9 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.task.domain.Task; import org.nl.acs.utils.PageUtil; -import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.MapOf; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateDDJInst.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateDDJInst.java new file mode 100644 index 0000000..484616b --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateDDJInst.java @@ -0,0 +1,159 @@ +package org.nl.system.service.quartz.task; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.device.device.domain.Device; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.driver.storage.standard_storage.StandardStorageDeviceDriver; +import org.nl.acs.instruction.domain.Instruction; +import org.nl.acs.instruction.enums.InstructionStatusEnum; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.route.service.RouteLineService; +import org.nl.acs.route.service.dto.RouteLineDto; +import org.nl.acs.task.enums.TaskStatusEnum; +import org.nl.acs.task.service.TaskService; +import org.nl.acs.task.service.dto.TaskDto; +import org.nl.common.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Arrays; +import java.util.List; + +/** + * 自动创建堆垛机出库指令 + */ +@Slf4j +@Component +public class AutoCreateDDJInst { + + @Autowired + private TaskService taskService; + @Autowired + private InstructionService instructionService; + @Autowired + private RouteLineService routeLineService; + @Autowired + private DeviceAppService deviceAppService; + + + public void run() throws Exception { + List list = taskService.queryAllByStatus("0"); + for (int i = 0; i < list.size(); i++) { + TaskDto acsTask = list.get(i); + String start_device_code = acsTask.getStart_device_code(); + Device startDevice = deviceAppService.findDeviceByCode(start_device_code); + if (startDevice != null && startDevice.getDeviceDriver() instanceof StandardStorageDeviceDriver) { + String taskid = acsTask.getTask_id(); + String taskcode = acsTask.getTask_code(); + String task_type = acsTask.getTask_type(); + String vehiclecode = acsTask.getVehicle_code(); + String storage_task_type = acsTask.getStorage_task_type(); + String priority = acsTask.getPriority(); + String is_send = acsTask.getIs_send(); + + String start_point_code = acsTask.getStart_point_code(); + + String put_device_code = acsTask.getPut_device_code(); + String put_point_code = acsTask.getPut_point_code(); + + String next_device_code = acsTask.getNext_device_code(); + String next_point_code = acsTask.getNext_point_code(); + + String start_point_code2 = acsTask.getStart_point_code2(); + String start_device_code2 = acsTask.getStart_device_code2(); + + String next_point_code2 = acsTask.getNext_point_code2(); + String next_device_code2 = acsTask.getNext_device_code2(); + + String route_plan_code = acsTask.getRoute_plan_code(); + String vehicleType = acsTask.getVehicle_type(); + String agv_system_type = acsTask.getAgv_system_type(); + + String start_height = acsTask.getStart_height(); + String next_height = acsTask.getNext_height(); + + + if (StrUtil.equals(is_send, "0")) { + continue; + } + + List shortPathsList = routeLineService.getShortPathLines(acsTask.getStart_device_code(), acsTask.getNext_device_code(), route_plan_code); + if (CollectionUtil.isEmpty(shortPathsList)) { + shortPathsList = routeLineService.getShortPathLinesByCode(acsTask.getStart_device_code(), route_plan_code); + } + if (CollectionUtil.isEmpty(shortPathsList)) { + acsTask.setRemark("路由不通"); + taskService.updateByCodeFromCache(acsTask); + continue; + } + RouteLineDto routeLineDto = shortPathsList.get(0); + String path = routeLineDto.getPath(); + String[] str = path.split("->"); + List pathlist = Arrays.asList(str); + int index = 0; + for (int m = 0; m < pathlist.size(); m++) { + if (pathlist.get(m).equals(start_device_code)) { + index = m + 1; + break; + } + } + next_device_code = pathlist.get(index); + + if (StrUtil.equals(deviceAppService.findDeviceTypeByCode(next_device_code), "storage")) { + next_point_code = next_device_code + "-" + acsTask.getTo_y() + "-" + acsTask.getTo_z(); + } else { + next_point_code = next_device_code; + } + + Instruction instdto = new Instruction(); + instdto.setInstruction_type(task_type); + instdto.setInstruction_id(IdUtil.simpleUUID()); + instdto.setRoute_plan_code(route_plan_code); + instdto.setRemark(acsTask.getRemark()); + instdto.setMaterial(acsTask.getMaterial()); + instdto.setQuantity(acsTask.getQuantity()); + instdto.setTask_id(taskid); + instdto.setTask_code(taskcode); + instdto.setVehicle_code(vehiclecode); + String now = DateUtil.now(); + instdto.setCreate_time(now); + instdto.setCreate_by(SecurityUtils.getCurrentNickName()); + + instdto.setStart_device_code(start_device_code); + instdto.setStart_point_code(start_point_code); + instdto.setPut_device_code(put_device_code); + instdto.setPut_point_code(put_point_code); + instdto.setNext_device_code(next_device_code); + instdto.setNext_point_code(next_point_code); + + instdto.setStart_point_code2(start_point_code2); + instdto.setStart_device_code2(start_device_code2); + instdto.setNext_point_code2(next_point_code2); + instdto.setNext_device_code2(next_device_code2); + + instdto.setPriority(priority); + instdto.setInstruction_status(InstructionStatusEnum.READY.getIndex()); + instdto.setExecute_device_code(start_point_code); + instdto.setVehicle_type(vehicleType); + instdto.setAgv_system_type(agv_system_type); + instdto.setStart_height(start_height); + instdto.setNext_height(next_height); + + try { + instructionService.create(instdto); + } catch (Exception e) { + acsTask.setRemark("指令创建失败"); + taskService.updateByCodeFromCache(acsTask); + continue; + } + //创建指令后修改任务状态 + acsTask.setTask_status(TaskStatusEnum.BUSY.getIndex()); + taskService.update(acsTask); + } + } + } +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index 83dbbe6..d858860 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -1,23 +1,17 @@ package org.nl.system.service.quartz.task; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.instruction.domain.InstructionMybatis; import org.nl.acs.instruction.enums.InstructionStatusEnum; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.limit_regional.server.LimitRegionalService; -import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; +import org.nl.acs.device.device.service.DeviceAppService; +import org.nl.acs.device.device.service.impl.DeviceAppServiceImpl; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.enums.TaskStatusEnum; @@ -55,9 +49,9 @@ public class AutoCreateInst { List list = taskserver.queryAllByStatus("0"); for (int i = 0; i < list.size(); i++) { TaskDto acsTask = list.get(i); - if (StrUtil.equals(acsTask.getTask_type(), TaskTypeEnum.AGV_Task.getIndex()) && !StrUtil.startWith(acsTask.getTask_code(), "-")) { - continue; - } +// if (StrUtil.equals(acsTask.getTask_type(), TaskTypeEnum.AGV_Task.getIndex()) && !StrUtil.startWith(acsTask.getTask_code(), "-")) { +// continue; +// } String taskid = acsTask.getTask_id(); String taskcode = acsTask.getTask_code(); String task_type = acsTask.getTask_type(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java deleted file mode 100644 index 109c37d..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/CreateDDJInst.java +++ /dev/null @@ -1,392 +0,0 @@ -package org.nl.system.service.quartz.task; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.nl.acs.common.base.CommonFinalParam; -import org.nl.acs.device.domain.Device; -import org.nl.acs.device.enums.DeviceType; -import org.nl.acs.device.service.DeviceExtraService; -import org.nl.acs.device.service.impl.DeviceExtraServiceImpl; -import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver; -import org.nl.acs.device_driver.stacker.standard_stacker.StandardStackerDeviceDriver; -import org.nl.acs.instruction.domain.Instruction; -import org.nl.acs.instruction.enums.InstructionStatusEnum; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.opc.DeviceAppService; -import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.route.service.RouteLineService; -import org.nl.acs.route.service.dto.RouteLineDto; -import org.nl.acs.task.enums.TaskStatusEnum; -import org.nl.acs.task.service.TaskService; -import org.nl.acs.task.service.dto.TaskDto; -import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; -import org.nl.config.SpringContextHolder; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -@Slf4j -@Component -public class CreateDDJInst { - - - /** - * 定时查询堆垛机任务 - */ - public void run() { - TaskService taskserver = SpringContextHolder.getBean(TaskService.class); - InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); - RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - List taskDtos = taskserver.findByTaskStatus("0"); - List taskDtoList = new ArrayList<>(); - if (CollUtil.isEmpty(taskDtos) || taskDtos.size() < 1) { - } else { - for (TaskDto taskDto : taskDtos) { - String start_device_code = taskDto.getStart_device_code(); - Device startDevice = appService.findDeviceByCode(start_device_code); - String next_device_code = taskDto.getNext_device_code(); - Device nextDevice = appService.findDeviceByCode(next_device_code); - if (startDevice.getDevice_type().equals(DeviceType.storage.name()) && - (nextDevice.getDevice_type().equals(DeviceType.conveyor.name()) || nextDevice.getDevice_type().equals(DeviceType.storage.name()))) { - taskDtoList.add(taskDto); - - } - } - if (CollUtil.isNotEmpty(taskDtoList)) { - taskDtoList = sortInst(taskDtoList); - for (TaskDto taskDto : taskDtoList) { - List list = - routeLineService.getShortPathLines( - taskDto.getStart_device_code(), taskDto.getNext_device_code(), taskDto.getRoute_plan_code()); - if (ObjectUtils.isEmpty(list)) { - throw new BadRequestException("路由不通"); - } - RouteLineDto routeLineDto = list.get(0); - String[] path = routeLineDto.getPath().split("->"); - List pathlist = Arrays.asList(path); - String deviceType = appService.findDeviceByCode(pathlist.get(1)).getDevice_type(); - if (pathlist.size() < 3 || (!deviceType.equals(DeviceType.stacker.name()))) { - return; - } - Device deviceByCode = appService.findDeviceByCode(pathlist.get(1)); - if (ObjectUtils.isEmpty(deviceByCode)) { - log.error("没有找到DDJ设备"); - return; - } - StandardStackerDeviceDriver standardStackerDeviceDriver; - if (deviceByCode.getDeviceDriver() instanceof StandardStackerDeviceDriver) { - standardStackerDeviceDriver = (StandardStackerDeviceDriver) deviceByCode.getDeviceDriver(); - if (standardStackerDeviceDriver.getMode() != 3 || standardStackerDeviceDriver.getMove() == 1 || standardStackerDeviceDriver.getCommand() != 0) { - log.error("堆垛机,{}未联机或者在执行中", deviceByCode.getDevice_code()); - return; - } - } - String next_device_code = taskDto.getNext_device_code(); - Device nextDevice = appService.findDeviceByCode(next_device_code); - BeltConveyorDeviceDriver beltConveyorDeviceDriver; - if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { - beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver(); - if (beltConveyorDeviceDriver.getMode() != 2 || beltConveyorDeviceDriver.getMove() == 1) { - log.error("输送机,{}未联机或执行中", next_device_code); - return; - } - } - String taskid = taskDto.getTask_id(); - String taskcode = taskDto.getTask_code(); - String task_type = taskDto.getTask_type(); - String vehiclecode = taskDto.getVehicle_code(); - String storage_task_type = taskDto.getStorage_task_type(); - String priority = taskDto.getPriority(); - String is_send = taskDto.getIs_send(); - - String start_device_code = taskDto.getStart_device_code(); - Device startDevice = appService.findDeviceByCode(start_device_code); - String start_point_code = taskDto.getStart_point_code(); - - String put_device_code = taskDto.getPut_device_code(); - String put_point_code = taskDto.getPut_point_code(); - - String next_point_code = taskDto.getNext_point_code(); - - String start_point_code2 = taskDto.getStart_point_code2(); - String start_device_code2 = taskDto.getStart_device_code2(); - - String next_point_code2 = taskDto.getNext_point_code2(); - String next_device_code2 = taskDto.getNext_device_code2(); - - String route_plan_code = taskDto.getRoute_plan_code(); - String vehicleType = taskDto.getVehicle_type(); - String agv_system_type = taskDto.getAgv_system_type(); - - String start_height = taskDto.getStart_height(); - String next_height = taskDto.getNext_height(); - /** - * 开始平均分配 - */ - String this_coevice_code = taskserver.queryAssignedByDeviceCode(start_device_code, next_device_code); - if (StrUtil.isEmpty(this_coevice_code)) { - List shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code); - RouteLineDto routeLineDto1 = shortPathsList.get(0); - - String path1 = routeLineDto1.getPath(); - String[] str = path1.split("->"); - - List pathlist1 = Arrays.asList(str); - int index = 0; - for (int m = 0; m < pathlist1.size(); m++) { - String deviceType1 = appService.findDeviceByCode(pathlist1.get(m)).getDevice_type(); - if(deviceType1.equals(DeviceType.stacker.name())){ - index = m + 1; - break; - } - /*if (pathlist1.get(m).equals(start_device_code)) { - - }*/ - } - next_device_code = pathlist1.get(index); - } else { - next_device_code = this_coevice_code; - } - //校验路由关系 - List shortPathsList = routeLineService.getShortPathLines(start_device_code, next_device_code, route_plan_code); - if (ObjectUtils.isEmpty(shortPathsList) || shortPathsList.size()<1) { - throw new RuntimeException("路由不通!"); - } -// Device startdevice = appService.findDeviceByCode(start_device_code); -// Device nextdevice = appService.findDeviceByCode(next_device_code); - if (StrUtil.equals(appService.findDeviceTypeByCode(next_device_code), "storage")) { - next_point_code = next_device_code + "-" + taskDto.getTo_y() + "-" + taskDto.getTo_z(); - } else { - next_point_code = next_device_code; - } - //单台堆垛机最多只能创建固定数量指令 - Instruction instruction = new Instruction(); - instruction.setInstruction_status(CommonFinalParam.ONE); - List byDeviceCodes = instructionService.findByDeviceCodes(instruction, true); - Instruction instdto = new Instruction(); - if (CollUtil.isEmpty(byDeviceCodes)) { - instdto.setInstruction_type(task_type); - instdto.setInstruction_id(IdUtil.simpleUUID()); - instdto.setRoute_plan_code(route_plan_code); - instdto.setRemark(taskDto.getRemark()); - instdto.setMaterial(taskDto.getMaterial()); - instdto.setQuantity(taskDto.getQuantity()); - instdto.setTask_id(taskid); - instdto.setTask_code(taskcode); - instdto.setVehicle_code(vehiclecode); - String now = DateUtil.now(); - instdto.setCreate_time(now); - instdto.setCreate_by(SecurityUtils.getCurrentNickName()); - - instdto.setStart_device_code(start_device_code); - instdto.setStart_point_code(start_point_code); - instdto.setPut_device_code(put_device_code); - instdto.setPut_point_code(put_point_code); - instdto.setNext_device_code(next_device_code); - instdto.setNext_point_code(next_point_code); - - instdto.setStart_point_code2(start_point_code2); - instdto.setStart_device_code2(start_device_code2); - instdto.setNext_point_code2(next_point_code2); - instdto.setNext_device_code2(next_device_code2); - - instdto.setPriority(priority); - instdto.setInstruction_status(InstructionStatusEnum.READY.getIndex()); - instdto.setExecute_device_code(start_point_code); - instdto.setVehicle_type(vehicleType); - instdto.setAgv_system_type(agv_system_type); - instdto.setStart_height(start_height); - instdto.setNext_height(next_height); - if (startDevice.getDevice_type().equals(DeviceType.storage.name())) { - instdto.setFrom_x(taskDto.getFrom_x()); - instdto.setFrom_z(taskDto.getFrom_z()); - instdto.setFrom_y(taskDto.getFrom_y()); - } - if (nextDevice.getDevice_type().equals(DeviceType.storage.name())) { - instdto.setTo_x(taskDto.getTo_x()); - instdto.setTo_z(taskDto.getTo_z()); - instdto.setTo_y(taskDto.getTo_y()); - } - //判断agv系统 - //1、1楼叉车系统 - //2、2楼1区域AGV系统 - //3、2楼2区域AGV系统 -已废弃 - if (!StrUtil.equals(agv_system_type, CommonFinalParam.ONE)) { - // task_type - //1、生箔； Itype=1:取空，取满，放空，放满； - //2、分切 Itype=3取满、取空、放满、放空； - //3、普通任务 Itype=2:取货、放货； - //4、叉车任务 - //5、输送任务 - //6、行架 - //7、立库 - if (StrUtil.equals(task_type, CommonFinalParam.ONE)) { - instdto.setAgv_inst_type(CommonFinalParam.ONE); - } else if (StrUtil.equals(task_type, "3")) { - instdto.setAgv_inst_type("2"); - } else if (StrUtil.equals(task_type, "2")) { - instdto.setAgv_inst_type("3"); - } else if (StrUtil.equals(task_type, "8")) { - instdto.setAgv_inst_type("2"); - } else { - log.info("未找到对应的AGV指令类型，任务号:" + taskDto.getTask_code() + ",task_type:" + taskDto.getTask_type()); - } - } else { - instdto.setAgv_inst_type("4"); - } - try { - instructionService.create(instdto); - } catch (Exception e) { - taskDto.setRemark(e.getMessage()); - taskserver.updateByCodeFromCache(taskDto); - } - //创建指令后修改任务状态 - taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); - taskserver.update(taskDto); - } else { - List insts = new ArrayList<>(); - for (Instruction byDeviceCode : byDeviceCodes) { - String nextDeviceCode = byDeviceCode.getNext_device_code(); - Device nextdevice = appService.findDeviceByCode(nextDeviceCode); - if (startDevice.getDevice_type().equals(DeviceType.storage.name()) && - (nextdevice.getDevice_type().equals(DeviceType.conveyor.name()) || nextdevice.getDevice_type().equals(DeviceType.storage.name()))) { - insts.add(byDeviceCode); - } - } - int max = 0; - for (Instruction inst : insts) { - List shortPathLines = routeLineService.getShortPathLines(inst.getStart_device_code(), inst.getNext_device_code(), - inst.getRoute_plan_code()); - if (CollUtil.isEmpty(shortPathLines) || shortPathLines.size() < 1) { - log.error("没有此路由"); - throw new BadRequestException("路由不通"); - } - RouteLineDto routeLineDto1 = (RouteLineDto) shortPathLines.get(0); - String[] path1 = routeLineDto1.getPath().split("->"); - List pathlist1 = Arrays.asList(path1); - if (pathlist1.size() < 3 || pathlist1.get(1).equals(DeviceType.stacker.name())) { - //return; - } - if (pathlist1.get(1).equals(pathlist.get(1))) { - max++; - } - } - /*List deviceExtras = deviceExtra.list(Wrappers.lambdaQuery(DeviceExtra.class). - eq(DeviceExtra::getDevice_code, pathlist.get(1)).orderByDesc(DeviceExtra::getCreate_time));*/ - String count = deviceByCode.getExtraValue().get("count").toString(); - if (StrUtil.isNotEmpty(count) ) { - if (max <= Integer.parseInt(count)) { - instdto.setInstruction_type(task_type); - instdto.setInstruction_id(IdUtil.simpleUUID()); - instdto.setRoute_plan_code(route_plan_code); - instdto.setRemark(taskDto.getRemark()); - instdto.setMaterial(taskDto.getMaterial()); - instdto.setQuantity(taskDto.getQuantity()); - instdto.setTask_id(taskid); - instdto.setTask_code(taskcode); - instdto.setVehicle_code(vehiclecode); - String now = DateUtil.now(); - instdto.setCreate_time(now); - instdto.setCreate_by(SecurityUtils.getCurrentNickName()); - - instdto.setStart_device_code(start_device_code); - instdto.setStart_point_code(start_point_code); - instdto.setPut_device_code(put_device_code); - instdto.setPut_point_code(put_point_code); - instdto.setNext_device_code(next_device_code); - instdto.setNext_point_code(next_point_code); - - instdto.setStart_point_code2(start_point_code2); - instdto.setStart_device_code2(start_device_code2); - instdto.setNext_point_code2(next_point_code2); - instdto.setNext_device_code2(next_device_code2); - - instdto.setPriority(priority); - instdto.setInstruction_status(InstructionStatusEnum.READY.getIndex()); - instdto.setExecute_device_code(start_point_code); - instdto.setVehicle_type(vehicleType); - instdto.setAgv_system_type(agv_system_type); - instdto.setStart_height(start_height); - instdto.setNext_height(next_height); - if (startDevice.getDevice_type().equals(DeviceType.storage.name())) { - instdto.setFrom_x(taskDto.getFrom_x()); - instdto.setFrom_z(taskDto.getFrom_z()); - instdto.setFrom_y(taskDto.getFrom_y()); - } - if (nextDevice.getDevice_type().equals(DeviceType.storage.name())) { - instdto.setTo_x(taskDto.getTo_x()); - instdto.setTo_z(taskDto.getTo_z()); - instdto.setTo_y(taskDto.getTo_y()); - } - //判断agv系统 - //1、1楼叉车系统 - //2、2楼1区域AGV系统 - //3、2楼2区域AGV系统 -已废弃 - if (!StrUtil.equals(agv_system_type, CommonFinalParam.ONE)) { - // task_type - //1、生箔； Itype=1:取空，取满，放空，放满； - //2、分切 Itype=3取满、取空、放满、放空； - //3、普通任务 Itype=2:取货、放货； - //4、叉车任务 - //5、输送任务 - //6、行架 - //7、立库 - if (StrUtil.equals(task_type, CommonFinalParam.ONE)) { - instdto.setAgv_inst_type(CommonFinalParam.ONE); - } else if (StrUtil.equals(task_type, "3")) { - instdto.setAgv_inst_type("2"); - } else if (StrUtil.equals(task_type, "2")) { - instdto.setAgv_inst_type("3"); - } else if (StrUtil.equals(task_type, "8")) { - instdto.setAgv_inst_type("2"); - } else { - log.info("未找到对应的AGV指令类型，任务号:" + taskDto.getTask_code() + ",task_type:" + taskDto.getTask_type()); - } - } else { - instdto.setAgv_inst_type("4"); - } - try { - instructionService.create(instdto); - } catch (Exception e) { - taskDto.setRemark(e.getMessage()); - taskserver.updateByCodeFromCache(taskDto); - } - //创建指令后修改任务状态 - taskDto.setTask_status(TaskStatusEnum.BUSY.getIndex()); - taskserver.update(taskDto); - continue; - } - } - - - } - } - } - //单台堆垛机只能出四五 - } - } - - private List sortInst(List taskDtos) { - Collections.sort(taskDtos, (t1, t2) -> { - //优先级从大到小 - int i = t2.getPriority().compareTo(t1.getPriority()); - //如果优先级相等 - if (i == 0) { - //时间从早到晚 - i = t1.getCreate_time().compareTo(t2.getCreate_time()); - } - return i; - }); - return taskDtos; - } - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/NdcAutoReconnection.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/NdcAutoReconnection.java index c1b1d54..53ef0cc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/NdcAutoReconnection.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/NdcAutoReconnection.java @@ -1,7 +1,7 @@ package org.nl.system.service.quartz.task; import lombok.extern.slf4j.Slf4j; -import org.nl.acs.auto.run.AutoRunService; +import org.nl.acs.auto.run.service.AutoRunService; import org.nl.system.service.param.ISysParamService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java index 0b4821f..8339d1c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/redis/vo/RedisKeyDefineRespVO.java @@ -5,7 +5,6 @@ package org.nl.system.service.redis.vo; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import org.nl.acs.common.base.CommonFinalParam; import org.nl.system.service.redis.dao.RedisKeyDefine; import java.time.Duration; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index aa11546..747bcd9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; -import org.nl.acs.common.base.CommonFinalParam; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application-dev2.yml b/nladmin-system/nlsso-server/src/main/resources/config/application-dev2.yml index ea89675..3f614cf 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application-dev2.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application-dev2.yml @@ -83,7 +83,7 @@ spring: url: 10.211.55.3 clientId: hs_mqtt21 topics: - - A/# + - HS/# qoss: - 2 timeout: 30 diff --git a/nladmin-system/nlsso-server/src/main/resources/log/MqttService.xml b/nladmin-system/nlsso-server/src/main/resources/log/MqttService.xml new file mode 100644 index 0000000..1f14f2c --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/resources/log/MqttService.xml @@ -0,0 +1,29 @@ + + + + + + + + + ${LOG_HOME}/MqttService/%d{yyyy-MM-dd}.%i.log + + 15 + + 50MB + + 2GB + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${log.charset} + + + + + + + + + diff --git a/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml b/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml index d47c530..d5eb107 100644 --- a/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml +++ b/nladmin-system/nlsso-server/src/main/resources/log/XgAgvDeviceDriver.xml @@ -28,7 +28,7 @@ 512 - + diff --git a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml index 96f35c7..a04b5e9 100644 --- a/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml +++ b/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml @@ -20,6 +20,7 @@ https://juejin.cn/post/6844903775631572999 + diff --git a/nladmin-ui/.env.development b/nladmin-ui/.env.development index e37a9a4..db4730d 100644 --- a/nladmin-ui/.env.development +++ b/nladmin-ui/.env.development @@ -1,8 +1,8 @@ ENV = 'development' # 接口地址 -VUE_APP_BASE_API = 'http://localhost:8011' -VUE_APP_WS_API = 'ws://localhost:8011' +VUE_APP_BASE_API = 'http://127.0.0.1:8011' +VUE_APP_WS_API = 'ws://127.0.0.1:8011' # 是否启用 babel-plugin-dynamic-import-node插件 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/nladmin-ui/src/api/acs/device/driverConfig.js b/nladmin-ui/src/api/acs/device/driverConfig.js index 79b2b5d..544c6a1 100644 --- a/nladmin-ui/src/api/acs/device/driverConfig.js +++ b/nladmin-ui/src/api/acs/device/driverConfig.js @@ -87,3 +87,10 @@ export function getAllDriverCodeList() { }) } +export function getStrategy() { + return request({ + url: 'api/device/getStrategy', + method: 'get' + }) +} + diff --git a/nladmin-ui/src/views/acs/device/config.vue b/nladmin-ui/src/views/acs/device/config.vue index 2eb9742..cc5f310 100644 --- a/nladmin-ui/src/views/acs/device/config.vue +++ b/nladmin-ui/src/views/acs/device/config.vue @@ -132,6 +132,8 @@ import scanner_weight_conveyor from '@/views/acs/device/driver/one_conveyor/scan import un_box_lable_conveyor from '@/views/acs/device/driver/one_conveyor/un_box_lable_conveyor.vue' import xg_agv_car from '@/views/acs/device/driver/agv/xg_agv_car.vue' import oven_inspect_site from '@/views/acs/device/driver/oven_inspect_site.vue' +import standard_stacker_device from '@/views/acs/device/driver/standard_stacker_device.vue' +import appearance_inspection_scanner_conveyor_device from '@/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue' export default { name: 'DeviceConfig', components: { @@ -190,7 +192,9 @@ export default { oven_inspect_site, manipulator_agv_station, volume_two_manipulator, - manipulator_cache + manipulator_cache, + standard_stacker_device, + appearance_inspection_scanner_conveyor_device }, dicts: ['device_type'], mixins: [crud], diff --git a/nladmin-ui/src/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue b/nladmin-ui/src/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue new file mode 100644 index 0000000..a4b4c96 --- /dev/null +++ b/nladmin-ui/src/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue @@ -0,0 +1,598 @@ + + + + + diff --git a/nladmin-ui/src/views/acs/device/driver/standard_stacker_device.vue b/nladmin-ui/src/views/acs/device/driver/standard_stacker_device.vue new file mode 100644 index 0000000..b8c9c4f --- /dev/null +++ b/nladmin-ui/src/views/acs/device/driver/standard_stacker_device.vue @@ -0,0 +1,628 @@ + + + + + diff --git a/nladmin-ui/src/views/acs/device/driver/with_station_device.vue b/nladmin-ui/src/views/acs/device/driver/with_station_device.vue index 334a521..b5c2b33 100644 --- a/nladmin-ui/src/views/acs/device/driver/with_station_device.vue +++ b/nladmin-ui/src/views/acs/device/driver/with_station_device.vue @@ -1,49 +1,6 @@