diff --git a/src/main/java/com/rekoe/domain/Pj.java b/src/main/java/com/rekoe/domain/Pj.java index a4be124..d323faa 100644 --- a/src/main/java/com/rekoe/domain/Pj.java +++ b/src/main/java/com/rekoe/domain/Pj.java @@ -4,6 +4,7 @@ import java.io.Serializable; import org.nutz.dao.entity.annotation.Comment; import org.nutz.dao.entity.annotation.Name; +import org.nutz.dao.entity.annotation.Readonly; import org.nutz.dao.entity.annotation.Table; /** @@ -44,7 +45,7 @@ public class Pj implements Serializable{ /** * 用户是否是这个项目的管理员 */ - @Comment + @Readonly private boolean manager; /** diff --git a/src/main/java/com/rekoe/domain/PjAuth.java b/src/main/java/com/rekoe/domain/PjAuth.java index 5f2b875..920547a 100644 --- a/src/main/java/com/rekoe/domain/PjAuth.java +++ b/src/main/java/com/rekoe/domain/PjAuth.java @@ -2,15 +2,9 @@ package com.rekoe.domain; import java.io.Serializable; -import org.nutz.dao.entity.annotation.Comment; -import org.nutz.dao.entity.annotation.PK; -import org.nutz.dao.entity.annotation.Table; - /** * 权限 */ -@Table("pj_auth") -@PK({ "pj", "res", "gr" }) public class PjAuth implements Serializable { /** * @@ -19,37 +13,30 @@ public class PjAuth implements Serializable { /** * 资源 */ - @Comment private String res; /** * 项目 */ - @Comment private String pj; /** * 组 */ - @Comment private String gr; /** * 用户 */ - @Comment private String usr; /** * 用户姓名 */ - @Comment private String usrName; /** * r : 可读; w : 可写 */ - @Comment private String rw; /** * 描述 */ - @Comment private String des; /** diff --git a/src/main/java/com/rekoe/domain/PjUsr.java b/src/main/java/com/rekoe/domain/PjUsr.java index 95690d7..7b7d8f5 100644 --- a/src/main/java/com/rekoe/domain/PjUsr.java +++ b/src/main/java/com/rekoe/domain/PjUsr.java @@ -6,6 +6,7 @@ import org.nutz.dao.entity.annotation.Column; import org.nutz.dao.entity.annotation.Index; import org.nutz.dao.entity.annotation.Name; import org.nutz.dao.entity.annotation.PK; +import org.nutz.dao.entity.annotation.Readonly; import org.nutz.dao.entity.annotation.Table; import org.nutz.dao.entity.annotation.TableIndexes; @@ -31,106 +32,45 @@ public class PjUsr implements Serializable { */ @Name private String usr; - /** - * 用户姓名 - */ - @Column - private String name; /** * 密码(加密) */ @Column private String psw; - /** - * 角色 - */ - @Column - private String role; - @Column - private String email; - - /** - * @return 用户ID - */ - public String getUsr() { - return usr; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - /** - * @param usr - * 用户ID - */ - public void setUsr(String usr) { - this.usr = usr; - } - - /** - * @return 用户姓名 - */ + @Readonly + private String name; + public String getName() { return name; } - /** - * @param name - * 用户姓名 - */ public void setName(String name) { this.name = name; } - /** - * @return 密码(加密) - */ - public String getPsw() { - return psw; - } - - /** - * @param psw - * 密码(加密) - */ - public void setPsw(String psw) { - this.psw = psw; - } - - /** - * @return 角色 - */ - public String getRole() { - return role; - } - - /** - * @param role - * 角色 - */ - public void setRole(String role) { - this.role = role; - } - - /** - * @return 项目ID - */ public String getPj() { return pj; } - /** - * @param pj - * 项目ID - */ public void setPj(String pj) { this.pj = pj; } + public String getUsr() { + return usr; + } + + public void setUsr(String usr) { + this.usr = usr; + } + + public String getPsw() { + return psw; + } + + public void setPsw(String psw) { + this.psw = psw; + } + }