mirror of
https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git
synced 2026-01-25 07:46:40 +08:00
优化
This commit is contained in:
@@ -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<String, Object> toMap() {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user