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

rev：自动线程修改

Browse Source
This commit is contained in:
liuxy
2026-07-16 16:43:37 +08:00
parent 1ab6715791
commit e76507fb9e
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java
View File

@@ -53,7 +53,8 @@ public class DeviceExecuteAutoRunable extends AbstractAutoRunnable {
@Override @Override
public void autoRun() throws Exception { public void autoRun() throws Exception {
for (int i = 0; !OpcConfig.OPC_START_TAG; ++i) { // TODO本项目没有OPC
/*for (int i = 0; !OpcConfig.OPC_START_TAG; ++i) {
log.info("设备执行线程等待opc同步线程..."); log.info("设备执行线程等待opc同步线程...");
Thread.sleep(1000L); Thread.sleep(1000L);
if (i > 60) { if (i > 60) {
@@ -87,6 +88,6 @@ public class DeviceExecuteAutoRunable extends AbstractAutoRunnable {
executorService.submit(runnable); executorService.submit(runnable);
} }
} }
} }*/
} }
} }

1
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/controller/AutoRunController.java
View File

@@ -21,6 +21,7 @@ public class AutoRunController {
@Log("查询自动线程") @Log("查询自动线程")
@GetMapping
public ResponseEntity<Object> query(Map map) throws Exception { public ResponseEntity<Object> query(Map map) throws Exception {
List<AutoRunDto> ThreadDtos = autoRunService.findAll(); List<AutoRunDto> ThreadDtos = autoRunService.findAll();
return new ResponseEntity<>(PageUtil.toPage(ThreadDtos, ThreadDtos.size()), HttpStatus.OK); return new ResponseEntity<>(PageUtil.toPage(ThreadDtos, ThreadDtos.size()), HttpStatus.OK);

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java
View File

@@ -2,6 +2,7 @@ package org.nl.acs.autoThread.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.nl.ApplicationAutoInitial; import org.nl.ApplicationAutoInitial;
@@ -79,6 +80,9 @@ public class AutoRunServiceImpl implements AutoRunService, ApplicationAutoInitia
AutoRunDto autoRunDto = new AutoRunDto(); AutoRunDto autoRunDto = new AutoRunDto();
BeanUtil.copyProperties(autoRunnable, autoRunDto, true); BeanUtil.copyProperties(autoRunnable, autoRunDto, true);
Thread thread = code_Thread_Map.get(autoRunnable.getCode()); Thread thread = code_Thread_Map.get(autoRunnable.getCode());
if (ObjectUtil.isEmpty(thread)) {
continue;
}
autoRunDto.setCode(autoRunnable.getCode()); autoRunDto.setCode(autoRunnable.getCode());
autoRunDto.setName(autoRunnable.getName()); autoRunDto.setName(autoRunnable.getName());
autoRunDto.setThread_alive(thread.isAlive()); autoRunDto.setThread_alive(thread.isAlive());