From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change

---
 src/main/java/com/nanometer/smartlab/entity/BaseRole.java |   74 +++++++++----------------------------
 1 files changed, 18 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/entity/BaseRole.java b/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
index 42dd898..c289243 100644
--- a/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
+++ b/src/main/java/com/nanometer/smartlab/entity/BaseRole.java
@@ -1,78 +1,40 @@
 package com.nanometer.smartlab.entity;
 
 import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang.StringUtils;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.util.Arrays;
 import java.util.List;
 
 /**
  * Created by johnny on 17/11/18.
  */
+@Setter
+@Getter
 public class BaseRole implements Serializable {
-
-    private String id;
+    private Long id;
     private String name;
     private String memo;
     private ValidFlag validFlag;
     private Timestamp createTime;
     private Timestamp updateTime;
+    private String btnPermission;
+    private String userPermission;
 
-    private List<String> pageIdList;
+    //非数据库字段
+    private List<String> btnPermissions;
+    private List<Long> pageIdList;
 
-    public String getId() {
-        return id;
+
+    public void setBtnPermission(String btnPermission) {
+        if (StringUtils.isNotBlank(btnPermission)) {
+            btnPermissions = Arrays.asList(btnPermission.split(","));
+        }
+        this.btnPermission = btnPermission;
     }
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ValidFlag getValidFlag() {
-        return validFlag;
-    }
-
-    public void setValidFlag(ValidFlag validFlag) {
-        this.validFlag = validFlag;
-    }
-
-    public Timestamp getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Timestamp createTime) {
-        this.createTime = createTime;
-    }
-
-    public Timestamp getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Timestamp updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getMemo() {
-        return memo;
-    }
-
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    public List<String> getPageIdList() {
-        return pageIdList;
-    }
-
-    public void setPageIdList(List<String> pageIdList) {
-        this.pageIdList = pageIdList;
-    }
 }

--
Gitblit v1.9.2