From dec05421477557a760353d020386e00a82f0c682 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Thu, 23 Nov 2023 18:10:44 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E7=AD=96=E7=95=A5=E5=86=85=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custompolicy/CustomerStragetyCacheService.java | 10 +++++++++- .../org/nl/acs/custompolicy/StackerStrategyDto.java | 2 ++ .../acs/custompolicy/server/CustomPolicyService.java | 1 - .../server/impl/CustomPolicyServiceImpl.java | 11 ++++++++++- .../StandardCoveyorControlDeviceDriver.java | 5 +++++ 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/CustomerStragetyCacheService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/CustomerStragetyCacheService.java index fd61b20..3d2c595 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/CustomerStragetyCacheService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/CustomerStragetyCacheService.java @@ -1,11 +1,14 @@ package org.nl.acs.custompolicy; +import org.nl.acs.auto.initial.ApplicationAutoInitial; + import java.util.HashMap; import java.util.Map; -public class CustomerStragetyCacheService { +public class CustomerStragetyCacheService implements ApplicationAutoInitial { private Map strategyCache = new HashMap(); + public CustomerStragetyCacheService() { } @@ -21,4 +24,9 @@ public class CustomerStragetyCacheService { public synchronized void setStragety(String deiviceCode, StackerStrategyDto strategy) { this.strategyCache.put(deiviceCode, strategy); } + + @Override + public void autoInitial() throws Exception { + // 策略缓存 + } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/StackerStrategyDto.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/StackerStrategyDto.java index 7e90de4..9bf7875 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/StackerStrategyDto.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/StackerStrategyDto.java @@ -5,7 +5,9 @@ import java.util.List; public class StackerStrategyDto { private String deviceCode; + //策略 private List plan = new ArrayList(); + //禁止策略 暂时未开发 private List forbid = new ArrayList(); public StackerStrategyDto() { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java index 1231061..02b187b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/CustomPolicyService.java @@ -16,7 +16,6 @@ import java.util.Map; */ public interface CustomPolicyService extends CommonService { - PageInfo queryAll(Map whereJson, Pageable page); void create(CustomPolicyDTO dto); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java index 924527f..b7a8dd0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/custompolicy/server/impl/CustomPolicyServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; 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.custompolicy.DeviceStrategy; @@ -17,6 +18,7 @@ import org.nl.acs.custompolicy.server.dto.CustomPolicyDTO; import org.nl.acs.custompolicy.server.dto.CustomPolicyPlantDTO; import org.nl.acs.custompolicy.server.mapper.CustomPolicyMapper; import org.nl.acs.custompolicy.server.vo.CustomPolicyPlantVO; +import org.nl.acs.task.TaskInstructionLock; import org.nl.acs.utils.ConvertUtil; import org.nl.acs.utils.PageUtil; import org.nl.common.utils.SecurityUtils; @@ -35,7 +37,7 @@ import java.util.stream.Collectors; @Service @AllArgsConstructor @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class CustomPolicyServiceImpl extends CommonServiceImpl implements CustomPolicyService { +public class CustomPolicyServiceImpl extends CommonServiceImpl implements CustomPolicyService, ApplicationAutoInitial { List strategys = Collections.synchronizedList(new LinkedList()); @@ -43,6 +45,13 @@ public class CustomPolicyServiceImpl extends CommonServiceImpl findAllDeviceStrategy() { return (List)(this.instructionStrategys != null && this.instructionStrategys.size() > 0 ? this.instructionStrategys : new LinkedList()); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java index 63053aa..3961ed8 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; 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; @@ -187,6 +188,10 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver } } } + WaitingInstructionDeque deque = null; + deque = instructionService.findByStategy(this.getDeviceCode(), "deviceCustomerDequeStrategy"); + + } catch (Exception var17) { return; }