fix:调整数据库表结构、实体结构

src/main/java/com/iflytop/handacid/app/controller/AuditRecordController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.iflytop.handacid.app.common.utils.UsbDriverUtil;
 import com.iflytop.handacid.common.base.BasePageQuery;
 import com.iflytop.handacid.common.model.entity.AuditRecord;
-import com.iflytop.handacid.common.model.entity.Formulation;
 import com.iflytop.handacid.common.result.PageResult;
 import com.iflytop.handacid.common.result.Result;
 import com.iflytop.handacid.common.service.AuditRecordService;
@@ -12,7 +11,6 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -22,11 +20,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+
 /**
  * 审计
  */
@@ -103,11 +101,11 @@ public class AuditRecordController {
             AuditRecord record = list.get(i);
             Row row = sheet.createRow(i + 1);
             row.createCell(0).setCellValue(record.getId());
-                row.createCell(1).setCellValue(record.getUserName());
+            row.createCell(1).setCellValue(record.getUserNickname());
             row.createCell(2).setCellValue(record.getSolutionName());
             row.createCell(3).setCellValue(record.getConcentration());
-                row.createCell(4).setCellValue(record.getChannelId() != null ? record.getChannelId() : 0);
-                row.createCell(5).setCellValue(record.getVolume());
+            row.createCell(4).setCellValue(record.getChannelCode());
+            row.createCell(5).setCellValue(record.getUsedVolume());
             row.createCell(6).setCellValue(record.getCreateTime() != null ? record.getCreateTime().toString() : "");
             row.createCell(7).setCellValue(record.getUpdateTime() != null ? record.getUpdateTime().toString() : "");
         }

src/main/java/com/iflytop/handacid/app/controller/ReceiveRecordController.java

@@ -103,12 +103,12 @@ public class ReceiveRecordController {
             ReceiveRecord record = list.get(i);
             Row row = sheet.createRow(i + 1);
             row.createCell(0).setCellValue(record.getId());
-            row.createCell(1).setCellValue(record.getUserName());
-            row.createCell(2).setCellValue(record.getReceiver());
+            row.createCell(1).setCellValue(record.getIssuerNickname());
+            row.createCell(2).setCellValue(record.getReceiverNickname());
             row.createCell(3).setCellValue(record.getSolutionName());
             row.createCell(4).setCellValue(record.getConcentration());
-            row.createCell(5).setCellValue(record.getChannelId());
-            row.createCell(6).setCellValue(record.getVolume());
+            row.createCell(5).setCellValue(record.getChannelCode());
+            row.createCell(6).setCellValue(record.getReceivedVolume());
             row.createCell(7).setCellValue(record.getCreateTime() != null ? record.getCreateTime().toString() : "");
             row.createCell(8).setCellValue(record.getUpdateTime() != null ? record.getUpdateTime().toString() : "");
         }
@@ -129,7 +129,6 @@ public class ReceiveRecordController {
             return Result.failed("导出失败" + e.getMessage());
             //throw new RuntimeException(e);
         }
-
     }
 }
 

src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java

@@ -25,12 +25,6 @@ public class ChannelState {
     @Schema(description = "是否已预充")
     private volatile boolean pre = false;
 
-    @Schema(description = "剩余容量（单位：mL）")
-    private volatile Double remainingVolume;
-
-    @Schema(description = "加液量（单位：mL）")
-    private Double volume;
-
     @Schema(description = "溶液id")
     private volatile Long solutionId;
 
@@ -46,11 +40,19 @@ public class ChannelState {
     @Schema(description = "目标加液量（单位：mL）")
     private volatile Double targetVolume;
 
-    public ChannelState(ChannelCode channelCode, Double remainingVolume, Long solutionId, String solutionName, String concentration) {
+    @Schema(description = "当前溶液量（单位：mL）")
+    private volatile Double currentVolume;
+
+    @Schema(description = "领取溶液量（单位：mL）")
+    private volatile Double receivedVolume;
+
+    public ChannelState(ChannelCode channelCode, Long solutionId, String solutionName, String concentration, Double targetVolume, Double receivedVolume, Double currentVolume) {
         this.channelCode = channelCode;
-        this.remainingVolume = remainingVolume;
         this.solutionId = solutionId;
         this.solutionName = solutionName;
         this.concentration = concentration;
+        this.targetVolume = targetVolume;
+        this.receivedVolume = receivedVolume;
+        this.currentVolume = currentVolume;
     }
 }

src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java

@@ -56,7 +56,8 @@ public class DeviceInitService {
         for (ChannelCode code : ChannelCode.values()) {
             //初始化通道
             Channel channel = channelService.getOne(new LambdaQueryWrapper<>(new Channel()).eq(Channel::getCode, code));
-            ChannelState channelState = channelStateObjectProvider.getObject(code, channel.getVolume(), channel.getSolutionId(), channel.getSolutionName(), channel.getConcentration());
+            Solution solution = solutionService.getById(channel.getSolutionId());
+            ChannelState channelState = channelStateObjectProvider.getObject(code, solution.getId(), solution.getName(), channel.getConcentration(), channel.getTargetVolume(), channel.getReceivedVolume(), channel.getCurrentVolume());
             deviceState.getChannelStateMap().put(code, channelState);
         }
         log.info("初始化 initDeviceState完毕");

src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java

@@ -14,6 +14,14 @@ import lombok.EqualsAndHashCode;
 @Schema(description = "领取记录")
 public class ReceiveRecord extends BaseEntity {
 
+    @TableField("issuer_id")
+    @Schema(description = "发放人ID")
+    private Long issuerId;
+
+    @TableField("issuer_nickname")
+    @Schema(description = "发放人昵称")
+    private String issuerNickname;
+
     @Schema(description = "领取人ID")
     private Long receiverId;
 
@@ -23,9 +31,15 @@ public class ReceiveRecord extends BaseEntity {
     @Schema(description = "溶液ID")
     private Long solutionId;
 
+    @Schema(description = "溶液名称")
+    private String solutionName;
+
     @Schema(description = "溶液浓度")
     private Integer concentration;
 
     @Schema(description = "领取溶液量")
     private Double receivedVolume;
+
+    @Schema(description = "通道Code")
+    private String channelCode;
 }

src/main/resources/sql/init.sql

@@ -15,11 +15,15 @@ CREATE TABLE IF NOT EXISTS audit_record(
 -- 领取记录（加液记录）
 CREATE TABLE IF NOT EXISTS receive_record (
     id                      INTEGER PRIMARY KEY AUTOINCREMENT,
+    issuer_id               INTEGER,--发放人id
+    issuer_nickname         INTEGER,--发放人昵称
     receiver_id             INTEGER,--领取人id
     receiver_nickname       TEXT,--领取人昵称
     solution_id             INTEGER,--溶液id
+    solution_name           TEXT,--溶液名称
     concentration           INTEGER,--溶液浓度
     received_volume         REAL,--领取溶液量
+    channel_code            TEXT,--通道code
     create_time             TEXT DEFAULT CURRENT_TIMESTAMP,
     update_time             TEXT DEFAULT CURRENT_TIMESTAMP
 );