修改实体类

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

@@ -1,6 +1,11 @@
 package com.iflytop.handacid.app.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.iflytop.handacid.common.base.BasePageQuery;
 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.FormulationService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -22,10 +27,17 @@ public class FormulationController {
     @Autowired
     private FormulationService formulationService;
 
+    @PostMapping
+    @Operation(summary = "获取分页数据")
+    public PageResult<Formulation> getPage( BasePageQuery query) {
+        return PageResult.success(formulationService.page(new Page<>(query.getPageNum(), query.getPageSize())));
+    }
+
     @GetMapping
     @Operation(summary = "获取List数据")
-    public List<Formulation> getAll() {
-        return formulationService.list();
+    public Result<List<Formulation>> getList(  @RequestParam Integer solutionId, @RequestParam String concentration) {
+        List<Formulation> formulations=formulationService.list(new LambdaQueryWrapper<Formulation>().eq(Formulation::getSolutionId, solutionId).eq(Formulation::getConcentration,concentration));
+        return Result.success(formulations);
     }
 
     @GetMapping("/{id}")

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

@@ -12,15 +12,17 @@ import lombok.EqualsAndHashCode;
 @Schema(description = "审计记录")
 public class AuditRecord extends BaseEntity {
     @Schema(description = "用户ID")
-    private Integer userId;
+    private Long userId;
     @Schema(description = "用户名称")
     private String userName;
     @Schema(description = "酸液ID")
-    private Integer solutionId;
+    private Long solutionId;
     @Schema(description = "酸液名称")
     private String solutionName;
+    @Schema(description = "酸液浓度")
+    private String concentration;
     @Schema(description = "通道ID")
-    private Integer channelId;
+    private Long channelId;
     @Schema(description = "加液量")
-    private String volume;
+    private Double volume;
 }

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

@@ -1,6 +1,7 @@
 package com.iflytop.handacid.common.model.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.iflytop.handacid.app.common.enums.ChannelCode;
 import com.iflytop.handacid.common.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -14,7 +15,16 @@ public class Channel extends BaseEntity {
     @Schema(description = "名称")
     private String name;
     @Schema(description = "酸液ID")
-    private Integer solutionId;
+    private Long solutionId;
+    @Schema(description = "酸液名称")
+    private Long solutionName;
+    @Schema(description = "酸液浓度")
+    private String concentration;
+    @Schema(description = "通道code")
+    private ChannelCode code;
+    @Schema(description = "剩余量")
+    private Double volume;
+
 
 }
 

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

@@ -3,6 +3,7 @@ package com.iflytop.handacid.common.model.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.iflytop.handacid.common.base.BaseEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,16 +12,21 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Schema(description = "配方")
 public class Formulation extends BaseEntity {
-    @Schema(description = "名称")
-    private String name;
+    @NotNull
+    @Schema(description = "用量")
+    private Double volume;
+    @NotNull
     @Schema(description = "酸液ID")
-    private Integer solutionId;
+    private Long solutionId;
+    @NotNull
     @Schema(description = "酸液名称")
     private String solutionName;
+    @NotNull
     @Schema(description = "浓度")
     private String concentration;
+
     @Schema(description = "系数")
-    private String scale;
+    private Double scale;
     @Schema(description = "转数")
-    private String revolutions;
+    private Double revolutions;
 }

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

@@ -13,15 +13,17 @@ import lombok.EqualsAndHashCode;
 @Schema(description = "领取记录")
 public class ReceiveRecord  extends BaseEntity {
     @Schema(description = "用户ID")
-    private Integer userId;
+    private Long userId;
     @Schema(description = "用户名称")
     private String userName;
     @Schema(description = "酸液ID")
-    private Integer solutionId;
+    private Long solutionId;
     @Schema(description = "酸液名称")
     private String solutionName;
+    @Schema(description = "酸液浓度")
+    private String concentration;
     @Schema(description = "通道ID")
-    private Integer channelId;
+    private Long channelId;
     @Schema(description = "申请量")
-    private String volume;
+    private Double volume;
 }

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

@@ -34,7 +34,6 @@ public class User extends BaseEntity {
     @Schema(description = "人员角色")
     private UserRole role;
 
-    @NotNull
     @Schema(description = "是否删除")
     private EnableStatus deleted;
 

src/main/resources/sql/init.sql

@@ -25,10 +25,11 @@ CREATE TABLE "audit_record" (
                                 "user_name" TEXT,
                                 "solution_id" INTEGER,
                                 "solution_name" TEXT,
+                                "concentration" TEXT,
                                 "channel_id" integer,
                                 "volume" TEXT,
-                                "create_time" DATE,
-                                "update_time" DATE,
+                                "create_time" DATE DEFAULT CURRENT_TIMESTAMP,
+                                "update_time" DATE DEFAULT CURRENT_TIMESTAMP,
                                 PRIMARY KEY ("id")
 );
 
@@ -44,8 +45,12 @@ CREATE TABLE "channel" (
                            "id" INTEGER NOT NULL,
                            "name" TEXT,
                            "solution_id" INTEGER,
-                           "create_time" DATE,
-                           "update_time" DATE,
+                           "solution_name" TEXT,
+                            "concentration" TEXT,
+                            "code" TEXT,
+                            "volume" DOUBLE,
+                           "create_time" DATE DEFAULT CURRENT_TIMESTAMP,
+                           "update_time" DATE DEFAULT CURRENT_TIMESTAMP,
                            PRIMARY KEY ("id")
 );
 
@@ -59,14 +64,14 @@ CREATE TABLE "channel" (
 DROP TABLE IF EXISTS "formulation";
 CREATE TABLE "formulation" (
                                "id" INTEGER NOT NULL,
-                               "name" TEXT,
+                               "volume" DOUBLE,
                                "solution_id" INTEGER,
                                "solution_name" TEXT,
                                "concentration" TEXT,
-                               "scale" TEXT,
-                               "revolutions" TEXT,
-                               "create_time" DATE,
-                               "update_time" DATE,
+                               "scale" DOUBLE,
+                               "revolutions" DOUBLE,
+                               "create_time" DATE DEFAULT CURRENT_TIMESTAMP,
+                               "update_time" DATE DEFAULT CURRENT_TIMESTAMP,
                                PRIMARY KEY ("id")
 );
 
@@ -84,10 +89,11 @@ CREATE TABLE "receive_record" (
                                   "user_name" TEXT,
                                   "solution_id" INTEGER,
                                   "solution_name" TEXT,
+                                  "concentration" TEXT,
                                   "channel_id" integer,
-                                  "volume" TEXT,
-                                  "create_time" DATE,
-                                  "update_time" DATE,
+                                  "volume" DOUBLE,
+                                  "create_time" DATE DEFAULT CURRENT_TIMESTAMP,
+                                  "update_time" DATE DEFAULT CURRENT_TIMESTAMP,
                                   PRIMARY KEY ("id")
 );
 
@@ -154,8 +160,8 @@ CREATE TABLE "user" (
                         "nickname" TEXT,
                         "password" TEXT,
                         "role" TEXT,
-                        "fixed_user" TEXT,
-                        "deleted" TEXT,
+                        "fixed_user" TEXT DEFAULT 'DISABLE',
+                        "deleted" INTEGER,
                         "create_time" TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
                         "update_time" TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
                         UNIQUE ("username" ASC)