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

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/OrgModelMapper.java

@@ -1,7 +1,16 @@
 package com.xt.js.gkaq.frame.mappers;
 
-import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.OrgModel;
+import java.util.List;
 
-public interface OrgModelMapper extends BaseMapper<OrgModel> {
+public interface OrgModelMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(OrgModel record);
+
+    OrgModel selectByPrimaryKey(String id);
+
+    List<OrgModel> selectAll();
+
+    int updateByPrimaryKey(OrgModel record);
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/UserGroupModelMapper.java

@@ -1,7 +1,16 @@
 package com.xt.js.gkaq.frame.mappers;
 
-import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.UserGroupModel;
+import java.util.List;
 
-public interface UserGroupModelMapper extends BaseMapper<UserGroupModel> {
+public interface UserGroupModelMapper {
+    int deleteByPrimaryKey(String id);
+
+    int insert(UserGroupModel record);
+
+    UserGroupModel selectByPrimaryKey(String id);
+
+    List<UserGroupModel> selectAll();
+
+    int updateByPrimaryKey(UserGroupModel record);
 }

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

@@ -9,12 +9,6 @@ public class GroupModel extends BaseUUIDModel {
 
 	private String remark;
 
-	private Object createTime;
-
-	private Object updateTime;
-
-	private String state;
-
 	public String getOrg() {
 		return org;
 	}
@@ -38,28 +32,4 @@ public class GroupModel extends BaseUUIDModel {
 	public void setRemark(String remark) {
 		this.remark = remark == null ? null : remark.trim();
 	}
-
-	public Object getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Object createTime) {
-		this.createTime = createTime;
-	}
-
-	public Object getUpdateTime() {
-		return updateTime;
-	}
-
-	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();
-	}
 }

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

@@ -3,12 +3,11 @@ package com.xt.js.gkaq.frame.model;
 import com.xt.js.gkaq.common.BaseUUIDModel;
 
 public class OrgModel extends BaseUUIDModel {
-
-	private Object name;
+	private String name;
 
 	private String orgType;
 
-	private Object remark;
+	private String remark;
 
 	private String pid;
 
@@ -20,14 +19,12 @@ public class OrgModel extends BaseUUIDModel {
 
 	private String szdName;
 
-	private String state;
-
-	public Object getName() {
+	public String getName() {
 		return name;
 	}
 
-	public void setName(Object name) {
-		this.name = name;
+	public void setName(String name) {
+		this.name = name == null ? null : name.trim();
 	}
 
 	public String getOrgType() {
@@ -38,12 +35,12 @@ public class OrgModel extends BaseUUIDModel {
 		this.orgType = orgType == null ? null : orgType.trim();
 	}
 
-	public Object getRemark() {
+	public String getRemark() {
 		return remark;
 	}
 
-	public void setRemark(Object remark) {
-		this.remark = remark;
+	public void setRemark(String remark) {
+		this.remark = remark == null ? null : remark.trim();
 	}
 
 	public String getPid() {
@@ -85,12 +82,4 @@ public class OrgModel extends BaseUUIDModel {
 	public void setSzdName(String szdName) {
 		this.szdName = szdName == null ? null : szdName.trim();
 	}
-
-	public String getState() {
-		return state;
-	}
-
-	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

@@ -11,8 +11,6 @@ public class ParamModel extends BaseUUIDModel {
 
 	private String disp;
 
-	private String state;
-
 	public String getKey() {
 		return key;
 	}
@@ -44,12 +42,4 @@ public class ParamModel extends BaseUUIDModel {
 	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();
-	}
 }

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

@@ -1,7 +1,5 @@
 package com.xt.js.gkaq.frame.model;
 
-import java.math.BigDecimal;
-
 import com.xt.js.gkaq.common.BaseUUIDModel;
 
 public class RoleModel extends BaseUUIDModel {
@@ -12,13 +10,7 @@ public class RoleModel extends BaseUUIDModel {
 
 	private String remark;
 
-	private Object createTime;
-
-	private Object updateTime;
-
-	private String state;
-
-	private BigDecimal sortno;
+	private Long sortno;
 
 	public String getName() {
 		return name;
@@ -44,35 +36,11 @@ public class RoleModel extends BaseUUIDModel {
 		this.remark = remark == null ? null : remark.trim();
 	}
 
-	public Object getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Object createTime) {
-		this.createTime = createTime;
-	}
-
-	public Object getUpdateTime() {
-		return updateTime;
-	}
-
-	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 BigDecimal getSortno() {
+	public Long getSortno() {
 		return sortno;
 	}
 
-	public void setSortno(BigDecimal sortno) {
+	public void setSortno(Long sortno) {
 		this.sortno = sortno;
 	}
 }

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

@@ -1,39 +1,49 @@
 package com.xt.js.gkaq.frame.model;
 
-import com.xt.js.gkaq.common.BaseUUIDModel;
+import java.util.Date;
 
-public class UserGroupModel extends BaseUUIDModel {
-	private Object groupId;
+public class UserGroupModel {
+	private String id;
 
-	private Object userId;
+	private String groupId;
 
-	private Object createTime;
+	private String userId;
 
-	private Object updateTime;
+	private Date createTime;
+
+	private Date updateTime;
 
 	private String state;
 
-	public Object getGroupId() {
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id == null ? null : id.trim();
+	}
+
+	public String getGroupId() {
 		return groupId;
 	}
 
-	public void setGroupId(Object groupId) {
-		this.groupId = groupId;
+	public void setGroupId(String groupId) {
+		this.groupId = groupId == null ? null : groupId.trim();
 	}
 
-	public Object getUserId() {
+	public String getUserId() {
 		return userId;
 	}
 
-	public void setUserId(Object userId) {
-		this.userId = userId;
+	public void setUserId(String userId) {
+		this.userId = userId == null ? null : userId.trim();
 	}
 
 	public Object getCreateTime() {
 		return createTime;
 	}
 
-	public void setCreateTime(Object createTime) {
+	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
@@ -41,7 +51,7 @@ public class UserGroupModel extends BaseUUIDModel {
 		return updateTime;
 	}
 
-	public void setUpdateTime(Object updateTime) {
+	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
 	}
 

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

@@ -8,7 +8,7 @@ import com.xt.js.gkaq.common.BaseUUIDModel;
  * @author yuanxd
  *
  */
-public class UserModel extends BaseUUIDModel{
+public class UserModel extends BaseUUIDModel {
 	/** 用户真实姓名 */
 	private String realName;
 	/** 登录账号 */
@@ -25,15 +25,6 @@ public class UserModel extends BaseUUIDModel{
 	/** 电子邮件地址 */
 	private String email;
 
-	/** 创建时间 */
-	private Object createTime;
-
-	/** 更新时间 */
-	private Object updateTime;
-
-	/** 记录状态 */
-	private String state;
-
 	/** 人员类型（行政人员 1、经营人2、船代3等） */
 	private String rylx;
 
@@ -96,30 +87,6 @@ public class UserModel extends BaseUUIDModel{
 		this.email = email == null ? null : email.trim();
 	}
 
-	public Object getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Object createTime) {
-		this.createTime = createTime;
-	}
-
-	public Object getUpdateTime() {
-		return updateTime;
-	}
-
-	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 String getRylx() {
 		return rylx;
 	}

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/OrgModelMapper.xml

@@ -3,15 +3,17 @@
 <mapper namespace="com.xt.js.gkaq.frame.mappers.OrgModelMapper" >
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.OrgModel" >
     <id column="ID" property="id" jdbcType="VARCHAR" />
-    <result column="NAME" property="name" jdbcType="OTHER" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
     <result column="ORG_TYPE" property="orgType" jdbcType="VARCHAR" />
-    <result column="REMARK" property="remark" jdbcType="OTHER" />
+    <result column="REMARK" property="remark" jdbcType="VARCHAR" />
     <result column="PID" property="pid" jdbcType="VARCHAR" />
     <result column="SORTNO" property="sortno" jdbcType="DECIMAL" />
     <result column="CODE" property="code" jdbcType="VARCHAR" />
     <result column="SZD" property="szd" jdbcType="VARCHAR" />
     <result column="SZD_NAME" property="szdName" jdbcType="VARCHAR" />
     <result column="STATE" property="state" jdbcType="CHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_ORG
@@ -21,32 +23,38 @@
     insert into AQ_BASIC_FRAME_ORG (ID, NAME, ORG_TYPE, 
       REMARK, PID, SORTNO, 
       CODE, SZD, SZD_NAME, 
-      STATE)
-    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=OTHER}, #{orgType,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=OTHER}, #{pid,jdbcType=VARCHAR}, #{sortno,jdbcType=DECIMAL}, 
+      STATE, CREATE_TIME, UPDATE_TIME
+      )
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{orgType,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{sortno,jdbcType=DECIMAL}, 
       #{code,jdbcType=VARCHAR}, #{szd,jdbcType=VARCHAR}, #{szdName,jdbcType=VARCHAR}, 
-      #{state,jdbcType=CHAR})
+      #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.OrgModel" >
     update AQ_BASIC_FRAME_ORG
-    set NAME = #{name,jdbcType=OTHER},
+    set NAME = #{name,jdbcType=VARCHAR},
       ORG_TYPE = #{orgType,jdbcType=VARCHAR},
-      REMARK = #{remark,jdbcType=OTHER},
+      REMARK = #{remark,jdbcType=VARCHAR},
       PID = #{pid,jdbcType=VARCHAR},
       SORTNO = #{sortno,jdbcType=DECIMAL},
       CODE = #{code,jdbcType=VARCHAR},
       SZD = #{szd,jdbcType=VARCHAR},
       SZD_NAME = #{szdName,jdbcType=VARCHAR},
-      STATE = #{state,jdbcType=CHAR}
+      STATE = #{state,jdbcType=CHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
     where ID = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE, SZD, SZD_NAME, STATE
+    select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE, SZD, SZD_NAME, STATE, CREATE_TIME, 
+    UPDATE_TIME
     from AQ_BASIC_FRAME_ORG
     where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap" >
-    select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE, SZD, SZD_NAME, STATE
+    select ID, NAME, ORG_TYPE, REMARK, PID, SORTNO, CODE, SZD, SZD_NAME, STATE, CREATE_TIME, 
+    UPDATE_TIME
     from AQ_BASIC_FRAME_ORG
   </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/ParamModelMapper.xml

@@ -1,40 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xt.js.gkaq.frame.mappers.ParamModelMapper">
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.ParamModel">
-    <id column="ID" jdbcType="VARCHAR" property="id" />
-    <result column="KEY" jdbcType="VARCHAR" property="key" />
-    <result column="VALUE" jdbcType="VARCHAR" property="value" />
-    <result column="CLAZZ" jdbcType="VARCHAR" property="clazz" />
-    <result column="DISP" jdbcType="VARCHAR" property="disp" />
-    <result column="STATE" jdbcType="CHAR" property="state" />
-  </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from AQ_BASIC_FRAME_PARAM
-    where ID = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.ParamModel">
-    insert into AQ_BASIC_FRAME_PARAM (ID, KEY, VALUE, 
-      CLAZZ, DISP, STATE)
-    values (#{id,jdbcType=VARCHAR}, #{key,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, 
-      #{clazz,jdbcType=VARCHAR}, #{disp,jdbcType=VARCHAR}, #{state,jdbcType=CHAR})
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.ParamModel">
-    update AQ_BASIC_FRAME_PARAM
-    set KEY = #{key,jdbcType=VARCHAR},
-      VALUE = #{value,jdbcType=VARCHAR},
-      CLAZZ = #{clazz,jdbcType=VARCHAR},
-      DISP = #{disp,jdbcType=VARCHAR},
-      STATE = #{state,jdbcType=CHAR}
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select ID, KEY, VALUE, CLAZZ, DISP, STATE
-    from AQ_BASIC_FRAME_PARAM
-    where ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap">
-    select ID, KEY, VALUE, CLAZZ, DISP, STATE
-    from AQ_BASIC_FRAME_PARAM
-  </select>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xt.js.gkaq.frame.mappers.ParamModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.ParamModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="KEY" property="key" jdbcType="VARCHAR" />
+    <result column="VALUE" property="value" jdbcType="VARCHAR" />
+    <result column="CLAZZ" property="clazz" jdbcType="VARCHAR" />
+    <result column="DISP" property="disp" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="CHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_PARAM
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.ParamModel" >
+    insert into AQ_BASIC_FRAME_PARAM (ID, KEY, VALUE, 
+      CLAZZ, DISP, STATE, CREATE_TIME, 
+      UPDATE_TIME)
+    values (#{id,jdbcType=VARCHAR}, #{key,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR}, 
+      #{clazz,jdbcType=VARCHAR}, #{disp,jdbcType=VARCHAR}, #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.ParamModel" >
+    update AQ_BASIC_FRAME_PARAM
+    set KEY = #{key,jdbcType=VARCHAR},
+      VALUE = #{value,jdbcType=VARCHAR},
+      CLAZZ = #{clazz,jdbcType=VARCHAR},
+      DISP = #{disp,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=CHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, KEY, VALUE, CLAZZ, DISP, STATE, CREATE_TIME, UPDATE_TIME
+    from AQ_BASIC_FRAME_PARAM
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+    select ID, KEY, VALUE, CLAZZ, DISP, STATE, CREATE_TIME, UPDATE_TIME
+    from AQ_BASIC_FRAME_PARAM
+  </select>
 </mapper>

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/UserGroupModelMapper.xml

@@ -2,38 +2,38 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xt.js.gkaq.frame.mappers.UserGroupModelMapper">
   <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.UserGroupModel">
-    <id column="ID" jdbcType="OTHER" property="id" />
-    <result column="GROUP_ID" jdbcType="OTHER" property="groupId" />
-    <result column="USER_ID" jdbcType="OTHER" property="userId" />
-    <result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
-    <result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
+    <id column="ID" jdbcType="VARCHAR" property="id" />
+    <result column="GROUP_ID" jdbcType="VARCHAR" property="groupId" />
+    <result column="USER_ID" jdbcType="VARCHAR" property="userId" />
+    <result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="STATE" jdbcType="CHAR" property="state" />
   </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Object">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
     delete from AQ_BASIC_FRAME_USER_GROUP
-    where ID = #{id,jdbcType=OTHER}
+    where ID = #{id,jdbcType=VARCHAR}
   </delete>
   <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.UserGroupModel">
     insert into AQ_BASIC_FRAME_USER_GROUP (ID, GROUP_ID, USER_ID, 
       CREATE_TIME, UPDATE_TIME, STATE
       )
-    values (#{id,jdbcType=OTHER}, #{groupId,jdbcType=OTHER}, #{userId,jdbcType=OTHER}, 
-      #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, #{state,jdbcType=CHAR}
+    values (#{id,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=CHAR}
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.UserGroupModel">
     update AQ_BASIC_FRAME_USER_GROUP
-    set GROUP_ID = #{groupId,jdbcType=OTHER},
-      USER_ID = #{userId,jdbcType=OTHER},
-      CREATE_TIME = #{createTime,jdbcType=OTHER},
-      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
+    set GROUP_ID = #{groupId,jdbcType=VARCHAR},
+      USER_ID = #{userId,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
       STATE = #{state,jdbcType=CHAR}
-    where ID = #{id,jdbcType=OTHER}
+    where ID = #{id,jdbcType=VARCHAR}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Object" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE
     from AQ_BASIC_FRAME_USER_GROUP
-    where ID = #{id,jdbcType=OTHER}
+    where ID = #{id,jdbcType=VARCHAR}
   </select>
   <select id="selectAll" resultMap="BaseResultMap">
     select ID, GROUP_ID, USER_ID, CREATE_TIME, UPDATE_TIME, STATE

gkaqv2/trunk/modules/frame/src/main/resources/generatorConfig.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE generatorConfiguration  PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"  "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
+ <!-- 引入配置文件 -->  
+    <properties resource="init.properties"/>  
+    <!-- 指定数据连接驱动jar地址 -->  
 	<context id="MysqlTables" targetRuntime="MyBatis3Simple">
 		<commentGenerator>
 			<property name="suppressAllComments" value="true" />
@@ -9,13 +12,11 @@
 		<javaTypeResolver>
 			<property name="forceBigDecimals" value="false" />
 		</javaTypeResolver>
-		<javaModelGenerator targetPackage="com.xt.js.gkaq.frame.model"
-			targetProject="src/main/java">
+		<javaModelGenerator targetPackage="com.xt.js.gkaq.frame.model" targetProject="src/main/java">
 			<property name="enableSubPackages" value="true" />
 			<property name="trimStrings" value="true" />
 		</javaModelGenerator>
-		<sqlMapGenerator targetPackage="com.xt.js.gkaq.frame.mappers"
-			targetProject="src/main/resources">
+		<sqlMapGenerator targetPackage="com.xt.js.gkaq.frame.mappers" targetProject="src/main/resources">
 			<property name="enableSubPackages" value="true" />
 		</sqlMapGenerator>
 		<javaClientGenerator type="XMLMAPPER"
@@ -23,10 +24,22 @@
 			<property name="enableSubPackages" value="true" />
 		</javaClientGenerator>
 		<!-- <table tableName="AQ_BASIC_FRAME_USER" domainObjectName="UserModel"></table> -->
-		<!-- <table tableName="AQ_BASIC_FRAME_ROLE" domainObjectName="RoleModel"></table>  -->
-		 <!-- <table tableName="AQ_BASIC_FRAME_ORG" domainObjectName="OrgModel"></table> -->
-		<!--  <table tableName="AQ_BASIC_FRAME_GROUP" domainObjectName="GroupModel"></table>  -->
-		<!-- <table tableName="AQ_BASIC_FRAME_USER_GROUP" domainObjectName="UserGroupModel"></table>   -->
-		<table tableName="AQ_BASIC_FRAME_PARAM" domainObjectName="ParamModel"></table>
+		<!-- <table tableName="AQ_BASIC_FRAME_ROLE" domainObjectName="RoleModel"></table>
+		<table tableName="AQ_BASIC_FRAME_ORG" domainObjectName="OrgModel">
+			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
+			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
+		</table>
+		  -->
+		<!--  <table tableName="AQ_BASIC_FRAME_GROUP" domainObjectName="GroupModel"></table>
+		<table tableName="AQ_BASIC_FRAME_USER_GROUP" domainObjectName="UserGroupModel">
+			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
+			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
+		</table>
+		
+		<table tableName="AQ_BASIC_FRAME_PARAM" domainObjectName="ParamModel">
+			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
+			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/> 
+		</table>
+		  -->
 	</context>
 </generatorConfiguration>

gkaqv2/trunk/modules/frame/src/main/resources/generatorConfig2.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE generatorConfiguration  PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"  "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+ <!-- 引入配置文件 -->  
+    <properties resource="init.properties"/>  
+    <!-- 指定数据连接驱动jar地址
+    <classPathEntry location="${classPath}" />  
+     -->  
+	<context id="MysqlTables" targetRuntime="MyBatis3Simple">
+		<commentGenerator>
+			<property name="suppressAllComments" value="false" />
+		</commentGenerator>
+        <!-- jdbc连接 -->  
+        <jdbcConnection driverClass="${jdbc_driver}"  connectionURL="${jdbc_url}" userId="${jdbc_user}"  password="${jdbc_password}" />  
+         <javaTypeResolver>
+			<property name="forceBigDecimals" value="false" />
+		</javaTypeResolver>
+		<javaModelGenerator targetPackage="com.xt.js.gkaq.frame.model" targetProject="src/main/java">
+			<property name="enableSubPackages" value="true" />
+			<property name="trimStrings" value="true" />
+		</javaModelGenerator>
+		<sqlMapGenerator targetPackage="com.xt.js.gkaq.frame.mappers" targetProject="src/main/resources">
+			<property name="enableSubPackages" value="true" />
+		</sqlMapGenerator>
+		<javaClientGenerator type="XMLMAPPER"
+			targetPackage="com.xt.js.gkaq.frame.mappers" targetProject="src/main/java">
+			<property name="enableSubPackages" value="true" />
+		</javaClientGenerator>
+		<!-- <table tableName="AQ_BASIC_FRAME_USER" domainObjectName="UserModel"></table> -->
+		<!-- <table tableName="AQ_BASIC_FRAME_ROLE" domainObjectName="RoleModel"></table>  -->
+		 <!-- <table tableName="AQ_BASIC_FRAME_ORG" domainObjectName="OrgModel"></table> -->
+		<!--  <table tableName="AQ_BASIC_FRAME_GROUP" domainObjectName="GroupModel"></table>  -->
+		<table tableName="AQ_BASIC_FRAME_USER_GROUP" domainObjectName="UserGroupModel">
+			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
+			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
+		</table>
+		<!-- <table tableName="AQ_BASIC_FRAME_PARAM" domainObjectName="ParamModel"></table>-->
+	</context>
+</generatorConfiguration>

gkaqv2/trunk/modules/frame/src/main/resources/init.properties

@@ -0,0 +1,6 @@
+#Mybatis Generator configuration  
+#classPath=E:/workplace/EKSP/WebContent/WEB-INF/lib/ojdbc14.jar  
+jdbc_driver = oracle.jdbc.driver.OracleDriver  
+jdbc_url=jdbc:oracle:thin:@192.168.57.36:1521:orcl
+jdbc_user=gkaqv2  
+jdbc_password=gkaq