git-svn-id: https://192.168.57.71/svn/jsgkj@584 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/GroupModel.java

@@ -1,73 +1,65 @@
 package com.xt.js.gkaq.frame.model;
 
-public class GroupModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
 
-    private String org;
+public class GroupModel extends BaseUUIDModel {
+	private String org;
 
-    private String role;
+	private String role;
 
-    private String remark;
+	private String remark;
 
-    private Object createTime;
+	private Object createTime;
 
-    private Object updateTime;
+	private Object updateTime;
 
-    private String state;
+	private String state;
 
-    public String getId() {
-        return id;
-    }
+	public String getOrg() {
+		return org;
+	}
 
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
+	public void setOrg(String org) {
+		this.org = org == null ? null : org.trim();
+	}
 
-    public String getOrg() {
-        return org;
-    }
+	public String getRole() {
+		return role;
+	}
 
-    public void setOrg(String org) {
-        this.org = org == null ? null : org.trim();
-    }
+	public void setRole(String role) {
+		this.role = role == null ? null : role.trim();
+	}
 
-    public String getRole() {
-        return role;
-    }
+	public String getRemark() {
+		return remark;
+	}
 
-    public void setRole(String role) {
-        this.role = role == null ? null : role.trim();
-    }
+	public void setRemark(String remark) {
+		this.remark = remark == null ? null : remark.trim();
+	}
 
-    public String getRemark() {
-        return remark;
-    }
+	public Object getCreateTime() {
+		return createTime;
+	}
 
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
+	public void setCreateTime(Object createTime) {
+		this.createTime = createTime;
+	}
 
-    public Object getCreateTime() {
-        return createTime;
-    }
+	public Object getUpdateTime() {
+		return updateTime;
+	}
 
-    public void setCreateTime(Object createTime) {
-        this.createTime = createTime;
-    }
+	public void setUpdateTime(Object updateTime) {
+		this.updateTime = updateTime;
+	}
 
-    public Object getUpdateTime() {
-        return updateTime;
-    }
+	public String getState() {
+		return state;
+	}
 
-    public void setUpdateTime(Object updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
+	public void setState(String state) {
+		this.state = state == null ? null : state.trim();
+	}
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/OrgModel.java

@@ -1,103 +1,96 @@
 package com.xt.js.gkaq.frame.model;
 
-public class OrgModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
 
-    private Object name;
+public class OrgModel extends BaseUUIDModel {
 
-    private String orgType;
+	private Object name;
 
-    private Object remark;
+	private String orgType;
 
-    private String pid;
+	private Object remark;
 
-    private Short sortno;
+	private String pid;
 
-    private String code;
+	private Short sortno;
 
-    private String szd;
+	private String code;
 
-    private String szdName;
+	private String szd;
 
-    private String state;
+	private String szdName;
 
-    public String getId() {
-        return id;
-    }
+	private String state;
 
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
+	public Object getName() {
+		return name;
+	}
 
-    public Object getName() {
-        return name;
-    }
+	public void setName(Object name) {
+		this.name = name;
+	}
 
-    public void setName(Object name) {
-        this.name = name;
-    }
+	public String getOrgType() {
+		return orgType;
+	}
 
-    public String getOrgType() {
-        return orgType;
-    }
+	public void setOrgType(String orgType) {
+		this.orgType = orgType == null ? null : orgType.trim();
+	}
 
-    public void setOrgType(String orgType) {
-        this.orgType = orgType == null ? null : orgType.trim();
-    }
+	public Object getRemark() {
+		return remark;
+	}
 
-    public Object getRemark() {
-        return remark;
-    }
+	public void setRemark(Object remark) {
+		this.remark = remark;
+	}
 
-    public void setRemark(Object remark) {
-        this.remark = remark;
-    }
+	public String getPid() {
+		return pid;
+	}
 
-    public String getPid() {
-        return pid;
-    }
+	public void setPid(String pid) {
+		this.pid = pid == null ? null : pid.trim();
+	}
 
-    public void setPid(String pid) {
-        this.pid = pid == null ? null : pid.trim();
-    }
+	public Short getSortno() {
+		return sortno;
+	}
 
-    public Short getSortno() {
-        return sortno;
-    }
+	public void setSortno(Short sortno) {
+		this.sortno = sortno;
+	}
 
-    public void setSortno(Short sortno) {
-        this.sortno = sortno;
-    }
+	public String getCode() {
+		return code;
+	}
 
-    public String getCode() {
-        return code;
-    }
+	public void setCode(String code) {
+		this.code = code == null ? null : code.trim();
+	}
 
-    public void setCode(String code) {
-        this.code = code == null ? null : code.trim();
-    }
+	public String getSzd() {
+		return szd;
+	}
 
-    public String getSzd() {
-        return szd;
-    }
+	public void setSzd(String szd) {
+		this.szd = szd == null ? null : szd.trim();
+	}
 
-    public void setSzd(String szd) {
-        this.szd = szd == null ? null : szd.trim();
-    }
+	public String getSzdName() {
+		return szdName;
+	}
 
-    public String getSzdName() {
-        return szdName;
-    }
+	public void setSzdName(String szdName) {
+		this.szdName = szdName == null ? null : szdName.trim();
+	}
 
-    public void setSzdName(String szdName) {
-        this.szdName = szdName == null ? null : szdName.trim();
-    }
+	public String getState() {
+		return state;
+	}
 
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
+	public void setState(String state) {
+		this.state = state == null ? null : state.trim();
+	}
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/ParamModel.java

@@ -1,63 +1,55 @@
 package com.xt.js.gkaq.frame.model;
 
-public class ParamModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
 
-    private String key;
+public class ParamModel extends BaseUUIDModel {
+	private String key;
 
-    private String value;
+	private String value;
 
-    private String clazz;
+	private String clazz;
 
-    private String disp;
+	private String disp;
 
-    private String state;
+	private String state;
 
-    public String getId() {
-        return id;
-    }
+	public String getKey() {
+		return key;
+	}
 
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
+	public void setKey(String key) {
+		this.key = key == null ? null : key.trim();
+	}
 
-    public String getKey() {
-        return key;
-    }
+	public String getValue() {
+		return value;
+	}
 
-    public void setKey(String key) {
-        this.key = key == null ? null : key.trim();
-    }
+	public void setValue(String value) {
+		this.value = value == null ? null : value.trim();
+	}
 
-    public String getValue() {
-        return value;
-    }
+	public String getClazz() {
+		return clazz;
+	}
 
-    public void setValue(String value) {
-        this.value = value == null ? null : value.trim();
-    }
+	public void setClazz(String clazz) {
+		this.clazz = clazz == null ? null : clazz.trim();
+	}
 
-    public String getClazz() {
-        return clazz;
-    }
+	public String getDisp() {
+		return disp;
+	}
 
-    public void setClazz(String clazz) {
-        this.clazz = clazz == null ? null : clazz.trim();
-    }
+	public void setDisp(String disp) {
+		this.disp = disp == null ? null : disp.trim();
+	}
 
-    public String getDisp() {
-        return disp;
-    }
+	public String getState() {
+		return state;
+	}
 
-    public void setDisp(String disp) {
-        this.disp = disp == null ? null : disp.trim();
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
+	public void setState(String state) {
+		this.state = state == null ? null : state.trim();
+	}
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/RoleModel.java

@@ -2,84 +2,77 @@ package com.xt.js.gkaq.frame.model;
 
 import java.math.BigDecimal;
 
-public class RoleModel {
-    private String id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
 
-    private String name;
+public class RoleModel extends BaseUUIDModel {
 
-    private String code;
+	private String name;
 
-    private String remark;
+	private String code;
 
-    private Object createTime;
+	private String remark;
 
-    private Object updateTime;
+	private Object createTime;
 
-    private String state;
+	private Object updateTime;
 
-    private BigDecimal sortno;
+	private String state;
 
-    public String getId() {
-        return id;
-    }
+	private BigDecimal sortno;
 
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
+	public String getName() {
+		return name;
+	}
 
-    public String getName() {
-        return name;
-    }
+	public void setName(String name) {
+		this.name = name == null ? null : name.trim();
+	}
 
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
+	public String getCode() {
+		return code;
+	}
 
-    public String getCode() {
-        return code;
-    }
+	public void setCode(String code) {
+		this.code = code == null ? null : code.trim();
+	}
 
-    public void setCode(String code) {
-        this.code = code == null ? null : code.trim();
-    }
+	public String getRemark() {
+		return remark;
+	}
 
-    public String getRemark() {
-        return remark;
-    }
+	public void setRemark(String remark) {
+		this.remark = remark == null ? null : remark.trim();
+	}
 
-    public void setRemark(String remark) {
-        this.remark = remark == null ? null : remark.trim();
-    }
+	public Object getCreateTime() {
+		return createTime;
+	}
 
-    public Object getCreateTime() {
-        return createTime;
-    }
+	public void setCreateTime(Object createTime) {
+		this.createTime = createTime;
+	}
 
-    public void setCreateTime(Object createTime) {
-        this.createTime = createTime;
-    }
+	public Object getUpdateTime() {
+		return updateTime;
+	}
 
-    public Object getUpdateTime() {
-        return updateTime;
-    }
+	public void setUpdateTime(Object updateTime) {
+		this.updateTime = updateTime;
+	}
 
-    public void setUpdateTime(Object updateTime) {
-        this.updateTime = updateTime;
-    }
+	public String getState() {
+		return state;
+	}
 
-    public String getState() {
-        return state;
-    }
+	public void setState(String state) {
+		this.state = state == null ? null : state.trim();
+	}
 
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
+	public BigDecimal getSortno() {
+		return sortno;
+	}
 
-    public BigDecimal getSortno() {
-        return sortno;
-    }
-
-    public void setSortno(BigDecimal sortno) {
-        this.sortno = sortno;
-    }
+	public void setSortno(BigDecimal sortno) {
+		this.sortno = sortno;
+	}
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/UserGroupModel.java

@@ -1,63 +1,55 @@
 package com.xt.js.gkaq.frame.model;
 
-public class UserGroupModel {
-    private Object id;
+import com.xt.js.gkaq.common.BaseUUIDModel;
 
-    private Object groupId;
+public class UserGroupModel extends BaseUUIDModel {
+	private Object groupId;
 
-    private Object userId;
+	private Object userId;
 
-    private Object createTime;
+	private Object createTime;
 
-    private Object updateTime;
+	private Object updateTime;
 
-    private String state;
+	private String state;
 
-    public Object getId() {
-        return id;
-    }
+	public Object getGroupId() {
+		return groupId;
+	}
 
-    public void setId(Object id) {
-        this.id = id;
-    }
+	public void setGroupId(Object groupId) {
+		this.groupId = groupId;
+	}
 
-    public Object getGroupId() {
-        return groupId;
-    }
+	public Object getUserId() {
+		return userId;
+	}
 
-    public void setGroupId(Object groupId) {
-        this.groupId = groupId;
-    }
+	public void setUserId(Object userId) {
+		this.userId = userId;
+	}
 
-    public Object getUserId() {
-        return userId;
-    }
+	public Object getCreateTime() {
+		return createTime;
+	}
 
-    public void setUserId(Object userId) {
-        this.userId = userId;
-    }
+	public void setCreateTime(Object createTime) {
+		this.createTime = createTime;
+	}
 
-    public Object getCreateTime() {
-        return createTime;
-    }
+	public Object getUpdateTime() {
+		return updateTime;
+	}
 
-    public void setCreateTime(Object createTime) {
-        this.createTime = createTime;
-    }
+	public void setUpdateTime(Object updateTime) {
+		this.updateTime = updateTime;
+	}
 
-    public Object getUpdateTime() {
-        return updateTime;
-    }
+	public String getState() {
+		return state;
+	}
 
-    public void setUpdateTime(Object updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state == null ? null : state.trim();
-    }
+	public void setState(String state) {
+		this.state = state == null ? null : state.trim();
+	}
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/model/UserModel.java

@@ -1,14 +1,14 @@
 package com.xt.js.gkaq.frame.model;
 
+import com.xt.js.gkaq.common.BaseUUIDModel;
+
 /**
  * 用户对象模型
  * 
  * @author yuanxd
  *
  */
-public class UserModel {
-	/** 唯一主键UUID */
-	private String id;
+public class UserModel extends BaseUUIDModel{
 	/** 用户真实姓名 */
 	private String realName;
 	/** 登录账号 */
@@ -40,19 +40,6 @@ public class UserModel {
 	/** 账号失效时间 */
 	private Object sxsj;
 
-	/**
-	 * 唯一主键UUID
-	 * 
-	 * @return
-	 */
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id == null ? null : id.trim();
-	}
-
 	public String getRealName() {
 		return realName;
 	}