From d6e6fbf968a12228f9026d3bd0fa7fd148d0b595 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Thu, 18 Apr 2024 15:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coalAnalysis/dto/CoalAnalysisDto.java | 34 +++---------------- .../entity/CoalAnalysisEntity.java | 30 +--------------- 2 files changed, 5 insertions(+), 59 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/coalAnalysis/dto/CoalAnalysisDto.java b/src/main/java/cn/lihongjie/coal/coalAnalysis/dto/CoalAnalysisDto.java index 1acab536..d6429ae8 100644 --- a/src/main/java/cn/lihongjie/coal/coalAnalysis/dto/CoalAnalysisDto.java +++ b/src/main/java/cn/lihongjie/coal/coalAnalysis/dto/CoalAnalysisDto.java @@ -2,13 +2,12 @@ package cn.lihongjie.coal.coalAnalysis.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity; - -//import jakarta.validation.constraints.DecimalMin; +import cn.lihongjie.coal.common.DictCode; +import cn.lihongjie.coal.pojoProcessor.DictTranslate; import lombok.Data; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; import java.util.HashMap; import java.util.Map; @@ -21,92 +20,67 @@ public class CoalAnalysisDto extends OrgCommonDto { @Comment("归档状态") private String archiveStatus; - @Formula( - "(select i.name\n" - + "from t_dictionary d,\n" - + " t_dictionary_item i\n" - + "where d.id = i.dictionary_id\n" - + " and d.code = 'archiveStatus'\n" - + " and i.code = archive_status)") + + @DictTranslate(dictKey = DictCode.ARCHIVESTATUS) private String archiveStatusName; @Comment("参数 1 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param1; @Comment("参数 2 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param2; @Comment("参数 3 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param3; @Comment("参数 4 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param4; @Comment("参数 5 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param5; @Comment("参数 6 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param6; @Comment("参数 7 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param7; @Comment("参数 8 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param8; @Comment("参数 9 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param9; @Comment("参数 10 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param10; @Comment("参数 11 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param11; @Comment("参数 12 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param12; @Comment("参数 13 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param13; @Comment("参数 14 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param14; @Comment("参数 15 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param15; @Comment("参数 16 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param16; @Comment("参数 17 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param17; @Comment("参数 18 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param18; @Comment("参数 19 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param19; @Comment("参数 20 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param20; public Map toMap() { diff --git a/src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java b/src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java index 44e8ec9d..aaf7104e 100644 --- a/src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java +++ b/src/main/java/cn/lihongjie/coal/coalAnalysis/entity/CoalAnalysisEntity.java @@ -11,7 +11,6 @@ import lombok.Data; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.Comment; -import org.hibernate.annotations.Formula; @Data @Entity @@ -25,91 +24,64 @@ public class CoalAnalysisEntity extends OrgCommonEntity { @ColumnDefault("'0'") private String archiveStatus = "0"; - @Formula( - "(select i.name\n" - + "from t_dictionary d,\n" - + " t_dictionary_item i\n" - + "where d.id = i.dictionary_id\n" - + " and d.code = 'archiveStatus'\n" - + " and i.code = archive_status)") - private String archiveStatusName; + @Comment("参数 1 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param1; @Comment("参数 2 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param2; @Comment("参数 3 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param3; @Comment("参数 4 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param4; @Comment("参数 5 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param5; @Comment("参数 6 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param6; @Comment("参数 7 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param7; @Comment("参数 8 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param8; @Comment("参数 9 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param9; @Comment("参数 10 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param10; @Comment("参数 11 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param11; @Comment("参数 12 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param12; @Comment("参数 13 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param13; @Comment("参数 14 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param14; @Comment("参数 15 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param15; @Comment("参数 16 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param16; @Comment("参数 17 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param17; @Comment("参数 18 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param18; @Comment("参数 19 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param19; @Comment("参数 20 ") -// @DecimalMin(value = "0.1", inclusive = true, message = "参数不能小于0.1") private Double param20; }