From 4609c711af4edd359040a15b710536c0be02deba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Tue, 29 Jul 2025 20:07:54 +0800
Subject: [PATCH] =?UTF-8?q?solution=20=E5=A2=9E=E5=8A=A0=E6=B5=93=E5=BA=A6?=
 =?UTF-8?q?=E5=92=8C=E7=B3=BB=E6=95=B0=20=E5=90=AF=E7=94=A8=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/SystemConfigController.java     |  1 +
 .../handacid/common/enums/SystemConfigType.java    | 30 ++++++++++++++++++++++
 .../handacid/common/model/entity/Solution.java     |  6 +++++
 .../handacid/common/model/entity/SystemConfig.java |  3 +++
 src/main/resources/sql/init.sql                    | 14 +++++++---
 5 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/com/iflytop/handacid/common/enums/SystemConfigType.java

diff --git a/src/main/java/com/iflytop/handacid/app/controller/SystemConfigController.java b/src/main/java/com/iflytop/handacid/app/controller/SystemConfigController.java
index 9719cf7..6dabfba 100644
--- a/src/main/java/com/iflytop/handacid/app/controller/SystemConfigController.java
+++ b/src/main/java/com/iflytop/handacid/app/controller/SystemConfigController.java
@@ -50,4 +50,5 @@ public class SystemConfigController {
         );
         return success ? Result.success() : Result.failed();
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/iflytop/handacid/common/enums/SystemConfigType.java b/src/main/java/com/iflytop/handacid/common/enums/SystemConfigType.java
new file mode 100644
index 0000000..90f89c0
--- /dev/null
+++ b/src/main/java/com/iflytop/handacid/common/enums/SystemConfigType.java
@@ -0,0 +1,30 @@
+package com.iflytop.handacid.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 通用设备动作枚举
+ */
+public enum SystemConfigType {
+    SOLUTION_TYPE("溶液种类"),
+    CHANNEL_1_VOLUME("通道一溶液使用量"),
+    CHANNEL_2_VOLUME("通道二溶液使用量"),
+    CHANNEL_3_VOLUME("通道三溶液使用量"),
+    CHANNEL_4_VOLUME("通道四溶液使用量"),
+    ;
+
+    /**
+     * 动作的中文描述
+     */
+    @Getter
+    private final String description;
+
+    SystemConfigType(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public String toString() {
+        return name();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/Solution.java b/src/main/java/com/iflytop/handacid/common/model/entity/Solution.java
index 58a07c8..24c8ad1 100644
--- a/src/main/java/com/iflytop/handacid/common/model/entity/Solution.java
+++ b/src/main/java/com/iflytop/handacid/common/model/entity/Solution.java
@@ -14,4 +14,10 @@ public class Solution extends BaseEntity {
 
     @Schema(description = "溶液名称")
     private String name;
+
+    @Schema(description = "溶液浓度")
+    private double concentration;
+
+    @Schema(description = "溶液系数")
+    private double scale;
 }
\ No newline at end of file
diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/SystemConfig.java b/src/main/java/com/iflytop/handacid/common/model/entity/SystemConfig.java
index c776e7e..537c2e1 100644
--- a/src/main/java/com/iflytop/handacid/common/model/entity/SystemConfig.java
+++ b/src/main/java/com/iflytop/handacid/common/model/entity/SystemConfig.java
@@ -18,4 +18,7 @@ public class SystemConfig extends BaseEntity {
 
     @Schema(description = "配置值")
     private String value;
+
+    @Schema(description = "描述")
+    private String description;
 }
\ No newline at end of file
diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql
index e7dd2fd..dcaeadb 100644
--- a/src/main/resources/sql/init.sql
+++ b/src/main/resources/sql/init.sql
@@ -79,6 +79,8 @@ CREATE TABLE IF NOT EXISTS receive_record (
 CREATE TABLE IF NOT EXISTS solution (
     id            INTEGER PRIMARY KEY AUTOINCREMENT,
     name          TEXT,
+    concentration  DOUBLE,
+    scale          DOUBLE,
     create_time   TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     update_time   TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
@@ -86,9 +88,9 @@ CREATE TABLE IF NOT EXISTS solution (
 -- ----------------------------
 -- Records of solution
 -- ----------------------------
-INSERT OR IGNORE INTO solution (id, name) VALUES
-    (1, '盐酸'),
-    (2, '硫酸');
+INSERT OR IGNORE INTO solution (id, name, concentration, scale) VALUES
+    (1, '盐酸', 15, 1.1),
+    (2, '硫酸', 10, 1.2);
 
 -- ----------------------------
 -- Table structure for system_config
@@ -97,9 +99,15 @@ CREATE TABLE IF NOT EXISTS system_config (
     id            INTEGER PRIMARY KEY AUTOINCREMENT,
     key           TEXT,
     value         TEXT,
+    description   TEXT,
     create_time   TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     update_time   TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
+-- ----------------------------
+-- Records of system_config
+-- ----------------------------
+
+
 
 -- ----------------------------
 -- Table structure for system_log