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

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

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

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

@@ -3,33 +3,36 @@ package com.xt.js.gkaq.frame.model;
 import com.xt.js.gkaq.common.BaseUUIDModel;
 
 public class GroupModel extends BaseUUIDModel {
-	private String org;
+    /** serialVersionUID */
+    private static final long serialVersionUID = 5260482171809467240L;
 
-	private String role;
+    private String org;
 
-	private String remark;
+    private String role;
 
-	public String getOrg() {
-		return org;
-	}
+    private String remark;
 
-	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 void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
 }

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

@@ -3,83 +3,106 @@ package com.xt.js.gkaq.frame.model;
 import com.xt.js.gkaq.common.BaseUUIDModel;
 
 public class OrgModel extends BaseUUIDModel {
-	private String name;
+    /** serialVersionUID */
+    private static final long serialVersionUID = -2893543942755787508L;
 
-	private String orgType;
+    private String name;
 
-	private String remark;
+    private String orgType;
 
-	private String pid;
+    private String 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;
 
-	public String getName() {
-		return name;
-	}
+    private String szdName;
 
-	public void setName(String name) {
-		this.name = name == null ? null : name.trim();
-	}
+    private String xzqh;
 
-	public String getOrgType() {
-		return orgType;
-	}
+    private String level;
 
-	public void setOrgType(String orgType) {
-		this.orgType = orgType == null ? null : orgType.trim();
-	}
+    public String getName() {
+        return name;
+    }
 
-	public String getRemark() {
-		return remark;
-	}
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
 
-	public void setRemark(String remark) {
-		this.remark = remark == null ? null : remark.trim();
-	}
+    public String getOrgType() {
+        return orgType;
+    }
 
-	public String getPid() {
-		return pid;
-	}
+    public void setOrgType(String orgType) {
+        this.orgType = orgType == null ? null : orgType.trim();
+    }
 
-	public void setPid(String pid) {
-		this.pid = pid == null ? null : pid.trim();
-	}
+    public String getRemark() {
+        return remark;
+    }
 
-	public Short getSortno() {
-		return sortno;
-	}
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
 
-	public void setSortno(Short sortno) {
-		this.sortno = sortno;
-	}
+    public String getPid() {
+        return pid;
+    }
 
-	public String getCode() {
-		return code;
-	}
+    public void setPid(String pid) {
+        this.pid = pid == null ? null : pid.trim();
+    }
 
-	public void setCode(String code) {
-		this.code = code == null ? null : code.trim();
-	}
+    public Short getSortno() {
+        return sortno;
+    }
 
-	public String getSzd() {
-		return szd;
-	}
+    public void setSortno(Short sortno) {
+        this.sortno = sortno;
+    }
 
-	public void setSzd(String szd) {
-		this.szd = szd == null ? null : szd.trim();
-	}
+    public String getCode() {
+        return code;
+    }
 
-	public String getSzdName() {
-		return szdName;
-	}
+    public void setCode(String code) {
+        this.code = code == null ? null : code.trim();
+    }
 
-	public void setSzdName(String szdName) {
-		this.szdName = szdName == null ? null : szdName.trim();
-	}
+    public String getSzd() {
+        return szd;
+    }
+
+    public void setSzd(String szd) {
+        this.szd = szd == null ? null : szd.trim();
+    }
+
+    public String getSzdName() {
+        return szdName;
+    }
+
+    public void setSzdName(String szdName) {
+        this.szdName = szdName == null ? null : szdName.trim();
+    }
+
+    public String getXzqh() {
+        return xzqh;
+    }
+
+    public void setXzqh(String xzqh) {
+        this.xzqh = xzqh == null ? null : xzqh.trim();
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level == null ? null : level.trim();
+    }
 }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/GroupService.java

@@ -0,0 +1,8 @@
+package com.xt.js.gkaq.frame.service;
+
+import com.xt.js.gkaq.common.BaseService;
+import com.xt.js.gkaq.frame.model.GroupModel;
+
+public interface GroupService extends BaseService<GroupModel> {
+
+}

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/GroupServiceImpl.java

@@ -0,0 +1,21 @@
+package com.xt.js.gkaq.frame.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.js.gkaq.common.BaseMapper;
+import com.xt.js.gkaq.common.BaseUUIDModelServiceImpl;
+import com.xt.js.gkaq.frame.mappers.GroupModelMapper;
+import com.xt.js.gkaq.frame.model.GroupModel;
+import com.xt.js.gkaq.frame.service.GroupService;
+
+@Service
+public class GroupServiceImpl extends BaseUUIDModelServiceImpl<GroupModel> implements GroupService {
+    @Autowired
+    private GroupModelMapper mapper;
+
+    @Override
+    protected BaseMapper<GroupModel> getMapper() {
+        return mapper;
+    }
+}

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

@@ -1,44 +1,44 @@
-<?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.GroupModelMapper">
-  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupModel">
-    <id column="ID" jdbcType="VARCHAR" property="id" />
-    <result column="ORG" jdbcType="VARCHAR" property="org" />
-    <result column="ROLE" jdbcType="VARCHAR" property="role" />
-    <result column="REMARK" jdbcType="VARCHAR" property="remark" />
-    <result column="CREATE_TIME" jdbcType="OTHER" property="createTime" />
-    <result column="UPDATE_TIME" jdbcType="OTHER" property="updateTime" />
-    <result column="STATE" jdbcType="CHAR" property="state" />
-  </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from AQ_BASIC_FRAME_GROUP
-    where ID = #{id,jdbcType=VARCHAR}
-  </delete>
-  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.GroupModel">
-    insert into AQ_BASIC_FRAME_GROUP (ID, ORG, ROLE, 
-      REMARK, CREATE_TIME, UPDATE_TIME, 
-      STATE)
-    values (#{id,jdbcType=VARCHAR}, #{org,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=OTHER}, #{updateTime,jdbcType=OTHER}, 
-      #{state,jdbcType=CHAR})
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.GroupModel">
-    update AQ_BASIC_FRAME_GROUP
-    set ORG = #{org,jdbcType=VARCHAR},
-      ROLE = #{role,jdbcType=VARCHAR},
-      REMARK = #{remark,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=OTHER},
-      UPDATE_TIME = #{updateTime,jdbcType=OTHER},
-      STATE = #{state,jdbcType=CHAR}
-    where ID = #{id,jdbcType=VARCHAR}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_GROUP
-    where ID = #{id,jdbcType=VARCHAR}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap">
-    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
-    from AQ_BASIC_FRAME_GROUP
-  </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.GroupModelMapper" >
+  <resultMap id="BaseResultMap" type="com.xt.js.gkaq.frame.model.GroupModel" >
+    <id column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="ORG" property="org" jdbcType="VARCHAR" />
+    <result column="ROLE" property="role" jdbcType="VARCHAR" />
+    <result column="REMARK" property="remark" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="STATE" property="state" jdbcType="CHAR" />
+  </resultMap>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    delete from AQ_BASIC_FRAME_GROUP
+    where ID = #{id,jdbcType=VARCHAR}
+  </delete>
+  <insert id="insert" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
+    insert into AQ_BASIC_FRAME_GROUP (ID, ORG, ROLE, 
+      REMARK, CREATE_TIME, UPDATE_TIME, 
+      STATE)
+    values (#{id,jdbcType=VARCHAR}, #{org,jdbcType=VARCHAR}, #{role,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{state,jdbcType=CHAR})
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.GroupModel" >
+    update AQ_BASIC_FRAME_GROUP
+    set ORG = #{org,jdbcType=VARCHAR},
+      ROLE = #{role,jdbcType=VARCHAR},
+      REMARK = #{remark,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      STATE = #{state,jdbcType=CHAR}
+    where ID = #{id,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
+    from AQ_BASIC_FRAME_GROUP
+    where ID = #{id,jdbcType=VARCHAR}
+  </select>
+  <select id="selectAll" resultMap="BaseResultMap" >
+    select ID, ORG, ROLE, REMARK, CREATE_TIME, UPDATE_TIME, STATE
+    from AQ_BASIC_FRAME_GROUP
+  </select>
 </mapper>

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

@@ -14,6 +14,8 @@
     <result column="STATE" property="state" jdbcType="CHAR" />
     <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
     <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="XZQH" property="xzqh" jdbcType="VARCHAR" />
+    <result column="LEVEL" property="level" jdbcType="VARCHAR" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
     delete from AQ_BASIC_FRAME_ORG
@@ -23,13 +25,13 @@
     insert into AQ_BASIC_FRAME_ORG (ID, NAME, ORG_TYPE, 
       REMARK, PID, SORTNO, 
       CODE, SZD, SZD_NAME, 
-      STATE, CREATE_TIME, UPDATE_TIME
-      )
+      STATE, CREATE_TIME, UPDATE_TIME, 
+      XZQH, LEVEL)
     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}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+      #{state,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{xzqh,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.xt.js.gkaq.frame.model.OrgModel" >
     update AQ_BASIC_FRAME_ORG
@@ -43,18 +45,20 @@
       SZD_NAME = #{szdName,jdbcType=VARCHAR},
       STATE = #{state,jdbcType=CHAR},
       CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP}
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      XZQH = #{xzqh,jdbcType=VARCHAR},
+      LEVEL = #{level,jdbcType=VARCHAR}
     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, CREATE_TIME, 
-    UPDATE_TIME
+    UPDATE_TIME, XZQH, LEVEL
     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, CREATE_TIME, 
-    UPDATE_TIME
+    UPDATE_TIME, XZQH, LEVEL
     from AQ_BASIC_FRAME_ORG
   </select>
 </mapper>

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

@@ -24,13 +24,19 @@
 			<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_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_GROUP" domainObjectName="GroupModel">
+			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
+			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>  
+		</table>
+		 -->
+		<!--  
 		<table tableName="AQ_BASIC_FRAME_USER_GROUP" domainObjectName="UserGroupModel">
 			<columnOverride column="CREATE_TIME" jdbcType="TIMESTAMP"/>  
 			<columnOverride column="UPDATE_TIME" jdbcType="TIMESTAMP"/>