Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-common into f-6.7.0

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/adminUser/AdminResourcesBean.java

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.common.vo.adminUser;
+public class AdminResourcesBean {
+
+	private Integer id;
+	/**
+	 * 角色名称
+	 */
+	private String name;
+	/**
+	 * 父级路径id
+	 */
+	private String parentId;
+	/**
+	 * 资源KEY
+	 */
+	private String resKey;
+
+	/**
+	 * 资源类型
+	 */
+	private String type;
+
+	/**
+	 * 资源路径
+	 */
+	private String resUrl;
+
+	/**
+	 * 资源级别
+	 */
+	private Integer level;
+
+	/**
+	 * 角色描述
+	 */
+	private String description;
+	
+	
+	public AdminResourcesBean() {
+		
+	}
+
+	public AdminResourcesBean(String resKey, String resUrl) {
+		super();
+		this.resKey = resKey;
+		this.resUrl = resUrl;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+
+
+	public String getResKey() {
+		return resKey;
+	}
+
+	public void setResKey(String resKey) {
+		this.resKey = resKey;
+	}
+
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+
+	public String getResUrl() {
+		return resUrl;
+	}
+
+	public void setResUrl(String resUrl) {
+		this.resUrl = resUrl;
+	}
+
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+}

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/adminUser/AdminResourcesQuery.java

+package com.ctrip.fun.common.vo.adminUser;
+import com.ctrip.fun.common.vo.AbstractPagedQuery;
+
+/**
+ * Created by pat on 14-5-26.
+ *
+ * @author: l_cheng@ctrip.com
+ * @date: 2014-05-26
+ */
+public class AdminResourcesQuery extends AbstractPagedQuery {
+	private Integer id;
+	
+    private String name;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+}

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/adminUser/AdminRoleBean.java

+/**
+ * Copyright 2014 CTRIP Co.,Ltd. All rights reserved.
+ */
+package com.ctrip.fun.common.vo.adminUser;
+/**
+ * @author zgsong
+ * @version 1.0.0
+ */
+public class AdminRoleBean {
+
+    private Integer id;
+    /**
+     * 角色名称
+     */
+    private String name;
+    /**
+     * 角色KEY
+     */
+    private String roleKey;
+    
+    /**
+     * 角色描述
+     */    
+    private String description;
+    /**
+     * 是否可用
+     */
+    private Integer enable;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getRoleKey() {
+		return roleKey;
+	}
+
+	public void setRoleKey(String roleKey) {
+		this.roleKey = roleKey;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Integer getEnable() {
+		return enable;
+	}
+
+	public void setEnable(Integer enable) {
+		this.enable = enable;
+	}
+
+}

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/adminUser/AdminUserBean.java

@@ -3,6 +3,7 @@
  */
 package com.ctrip.fun.common.vo.adminUser;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -14,6 +15,14 @@ public class AdminUserBean {
     
     private String userName;
     
+    private String nickName;
+    
+    private Integer[] roleIds;
+    
+    private List<AdminRoleBean> roles;
+    
+    private String roleDesc;
+    
     private String password;
     
     private boolean enable;
@@ -58,6 +67,38 @@ public class AdminUserBean {
 
 	public void setId(Integer id) {
 		this.id = id;
+	}
+
+	public String getNickName() {
+		return nickName;
+	}
+
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+
+	public String getRoleDesc() {
+		return roleDesc;
+	}
+
+	public void setRoleDesc(String roleDesc) {
+		this.roleDesc = roleDesc;
+	}
+
+	public List<AdminRoleBean> getRoles() {
+		return roles;
+	}
+
+	public void setRoles(List<AdminRoleBean> roles) {
+		this.roles = roles;
+	}
+
+	public Integer[] getRoleIds() {
+		return roleIds;
+	}
+
+	public void setRoleIds(Integer[] roleIds) {
+		this.roleIds = roleIds;
 	} 
 
 }