From f249892e8a5482330997bacc76d75d1f51be70a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Wed, 23 Apr 2025 09:50:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainflowctrl/MainFlowCtrlScheduler.java | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java index eb2cf1f..0f612c8 100644 --- a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java @@ -282,20 +282,24 @@ public class MainFlowCtrlScheduler implements ApplicationListener onIDLE(); - case WORKING -> onWorking(); - case PAUSE -> onPause(); - } - - onPostProcessing(); - OS.forceSleep(500); + try{ + var state = deviceWorkStateMgrService.getDeviceWorkState(); + if (state.fatalErrorFlag) { + OS.forceSleep(500); + continue; + } + + switch (state.workState) { + case IDLE -> onIDLE(); + case WORKING -> onWorking(); + case PAUSE -> onPause(); + } + + onPostProcessing(); + OS.forceSleep(500); + } catch (Exception e) { + log.error("workFn error {}", e.getMessage(), e); + } } } From 6ebc1dcfbd6460a1dcbfb116e67ee45aaaaddce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Wed, 23 Apr 2025 10:46:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0spring=20boot=20admin=20?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=8A=A8=E6=80=81=E7=AE=A1=E7=90=86=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=B8=8E=E6=80=A7=E8=83=BD=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++++++++++++ src/main/java/a8k/BoditechA800Application.java | 4 +++- src/main/java/a8k/app/constant/AppConstant.java | 2 +- src/main/resources/application.yml | 11 +++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 19f2eb7..08549d0 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,18 @@ org.springframework.boot spring-boot-starter-actuator + + + de.codecentric + spring-boot-admin-starter-server + 3.3.6 + + + de.codecentric + spring-boot-admin-starter-client + 3.3.6 + + org.springframework.boot spring-boot-starter-thymeleaf diff --git a/src/main/java/a8k/BoditechA800Application.java b/src/main/java/a8k/BoditechA800Application.java index a3c19d9..3e63344 100644 --- a/src/main/java/a8k/BoditechA800Application.java +++ b/src/main/java/a8k/BoditechA800Application.java @@ -1,6 +1,7 @@ package a8k; +import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.core.env.Environment; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; @@ -14,8 +15,9 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; -@SpringBootApplication @Slf4j +@SpringBootApplication +@EnableAdminServer public class BoditechA800Application implements ApplicationListener { @Resource diff --git a/src/main/java/a8k/app/constant/AppConstant.java b/src/main/java/a8k/app/constant/AppConstant.java index 8e59cca..dd5f2ed 100644 --- a/src/main/java/a8k/app/constant/AppConstant.java +++ b/src/main/java/a8k/app/constant/AppConstant.java @@ -5,7 +5,7 @@ public class AppConstant { public static final int CONSUMABLE_COL_NUM = 5; public static final int CONSUMABLE_ROW_NUM = 5; public static final int TIP_NUM = 120; - public static final String APP_VERSION = "1.1.5"; + public static final String APP_VERSION = "1.1.6"; public static final int CONSUMABLE_CHANNEL_NUM = 6; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 63a5056..2de9999 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -31,6 +31,11 @@ spring: jackson: serialization: write-dates-as-timestamps: true + boot: + admin: + context-path: /admin + client: + url: http://127.0.0.1/admin springdoc: api-docs: @@ -40,3 +45,9 @@ springdoc: enabled: true # 开启swagger界面，依赖OpenApi，需要OpenApi同时开启 path: /doc/apitest.html # 自定义路径，默认为"/swagger-ui/index.html operationsSorter: method # 接口按照方法排序 + +management: + endpoints: + web: + exposure: + include: health,info,loggers,env,metrics From 3974db47e14f52cb33beab6e64469a1e1bc9b329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Wed, 23 Apr 2025 11:11:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=80=E5=9B=9E=EF=BC=8Cspring=20boot=20?= =?UTF-8?q?admin=E8=BF=98=E6=98=AF=E7=8B=AC=E7=AB=8B=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=BF=90=E8=A1=8C=E6=AF=94=E8=BE=83=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 ----------- src/main/java/a8k/BoditechA800Application.java | 24 +++++++++--------------- src/main/resources/application.yml | 11 +---------- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 08549d0..6fb942c 100644 --- a/pom.xml +++ b/pom.xml @@ -111,17 +111,6 @@ - de.codecentric - spring-boot-admin-starter-server - 3.3.6 - - - de.codecentric - spring-boot-admin-starter-client - 3.3.6 - - - org.springframework.boot spring-boot-starter-thymeleaf diff --git a/src/main/java/a8k/BoditechA800Application.java b/src/main/java/a8k/BoditechA800Application.java index 3e63344..8ed0f0c 100644 --- a/src/main/java/a8k/BoditechA800Application.java +++ b/src/main/java/a8k/BoditechA800Application.java @@ -1,35 +1,29 @@ package a8k; -import de.codecentric.boot.admin.server.config.EnableAdminServer; -import org.springframework.core.env.Environment; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ApplicationListener; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Component; +import org.springframework.core.env.Environment; @Slf4j @SpringBootApplication -@EnableAdminServer public class BoditechA800Application implements ApplicationListener { - @Resource - private Environment env; + @Resource + private Environment env; - public static void main(String[] args) { - SpringApplication.run(BoditechA800Application.class, args); + public static void main(String[] args) { + SpringApplication.run(BoditechA800Application.class, args); - } + } - @Override public void onApplicationEvent(ContextRefreshedEvent event) { + @Override + public void onApplicationEvent(ContextRefreshedEvent event) { // if (null == event.getApplicationContext().getParent()) { // log.info("Springboot加载完成"); // try { @@ -39,5 +33,5 @@ public class BoditechA800Application implements ApplicationListener