From fab191eb70b8bbdba0bc2a215bbaf080741321a5 Mon Sep 17 00:00:00 2001 From: ytfl <ytfl@qq.com> Date: 星期三, 25 六月 2025 15:30:45 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/properties/SlaveProperties.java | 40 +++++++++++++++++++++++++++++++++++----- 1 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/core/properties/SlaveProperties.java b/src/main/java/com/zy/core/properties/SlaveProperties.java index ad23f6a..079a641 100644 --- a/src/main/java/com/zy/core/properties/SlaveProperties.java +++ b/src/main/java/com/zy/core/properties/SlaveProperties.java @@ -1,28 +1,58 @@ package com.zy.core.properties; import com.zy.core.Slave; +import com.zy.core.model.CrnSlave; +import com.zy.core.model.DevpSlave; +import com.zy.core.model.LedSlave; +import com.zy.core.model.RgvSlave; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import java.util.ArrayList; import java.util.List; /** * Created by vincent on 2020/8/4 + * + */ + +/** + * 璇ョ被鏁翠釜灏辨槸涓�涓�氳繃閰嶇疆鏂囦欢鏉ュ疄浣撳寲瀵硅薄绫� */ @Data @Configuration @ConfigurationProperties(prefix = "wcs-slave") public class SlaveProperties { - private List<Slave> crn; + private boolean doubleDeep; - private List<Slave> devp; + private List<Integer> doubleLocs = new ArrayList<>(); - private List<Slave> barcode; + // 宸︽繁搴撲綅鎺掑彿 + private List<Integer> doubleLocsLeft = new ArrayList<>(); + // 鍙虫繁搴撲綅鎺掑彿 + private List<Integer> doubleLocsRight = new ArrayList<>(); - private List<Slave> led; + // 宸︽祬搴撲綅鎺掑彿 + private List<Integer> shallowLocsLeft = new ArrayList<>(); + // 鍙虫祬搴撲綅鎺掑彿 + private List<Integer> shallowLocsRight = new ArrayList<>(); - private List<Slave> scale; + private int groupCount; + + private List<CrnSlave> crn = new ArrayList<>(); + + private List<DevpSlave> devp = new ArrayList<>(); + + private List<Slave> barcode = new ArrayList<>(); + + private List<LedSlave> led = new ArrayList<>(); + + private List<Slave> scale = new ArrayList<>(); + + private List<Slave> car = new ArrayList<>(); + + private List<RgvSlave> rgv = new ArrayList<>(); } -- Gitblit v1.9.1