diff --git a/acs/nladmin-system/nlsso-server/pom.xml b/acs/nladmin-system/nlsso-server/pom.xml
index 0283300..0c7374e 100644
--- a/acs/nladmin-system/nlsso-server/pom.xml
+++ b/acs/nladmin-system/nlsso-server/pom.xml
@@ -430,6 +430,12 @@
commons-csv
${commons-csv.version}
+
+ org.dromara.dynamictp
+ dynamic-tp-core
+ 1.1.7
+ compile
+
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java
index 26fde22..69ee0c4 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java
@@ -1,316 +1,109 @@
package org.nl.acs.opc;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.lucene.util.NamedThreadFactory;
-import org.nl.acs.AcsConfig;
+import cn.hutool.core.util.ObjectUtil;
+import org.dromara.dynamictp.core.support.ThreadPoolBuilder;
import org.nl.acs.auto.run.AbstractAutoRunnable;
import org.nl.acs.opc.service.dto.OpcServerManageDto;
-import org.nl.acs.udw.UnifiedDataAccessor;
-import org.nl.acs.udw.UnifiedDataAccessorFactory;
-import org.nl.acs.udw.UnifiedDataAppService;
-import org.nl.common.enums.LogTypeEnum;
-import org.nl.config.SpringContextHolder;
-import org.nl.system.service.lucene.dto.LuceneLogDto;
-import org.nl.system.service.param.ISysParamService;
-import org.openscada.opc.lib.da.Group;
-import org.openscada.opc.lib.da.Item;
-import org.openscada.opc.lib.da.ItemState;
+import org.nl.config.thread.TheadFactoryName;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.*;
-import java.util.regex.Pattern;
+import javax.annotation.Resource;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import static org.dromara.dynamictp.common.em.QueueTypeEnum.MEMORY_SAFE_LINKED_BLOCKING_QUEUE;
/**
* OPC设备同步启动
+ * @author 20220102CG\noblelift
*/
@Component
-@Slf4j
public class DeviceOpcSynchronizeAutoRun extends AbstractAutoRunnable {
- static boolean isRun = true;
+
+ public static boolean isRun = false;
+ ExecutorService executorService = ThreadPoolBuilder.newBuilder()
+ .threadPoolName("deviceOpc_thread")
+ .threadFactory("deviceOpc_thread")
+ .corePoolSize(80)
+ .maximumPoolSize(100)
+ .keepAliveTime(40)
+ .timeUnit(TimeUnit.SECONDS)
+ .workQueue(MEMORY_SAFE_LINKED_BLOCKING_QUEUE.getName(), 2000)
+ .buildDynamic();
+
@Autowired
private DeviceAppService deviceAppService;
@Autowired
private OpcServerManageService opcServerManageService;
-// @Autowired
-// LuceneExecuteLogService lucene;
-
- static ExecutorService executorService;
- public static Map opcServersConfig;
- public static Map itemCodeOpcItemDtoMapping = new ConcurrentHashMap();
-
- static boolean canRefreshOpcEntity = true;
- private long lastRefreshOpcEntityTime;
- static UnifiedDataAccessor udw;
- private static Map canReadOpcValues;
- private static volatile Map opcCodeOpcEntityMapping;
-
- public DeviceOpcSynchronizeAutoRun() {
- this.lastRefreshOpcEntityTime = 0L;
- }
+ @Override
public String getCode() {
return DeviceOpcSynchronizeAutoRun.class.getSimpleName();
}
+ @Override
public String getName() {
return "opc设备同步器";
}
- static Group getGroup(String opcCode) throws Exception {
- OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService.class);
- return opcServerService.getServer(opcCode);
- }
-
- static void submitTimeLimitTask(Runnable runnable, String opcCode) {
- CompletableFuture future = CompletableFuture.runAsync(runnable, executorService);
-
-// try {
-// future.get(10L, TimeUnit.SECONDS);
-// } catch (InterruptedException var9) {
-// Thread.currentThread().interrupt();
-// } catch (ExecutionException var10) {
-// var10.printStackTrace();
-// } catch (TimeoutException var11) {
-// itemCodeOpcItemDtoMapping.keySet().forEach((key) -> {
-// udw.setValue(key, (Object) null);
-// });
-// canReadOpcValues = new ConcurrentHashMap<>();
-// System.out.println("opc设备同步器 任务执行超时，取消任务...");
-// future.cancel(true);
-// } finally {
-// canRefreshOpcEntity = true;
-// if (opcCode != null) {
-// canReadOpcValues.put(opcCode, true);
-// }
-//
-// }
- }
-
- private ExecutorService createThreadPool() {
- ThreadPoolExecutor executor = new ThreadPoolExecutor(32, 32, 10L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory("opc-sync"));
- executor.allowCoreThreadTimeOut(true);
- return executor;
- }
-
- public void autoRun() {
- OpcStartTag.is_run = true;
- opcServersConfig = this.opcServerManageService.queryAllServerMap();
- executorService = this.createThreadPool();
- opcCodeOpcEntityMapping = new ConcurrentHashMap();
- itemCodeOpcItemDtoMapping.keySet().forEach((key) -> {
- udw.setValue(key, (Object) null);
- });
- canRefreshOpcEntity = true;
- canReadOpcValues.clear();
-
- while (true) {
- this.refreshOpcEntity();
- Iterator var1 = opcServersConfig.keySet().iterator();
-
- while (var1.hasNext()) {
- String opcCode = (String) var1.next();
- submitTimeLimitTask(() -> {
- boolean in = false;
- try {
- if (canReadOpcValues.computeIfAbsent(opcCode, (key) -> true)) {
- in = true;
- canReadOpcValues.put(opcCode, false);
- this.readOpcValues(opcCode);
- }
- } catch (Exception var3) {
- var3.printStackTrace();
- } finally {
- canRefreshOpcEntity = true;
- if (opcCode != null && in) {
- canReadOpcValues.put(opcCode, true);
- }
- }
- }, opcCode);
- }
-
- ThreadUtl.sleep((long) OpcConfig.synchronized_millisecond);
- }
- }
-
- private void readOpcValues(String opcCode) throws Exception {
- synchronized (opcCode.intern()) {
- OpcEntity opcEntity = (OpcEntity) opcCodeOpcEntityMapping.get(opcCode);
- if (opcEntity != null) {
- if (opcEntity.getItems().size() != 0) {
- long begin = System.currentTimeMillis();
- if (log.isTraceEnabled()) {
- log.trace("opc {} 开始计时{}", opcCode, begin);
- }
-
- new HashMap();
-
- Map itemStatus;
- try {
- itemStatus = opcEntity.readAll();
- } catch (Exception var15) {
- itemStatus = opcEntity.readDividually();
- }
-
- long end = System.currentTimeMillis();
- long duration = end - begin;
- if (log.isTraceEnabled()) {
- log.trace("opc {} 读取耗时：{}", opcCode, duration);
- }
-
- if (duration > 1000L) {
- log.warn("opc {} 读取超时 : {}", opcCode, duration);
- }
-
-// boolean allNull = itemStatus.entrySet().stream().map((map) -> {
-// return OpcUtl.getValue((Item)map.getKey(), (ItemState)map.getValue());
-// }).allMatch(Objects::isNull);
-// if (allNull) {
-// opcEntity.getItems().clear();
-// }
-
- UnifiedDataAccessor udw = opcEntity.getUdw();
-
-
- Set- items = itemStatus.keySet();
- Iterator var18 = items.iterator();
-
- while (var18.hasNext()) {
- Item item = (Item) var18.next();
- ItemState itemState = (ItemState) itemStatus.get(item);
- Object nowValue = OpcUtl.getValue(item, itemState);
- String itemId = item.getId();
- Object historyValue = udw.getValue(itemId);
- if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD) && historyValue != null) {
- log.warn("opc 值不健康 item: {}, 状态: {}", itemId, itemState.getQuality());
- }
- if (!UnifiedDataAppService.isEquals(nowValue, historyValue)) {
- OpcItemDto itemDto = (OpcItemDto) itemCodeOpcItemDtoMapping.get(itemId);
- if (true) {
- this.logItemChanged(itemId, udw, nowValue, itemDto);
- }
- udw.setValue(itemId, nowValue);
- }
-
- }
+ @Override
+ public void autoRun() throws Exception {
+ {
+ //Thread.sleep(10000L);
+ isRun = true;
+ Map servers = this.opcServerManageService.queryAllServerMap();
+ Map>> pros;
+ do {
+ Thread.sleep(1000L);
+ pros = this.deviceAppService.findAllFormatProtocolFromDriver();
+ } while (ObjectUtil.isEmpty(pros));
+ Set keys = pros.keySet();
+ Iterator var4 = keys.iterator();
+ //代码执行一次
+ while (var4.hasNext()) {
+ String key = (String) var4.next();
+ List> list = (List) pros.get(key);
+ OpcServerManageDto opcServer = (OpcServerManageDto) servers.get(key);
+ Iterator var8 = list.iterator();
+ while (var8.hasNext()) {
+ List groupProtols = (List) var8.next();
+ DeviceOpcProtocolRunable runable = new DeviceOpcProtocolRunable();
+ runable.setProtocols(groupProtols);
+ runable.setOpcServer(opcServer);
+ this.executorService.submit(runable);
}
}
- }
- }
- private void refreshOpcEntity() {
- if (canRefreshOpcEntity) {
- canRefreshOpcEntity = false;
- long now = System.currentTimeMillis();
- if (now - this.lastRefreshOpcEntityTime >= 20000L) {
- this.lastRefreshOpcEntityTime = now;
- submitTimeLimitTask(() -> {
- try {
- Map>> protocol = this.deviceAppService.findAllFormatProtocolFromDriver();
- Iterator var2 = protocol.entrySet().iterator();
+ // 同步无光电设备信号
+ //Map>> pros1 = this.deviceAppService.findAllFormatProtocolFromDriver();
+ //List opcDrivers = this.deviceAppService.findDeviceDriver(DeviceDriver.class);
- while (var2.hasNext()) {
- Entry>> stringListEntry = (Entry) var2.next();
- String opcCode = (String) stringListEntry.getKey();
- List> opcItemDtos = (List) stringListEntry.getValue();
- ((OpcEntity) opcCodeOpcEntityMapping.computeIfAbsent(opcCode, OpcEntity::new)).reload(opcItemDtos);
- }
- } catch (Exception var6) {
- var6.printStackTrace();
- } finally {
- canRefreshOpcEntity = true;
- }
-
- }, (String) null);
+ while (true) {
+ Thread.sleep(3000L);
}
}
}
- private void logMessage(String errorMessage) {
- try {
-// issueLogger.setResource(OpcConfig.resource_code, OpcConfig.resource_name).setError(StringUtl.getString(100), "设备同步通信异常").log(errorMessage, new Object[0]);
-// businessLogger.setResource(OpcConfig.resource_code, OpcConfig.resource_name).setError(StringUtl.getString(100), "设备同步通信异常").log(errorMessage, new Object[0]);
- } catch (Exception var5) {
- var5.printStackTrace();
- }
-
- }
-
+ @Override
public void after() {
- OpcStartTag.is_run = false;
- opcCodeOpcEntityMapping.values().forEach((opcEntity) -> {
- opcEntity.cleanUdwCache();
- OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService.class);
- opcServerService.cleanGroups(opcEntity.getOpcCode());
- });
- opcCodeOpcEntityMapping = new ConcurrentHashMap();
- itemCodeOpcItemDtoMapping = new ConcurrentHashMap();
- executorService.shutdownNow();
- }
-
- private void logItemChanged(String itemId, UnifiedDataAccessor accessor_value, Object value, OpcItemDto itemDto) {
- ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class);
- Object his = accessor_value.getValue(itemId);
- List relate_items = itemDto.getRelate_items();
- if (relate_items != null && !relate_items.isEmpty()) {
- StringBuilder sb = new StringBuilder();
- Iterator var8 = relate_items.iterator();
-
- while (var8.hasNext()) {
- String relate = (String) var8.next();
- Object obj = accessor_value.getValue(relate);
- sb.append("key:" + relate + "value: " + obj + ";");
- }
- if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time") && !itemDto.getItem_code().endsWith("consumption")) {
- // 存在上次点位值为null情况 则不记录日志
- if(!(his instanceof Float) && !(value instanceof Float)){
- LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(),4, itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
- String.valueOf(his), String.valueOf(value));
- luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
- String logLevel = paramService.findByCode(AcsConfig.LOGLEVEL).getValue();
- if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){
- log.info("{}", JSON.toJSONString(luceneLogDto));
- }
- }
- }
- } else {
-
-// if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time") && !itemDto.getItem_code().endsWith("consumption")) {
-// if(!(his instanceof Float) && !(value instanceof Float)){
-// LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(), itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
-// String.valueOf(his), String.valueOf(value));
-// luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
-// log.info("{}", JSON.toJSONString(luceneLogDto));
-// }
-// }
-
- if (!itemDto.getItem_code().endsWith("heartbeat") && !itemDto.getItem_code().endsWith("time") && !itemDto.getItem_code().endsWith("consumption")) {
- if(!(his instanceof Float) && !(value instanceof Float)){
- LuceneLogDto luceneLogDto = new LuceneLogDto(itemDto.getOpc_server_code(), itemDto.getOpc_plc_code(),4, itemDto.getDevice_code(), itemDto.getItem_code().substring(itemDto.getItem_code().lastIndexOf(".") + 1),
- String.valueOf(his), String.valueOf(value));
- luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc());
- String logLevel = paramService.findByCode(AcsConfig.LOGLEVEL).getValue();
- if(StrUtil.isNotEmpty(logLevel) && isNumeric(logLevel) && (luceneLogDto.getLog_level() >= Integer.parseInt(logLevel))){
- log.info("{}", JSON.toJSONString(luceneLogDto));
- }
- }
- }
-
- }
- }
-
- static {
- udw = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key);
- canReadOpcValues = new ConcurrentHashMap();
- opcCodeOpcEntityMapping = new ConcurrentHashMap();
- }
-
- public static boolean isNumeric(String str) {
- return Pattern.compile("^[0-9]+$").matcher(str).matches();
+ isRun = false;
+ this.executorService.shutdownNow();
+ this.executorService = ThreadPoolBuilder.newBuilder()
+ .threadPoolName("deviceOpc_thread")
+ .threadFactory("deviceOpc_thread")
+ .corePoolSize(80)
+ .maximumPoolSize(100)
+ .keepAliveTime(40)
+ .timeUnit(TimeUnit.SECONDS)
+ .workQueue(MEMORY_SAFE_LINKED_BLOCKING_QUEUE.getName(), 2000)
+ .buildDynamic();
}
}
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcEntity.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcEntity.java
index b291a56..c6889e2 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcEntity.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcEntity.java
@@ -1,180 +1,180 @@
-package org.nl.acs.opc;
-
-import org.nl.acs.opc.DeviceOpcSynchronizeAutoRun;
-import org.nl.acs.opc.OpcConfig;
-import org.nl.acs.opc.OpcItemDto;
-import org.nl.acs.opc.OpcServerService;
-import org.nl.acs.udw.UnifiedDataAccessor;
-import org.nl.acs.udw.UnifiedDataAccessorFactory;
-import org.openscada.opc.lib.da.Group;
-import org.openscada.opc.lib.da.Item;
-import org.openscada.opc.lib.da.ItemState;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-public class OpcEntity {
- @Autowired
- OpcServerService opcServerService;
- private final UnifiedDataAccessor udw;
- private Map> items;
- private Map> someFailDevices;
- private String opcCode;
-
- public OpcEntity(String opcCode) {
- this.udw = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key);
- this.items = new ConcurrentHashMap();
- this.someFailDevices = new ConcurrentHashMap();
- this.opcCode = opcCode;
- }
-
- public void reload(List> opcItemDtos) {
- Map> itemCodes = new ConcurrentHashMap();
- (opcItemDtos.stream().flatMap(Collection::stream).collect(Collectors.groupingBy(OpcItemDto::getDevice_code))).forEach((deviceCodes, opcItemDtoList) -> {
- itemCodes.put(deviceCodes, opcItemDtoList.stream().map(OpcItemDto::getItem_code).collect(Collectors.toList()));
- });
- DeviceOpcSynchronizeAutoRun.itemCodeOpcItemDtoMapping.putAll((Map)opcItemDtos.stream().flatMap(Collection::stream).collect(Collectors.toMap(OpcItemDto::getItem_code, (obj) -> {
- return obj;
- },(k, v) -> k)));
- if (this.items.size() == 0) {
- itemCodes.values().stream().flatMap(Collection::stream).forEach((key) -> {
- this.udw.setValue(key, (Object)null);
- });
- this.addItemsIntoGroup(itemCodes);
- } else {
- if (this.someFailDevices.size() > 0) {
- this.reAddDevices();
- }
-
- }
- }
-
- private void reAddDevices() {
- Map> addItems = new ConcurrentHashMap();
- StringBuilder err_message = new StringBuilder();
- this.someFailDevices.forEach((deviceCode, itemCodesList) -> {
- itemCodesList.forEach((itemCode) -> {
- try {
- Group group = DeviceOpcSynchronizeAutoRun.getGroup(this.opcCode);
- ((List)addItems.computeIfAbsent(deviceCode, (key) -> {
- return new ArrayList();
- })).add(group.addItem(itemCode));
- } catch (Exception var6) {
- err_message.append(itemCode).append(" 添加失败; ");
- }
-
- });
- List
- deviceItems = (List)addItems.get(deviceCode);
- if (deviceItems != null && deviceItems.size() == itemCodesList.size()) {
- this.someFailDevices.remove(deviceCode);
- } else if (itemCodesList.size() == 0) {
- addItems.remove(deviceCode);
- } else {
- assert deviceItems != null;
-
- ((List)this.someFailDevices.get(deviceCode)).removeAll(deviceItems);
- }
-
- synchronized(this.opcCode.intern()) {
- this.items.putAll(addItems);
- }
-
- if (err_message.length() > 0) {
- String errMsg = err_message.toString();
- //this.log.warn("{}:{}", com.wxzd.wcs.opc.OpcConfig.resource_code, errMsg);
- }
-
- });
- }
-
- private void addItemsIntoGroup(Map> itemCodes) {
- try {
- Group group = DeviceOpcSynchronizeAutoRun.getGroup(this.opcCode);
- StringBuilder err_message = new StringBuilder();
- Map> items = new ConcurrentHashMap();
- itemCodes.forEach((deviceCode, itemCodesList) -> {
- itemCodesList.forEach((itemCode) -> {
- try {
- ((List)items.computeIfAbsent(deviceCode, (key) -> {
- return new ArrayList();
- })).add(group.addItem(itemCode));
- } catch (Exception var7) {
- ((List)this.someFailDevices.computeIfAbsent(deviceCode, (key) -> {
- return new ArrayList();
- })).add(itemCode);
- this.udw.setValue(itemCode, (Object)null);
- err_message.append(itemCode).append(" 添加失败; ");
- }
-
- });
- List
- deviceItems = (List)items.get(deviceCode);
- if (deviceItems != null && deviceItems.size() != itemCodesList.size()) {
- items.remove(deviceCode);
- this.someFailDevices.put(deviceCode, itemCodesList);
- }
-
- });
- synchronized(this.opcCode.intern()) {
- this.items = items;
- }
-
- if (err_message.length() > 0) {
- String errMsg = err_message.toString();
-// this.log.warn("{}:{}", OpcConfig.resource_code, errMsg);
- }
- } catch (Exception var8) {
- var8.printStackTrace();
- }
-
- }
-
- public void cleanUdwCache() {
- this.items.values().stream().flatMap(Collection::stream).map(Item::getId).forEach((key) -> {
- this.udw.setValue(key, (Object)null);
- });
- }
-
- public Map readAll() throws Exception {
- return opcServerService.getServer(this.opcCode).read(true, (Item[])this.items.values().stream().flatMap(Collection::stream).toArray((x$0) -> {
- return new Item[x$0];
- }));
- }
-
- public Map readDividually() {
- Map result = new HashMap();
- CompletableFuture[] futures = (CompletableFuture[])this.items.entrySet().stream().map((entry) -> {
- return CompletableFuture.runAsync(() -> {
- try {
- Group group = DeviceOpcSynchronizeAutoRun.getGroup(this.opcCode);
- result.putAll(group.read(true, (Item[])((List)entry.getValue()).toArray(new Item[0])));
- } catch (Exception var5) {
- String deviceCode = (String)entry.getKey();
- // to do
-// this.someFailDevices.put(deviceCode, ((List)entry.getValue()).stream().map(Item::getId).collect(Collectors.toList()));
- this.items.remove(deviceCode);
- }
-
- }, DeviceOpcSynchronizeAutoRun.executorService);
- }).toArray((x$0) -> {
- return new CompletableFuture[x$0];
- });
- CompletableFuture.allOf(futures).join();
- return result;
- }
-
-
- public UnifiedDataAccessor getUdw() {
- return this.udw;
- }
-
- public Map> getItems() {
- return this.items;
- }
-
- public String getOpcCode() {
- return this.opcCode;
- }
-}
+//package org.nl.acs.opc;
+//
+//import org.nl.acs.opc.DeviceOpcSynchronizeAutoRun;
+//import org.nl.acs.opc.OpcConfig;
+//import org.nl.acs.opc.OpcItemDto;
+//import org.nl.acs.opc.OpcServerService;
+//import org.nl.acs.udw.UnifiedDataAccessor;
+//import org.nl.acs.udw.UnifiedDataAccessorFactory;
+//import org.openscada.opc.lib.da.Group;
+//import org.openscada.opc.lib.da.Item;
+//import org.openscada.opc.lib.da.ItemState;
+//import org.springframework.beans.factory.annotation.Autowired;
+//
+//import java.util.*;
+//import java.util.concurrent.CompletableFuture;
+//import java.util.concurrent.ConcurrentHashMap;
+//import java.util.stream.Collectors;
+//
+//public class OpcEntity {
+// @Autowired
+// OpcServerService opcServerService;
+// private final UnifiedDataAccessor udw;
+// private Map> items;
+// private Map> someFailDevices;
+// private String opcCode;
+//
+// public OpcEntity(String opcCode) {
+// this.udw = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key);
+// this.items = new ConcurrentHashMap();
+// this.someFailDevices = new ConcurrentHashMap();
+// this.opcCode = opcCode;
+// }
+//
+// public void reload(List> opcItemDtos) {
+// Map> itemCodes = new ConcurrentHashMap();
+// (opcItemDtos.stream().flatMap(Collection::stream).collect(Collectors.groupingBy(OpcItemDto::getDevice_code))).forEach((deviceCodes, opcItemDtoList) -> {
+// itemCodes.put(deviceCodes, opcItemDtoList.stream().map(OpcItemDto::getItem_code).collect(Collectors.toList()));
+// });
+// DeviceOpcSynchronizeAutoRun.itemCodeOpcItemDtoMapping.putAll((Map)opcItemDtos.stream().flatMap(Collection::stream).collect(Collectors.toMap(OpcItemDto::getItem_code, (obj) -> {
+// return obj;
+// },(k, v) -> k)));
+// if (this.items.size() == 0) {
+// itemCodes.values().stream().flatMap(Collection::stream).forEach((key) -> {
+// this.udw.setValue(key, (Object)null);
+// });
+// this.addItemsIntoGroup(itemCodes);
+// } else {
+// if (this.someFailDevices.size() > 0) {
+// this.reAddDevices();
+// }
+//
+// }
+// }
+//
+// private void reAddDevices() {
+// Map> addItems = new ConcurrentHashMap();
+// StringBuilder err_message = new StringBuilder();
+// this.someFailDevices.forEach((deviceCode, itemCodesList) -> {
+// itemCodesList.forEach((itemCode) -> {
+// try {
+// Group group = DeviceOpcSynchronizeAutoRun.getGroup(this.opcCode);
+// ((List)addItems.computeIfAbsent(deviceCode, (key) -> {
+// return new ArrayList();
+// })).add(group.addItem(itemCode));
+// } catch (Exception var6) {
+// err_message.append(itemCode).append(" 添加失败; ");
+// }
+//
+// });
+// List
- deviceItems = (List)addItems.get(deviceCode);
+// if (deviceItems != null && deviceItems.size() == itemCodesList.size()) {
+// this.someFailDevices.remove(deviceCode);
+// } else if (itemCodesList.size() == 0) {
+// addItems.remove(deviceCode);
+// } else {
+// assert deviceItems != null;
+//
+// ((List)this.someFailDevices.get(deviceCode)).removeAll(deviceItems);
+// }
+//
+// synchronized(this.opcCode.intern()) {
+// this.items.putAll(addItems);
+// }
+//
+// if (err_message.length() > 0) {
+// String errMsg = err_message.toString();
+// //this.log.warn("{}:{}", com.wxzd.wcs.opc.OpcConfig.resource_code, errMsg);
+// }
+//
+// });
+// }
+//
+// private void addItemsIntoGroup(Map> itemCodes) {
+// try {
+// Group group = DeviceOpcSynchronizeAutoRun.getGroup(this.opcCode);
+// StringBuilder err_message = new StringBuilder();
+// Map> items = new ConcurrentHashMap();
+// itemCodes.forEach((deviceCode, itemCodesList) -> {
+// itemCodesList.forEach((itemCode) -> {
+// try {
+// ((List)items.computeIfAbsent(deviceCode, (key) -> {
+// return new ArrayList();
+// })).add(group.addItem(itemCode));
+// } catch (Exception var7) {
+// ((List)this.someFailDevices.computeIfAbsent(deviceCode, (key) -> {
+// return new ArrayList();
+// })).add(itemCode);
+// this.udw.setValue(itemCode, (Object)null);
+// err_message.append(itemCode).append(" 添加失败; ");
+// }
+//
+// });
+// List
- deviceItems = (List)items.get(deviceCode);
+// if (deviceItems != null && deviceItems.size() != itemCodesList.size()) {
+// items.remove(deviceCode);
+// this.someFailDevices.put(deviceCode, itemCodesList);
+// }
+//
+// });
+// synchronized(this.opcCode.intern()) {
+// this.items = items;
+// }
+//
+// if (err_message.length() > 0) {
+// String errMsg = err_message.toString();
+//// this.log.warn("{}:{}", OpcConfig.resource_code, errMsg);
+// }
+// } catch (Exception var8) {
+// var8.printStackTrace();
+// }
+//
+// }
+//
+// public void cleanUdwCache() {
+// this.items.values().stream().flatMap(Collection::stream).map(Item::getId).forEach((key) -> {
+// this.udw.setValue(key, (Object)null);
+// });
+// }
+//
+// public Map readAll() throws Exception {
+// return opcServerService.getServer(this.opcCode).read(true, (Item[])this.items.values().stream().flatMap(Collection::stream).toArray((x$0) -> {
+// return new Item[x$0];
+// }));
+// }
+//
+// public Map readDividually() {
+// Map result = new HashMap();
+// CompletableFuture[] futures = (CompletableFuture[])this.items.entrySet().stream().map((entry) -> {
+// return CompletableFuture.runAsync(() -> {
+// try {
+// Group group = DeviceOpcSynchronizeAutoRun.getGroup(this.opcCode);
+// result.putAll(group.read(true, (Item[])((List)entry.getValue()).toArray(new Item[0])));
+// } catch (Exception var5) {
+// String deviceCode = (String)entry.getKey();
+// // to do
+//// this.someFailDevices.put(deviceCode, ((List)entry.getValue()).stream().map(Item::getId).collect(Collectors.toList()));
+// this.items.remove(deviceCode);
+// }
+//
+// }, DeviceOpcSynchronizeAutoRun.executorService);
+// }).toArray((x$0) -> {
+// return new CompletableFuture[x$0];
+// });
+// CompletableFuture.allOf(futures).join();
+// return result;
+// }
+//
+//
+// public UnifiedDataAccessor getUdw() {
+// return this.udw;
+// }
+//
+// public Map> getItems() {
+// return this.items;
+// }
+//
+// public String getOpcCode() {
+// return this.opcCode;
+// }
+//}
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
index 90c076e..76414a1 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
@@ -27,7 +27,6 @@ https://juejin.cn/post/6844903775631572999
-