From 271cfc6e837a138806c1e44d72477e0181cbc2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Thu, 31 Jul 2025 11:18:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=BA=B6=E6=B6=B2=E6=B5=93=E5=BA=A6?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iflytop/handacid/app/core/state/ChannelState.java | 4 ++-- .../com/iflytop/handacid/common/model/entity/AuditRecord.java | 2 +- .../java/com/iflytop/handacid/common/model/entity/Channel.java | 2 +- .../com/iflytop/handacid/common/model/entity/Formulation.java | 2 +- .../com/iflytop/handacid/common/model/entity/ReceiveRecord.java | 2 +- .../java/com/iflytop/handacid/common/model/vo/FormulationVO.java | 2 +- src/main/resources/sql/init.sql | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java b/src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java index bfcf915..4b2588e 100644 --- a/src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java +++ b/src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java @@ -32,7 +32,7 @@ public class ChannelState { private volatile String solutionName; @Schema(description = "溶液浓度") - private volatile Integer concentration; + private volatile Double concentration; @Schema(description = "是否选中") private volatile boolean selected = false; @@ -46,7 +46,7 @@ public class ChannelState { @Schema(description = "领取溶液量（单位：mL）") private volatile Double receivedVolume; - public ChannelState(ChannelCode channelCode, Long solutionId, String solutionName, Integer concentration, Double targetVolume, Double receivedVolume, Double currentVolume) { + public ChannelState(ChannelCode channelCode, Long solutionId, String solutionName, Double concentration, Double targetVolume, Double receivedVolume, Double currentVolume) { this.channelCode = channelCode; this.solutionId = solutionId; this.solutionName = solutionName; diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java b/src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java index 25b3567..85df9c5 100644 --- a/src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java +++ b/src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java @@ -25,7 +25,7 @@ public class AuditRecord extends BaseEntity { private String solutionName; @Schema(description = "溶液浓度") - private Integer concentration; + private Double concentration; @Schema(description = "通道Code") private String channelCode; diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/Channel.java b/src/main/java/com/iflytop/handacid/common/model/entity/Channel.java index 4c852f2..8a7d9f0 100644 --- a/src/main/java/com/iflytop/handacid/common/model/entity/Channel.java +++ b/src/main/java/com/iflytop/handacid/common/model/entity/Channel.java @@ -23,7 +23,7 @@ public class Channel extends BaseEntity { private Long solutionId; @Schema(description = "溶液浓度") - private Integer concentration; + private Double concentration; @Schema(description = "添加溶液量") private Double targetVolume; diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java b/src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java index 42737f5..cf3d8f8 100644 --- a/src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java +++ b/src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java @@ -19,7 +19,7 @@ public class Formulation extends BaseEntity { private Long solutionId; @Schema(description = "溶液浓度") - private Integer concentration; + private Double concentration; @Schema(description = "对应转数") private Double revolutions; diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java b/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java index 275c5ce..a09c2ee 100644 --- a/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java +++ b/src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java @@ -36,7 +36,7 @@ public class ReceiveRecord extends BaseEntity { private String solutionName; @Schema(description = "溶液浓度") - private Integer concentration; + private Double concentration; @Schema(description = "领取溶液量") private Double receivedVolume; diff --git a/src/main/java/com/iflytop/handacid/common/model/vo/FormulationVO.java b/src/main/java/com/iflytop/handacid/common/model/vo/FormulationVO.java index 150bbe5..ec4faaf 100644 --- a/src/main/java/com/iflytop/handacid/common/model/vo/FormulationVO.java +++ b/src/main/java/com/iflytop/handacid/common/model/vo/FormulationVO.java @@ -24,7 +24,7 @@ public class FormulationVO{ private String solutionName; @Schema(description = "溶液浓度") - private Integer concentration; + private Double concentration; @Schema(description = "对应转数") private Double revolutions; diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index 7886565..1bdcd5f 100644 --- a/src/main/resources/sql/init.sql +++ b/src/main/resources/sql/init.sql @@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS audit_record( user_nickname TEXT,--用户昵称 solution_id INTEGER,--溶液id solution_name TEXT,--溶液名称 - concentration INTEGER,--溶液浓度 + concentration REAL,--溶液浓度 channel_code TEXT,--通道code used_volume TEXT,--使用溶液量 create_time TEXT DEFAULT CURRENT_TIMESTAMP, @@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS receive_record ( receiver_nickname TEXT,--领取人昵称 solution_id INTEGER,--溶液id solution_name TEXT,--溶液名称 - concentration INTEGER,--溶液浓度 + concentration REAL,--溶液浓度 received_volume REAL,--领取溶液量 channel_code TEXT,--通道code create_time TEXT DEFAULT CURRENT_TIMESTAMP, @@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS channel ( name TEXT,--通道名称 code TEXT,--通道code solution_id INTEGER,--绑定的溶液id - concentration INTEGER,--溶液浓度 + concentration REAL,--溶液浓度 target_volume REAL,--添加溶液量 current_volume REAL,--当前溶液量 received_volume REAL,--领取溶液量 @@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS formulation ( id INTEGER PRIMARY KEY AUTOINCREMENT, volume REAL,--加液量 solution_id INTEGER,--溶液id - concentration INTEGER,--溶液浓度 + concentration REAL,--溶液浓度 revolutions REAL,--对应转数 create_time TEXT DEFAULT CURRENT_TIMESTAMP, update_time TEXT DEFAULT CURRENT_TIMESTAMP