From 1bfb3738a3560bf106e6751bffea9fb42e71c402 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 13 一月 2026 15:28:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/properties/SlaveProperties.java | 84 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 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..dcf9f4c 100644
--- a/src/main/java/com/zy/core/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/core/properties/SlaveProperties.java
@@ -1,28 +1,102 @@
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.RFIDSlave;
+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 int groupCount;
- private List<Slave> led;
+ /**
+ * 妫�鏌ュ爢鍨涙満鍑哄簱绔欑姸鎬�
+ * true: 妫�鏌ュ嚭搴撶珯鐘舵�侊紙榛樿鍊硷級
+ * false: 涓嶆鏌ワ紝榛樿鍑哄簱绔欏彲鐢�
+ */
+ private boolean checkOutStationStatus = true;
- private List<Slave> scale;
+ 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<>();
+
+ private List<RFIDSlave> rfid = new ArrayList<>();
+
+ /**
+ * RFID鍏ㄥ眬閰嶇疆
+ */
+ private RFIDConfig rfidConfig = new RFIDConfig();
+
+ @Data
+ public static class RFIDConfig {
+ /**
+ * 閲嶈繛闂撮殧锛堢锛�
+ */
+ private Integer reconnectInterval = 5;
+
+ /**
+ * 鏍囩妫�娴嬮棿闅旓紙姣锛�
+ */
+ private Integer tagScanInterval = 500;
+
+ /**
+ * 鏍囩鎵弿鏃堕棿锛堝崟浣�: 100ms锛岄粯璁�10=1绉掞級
+ */
+ private Integer tagScanTime = 10;
+
+ /**
+ * 鑾峰彇閲嶈繛闂撮殧锛屽鏋滄湭閰嶇疆鍒欒繑鍥為粯璁ゅ��
+ */
+ public Integer getReconnectInterval() {
+ return reconnectInterval != null ? reconnectInterval : 5;
+ }
+
+ /**
+ * 鑾峰彇鏍囩妫�娴嬮棿闅旓紝濡傛灉鏈厤缃垯杩斿洖榛樿鍊�
+ */
+ public Integer getTagScanInterval() {
+ return tagScanInterval != null ? tagScanInterval : 500;
+ }
+
+ /**
+ * 鑾峰彇鏍囩鎵弿鏃堕棿锛屽鏋滄湭閰嶇疆鍒欒繑鍥為粯璁ゅ��
+ */
+ public Integer getTagScanTime() {
+ return tagScanTime != null ? tagScanTime : 10;
+ }
+ }
}
--
Gitblit v1.9.1