From c6a845528d45bfb44591a69dadb44539432d06d0 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 12 五月 2023 11:55:06 +0800
Subject: [PATCH] 枚举相关改动
---
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/EnumVO.java | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/DictVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/EnumVO.java
similarity index 62%
rename from Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/DictVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/EnumVO.java
index 54a85fd..9fc7e40 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/DictVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/EnumVO.java
@@ -17,55 +17,60 @@
package com.vci.ubcs.omd.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.vci.ubcs.omd.entity.Dict;
-import io.swagger.annotations.ApiModel;
+import com.vci.ubcs.omd.entity.Enum;
+import com.vci.ubcs.omd.entity.EnumItem;
+import com.vci.ubcs.starter.util.node.INodeOid;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.springblade.core.tool.node.INode;
import java.util.ArrayList;
import java.util.List;
/**
- * 瑙嗗浘瀹炰綋绫�
+ * 鏋氫妇瀹氫箟 瑙嗗浘瀹炰綋绫�
*
- * @author Chill
+ * @author yuxc
+ * @since 2023-05-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@ApiModel(value = "DictVO瀵硅薄", description = "DictVO瀵硅薄")
-public class DictVO extends Dict implements INode<Dict> {
+public class EnumVO extends Enum implements INodeOid<EnumItem> {
private static final long serialVersionUID = 1L;
- /**
- * 涓婚敭ID
- */
- @JsonSerialize(using = ToStringSerializer.class)
- private Long id;
-
- /**
- * 鐖惰妭鐐笽D
- */
- @JsonSerialize(using = ToStringSerializer.class)
- private Long parentId;
/**
* 瀛愬瓩鑺傜偣
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
- private List<Dict> children;
+ private List<EnumItem> children = new ArrayList<>();
+ /**
+ * 鏄惁鏈夊瓙瀛欒妭鐐�
+ */
+ private Boolean hasChildren = false;
+ /**
+ * 瀛愯妭鐐筄ID
+ */
+ private String itemOid;
+ /**
+ * 瀛愯妭鐐规灇涓剧紪鐮�
+ */
+ private String itemName;
+ /**
+ * 瀛愯妭鐐规灇涓惧��
+ */
+ private String itemValue;
+ /**
+ * 瀛愯妭鐐规灇鎻忚堪
+ */
+ private String itemDescription;
@Override
- public List<Dict> getChildren() {
- if (this.children == null) {
- this.children = new ArrayList<>();
- }
+ public String getParentOid() {
+ return null;
+ }
+
+ @Override
+ public List<EnumItem> getChildren() {
return this.children;
}
- /**
- * 涓婄骇瀛楀吀
- */
- private String parentName;
}
--
Gitblit v1.9.3