From fe9bbce33cbb1cbb22bcc945da867ff09b623b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?= <9463626+zhou-junjiezjj@user.noreply.gitee.com> Date: Wed, 6 Dec 2023 17:13:51 +0800 Subject: [PATCH] fix:auto --- .../main/java/org/nl/acs/auto/AcsInit.java | 8 +++- .../org/nl/acs/auto/AutoRunController.java | 7 ++- .../auto/initial/ApplicationAutoInitial.java | 14 +++++- .../ApplicationAutoInitialExecuter.java | 13 +++++- .../nl/acs/auto/initial/WebAutoInitial.java | 11 ++++- .../auto/initial/WebAutoInitialExecuter.java | 6 +++ .../nl/acs/auto/run/AbstractAutoRunnable.java | 24 ++++++++-- .../org/nl/acs/auto/run/AutoRunService.java | 46 +++++++++++++++++-- .../nl/acs/auto/run/AutoRunServiceImpl.java | 27 +++++++++-- .../org/nl/acs/auto/run/DevelopConfig.java | 15 ++++-- .../run/OneNDCSocketConnectionAutoRun.java | 19 ++++---- .../org/nl/acs/auto/run/SystemConfig.java | 23 ++++++++-- .../java/org/nl/acs/auto/run/ThreadDto.java | 7 ++- .../org/nl/acs/auto/run/ThreadStatusEnum.java | 8 +++- .../nl/acs/auto/run/ThreadUsedStatusEnum.java | 9 +++- 15 files changed, 194 insertions(+), 43 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java index 01af2d3..4429bcb 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AcsInit.java @@ -9,7 +9,6 @@ import org.springframework.boot.ApplicationRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; - /** * 随项目启动模块 */ @@ -17,7 +16,12 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor @Order(50) -//@ConditionalOnProperty(value = "spring.profiles.active",havingValue = "prod") +/** + * Demo class + *@ConditionalOnProperty(value = "spring.profiles.active",havingValue = "prod") + * @author zhoujj + * @date 2023/12/06 + */ public class AcsInit implements ApplicationRunner { private final ApplicationAutoInitialExecuter applicationAutoInitialExecuter; private final WebAutoInitialExecuter webAutoInitialExecuter; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java index 11059db..aecf369 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/AutoRunController.java @@ -23,6 +23,12 @@ import java.util.Map; @RequestMapping("/api/autorun") @Api(tags = "系统：查询自动线程") @RequiredArgsConstructor +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public class AutoRunController { @Autowired @@ -32,7 +38,6 @@ public class AutoRunController { @Log("查询自动线程") @GetMapping public ResponseEntity query(Map map) throws Exception { - //List ThreadDtos = autoRunService.findByCondition(map); List ThreadDtos = autoRunService.findAll(); return new ResponseEntity<>(PageUtil.toPage(ThreadDtos, ThreadDtos.size()), HttpStatus.OK); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java index 9afb3e5..8329edd 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitial.java @@ -1,6 +1,18 @@ package org.nl.acs.auto.initial; -//DeviceOpcProtocolRunable-----DeviceOpcSynchronizeAutoRun----AbstractAutoRunable-----AutoRunServiceImpl----- WebAutoInitialExecuter +/** + * Demo class + * + * + * @author zhoujj + * @date 2023/12/06 + * //DeviceOpcProtocolRunable-----DeviceOpcSynchronizeAutoRun----AbstractAutoRunable-----AutoRunServiceImpl----- WebAutoInitialExecuter + * + */ public interface ApplicationAutoInitial { + /** + * + * @throws Exception + */ void autoInitial() throws Exception; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java index f596e49..b54dd1d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/ApplicationAutoInitialExecuter.java @@ -7,7 +7,12 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Iterator; import java.util.List; - +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ @Component public class ApplicationAutoInitialExecuter { /** @@ -15,7 +20,11 @@ public class ApplicationAutoInitialExecuter { */ @Autowired(required = false) List applicationAutoInitial; - //是否启动 + /** + * + * 是否启动 + * + */ private final static boolean IS_AUTO_THREAD_CODE = true; public void init() throws Exception { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java index 8f59413..b3bb3fe 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitial.java @@ -1,5 +1,14 @@ package org.nl.acs.auto.initial; - +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public interface WebAutoInitial { + /** + * + * @throws Exception + */ void autoInitial() throws Exception; } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java index dd7414b..2d5d705 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/initial/WebAutoInitialExecuter.java @@ -10,6 +10,12 @@ import java.util.List; @Component @Lazy(false) +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public class WebAutoInitialExecuter { @Autowired(required = false) List webAutoInitial; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java index 0239026..53474e9 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AbstractAutoRunnable.java @@ -5,6 +5,12 @@ import lombok.extern.slf4j.Slf4j; import java.util.Date; @Slf4j +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public abstract class AbstractAutoRunnable implements Runnable { private ThreadStatusEnum status; private Date startTime; @@ -26,8 +32,6 @@ public abstract class AbstractAutoRunnable implements Runnable { this.setStopMessage(true_clear); } catch (Throwable arg5) { log.warn("", arg5); - System.out.println(arg5.getMessage()); - // this.setStopMessage(ExceptionUtlEx.getSimpleTrace(arg5)); } finally { this.setStopTime(new Date()); this.setStatus(ThreadStatusEnum.stop); @@ -53,15 +57,25 @@ public abstract class AbstractAutoRunnable implements Runnable { public Boolean getForbidDisable() { return Boolean.valueOf(false); } - + /** + *getCode + * @return Code + */ public abstract String getCode(); - + /** + *getName + * @return Name + */ public abstract String getName(); public String getDescription() { return this.getName(); } - + /** + *autoRun + * @return autoRun + * @throws + */ public abstract void autoRun() throws Exception; public ThreadStatusEnum getStatus() { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java index 24651ce..41057ca 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunService.java @@ -2,17 +2,57 @@ package org.nl.acs.auto.run; import java.util.List; import java.util.Map; +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public interface AutoRunService { + /** + * 开始线程 + * + * @param arg0 条件 + * @return / + */ void startThread(String arg0); + /** + * 结束线程 + * + * @param arg0 条件 + * @return / + */ void stopThread(String arg0); + /** + * 通过编号查找 + * + * @param arg0 条件 + * @param arg1 条件 + * @return / + */ ThreadDto findByCode(String arg0, String arg1); - + /** + * 查找全部 + * + * + * @return / + */ List findAll(); - + /** + * 通过条件得到 + * + * @param whereJson 条件 + * @return / + */ List findByCondition(Map whereJson); - + /** + * 通过编码得到线程 + * + * @param code 条件 + * @return / + */ Thread getThreadByCode(String code); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java index c1f4b98..a5708c7 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/AutoRunServiceImpl.java @@ -20,14 +20,31 @@ import java.util.*; */ @Service @Slf4j +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public class AutoRunServiceImpl implements AutoRunService, ApplicationAutoInitial { @Autowired(required = false) private List abstractAutoRunnableList; - private List thread_autoRun = new ArrayList(); // 线程类 - private List autoRun_code_index = new ArrayList(); // key - private List threads = new ArrayList(); // 运行线程 - private List thread_code_index = new ArrayList(); // key - + /** + * 线程类 + */ + private List thread_autoRun = new ArrayList(); + /** + * key + */ + private List autoRun_code_index = new ArrayList(); + /** + * 运行线程 + */ + private List threads = new ArrayList(); + /** + * key + */ + private List thread_code_index = new ArrayList(); @Override public synchronized void startThread(String threadCode) { Thread thread = this.getThreadByCode(threadCode); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java index 5de361e..7efc94a 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/DevelopConfig.java @@ -2,11 +2,20 @@ package org.nl.acs.auto.run; import java.util.ArrayList; import java.util.List; - +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public class DevelopConfig { - //@DictionaryItem(description = "开发的选项只有当开发为true的时候才生效") + /** + * 开发的选项只有当开发为true的时候才生效 + */ public static Boolean develop = Boolean.valueOf(true); - //@DictionaryItem(description = "强制关闭的自启动线程") + /** + * 强制关闭的自启动线程 + */ public static List thread_auto_run_force_stop = new ArrayList(); static { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index f3d6c38..71347a3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -30,8 +30,12 @@ import java.util.Date; import java.util.List; import static org.nl.acs.agv.server.impl.NDCAgvServiceImpl.Bytes2HexString; - - +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ @Slf4j @Component public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { @@ -62,11 +66,11 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { public OneNDCSocketConnectionAutoRun() { this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut); } - + @Override public String getCode() { return OneNDCSocketConnectionAutoRun.class.getSimpleName(); } - + @Override public String getName() { return "NDC在线连接"; } @@ -112,7 +116,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { bs.append(temp < 16 ? bs1.append(Integer.toHexString(temp)) : Integer.toHexString(temp)); } - //System.out.println("收到请求参数：" + bs); boolean flag = false; if (arr[8] * 256 + arr[9] == 0x73) { byte[] data = null; @@ -219,12 +222,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { System.out.println("Agv链接异常"); log.info("Agv链接异常"); log.error("agv连接出现异常:{}", e); -// logServer.deviceExecuteLog("1", "", "", "agv异常" + e.getMessage()); -// logServer.deviceExecuteLog("1", "", "", "agv异常" + e); -// LuceneLogDto logDto = new LuceneLogDto(); -// logDto.setContent("agv异常" + e.getMessage()); -// logDto.setDevice_code("1001"); -// luceneExecuteLogService.deviceExecuteLog(logDto); if (ObjectUtil.isNotEmpty(s)) { s.close(); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java index 93653e3..aea4589 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/SystemConfig.java @@ -1,12 +1,25 @@ package org.nl.acs.auto.run; - +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public class SystemConfig { - //@DictionaryItem(description = "当前系统编码与其他系统通信对接的时候需要用到此编码") + /** + * 当前系统编码与其他系统通信对接的时候需要用到此编码 + */ public static String system_code = "wcs10"; - // @DictionaryItem(description = "默认用户密码") + /** + * 默认用户密码 + */ public static String default_password = "1"; - // @DictionaryItem(description = "默认序列创建初始值") + /** + * 默认序列创建初始值 + */ public static Integer sequence_initial_value = Integer.valueOf(1); - //@DictionaryItem(description = "主线程是否自动开启选项") + /** + * 主线程是否自动开启选项 + */ public static Boolean thread_auto_run = Boolean.valueOf(true); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java index 7a122b0..03f0260 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadDto.java @@ -1,7 +1,12 @@ package org.nl.acs.auto.run; import java.util.Date; - +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public class ThreadDto { private String code; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java index 12652a6..6fade68 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadStatusEnum.java @@ -1,6 +1,12 @@ package org.nl.acs.auto.run; - +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public enum ThreadStatusEnum { + //create 创建 create("创建", 1), run("运行", 2), stop("停止", 3); private String description; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java index deda8a1..4ffb8ad 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/ThreadUsedStatusEnum.java @@ -1,7 +1,12 @@ package org.nl.acs.auto.run; - +/** + * Demo class + * + * @author zhoujj + * @date 2023/12/06 + */ public enum ThreadUsedStatusEnum { - + //used 使用 used("使用", 1), unUsed("未使用", 2); private String description;