Browse Source

fix opc读取信号

master
张江玮 2 years ago
parent
commit
7c65674e6b
  1. 20
      hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/ConveyorDevice.java
  2. 4
      hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java
  3. 2
      hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java
  4. 4
      hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_scanner/StandardScannerDeviceDriver.java
  5. 4
      hd/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
  6. 276
      hd/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java
  7. 30
      hd/nladmin-system/src/main/java/org/nl/acs/opc/ItemValue.java
  8. 73
      hd/nladmin-system/src/main/java/org/nl/acs/opc/ObjectUtl.java
  9. 176
      hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcEntity.java
  10. 22
      hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerService.java
  11. 191
      hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java
  12. 2
      hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerUtl.java
  13. 299
      hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java
  14. 21
      hd/nladmin-system/src/main/java/org/nl/acs/opc/ThreadUtl.java
  15. 4
      hd/nladmin-system/src/main/java/org/nl/acs/socket/ClientUDWReceive.java
  16. 2
      hd/nladmin-system/src/main/java/org/nl/acs/udw/UdwConfig.java
  17. 2
      hd/nladmin-system/src/main/java/org/nl/acs/udw/UnifiedData.java
  18. 2
      hd/nladmin-system/src/main/java/org/nl/acs/udw/UnifiedDataAccessor.java
  19. 6
      hd/nladmin-system/src/main/java/org/nl/acs/udw/UnifiedDataAccessorFactory.java
  20. 4
      hd/nladmin-system/src/main/java/org/nl/acs/udw/UnifiedDataAppService.java
  21. 2
      hd/nladmin-system/src/main/java/org/nl/acs/udw/dto/UdwDto.java
  22. 6
      hd/nladmin-system/src/main/java/org/nl/acs/udw/service/UdwManageService.java
  23. 8
      hd/nladmin-system/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java
  24. 8
      hd/nladmin-system/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAccessorImpl.java
  25. 8
      hd/nladmin-system/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAppServiceImpl.java
  26. 4
      hd/nladmin-system/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataUnit.java

20
hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/ConveyorDevice.java

@ -43,16 +43,16 @@ public class ConveyorDevice {
@SneakyThrows @SneakyThrows
@Override @Override
public void run() { public void run() {
System.out.println("test"); // System.out.println("test");
String MODE = "RD1.RD1." + id + ".mode"; // String MODE = "RD1.RD1." + id + ".mode";
String code = OpcUtl.read(MODE); // String code = OpcUtl.read(MODE);
if ("2".equals(code)) { // if ("2".equals(code)) {
TaskService taskserver = new TaskServiceImpl(); // TaskService taskserver = new TaskServiceImpl();
TaskDto dto = new TaskDto(); // TaskDto dto = new TaskDto();
dto.setStart_point_code(id); // dto.setStart_point_code(id);
dto.setNext_point_code("1002"); // dto.setNext_point_code("1002");
taskserver.create(dto); // taskserver.create(dto);
} // }
} }
} }
} }

4
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java

@ -1,8 +1,8 @@
package org.nl.acs.device_driver.driver; package org.nl.acs.device_driver.driver;
import org.nl.acs.opc.OpcConfig; import org.nl.acs.opc.OpcConfig;
import org.nl.modules.udw.UnifiedDataAccessor; import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.modules.udw.UnifiedDataAccessorFactory; import org.nl.acs.udw.UnifiedDataAccessorFactory;
public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements OpcDeviceDriver { public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements OpcDeviceDriver {
UnifiedDataAccessor opcUdw; UnifiedDataAccessor opcUdw;

2
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/driver/OpcDeviceDriver.java

@ -5,7 +5,7 @@ import net.sf.json.JSONObject;
import org.nl.acs.device_driver.DeviceDriver; import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.opc.Device; import org.nl.acs.opc.Device;
import org.nl.acs.opc.OpcItemDto; import org.nl.acs.opc.OpcItemDto;
import org.nl.modules.udw.UnifiedDataAccessor; import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.wql.core.bean.WQLObject; import org.nl.wql.core.bean.WQLObject;
import java.util.ArrayList; import java.util.ArrayList;

4
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_scanner/StandardScannerDeviceDriver.java

@ -8,8 +8,8 @@ import org.nl.acs.device_driver.DeviceDriver;
import org.nl.acs.device_driver.ScannerDeviceDriver; import org.nl.acs.device_driver.ScannerDeviceDriver;
import org.nl.acs.device_driver.driver.AbstractDeviceDriver; import org.nl.acs.device_driver.driver.AbstractDeviceDriver;
import org.nl.acs.socket.SocketConfig; import org.nl.acs.socket.SocketConfig;
import org.nl.modules.udw.UnifiedDataAccessor; import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.modules.udw.UnifiedDataAccessorFactory; import org.nl.acs.udw.UnifiedDataAccessorFactory;
/** /**

4
hd/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java

@ -4,8 +4,8 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.modules.udw.UnifiedDataAccessor; import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.modules.udw.UnifiedDataAccessorFactory; import org.nl.acs.udw.UnifiedDataAccessorFactory;
import org.openscada.opc.lib.da.Group; import org.openscada.opc.lib.da.Group;
import org.openscada.opc.lib.da.Item; import org.openscada.opc.lib.da.Item;
import org.openscada.opc.lib.da.ItemState; import org.openscada.opc.lib.da.ItemState;

276
hd/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcSynchronizeAutoRun.java

@ -1,81 +1,267 @@
package org.nl.acs.opc; package org.nl.acs.opc;
import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j;
import org.apache.lucene.util.NamedThreadFactory;
import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.acs.udw.UnifiedDataAppService;
import org.nl.start.auto.run.AbstractAutoRunnable; import org.nl.start.auto.run.AbstractAutoRunnable;
import org.nl.utils.SpringContextHolder;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.nl.acs.udw.UnifiedDataAccessorFactory;
import java.util.Iterator; import java.util.*;
import java.util.List; import java.util.concurrent.*;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
/** /**
* OPC设备同步启动 * OPC设备同步启动
*/ */
@Component @Component
@Slf4j
public class DeviceOpcSynchronizeAutoRun extends AbstractAutoRunnable { public class DeviceOpcSynchronizeAutoRun extends AbstractAutoRunnable {
ExecutorService executorService = Executors.newCachedThreadPool(); static boolean isRun = true;
@Autowired @Autowired
private DeviceAppService deviceAppService; private DeviceAppService deviceAppService;
@Autowired @Autowired
private OpcServerManageService opcServerManageService; private OpcServerManageService opcServerManageService;
@Override static ExecutorService executorService;
public static Map<String, OpcServerManageDto> opcServersConfig;
public static Map<String, OpcItemDto> itemCodeOpcItemDtoMapping = new ConcurrentHashMap();
static boolean canRefreshOpcEntity = true;
private long lastRefreshOpcEntityTime;
static UnifiedDataAccessor udw;
private static Map<String, Boolean> canReadOpcValues;
private static volatile Map<String, OpcEntity> opcCodeOpcEntityMapping;
public DeviceOpcSynchronizeAutoRun() {
this.lastRefreshOpcEntityTime = 0L;
}
public String getCode() { public String getCode() {
return DeviceOpcSynchronizeAutoRun.class.getSimpleName(); return DeviceOpcSynchronizeAutoRun.class.getSimpleName();
} }
@Override
public String getName() { public String getName() {
return "opc设备同步器"; return "opc设备同步器";
} }
@Override static Group getGroup(String opcCode) throws Exception {
public void autoRun() throws Exception { OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService.class);
{ return opcServerService.getServer(opcCode);
}
Map<String, OpcServerManageDto> servers = this.opcServerManageService.queryAllServerMap();
Map<String, List<List<OpcItemDto>>> pros; static void submitTimeLimitTask(Runnable runnable, String opcCode) {
do{ CompletableFuture<Void> future = CompletableFuture.runAsync(runnable, executorService);
Thread.sleep(1000L);
pros = this.deviceAppService.findAllFormatProtocolFromDriver(); // try {
}while (ObjectUtil.isEmpty(pros)); // future.get(10L, TimeUnit.SECONDS);
Set<String> keys = pros.keySet(); // } catch (InterruptedException var9) {
Iterator var4 = keys.iterator(); // Thread.currentThread().interrupt();
System.out.println("test:" + var4.hasNext()); // } catch (ExecutionException var10) {
//代码执行一次 // var10.printStackTrace();
while (var4.hasNext()) { // } catch (TimeoutException var11) {
String key = (String) var4.next(); // itemCodeOpcItemDtoMapping.keySet().forEach((key) -> {
List<List<OpcItemDto>> list = (List) pros.get(key); // udw.setValue(key, (Object) null);
OpcServerManageDto opcServer = (OpcServerManageDto) servers.get(key); // });
Iterator var8 = list.iterator(); // canReadOpcValues = new ConcurrentHashMap<>();
System.out.println("test2:" + var8.hasNext()); // System.out.println("opc设备同步器 任务执行超时,取消任务...");
// future.cancel(true);
while (var8.hasNext()) { // } finally {
List<OpcItemDto> groupProtols = (List) var8.next(); // canRefreshOpcEntity = true;
DeviceOpcProtocolRunable runable = new DeviceOpcProtocolRunable(); // if (opcCode != null) {
runable.setProtocols(groupProtols); // canReadOpcValues.put(opcCode, true);
runable.setOpcServer(opcServer); // }
this.executorService.submit(runable); //
// }
}
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<Item, ItemState> 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<Item> 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);
}
}
} }
} }
}
}
// 同步无光电设备信号 private void refreshOpcEntity() {
//Map<String, List<List<OpcItemDto>>> pros1 = this.deviceAppService.findAllFormatProtocolFromDriver(); if (canRefreshOpcEntity) {
//List<DeviceDriver> opcDrivers = this.deviceAppService.findDeviceDriver(DeviceDriver.class); canRefreshOpcEntity = false;
long now = System.currentTimeMillis();
if (now - this.lastRefreshOpcEntityTime >= 20000L) {
this.lastRefreshOpcEntityTime = now;
submitTimeLimitTask(() -> {
try {
Map<String, List<List<OpcItemDto>>> protocol = this.deviceAppService.findAllFormatProtocolFromDriver();
Iterator var2 = protocol.entrySet().iterator();
while (true) { while (var2.hasNext()) {
Thread.sleep(3000L); Map.Entry<String, List<List<OpcItemDto>>> stringListEntry = (Map.Entry) var2.next();
String opcCode = (String) stringListEntry.getKey();
List<List<OpcItemDto>> opcItemDtos = (List) stringListEntry.getValue();
((OpcEntity) opcCodeOpcEntityMapping.computeIfAbsent(opcCode, OpcEntity::new)).reload(opcItemDtos);
}
} catch (Exception var6) {
var6.printStackTrace();
} finally {
canRefreshOpcEntity = true;
}
}, (String) null);
} }
} }
} }
@Override 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();
}
}
public void after() { public void after() {
this.executorService.shutdownNow(); OpcStartTag.is_run = false;
this.executorService = Executors.newCachedThreadPool(); 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 itemCode, UnifiedDataAccessor udw, Object value, OpcItemDto itemDto) {
Object his = udw.getValue(itemCode);
List<String> 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 = udw.getValue(relate);
sb.append("key:").append(relate).append("value:").append(obj).append(";");
}
} else {
}
}
static {
udw = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key);
canReadOpcValues = new ConcurrentHashMap();
opcCodeOpcEntityMapping = new ConcurrentHashMap();
} }
} }

30
hd/nladmin-system/src/main/java/org/nl/acs/opc/ItemValue.java

@ -0,0 +1,30 @@
package org.nl.acs.opc;
public class ItemValue {
private String item_code;
private Object item_value;
public ItemValue() {
}
public ItemValue(String item_code, Object item_value) {
this.item_code = item_code;
this.item_value = item_value;
}
public String getItem_code() {
return this.item_code;
}
public void setItem_code(String item_code) {
this.item_code = item_code;
}
public Object getItem_value() {
return this.item_value;
}
public void setItem_value(Object item_value) {
this.item_value = item_value;
}
}

73
hd/nladmin-system/src/main/java/org/nl/acs/opc/ObjectUtl.java

@ -0,0 +1,73 @@
package org.nl.acs.opc;
import org.nl.exception.WDKException;
import java.util.Arrays;
import java.util.Objects;
public class ObjectUtl {
private ObjectUtl() {
}
public static boolean isEquals(Object a, Object b) {
if (a == null && b == null) {
return true;
} else if (a != null && b != null) {
if (a.getClass().isArray()) {
if (a instanceof boolean[]) {
return Arrays.equals((boolean[]) ((boolean[]) a), (boolean[]) ((boolean[]) b));
} else if (a instanceof byte[]) {
return Arrays.equals((byte[]) ((byte[]) a), (byte[]) ((byte[]) b));
} else if (a instanceof int[]) {
return Arrays.equals((int[]) ((int[]) a), (int[]) ((int[]) b));
} else if (a instanceof long[]) {
return Arrays.equals((long[]) ((long[]) a), (long[]) ((long[]) b));
} else if (a instanceof double[]) {
return Arrays.equals((double[]) ((double[]) a), (double[]) ((double[]) b));
} else if (a instanceof short[]) {
return Arrays.equals((short[]) ((short[]) a), (short[]) ((short[]) b));
} else if (a instanceof char[]) {
return Arrays.equals((char[]) ((char[]) a), (char[]) ((char[]) b));
} else if (a instanceof float[]) {
return Arrays.equals((float[]) ((float[]) a), (float[]) ((float[]) b));
} else if (a instanceof Object[]) {
return Arrays.equals((Object[]) ((Object[]) a), (Object[]) ((Object[]) b));
} else {
throw new WDKException("未实现");
}
} else {
return Objects.equals(a, b);
}
} else {
return false;
}
}
public static boolean isTrue(Boolean boolean_) {
return boolean_ != null && isEquals(boolean_, true);
}
public static boolean isTrue(Boolean targetBoolean, boolean defaultBoolean) {
return targetBoolean == null ? defaultBoolean : targetBoolean;
}
public static boolean isFalse(Boolean boolean_) {
return boolean_ != null && isEquals(boolean_, false);
}
public static boolean isObject(Class<?> clazz) {
if (clazz == null) {
return false;
} else if (clazz.getClass().isArray()) {
return false;
} else {
return Object.class.isAssignableFrom(clazz);
}
}
}

176
hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcEntity.java

@ -0,0 +1,176 @@
package org.nl.acs.opc;
import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.acs.udw.UnifiedDataAccessorFactory;
import org.nl.utils.SpringContextHolder;
import org.openscada.opc.lib.da.Group;
import org.openscada.opc.lib.da.Item;
import org.openscada.opc.lib.da.ItemState;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
public class OpcEntity {
OpcServerService opcServerService = SpringContextHolder.getBean(OpcServerService.class);
private final UnifiedDataAccessor udw;
private Map<String, List<Item>> items;
private Map<String, List<String>> 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<List<OpcItemDto>> opcItemDtos) {
Map<String, List<String>> 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<String, List<Item>> 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<Item> 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<String, List<String>> itemCodes) {
try {
Group group = DeviceOpcSynchronizeAutoRun.getGroup(this.opcCode);
StringBuilder err_message = new StringBuilder();
Map<String, List<Item>> 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<Item> 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<Item, ItemState> 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<Item, ItemState> readDividually() {
Map<Item, ItemState> 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<String, List<Item>> getItems() {
return this.items;
}
public String getOpcCode() {
return this.opcCode;
}
}

22
hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerService.java

@ -0,0 +1,22 @@
package org.nl.acs.opc;
import org.openscada.opc.lib.da.Group;
/**
* @author ldjun
* @version 1.0
* @date 2023年02月01日 11:26
* @desc desc
*/
public interface OpcServerService {
void reload();
Group getServer(String var1) throws Exception;
void writeInteger(String var1, ItemValue... var2);
void clearServer(String var1);
void cleanGroups(String var1);
}

191
hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java

@ -0,0 +1,191 @@
package org.nl.acs.opc;
import cn.hutool.core.util.StrUtil;
import org.jinterop.dcom.common.JIException;
import org.nl.exception.BadRequestException;
import org.nl.start.auto.initial.ApplicationAutoInitial;
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<String, OpcServerManageDto> opcServerManageDtos = new HashMap();
Map<String, Server> servers = Collections.synchronizedMap(new HashMap());
Map<String, Group> groups = Collections.synchronizedMap(new HashMap());
public OpcServerServiceImpl() {}
public void autoInitial() throws Exception {
this.reload();
if (OpcConfig.auto_start_opc) {
Thread t =
new Thread() {
public void run() {
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();
}
}
public synchronized void reload() {
this.opcServerManageDtos = this.opcServerManageService.queryAllServerMap();
this.opcServerManageDtos = Collections.synchronizedMap(this.opcServerManageDtos);
}
public void cleanGroups(String opcCode) {
Group group = (Group)this.groups.get(opcCode);
if (group != null) {
Server server = group.getServer();
try {
group.remove();
} catch (JIException var5) {
var5.printStackTrace();
}
this.groups.remove(opcCode);
server.disconnect();
this.servers.remove(opcCode);
}
}
public Group getServer(String code) throws Exception {
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 BadRequestException(code + "{} 不存在");
}
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) {
var11.printStackTrace();
}
}
this.servers.put(code, server);
this.groups.put(code, group);
}
return group;
}
}
public void clearServer(String code) {
synchronized(this.buildLock(code)) {
try {
Server server = (Server)this.servers.get(code);
server.disconnect();
} catch (Exception var5) {
}
this.servers.remove(code);
this.groups.remove(code);
}
}
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;
}
}
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;
}
}

2
hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerUtl.java

@ -6,7 +6,7 @@ import org.openscada.opc.lib.da.Server;
public class OpcServerUtl { public class OpcServerUtl {
public static synchronized Server getServerWithOutException(String host, String clsid, String user, String password, public static synchronized Server getServerWithOutException(String host, String clsid, String user, String password,
String domain) { String domain) throws Exception {
if (!StrUtil.isEmpty(host) && !StrUtil.isEmpty(clsid) && !StrUtil.isEmpty(user)) { if (!StrUtil.isEmpty(host) && !StrUtil.isEmpty(clsid) && !StrUtil.isEmpty(user)) {
if (domain == null) { if (domain == null) {
domain = ""; domain = "";

299
hd/nladmin-system/src/main/java/org/nl/acs/opc/OpcUtl.java

@ -6,11 +6,16 @@ import org.jinterop.dcom.common.JIException;
import org.jinterop.dcom.core.*; import org.jinterop.dcom.core.*;
import org.nl.exception.BadRequestException; import org.nl.exception.BadRequestException;
import org.nl.exception.WDKException; import org.nl.exception.WDKException;
import org.openscada.opc.dcom.list.ClassDetails;
import org.openscada.opc.lib.common.AlreadyConnectedException;
import org.openscada.opc.lib.common.ConnectionInformation; import org.openscada.opc.lib.common.ConnectionInformation;
import org.openscada.opc.lib.da.*; import org.openscada.opc.lib.da.*;
import org.openscada.opc.lib.list.Categories;
import org.openscada.opc.lib.list.Category;
import org.openscada.opc.lib.list.ServerList;
import java.util.Iterator; import java.net.UnknownHostException;
import java.util.Map; import java.util.*;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@Slf4j @Slf4j
@ -19,45 +24,71 @@ public class OpcUtl {
private static String key = "rpc.socketTimeout"; private static String key = "rpc.socketTimeout";
public static void checkTimeout() { public static void checkTimeout() {
if (Integer.getInteger(key, 0).intValue() != timeout) { if (Integer.getInteger(key, 0) != timeout) {
System.setProperty(key, String.valueOf(timeout)); System.setProperty(key, String.valueOf(timeout));
} }
} }
private OpcUtl() {
}
public static void writeValue(Group group, WriteRequest... requests) { public static List<Map<String, String>> showAllOpcServer(String host, String user, String password, String domain) throws Exception {
try { try {
Map e = group.write(requests); List<Map<String, String>> listResult = new ArrayList();
boolean is_success = true; ServerList serverList = new ServerList(host, user, password, domain);
StringBuilder message = new StringBuilder(); Collection<ClassDetails> classDetails = serverList.listServersWithDetails(new Category[]{Categories.OPCDAServer10, Categories.OPCDAServer20, Categories.OPCDAServer30}, new Category[0]);
Iterator arg4 = e.keySet().iterator(); Iterator var7 = classDetails.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()); while(var7.hasNext()) {
message.append(":error code:"); ClassDetails details = (ClassDetails)var7.next();
message.append(integer); Map<String, String> result = new LinkedHashMap();
message.append("; "); result.put("classId", details.getClsId());
} result.put("progId", details.getProgId());
result.put("description", details.getDescription());
listResult.add(result);
} }
if (!is_success) { return listResult;
// throw new BusinessException(message.toString()); } catch (UnknownHostException | JIException | IllegalArgumentException var10) {
} throw new Exception(var10);
} catch (JIException arg7) { }
// throw new BusinessException(arg7); }
public static Server getServer(String host, String clsid, String user, String password, String domain) throws Exception {
checkTimeout();
Server server = null;
try {
server = new Server(getConnection(host, clsid, user, password, domain), Executors.newSingleThreadScheduledExecutor());
server.connect();
return server;
} catch (UnknownHostException | JIException | AlreadyConnectedException | IllegalArgumentException var7) {
throw new Exception(var7);
} }
} }
public static Object getValue(Item item, ItemState itemState) throws BadRequestException { public static Server getAutoServer(String host, String clsid, String user, String password, String domain) throws Exception {
if (NumberUtil.compare(itemState.getQuality(), Short.valueOf(QualityTypeValue.OPC_QUALITY_GOOD)) != 0) { 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 Object getValue(Item item, ItemState itemState) throws Exception {
if (!ObjectUtl.isEquals(itemState.getQuality(), QualityTypeValue.OPC_QUALITY_GOOD)) {
if (item != null) { if (item != null) {
log.debug("value is not good {} : {}", item.getId(), itemState.getQuality()); log.debug("value is not good {} : {}", item.getId(), itemState.getQuality());
} else { } else {
@ -71,24 +102,36 @@ public class OpcUtl {
} }
} }
public static Object getValue(JIVariant jiVariant, String id) throws BadRequestException { public static int getIntegerValue(Item item, ItemState itemState) throws Exception {
return (Integer)getValue(item, itemState);
}
public static String getStringValue(Item item, ItemState itemState) throws Exception {
return (String)getValue(item, itemState);
}
public static byte[] getByteArrayValue(Item item, ItemState itemState) throws Exception {
return (byte[])((byte[])getValue(item, itemState));
}
public static Object getValue(JIVariant jiVariant, String id) {
try { try {
Object e = jiVariant.getObject(); Object object = jiVariant.getObject();
if (e instanceof IJIUnsigned) { if (object instanceof IJIUnsigned) {
return Integer.valueOf(((IJIUnsigned) e).getValue().intValue()); return ((IJIUnsigned)object).getValue().intValue();
} else if (e instanceof Boolean) { } else if (object instanceof Boolean) {
return jiVariant.getObjectAsBoolean() ? Integer.valueOf(1) : Integer.valueOf(0); return jiVariant.getObjectAsBoolean() ? 1 : 0;
} else if (e instanceof JIString) { } else if (object instanceof JIString) {
return ((JIString) e).getString(); return ((JIString)object).getString();
} else if (!(e instanceof JIArray)) { } else if (!(object instanceof JIArray)) {
if (e instanceof Integer) { if (object instanceof Integer) {
return jiVariant.getObject(); return jiVariant.getObject();
} else if (e instanceof Short) { } else if (object instanceof Short) {
return jiVariant.getObject(); return jiVariant.getObject();
} else if (e instanceof Float) { } else if (object instanceof Float) {
return jiVariant.getObject(); return jiVariant.getObject();
} else { } else {
System.err.println(id + "不明类型" + e.getClass()); System.err.println(id + "不明类型" + object.getClass());
if (jiVariant.getType() == 0) { if (jiVariant.getType() == 0) {
System.err.println("因类型为emtpy 返回 null"); System.err.println("因类型为emtpy 返回 null");
return null; return null;
@ -100,15 +143,15 @@ public class OpcUtl {
} }
} }
} else { } else {
Class clazz = ((JIArray) e).getArrayClass(); Class<?> clazz = ((JIArray)object).getArrayClass();
int[] r; int[] r;
int i; int i;
if (JIUnsignedByte.class.isAssignableFrom(clazz)) { if (JIUnsignedByte.class.isAssignableFrom(clazz)) {
JIUnsignedByte[] arg7 = (JIUnsignedByte[]) ((JIUnsignedByte[]) ((JIArray) e).getArrayInstance()); JIUnsignedByte[] array = (JIUnsignedByte[])((JIUnsignedByte[])((JIArray)object).getArrayInstance());
r = new int[arg7.length]; r = new int[array.length];
for (i = 0; i < arg7.length; ++i) { for(i = 0; i < array.length; ++i) {
r[i] = arg7[i].getValue().byteValue(); r[i] = array[i].getValue().byteValue();
} }
return r; return r;
@ -121,77 +164,141 @@ public class OpcUtl {
System.err.println("因类型为null 返回 null"); System.err.println("因类型为null 返回 null");
return null; return null;
} else { } else {
return ((JIArray) e).getArrayInstance(); return ((JIArray)object).getArrayInstance();
} }
} else { } else {
JIUnsignedShort[] array = (JIUnsignedShort[]) ((JIUnsignedShort[]) ((JIArray) e) JIUnsignedShort[] array = (JIUnsignedShort[])((JIUnsignedShort[])((JIArray)object).getArrayInstance());
.getArrayInstance());
r = new int[array.length]; r = new int[array.length];
for (i = 0; i < array.length; ++i) { for(i = 0; i < array.length; ++i) {
r[i] = array[i].getValue().intValue(); r[i] = array[i].getValue().intValue();
} }
return r; return r;
} }
} }
} catch (JIException e) { } catch (JIException var7) {
throw new BadRequestException(e.getMessage()); // throw new Exception(var7);
var7.printStackTrace();
} }
return null;
} }
public static void writeValue(Group group, WriteRequest... requests) throws Exception {
try {
Map<Item, Integer> write = group.write(requests);
boolean is_success = true;
StringBuilder message = new StringBuilder();
Iterator var5 = write.keySet().iterator();
public static Server getServer(String host, String clsid, String user, String password, String domain) while(var5.hasNext()) {
throws WDKException { Item item = (Item)var5.next();
checkTimeout(); Integer integer = (Integer)write.get(item);
Server server = null; if (integer != 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 Exception(message.toString());
}
} catch (JIException var8) {
throw new Exception(var8);
}
}
public static void writeValue(Group group, ItemValue... values) throws Exception {
try { try {
server = new Server(getConnection(host, clsid, user, password, domain), if (values != null && values.length > 0) {
Executors.newSingleThreadScheduledExecutor()); List<WriteRequest> ws = new ArrayList();
server.connect(); ItemValue[] var3 = values;
return server; int var4 = values.length;
} catch (Exception e) {
throw new WDKException(e); 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 Exception(var8);
} }
} }
public static ConnectionInformation getConnection(String host, String clsid, String user, String password, public static JIVariant getVariant(Object object) throws Exception {
String domain) { if (object instanceof Integer) {
ConnectionInformation connection = new ConnectionInformation(); return getIntegerVariant((Integer)object);
connection.setHost(host); } else if (object instanceof String) {
connection.setClsid(clsid); return getStringVariant((String)object);
connection.setUser(user); } else if (object instanceof byte[]) {
connection.setPassword(password); return getByteArrayVariant((byte[])((byte[])object));
connection.setDomain(domain); } else if (object instanceof Byte[]) {
return connection; 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 Exception("未实现目前支持是int,string,byte[]");
}
}
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 String read(String item) throws Exception { public static JIVariant getIntegerVariant(Integer integer) {
System.out.println(item); return new JIVariant(integer);
Server server = getServer("192.168.81.251", "7bc0cc8e-482c-47ca-abdc-0fe7f9c6e729", "administrator", "Huawei@123", ""); }
// String byteItemString = "RD1.RD1.1001.mode";
Group group = server.addGroup(); public static JIVariant getStringVariant(String string) {
Item byteItem = group.addItem(item); return new JIVariant(string);
ItemState itemState = null; }
JIVariant value = null;
itemState = byteItem.read(true); public static JIVariant getByteArrayVariant(byte[] bytes) {
value = itemState.getValue(); Byte[] byte_Data = new Byte[bytes.length];
String data = OpcUtl.getValue(byteItem, itemState) + "";
return data; for(int i = 0; i < bytes.length; ++i) {
} byte_Data[i] = bytes[i];
}
public static void main(String[] args) throws Exception {
Server server = getServer("192.168.81.251", "7bc0cc8e-482c-47ca-abdc-0fe7f9c6e729", "administrator", "Huawei@123", ""); JIArray array = new JIArray(byte_Data, false);
String byteItemString = "RD1.RD1.1001.mode"; JIVariant value = new JIVariant(array);
Group group = server.addGroup(); return value;
Item byteItem = group.addItem(byteItemString); }
ItemState itemState = null;
JIVariant value = null; public static JIVariant getByteArrayVariant(Byte[] bytes) {
System.out.println(byteItem.getId()); JIArray array = new JIArray(bytes, false);
itemState = byteItem.read(true); JIVariant value = new JIVariant(array);
System.out.println(itemState.getQuality()); return value;
System.out.println(getValue(byteItem, itemState)); }
static {
checkTimeout();
} }
} }

21
hd/nladmin-system/src/main/java/org/nl/acs/opc/ThreadUtl.java

@ -0,0 +1,21 @@
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);
}
}
}

4
hd/nladmin-system/src/main/java/org/nl/acs/socket/ClientUDWReceive.java

@ -5,8 +5,8 @@ import org.nl.exception.BadRequestException;
import org.nl.logger.BusinessDomain; import org.nl.logger.BusinessDomain;
import org.nl.logger.BusinessLogger; import org.nl.logger.BusinessLogger;
import org.nl.logger.BusinessLoggerFactory; import org.nl.logger.BusinessLoggerFactory;
import org.nl.modules.udw.UnifiedDataAccessor; import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.modules.udw.UnifiedDataAccessorFactory; import org.nl.acs.udw.UnifiedDataAccessorFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
hd/nladmin-system/src/main/java/org/nl/modules/udw/UdwConfig.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/UdwConfig.java

@ -1,4 +1,4 @@
package org.nl.modules.udw; package org.nl.acs.udw;
public class UdwConfig { public class UdwConfig {

2
hd/nladmin-system/src/main/java/org/nl/modules/udw/UnifiedData.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/UnifiedData.java

@ -1,4 +1,4 @@
package org.nl.modules.udw; package org.nl.acs.udw;
import lombok.Data; import lombok.Data;

2
hd/nladmin-system/src/main/java/org/nl/modules/udw/UnifiedDataAccessor.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/UnifiedDataAccessor.java

@ -1,4 +1,4 @@
package org.nl.modules.udw; package org.nl.acs.udw;
import java.util.List; import java.util.List;

6
hd/nladmin-system/src/main/java/org/nl/modules/udw/UnifiedDataAccessorFactory.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/UnifiedDataAccessorFactory.java

@ -1,7 +1,7 @@
package org.nl.modules.udw; package org.nl.acs.udw;
import org.nl.modules.udw.service.impl.UnifiedDataAccessorImpl; import org.nl.acs.udw.service.impl.UnifiedDataAccessorImpl;
import org.nl.modules.udw.service.impl.UnifiedDataAppServiceImpl; import org.nl.acs.udw.service.impl.UnifiedDataAppServiceImpl;
public class UnifiedDataAccessorFactory { public class UnifiedDataAccessorFactory {
public UnifiedDataAccessorFactory() { public UnifiedDataAccessorFactory() {

4
hd/nladmin-system/src/main/java/org/nl/modules/udw/UnifiedDataAppService.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/UnifiedDataAppService.java

@ -1,7 +1,7 @@
package org.nl.modules.udw; package org.nl.acs.udw;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import org.nl.modules.udw.service.impl.UnifiedDataUnit; import org.nl.acs.udw.service.impl.UnifiedDataUnit;
import java.util.List; import java.util.List;

2
hd/nladmin-system/src/main/java/org/nl/modules/udw/dto/UdwDto.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/dto/UdwDto.java

@ -1,4 +1,4 @@
package org.nl.modules.udw.dto; package org.nl.acs.udw.dto;
import lombok.Data; import lombok.Data;

6
hd/nladmin-system/src/main/java/org/nl/modules/udw/service/UdwManageService.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/service/UdwManageService.java

@ -1,7 +1,7 @@
package org.nl.modules.udw.service; package org.nl.acs.udw.service;
import net.sf.json.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.nl.modules.udw.dto.UdwDto; import org.nl.acs.udw.dto.UdwDto;
import java.util.List; import java.util.List;

8
hd/nladmin-system/src/main/java/org/nl/modules/udw/service/impl/UdwManagerServiceImpl.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/service/impl/UdwManagerServiceImpl.java

@ -1,8 +1,8 @@
package org.nl.modules.udw.service.impl; package org.nl.acs.udw.service.impl;
import net.sf.json.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.nl.modules.udw.dto.UdwDto; import org.nl.acs.udw.dto.UdwDto;
import org.nl.modules.udw.service.UdwManageService; import org.nl.acs.udw.service.UdwManageService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;

8
hd/nladmin-system/src/main/java/org/nl/modules/udw/service/impl/UnifiedDataAccessorImpl.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAccessorImpl.java

@ -1,8 +1,8 @@
package org.nl.modules.udw.service.impl; package org.nl.acs.udw.service.impl;
import org.nl.modules.udw.UnifiedData; import org.nl.acs.udw.UnifiedData;
import org.nl.modules.udw.UnifiedDataAccessor; import org.nl.acs.udw.UnifiedDataAccessor;
import org.nl.modules.udw.UnifiedDataAppService; import org.nl.acs.udw.UnifiedDataAppService;
import java.util.List; import java.util.List;

8
hd/nladmin-system/src/main/java/org/nl/modules/udw/service/impl/UnifiedDataAppServiceImpl.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataAppServiceImpl.java

@ -1,10 +1,10 @@
package org.nl.modules.udw.service.impl; package org.nl.acs.udw.service.impl;
import lombok.extern.slf4j.Slf4j; 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.exception.BadRequestException; import org.nl.exception.BadRequestException;
import org.nl.modules.udw.UdwConfig;
import org.nl.modules.udw.UnifiedData;
import org.nl.modules.udw.UnifiedDataAppService;
import java.util.*; import java.util.*;

4
hd/nladmin-system/src/main/java/org/nl/modules/udw/service/impl/UnifiedDataUnit.java → hd/nladmin-system/src/main/java/org/nl/acs/udw/service/impl/UnifiedDataUnit.java

@ -1,7 +1,7 @@
package org.nl.modules.udw.service.impl; package org.nl.acs.udw.service.impl;
import lombok.Data; import lombok.Data;
import org.nl.modules.udw.UnifiedData; import org.nl.acs.udw.UnifiedData;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
Loading…
Cancel
Save