Merge remote-tracking branch 'origin/master'

pom.xml

@@ -109,6 +109,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>

src/main/java/a8k/BoditechA800Application.java

@@ -1,21 +1,16 @@
 package a8k;
 
 
-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;
 
-@SpringBootApplication
 @Slf4j
+@SpringBootApplication
 public class BoditechA800Application implements ApplicationListener<ContextRefreshedEvent> {
 
     @Resource
@@ -27,7 +22,8 @@ public class BoditechA800Application implements ApplicationListener<ContextRefre
 
     }
 
-	@Override public void onApplicationEvent(ContextRefreshedEvent event) {
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
 //		if (null == event.getApplicationContext().getParent()) {
 //			log.info("Springboot加载完成");
 //			try {

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;
 

src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java

@@ -282,6 +282,7 @@ public class MainFlowCtrlScheduler implements ApplicationListener<ApplicationSta
 
 	void workFn() {
 		while (workThread.isAlive()) {
+            try{
                 var state = deviceWorkStateMgrService.getDeviceWorkState();
                 if (state.fatalErrorFlag) {
                     OS.forceSleep(500);
@@ -296,6 +297,9 @@ public class MainFlowCtrlScheduler implements ApplicationListener<ApplicationSta
 
                 onPostProcessing();
                 OS.forceSleep(500);
+            } catch (Exception e) {
+                log.error("workFn error {}", e.getMessage(), e);
+            }
 		}
 	}
 

src/main/resources/application.yml

@@ -8,6 +8,7 @@ device.enableCanBus: true
 
 iflytophald:
   #  ip: 192.168.8.10
+  # ip: 192.168.8.10
   ip: 127.0.0.1
   cmdch.port: 19004
   datach.port: 19005
@@ -40,3 +41,4 @@ springdoc:
     enabled: true # 开启swagger界面，依赖OpenApi，需要OpenApi同时开启
     path: /doc/apitest.html # 自定义路径，默认为"/swagger-ui/index.html
     operationsSorter: method # 接口按照方法排序
+