From ab25b9f8c0bfd6bdc4d9b702095bb41b22387543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Sun, 13 Mar 2022 15:53:24 +0800
Subject: [PATCH] =?UTF-8?q?refactor(OptionVO.java):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9VO?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93=E4=B8=BAOptionVO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/youlai/admin/pojo/vo/IdLabelVO.java   | 29 -------------------
 .../com/youlai/common/domain/ValueLabel.java  | 22 --------------
 .../com/youlai/common/web/vo/OptionVO.java    | 12 ++++----
 3 files changed, 6 insertions(+), 57 deletions(-)
 delete mode 100644 youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/IdLabelVO.java
 delete mode 100644 youlai-common/common-core/src/main/java/com/youlai/common/domain/ValueLabel.java
 rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/ValueLabelVO.java => youlai-common/common-web/src/main/java/com/youlai/common/web/vo/OptionVO.java (81%)

diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/IdLabelVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/IdLabelVO.java
deleted file mode 100644
index 71802fb6..00000000
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/IdLabelVO.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.youlai.admin.pojo.vo;
-
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * 树形下拉视图对象
- */
-@Data
-@NoArgsConstructor
-public class IdLabelVO {
-
-    public IdLabelVO(Long id, String label) {
-        this.id = id;
-        this.label = label;
-    }
-
-    private Long id;
-
-    private String label;
-
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    private List<IdLabelVO> children;
-
-}
diff --git a/youlai-common/common-core/src/main/java/com/youlai/common/domain/ValueLabel.java b/youlai-common/common-core/src/main/java/com/youlai/common/domain/ValueLabel.java
deleted file mode 100644
index 42d9c525..00000000
--- a/youlai-common/common-core/src/main/java/com/youlai/common/domain/ValueLabel.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.youlai.common.domain;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 级联视图对象
- */
-@Data
-@Accessors(chain = true)
-public class ValueLabel {
-
-    private Long value;
-
-    private String label;
-
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    private List<ValueLabel> children;
-}
diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/ValueLabelVO.java b/youlai-common/common-web/src/main/java/com/youlai/common/web/vo/OptionVO.java
similarity index 81%
rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/ValueLabelVO.java
rename to youlai-common/common-web/src/main/java/com/youlai/common/web/vo/OptionVO.java
index 34ed26ad..91f00d60 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/ValueLabelVO.java
+++ b/youlai-common/common-web/src/main/java/com/youlai/common/web/vo/OptionVO.java
@@ -1,4 +1,4 @@
-package com.youlai.admin.pojo.vo;
+package com.youlai.common.web.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
@@ -17,24 +17,24 @@ import java.util.List;
 @ApiModel("Select选择器默认Option属性")
 @Data
 @NoArgsConstructor
-public class ValueLabelVO {
+public class OptionVO<T> {
 
-    public ValueLabelVO(Long value, String label) {
+    public OptionVO(T value, String label) {
         this.value = value;
         this.label = label;
     }
 
     @ApiModelProperty("选项的值")
-    private Long value;
+    private T value;
 
     @ApiModelProperty("选项的标签，若不设置则默认与value相同")
     private String label;
 
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
-    private List<ValueLabelVO> children;
+    private List<OptionVO> children;
 
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
     @ApiModelProperty("是否禁用该选项，默认false")
     public Boolean disabled;
 
-}
+}
\ No newline at end of file
-- 
GitLab