From bf52ba699672616794b31a5c0297a45889c6dff5 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 11:23:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/FormulationController.java | 16 ++++++++-- .../handacid/common/model/entity/AuditRecord.java | 10 ++++--- .../handacid/common/model/entity/Channel.java | 12 +++++++- .../handacid/common/model/entity/Formulation.java | 16 ++++++---- .../common/model/entity/ReceiveRecord.java | 10 ++++--- .../iflytop/handacid/common/model/entity/User.java | 1 - src/main/resources/sql/init.sql | 34 +++++++++++++--------- 7 files changed, 68 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java b/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java index fff5568..23dce21 100644 --- a/src/main/java/com/iflytop/handacid/app/controller/FormulationController.java +++ b/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 getPage( BasePageQuery query) { + return PageResult.success(formulationService.page(new Page<>(query.getPageNum(), query.getPageSize()))); + } + @GetMapping @Operation(summary = "获取List数据") - public List getAll() { - return formulationService.list(); + public Result> getList( @RequestParam Integer solutionId, @RequestParam String concentration) { + List formulations=formulationService.list(new LambdaQueryWrapper().eq(Formulation::getSolutionId, solutionId).eq(Formulation::getConcentration,concentration)); + return Result.success(formulations); } @GetMapping("/{id}") 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 958613b..a03041c 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 @@ -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; } 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 efda367..64f7de8 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 @@ -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; + } 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 46a70d4..1021042 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 @@ -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; } 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 c9b5f99..c254a61 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 @@ -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; } diff --git a/src/main/java/com/iflytop/handacid/common/model/entity/User.java b/src/main/java/com/iflytop/handacid/common/model/entity/User.java index 2c41f22..a391507 100644 --- a/src/main/java/com/iflytop/handacid/common/model/entity/User.java +++ b/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; diff --git a/src/main/resources/sql/init.sql b/src/main/resources/sql/init.sql index 2f531c1..72c6265 100644 --- a/src/main/resources/sql/init.sql +++ b/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)