root/xinFengTianNeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ndc反馈改119&取消指令不取消任务&device设备同步线程初始化优化

Browse Source
This commit is contained in:
psh
2024-06-19 18:04:04 +08:00
parent cd6a0b9d92
commit a2811875ad
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,7 +150,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
(byte) 0X00, (byte) 0X6D, (byte) 0X00, (byte) 0X6D,
(byte) 0X00, (byte) 0X08, (byte) 0X00, (byte) 0X08,
(byte) indexhigh, (byte) indexlow, (byte) indexhigh, (byte) indexlow,
(byte) 0X01, (byte) 0X12, (byte) 0X01, (byte) 0X19,
(byte) phasehigh, (byte) phaselow, (byte) phasehigh, (byte) phaselow,
(byte) nextPointHigh,(byte) nextPointLow (byte) nextPointHigh,(byte) nextPointLow
}; };

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -1195,7 +1195,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
return; return;
} }
removeByCodeFromCache(entity.getInstruction_code()); removeByCodeFromCache(entity.getInstruction_code());
taskService.cancel(entity.getTask_id()); // taskService.cancel(entity.getTask_id());
} }
@Override @Override

10
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceAppServiceImpl.java
View File

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
/** /**
* @author 20220102CG\noblelift * @author 20220102CG\noblelift
@@ -244,13 +245,12 @@ public class DeviceAppServiceImpl implements DeviceAppService, ApplicationAutoIn
@Override @Override
public <T extends DeviceDriver> List<T> findDeviceDriver(Class<T> clazz) { public <T extends DeviceDriver> List<T> findDeviceDriver(Class<T> clazz) {
List<T> list = new ArrayList(); List<T> list = new ArrayList<>();
Iterator var3 = this.findAllDevice().iterator(); List<Device> devices = new CopyOnWriteArrayList<>(this.findAllDevice());
while (var3.hasNext()) { for (Device device : devices) {
Device device = (Device) var3.next();
DeviceDriver deviceDriver = device.getDeviceDriver(); DeviceDriver deviceDriver = device.getDeviceDriver();
//查找某驱动的所有子类 // 查找某驱动的所有子类
if (deviceDriver != null && clazz.isAssignableFrom(deviceDriver.getClass())) { if (deviceDriver != null && clazz.isAssignableFrom(deviceDriver.getClass())) {
list.add((T) device.getDeviceDriver()); list.add((T) device.getDeviceDriver());
} }