From 1abc7e540292201766ac163d4dce7b32949c7c1d Mon Sep 17 00:00:00 2001
From: senzhi <10983298651@qq.com>
Date: Wed, 21 Jan 2026 14:16:50 +0800
Subject: [PATCH] fix:修改项目为组件
---
/dev/null | 11 -----------
src/main/java/com/eternal/rfid/params/UF3ReaderConfig.java | 20 ++++++++++----------
src/main/java/com/eternal/rfid/RfidReaderServer.java | 3 +--
3 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/eternal/rfid/RfidReaderServer.java b/src/main/java/com/eternal/rfid/RfidReaderServer.java
index 9b3ace9..89c8eca 100644
--- a/src/main/java/com/eternal/rfid/RfidReaderServer.java
+++ b/src/main/java/com/eternal/rfid/RfidReaderServer.java
@@ -46,7 +46,7 @@
/**
* 是否允许读写器工作
*/
- private boolean enableWork = true;
+ private boolean enableWork = false;
public void setEnableWork(boolean enableWork) {
log.info("RfidReaderServer work mode changed. from {} --> {}", this.enableWork, enableWork);
@@ -72,7 +72,6 @@
}
UF3RFIDReader uf3RFIDReader = new UF3RFIDReader(readerKey, "uf3-rfid-reader", antennasKey, "reader-antenna");
readers.add(uf3RFIDReader);
- start();
}
@Override
diff --git a/src/main/java/com/eternal/rfid/Uf3ReaderApplication.java b/src/main/java/com/eternal/rfid/Uf3ReaderApplication.java
deleted file mode 100644
index ad3e80f..0000000
--- a/src/main/java/com/eternal/rfid/Uf3ReaderApplication.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.eternal.rfid;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import com.eternal.rfid.params.UF3ReaderConfig;
-
-@SpringBootApplication
-@EnableScheduling
-public class Uf3ReaderApplication {
- public static void main(String[] args) {
- SpringApplication.run(Uf3ReaderApplication.class, args);
- }
-}
-
diff --git a/src/main/java/com/eternal/rfid/enums/RFIDReaderStatusEnum.java b/src/main/java/com/eternal/rfid/enums/RFIDReaderStatusEnum.java
deleted file mode 100644
index 892e4c3..0000000
--- a/src/main/java/com/eternal/rfid/enums/RFIDReaderStatusEnum.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.eternal.rfid.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@AllArgsConstructor
-@Getter
-public enum RFIDReaderStatusEnum {
-
- ANTENNA_OFFLINE("antenna-offline", "天线离线", "天线离线");
-
- private final String key;
-
- private final String name;
-
- private final String description;
-}
diff --git a/src/main/java/com/eternal/rfid/params/UF3ReaderConfig.java b/src/main/java/com/eternal/rfid/params/UF3ReaderConfig.java
index b5eb81f..f11b448 100644
--- a/src/main/java/com/eternal/rfid/params/UF3ReaderConfig.java
+++ b/src/main/java/com/eternal/rfid/params/UF3ReaderConfig.java
@@ -10,33 +10,33 @@
@Module(type = "东集读写器",name = "东集写器配置参数")
public class UF3ReaderConfig {
@Param(key = "component.reader.ip", defaultValue = "192.168.0.250", name = "读写器IP", fixed = true, description = "读写器IP")
- private String ip="192.168.0.250";
+ private String ip;
@Param(key = "component.reader.readerKey", defaultValue = "uf3-reader", name = "读写器KEY", fixed = true, description = "读写器KEY")
- private String readerKey="uf3-reader";
+ private String readerKey;
@Param(key = "component.reader.readerName", defaultValue = "东集读写器", name = "读写器名称", fixed = true, description = "读写器名称")
- private String readerName="东集读写器";
+ private String readerName;
@Param(key = "component.reader.port", defaultValue = "27011", name = "端口", fixed = true, description = "读写器端口")
- private int port=27011;
+ private int port;
@Param(key = "component.reader.readType", defaultValue = "4", name = "读写器类型", fixed = true, description = "读写器类型，当前连接的是几口设备，例如4，连的是4天线口设备；16表示连接的16天线口设备")
- private int readType = 4;
+ private int readType;
@Param(key = "component.reader.readLogOn_Off", defaultValue = "0", name = "日志开关", fixed = true, description = "日志开关。0-关；1-开")
- private int readLogOn_Off=0;
+ private int readLogOn_Off;
@Param(key = "component.reader.antennaPower", defaultValue = "22,22,22,26", name = "读写器功率", fixed = true, description = "读写器功率")
- private String antennasPower="22,22,22,26";
+ private String antennasPower;
@Param(key = "component.rfid.reader.mode", defaultValue = "epc", name = "读模式", description = "epc,user,tid")
- private String mode="epc";
+ private String mode;
@Param(key = "component.rfid.reader.read.log", defaultValue = "true", name = "是否打印读写日志", description = "是否打印读写日志")
- private boolean rfidReaderReadLog=true;
+ private boolean rfidReaderReadLog;
@Param(key = "component.rfid.reader.type", defaultValue = "uf3Reader", name = "设备类型", description = "RFID设备类型")
- private String equipType="uf3Reader";
+ private String equipType;
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 5ebdd89..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-spring.application.name=UF3ReaderDemo
-
-component.reader.ip=192.168.0.250
-component.reader.readerKey=uf3-reader
-component.reader.readerName=?????
-component.reader.port=27011
-component.reader.readType=4
-component.reader.readLogOn_Off=0
-component.reader.antennaPower=22,22,22,26
-component.rfid.reader.read.log=false
-component.rfid.reader.type=uf3Reader
--
Gitblit v1.9.3