From da4e29e96a1d01fd9fed34e8b1e993081c3fd450 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 22 Sep 2023 11:14:48 +0800 Subject: [PATCH] feat:补充提交 --- screen-api/src/main/java/com/moral/api/controller/DictController.java | 6 +-- screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java | 6 +++ screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java | 63 +++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 4 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/controller/DictController.java b/screen-api/src/main/java/com/moral/api/controller/DictController.java index 11051dd..2d698e1 100644 --- a/screen-api/src/main/java/com/moral/api/controller/DictController.java +++ b/screen-api/src/main/java/com/moral/api/controller/DictController.java @@ -1,10 +1,7 @@ package com.moral.api.controller; import com.moral.api.entity.CityConfigAqi; -import com.moral.api.pojo.enums.ChangeEnum; -import com.moral.api.pojo.enums.InvestigationEnum; -import com.moral.api.pojo.enums.StateEnum; -import com.moral.api.pojo.enums.YesOrNo; +import com.moral.api.pojo.enums.*; import com.moral.api.pojo.vo.DictionaryVo; import com.moral.constant.ResultMessage; import io.swagger.annotations.Api; @@ -32,6 +29,7 @@ .setChangeEnum(ChangeEnum.values()) .setInvestigationEnum(InvestigationEnum.values()) .setYesOrNo(YesOrNo.values()) + .setFileTableEnum(FileTableEnum.values()) ; return ResultMessage.ok(dictionaryVo); } diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java new file mode 100644 index 0000000..62fb34d --- /dev/null +++ b/screen-api/src/main/java/com/moral/api/pojo/enums/FileTableEnum.java @@ -0,0 +1,63 @@ +package com.moral.api.pojo.enums; + +import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.moral.api.exception.BusinessException; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * @ClassName StateEnum + * @Description TODO + * @Author @lizijie + * @Date 2023-09-20 11:11 + * @Version 1.0 + */ +@Getter +@JsonFormat(shape = JsonFormat.Shape.OBJECT) +public enum FileTableEnum implements IntegerValueEnum { + /** + *��������������� + */ + ALLOCATION_FOUNDATION(1010201, "���������������"), + /** + *��������������� + */ + ALLOCATION_RECTIFICATION(1010202, "���������������"), + /** + *��������������� + */ + ALLOCATION_APPROVE(1010203, "���������������"), + + ; + + @EnumValue + public final Integer value; + public final String name; + + FileTableEnum(Integer value, String name) { + this.value = value; + this.name = name; + } + + private static Map<Integer, FileTableEnum> valueMap = new HashMap<>(); + static { + for (FileTableEnum v : FileTableEnum.values()) { + valueMap.put(v.value, v); + } + } + @JsonCreator + public static FileTableEnum getByValue(Integer value) { + if (value == null) { + return null; + } + FileTableEnum result = valueMap.get(value); + if (result == null) { + throw new BusinessException("������������������" + value); + } + return result; + } +} diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java b/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java index e1874dc..dc6ff19 100644 --- a/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java +++ b/screen-api/src/main/java/com/moral/api/pojo/vo/DictionaryVo.java @@ -33,6 +33,8 @@ private List<Map<String, Object>> ChangeEnum; private List<Map<String, Object>> YesOrNo; + private List<Map<String, Object>> FileTableEnum; + @@ -62,5 +64,9 @@ return this; } + public DictionaryVo setFileTableEnum(com.moral.api.pojo.enums.FileTableEnum[] enumResult) { + this.FileTableEnum = enumArray2Map(enumResult); + return this; + } } -- Gitblit v1.8.0