From 93f1ba0d7767e65d44396aec59a65f9d627ed9d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 7 Mar 2024 11:20:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=94=BE=E8=A7=86=E8=A7=89=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhehekeji/web/config/ConfigProperties.java | 10 ++++++++++ web/src/main/resources/application-prod.yml | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java index eedadd4..6c5c908 100644 --- a/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java +++ b/web/src/main/java/com/zhehekeji/web/config/ConfigProperties.java @@ -5,6 +5,8 @@ import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; +import java.util.List; + @Component @ConfigurationProperties @Data @@ -44,7 +46,15 @@ public class ConfigProperties { private VisualSense visualSense; private Integer orderTest = 0; private String productDoc; + private List smokeBoxTypeList; + @Data + public static class SmokeBoxType{ + private Integer type= 1; + private String name= "古20"; + private Integer numOfLayers= 1; + private Integer numLayers= 6; + } @Data public static class VisualSense{ //连接视觉控制的url diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index a4be205..5e7d3ab 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -108,4 +108,12 @@ asyncExecutorThread: #订单测试 orderTest: 1 #品规文档 -productDoc: "C:/Users/昊天/Desktop/新建 文本文档 (3).txt" \ No newline at end of file +productDoc: "C:/Users/昊天/Desktop/新建 文本文档 (3).txt" + +smokeBoxType: + - type: 1 + name: 古20 + #用于视觉的一层个数 + numOfLayers: 1 + #用于计算总数的个数 + numLayers: 6