Nvarchar2改为varchar2

bsoft-api/pom.xml

@@ -117,15 +117,10 @@
                     <!--endregion-->
 
                     <!--region Mybatis Generator-->
-<!--                    <dependency>-->
-<!--                        <groupId>org.mybatis.generator</groupId>-->
-<!--                        <artifactId>mybatis-generator-core</artifactId>-->
-<!--                        <version>1.3.5</version>-->
-<!--                    </dependency>-->
                     <dependency>
-                        <groupId>com.bsoft</groupId>
-                        <artifactId>bsoft-plugins</artifactId>
-                        <version>1.0</version>
+                        <groupId>org.mybatis.generator</groupId>
+                        <artifactId>mybatis-generator-core</artifactId>
+                        <version>1.3.5</version>
                     </dependency>
                     <!--endregion-->
 

bsoft-api/src/main/java/com/bsoft/api/mapper/SysMenuMapper.java

 package com.bsoft.api.mapper;
 
 import com.bsoft.api.model.SysMenu;
+import com.bsoft.api.model.respmodel.SysMenuList;
+
 import java.util.List;
 
 public interface SysMenuMapper {
@@ -13,4 +15,6 @@ public interface SysMenuMapper {
     List<SysMenu> selectAll();
 
     int updateByPrimaryKey(SysMenu record);
+
+    List<SysMenuList> selectMenuByUser(Long userId);
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/mapper/SysUserRoleRsMapper.java

 package com.bsoft.api.mapper;
 
+import com.bsoft.api.model.SysRole;
 import com.bsoft.api.model.SysUserRoleRs;
 import java.util.List;
 
@@ -13,4 +14,6 @@ public interface SysUserRoleRsMapper {
     List<SysUserRoleRs> selectAll();
 
     int updateByPrimaryKey(SysUserRoleRs record);
+
+    List<SysRole> selectRoleByUser(Long userId);
 }
\ No newline at end of file

bsoft-api/src/main/resources/mapper/DicDimMapper.xml

@@ -6,8 +6,8 @@
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="DIM_NAME" jdbcType="NVARCHAR2" property="dimName" />
-    <result column="DIM_FIELD" jdbcType="NVARCHAR2" property="dimField" />
+    <result column="DIM_NAME" jdbcType="VARCHAR" property="dimName" />
+    <result column="DIM_FIELD" jdbcType="VARCHAR" property="dimField" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from LL.DIC_DIM
@@ -20,15 +20,15 @@
     insert into LL.DIC_DIM (CREATE_DATE, CREATE_USERID, STATE, 
       DIM_NAME, DIM_FIELD)
     values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, 
-      #{dimName,jdbcType=NVARCHAR2}, #{dimField,jdbcType=NVARCHAR2})
+      #{dimName,jdbcType=VARCHAR}, #{dimField,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicDim">
     update LL.DIC_DIM
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
       STATE = #{state,jdbcType=DECIMAL},
-      DIM_NAME = #{dimName,jdbcType=NVARCHAR2},
-      DIM_FIELD = #{dimField,jdbcType=NVARCHAR2}
+      DIM_NAME = #{dimName,jdbcType=VARCHAR},
+      DIM_FIELD = #{dimField,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=DECIMAL}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">

bsoft-api/src/main/resources/mapper/DicIndMapper.xml

@@ -6,11 +6,11 @@
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="IND_CODE" jdbcType="NVARCHAR2" property="indCode" />
-    <result column="IND_NAME" jdbcType="NVARCHAR2" property="indName" />
+    <result column="IND_CODE" jdbcType="VARCHAR" property="indCode" />
+    <result column="IND_NAME" jdbcType="VARCHAR" property="indName" />
     <result column="COMPUTE_MODE" jdbcType="DECIMAL" property="computeMode" />
-    <result column="EXEC_SQL" jdbcType="NVARCHAR2" property="execSql" />
-    <result column="DESCRIBE" jdbcType="NVARCHAR2" property="describe" />
+    <result column="EXEC_SQL" jdbcType="VARCHAR" property="execSql" />
+    <result column="DESCRIBE" jdbcType="VARCHAR" property="describe" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from LL.DIC_IND
@@ -24,19 +24,19 @@
       IND_CODE, IND_NAME, COMPUTE_MODE, 
       EXEC_SQL, DESCRIBE)
     values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, 
-      #{indCode,jdbcType=NVARCHAR2}, #{indName,jdbcType=NVARCHAR2}, #{computeMode,jdbcType=DECIMAL}, 
-      #{execSql,jdbcType=NVARCHAR2}, #{describe,jdbcType=NVARCHAR2})
+      #{indCode,jdbcType=VARCHAR}, #{indName,jdbcType=VARCHAR}, #{computeMode,jdbcType=DECIMAL},
+      #{execSql,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicInd">
     update LL.DIC_IND
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
       STATE = #{state,jdbcType=DECIMAL},
-      IND_CODE = #{indCode,jdbcType=NVARCHAR2},
-      IND_NAME = #{indName,jdbcType=NVARCHAR2},
+      IND_CODE = #{indCode,jdbcType=VARCHAR},
+      IND_NAME = #{indName,jdbcType=VARCHAR},
       COMPUTE_MODE = #{computeMode,jdbcType=DECIMAL},
-      EXEC_SQL = #{execSql,jdbcType=NVARCHAR2},
-      DESCRIBE = #{describe,jdbcType=NVARCHAR2}
+      EXEC_SQL = #{execSql,jdbcType=VARCHAR},
+      DESCRIBE = #{describe,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=DECIMAL}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">

bsoft-api/src/main/resources/mapper/DicOrgMapper.xml

@@ -6,13 +6,13 @@
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="ORG_CODE" jdbcType="NVARCHAR2" property="orgCode" />
-    <result column="ORG_NAME" jdbcType="NVARCHAR2" property="orgName" />
-    <result column="ORG_NO" jdbcType="NVARCHAR2" property="orgNo" />
-    <result column="ORG_SHORT_NAME" jdbcType="NVARCHAR2" property="orgShortName" />
-    <result column="ORG_GROUP" jdbcType="NVARCHAR2" property="orgGroup" />
-    <result column="ORG_TYPE" jdbcType="NVARCHAR2" property="orgType" />
-    <result column="ORG_ADDRESS" jdbcType="NVARCHAR2" property="orgAddress" />
+    <result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode" />
+    <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName" />
+    <result column="ORG_NO" jdbcType="VARCHAR" property="orgNo" />
+    <result column="ORG_SHORT_NAME" jdbcType="VARCHAR" property="orgShortName" />
+    <result column="ORG_GROUP" jdbcType="VARCHAR" property="orgGroup" />
+    <result column="ORG_TYPE" jdbcType="VARCHAR" property="orgType" />
+    <result column="ORG_ADDRESS" jdbcType="VARCHAR" property="orgAddress" />
     <result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -28,22 +28,22 @@
       ORG_SHORT_NAME, ORG_GROUP, ORG_TYPE, 
       ORG_ADDRESS, PARENT_ID)
     values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, 
-      #{orgCode,jdbcType=NVARCHAR2}, #{orgName,jdbcType=NVARCHAR2}, #{orgNo,jdbcType=NVARCHAR2}, 
-      #{orgShortName,jdbcType=NVARCHAR2}, #{orgGroup,jdbcType=NVARCHAR2}, #{orgType,jdbcType=NVARCHAR2}, 
-      #{orgAddress,jdbcType=NVARCHAR2}, #{parentId,jdbcType=DECIMAL})
+      #{orgCode,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, #{orgNo,jdbcType=VARCHAR},
+      #{orgShortName,jdbcType=VARCHAR}, #{orgGroup,jdbcType=VARCHAR}, #{orgType,jdbcType=VARCHAR},
+      #{orgAddress,jdbcType=VARCHAR}, #{parentId,jdbcType=DECIMAL})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.DicOrg">
     update LL.DIC_ORG
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
       STATE = #{state,jdbcType=DECIMAL},
-      ORG_CODE = #{orgCode,jdbcType=NVARCHAR2},
-      ORG_NAME = #{orgName,jdbcType=NVARCHAR2},
-      ORG_NO = #{orgNo,jdbcType=NVARCHAR2},
-      ORG_SHORT_NAME = #{orgShortName,jdbcType=NVARCHAR2},
-      ORG_GROUP = #{orgGroup,jdbcType=NVARCHAR2},
-      ORG_TYPE = #{orgType,jdbcType=NVARCHAR2},
-      ORG_ADDRESS = #{orgAddress,jdbcType=NVARCHAR2},
+      ORG_CODE = #{orgCode,jdbcType=VARCHAR},
+      ORG_NAME = #{orgName,jdbcType=VARCHAR},
+      ORG_NO = #{orgNo,jdbcType=VARCHAR},
+      ORG_SHORT_NAME = #{orgShortName,jdbcType=VARCHAR},
+      ORG_GROUP = #{orgGroup,jdbcType=VARCHAR},
+      ORG_TYPE = #{orgType,jdbcType=VARCHAR},
+      ORG_ADDRESS = #{orgAddress,jdbcType=VARCHAR},
       PARENT_ID = #{parentId,jdbcType=DECIMAL}
     where ID = #{id,jdbcType=DECIMAL}
   </update>

bsoft-api/src/main/resources/mapper/SerBlockMapper.xml

@@ -6,8 +6,8 @@
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="BLOCK_CODE" jdbcType="NVARCHAR2" property="blockCode" />
-    <result column="BLOCK_NAME" jdbcType="NVARCHAR2" property="blockName" />
+    <result column="BLOCK_CODE" jdbcType="VARCHAR" property="blockCode" />
+    <result column="BLOCK_NAME" jdbcType="VARCHAR" property="blockName" />
     <result column="RETURN_TYPE" jdbcType="DECIMAL" property="returnType" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -22,7 +22,7 @@
       BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
       )
     values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, 
-      #{blockCode,jdbcType=NVARCHAR2}, #{blockName,jdbcType=NVARCHAR2}, #{returnType,jdbcType=DECIMAL}
+      #{blockCode,jdbcType=VARCHAR}, #{blockName,jdbcType=VARCHAR}, #{returnType,jdbcType=DECIMAL}
       )
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerBlock">
@@ -30,8 +30,8 @@
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
       STATE = #{state,jdbcType=DECIMAL},
-      BLOCK_CODE = #{blockCode,jdbcType=NVARCHAR2},
-      BLOCK_NAME = #{blockName,jdbcType=NVARCHAR2},
+      BLOCK_CODE = #{blockCode,jdbcType=VARCHAR},
+      BLOCK_NAME = #{blockName,jdbcType=VARCHAR},
       RETURN_TYPE = #{returnType,jdbcType=DECIMAL}
     where ID = #{id,jdbcType=DECIMAL}
   </update>

bsoft-api/src/main/resources/mapper/SerPageMapper.xml

@@ -6,8 +6,8 @@
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="PAGE_CODE" jdbcType="NVARCHAR2" property="pageCode" />
-    <result column="PAGE_NAME" jdbcType="NVARCHAR2" property="pageName" />
+    <result column="PAGE_CODE" jdbcType="VARCHAR" property="pageCode" />
+    <result column="PAGE_NAME" jdbcType="VARCHAR" property="pageName" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from LL.SER_PAGE
@@ -20,15 +20,15 @@
     insert into LL.SER_PAGE (CREATE_DATE, CREATE_USERID, STATE, 
       PAGE_CODE, PAGE_NAME)
     values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, 
-      #{pageCode,jdbcType=NVARCHAR2}, #{pageName,jdbcType=NVARCHAR2})
+      #{pageCode,jdbcType=VARCHAR}, #{pageName,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SerPage">
     update LL.SER_PAGE
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
       STATE = #{state,jdbcType=DECIMAL},
-      PAGE_CODE = #{pageCode,jdbcType=NVARCHAR2},
-      PAGE_NAME = #{pageName,jdbcType=NVARCHAR2}
+      PAGE_CODE = #{pageCode,jdbcType=VARCHAR},
+      PAGE_NAME = #{pageName,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=DECIMAL}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">

bsoft-api/src/main/resources/mapper/SysMenuMapper.xml

@@ -6,9 +6,9 @@
     <result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="MENU_NAME" jdbcType="NVARCHAR2" property="menuName" />
-    <result column="MENU_URL" jdbcType="NVARCHAR2" property="menuUrl" />
-    <result column="MENU_IMAGE" jdbcType="NVARCHAR2" property="menuImage" />
+    <result column="MENU_NAME" jdbcType="VARCHAR" property="menuName" />
+    <result column="MENU_URL" jdbcType="VARCHAR" property="menuUrl" />
+    <result column="MENU_IMAGE" jdbcType="VARCHAR" property="menuImage" />
     <result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -23,7 +23,7 @@
       MENU_NAME, MENU_URL, MENU_IMAGE,
       PARENT_ID)
     values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
-      #{menuName,jdbcType=NVARCHAR2}, #{menuUrl,jdbcType=NVARCHAR2}, #{menuImage,jdbcType=NVARCHAR2},
+      #{menuName,jdbcType=VARCHAR}, #{menuUrl,jdbcType=VARCHAR}, #{menuImage,jdbcType=VARCHAR},
       #{parentId,jdbcType=DECIMAL})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysMenu">
@@ -31,9 +31,9 @@
     set CREATE_DATA = #{createData,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
       STATE = #{state,jdbcType=DECIMAL},
-      MENU_NAME = #{menuName,jdbcType=NVARCHAR2},
-      MENU_URL = #{menuUrl,jdbcType=NVARCHAR2},
-      MENU_IMAGE = #{menuImage,jdbcType=NVARCHAR2},
+      MENU_NAME = #{menuName,jdbcType=VARCHAR},
+      MENU_URL = #{menuUrl,jdbcType=VARCHAR},
+      MENU_IMAGE = #{menuImage,jdbcType=VARCHAR},
       PARENT_ID = #{parentId,jdbcType=DECIMAL}
     where ID = #{id,jdbcType=DECIMAL}
   </update>
@@ -66,4 +66,5 @@
         where umr.STATE=1 and m.STATE=1  and  umr.USER_ID = #{userId,jdbcType=DECIMAL}
 
   </select>
+    <select id="selectMenuByUser" resultType="com.bsoft.api.model.respmodel.SysMenuList"></select>
 </mapper>
\ No newline at end of file

bsoft-api/src/main/resources/mapper/SysOrgMapper.xml

@@ -4,15 +4,15 @@
   <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysOrg">
     <id column="ID" jdbcType="DECIMAL" property="id" />
     <result column="CREATE_DATA" jdbcType="TIMESTAMP" property="createData" />
-    <result column="CREATE_USERID" jdbcType="NVARCHAR2" property="createUserid" />
+    <result column="CREATE_USERID" jdbcType="VARCHAR" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="ORG_CODE" jdbcType="NVARCHAR2" property="orgCode" />
-    <result column="ORG_NAME" jdbcType="NVARCHAR2" property="orgName" />
-    <result column="ORG_NO" jdbcType="NVARCHAR2" property="orgNo" />
-    <result column="ORG_SHORT_NAME" jdbcType="NVARCHAR2" property="orgShortName" />
-    <result column="ORG_GROUP" jdbcType="NVARCHAR2" property="orgGroup" />
-    <result column="ORG_TYPE" jdbcType="NVARCHAR2" property="orgType" />
-    <result column="ORG_ADDRESS" jdbcType="NVARCHAR2" property="orgAddress" />
+    <result column="ORG_CODE" jdbcType="VARCHAR" property="orgCode" />
+    <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName" />
+    <result column="ORG_NO" jdbcType="VARCHAR" property="orgNo" />
+    <result column="ORG_SHORT_NAME" jdbcType="VARCHAR" property="orgShortName" />
+    <result column="ORG_GROUP" jdbcType="VARCHAR" property="orgGroup" />
+    <result column="ORG_TYPE" jdbcType="VARCHAR" property="orgType" />
+    <result column="ORG_ADDRESS" jdbcType="VARCHAR" property="orgAddress" />
     <result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -27,23 +27,23 @@
       ORG_CODE, ORG_NAME, ORG_NO, 
       ORG_SHORT_NAME, ORG_GROUP, ORG_TYPE, 
       ORG_ADDRESS, PARENT_ID)
-    values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=NVARCHAR2}, #{state,jdbcType=DECIMAL}, 
-      #{orgCode,jdbcType=NVARCHAR2}, #{orgName,jdbcType=NVARCHAR2}, #{orgNo,jdbcType=NVARCHAR2}, 
-      #{orgShortName,jdbcType=NVARCHAR2}, #{orgGroup,jdbcType=NVARCHAR2}, #{orgType,jdbcType=NVARCHAR2}, 
-      #{orgAddress,jdbcType=NVARCHAR2}, #{parentId,jdbcType=DECIMAL})
+    values (#{createData,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=VARCHAR}, #{state,jdbcType=DECIMAL}, 
+      #{orgCode,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, #{orgNo,jdbcType=VARCHAR}, 
+      #{orgShortName,jdbcType=VARCHAR}, #{orgGroup,jdbcType=VARCHAR}, #{orgType,jdbcType=VARCHAR}, 
+      #{orgAddress,jdbcType=VARCHAR}, #{parentId,jdbcType=DECIMAL})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysOrg">
     update LL.SYS_ORG
     set CREATE_DATA = #{createData,jdbcType=TIMESTAMP},
-      CREATE_USERID = #{createUserid,jdbcType=NVARCHAR2},
+      CREATE_USERID = #{createUserid,jdbcType=VARCHAR},
       STATE = #{state,jdbcType=DECIMAL},
-      ORG_CODE = #{orgCode,jdbcType=NVARCHAR2},
-      ORG_NAME = #{orgName,jdbcType=NVARCHAR2},
-      ORG_NO = #{orgNo,jdbcType=NVARCHAR2},
-      ORG_SHORT_NAME = #{orgShortName,jdbcType=NVARCHAR2},
-      ORG_GROUP = #{orgGroup,jdbcType=NVARCHAR2},
-      ORG_TYPE = #{orgType,jdbcType=NVARCHAR2},
-      ORG_ADDRESS = #{orgAddress,jdbcType=NVARCHAR2},
+      ORG_CODE = #{orgCode,jdbcType=VARCHAR},
+      ORG_NAME = #{orgName,jdbcType=VARCHAR},
+      ORG_NO = #{orgNo,jdbcType=VARCHAR},
+      ORG_SHORT_NAME = #{orgShortName,jdbcType=VARCHAR},
+      ORG_GROUP = #{orgGroup,jdbcType=VARCHAR},
+      ORG_TYPE = #{orgType,jdbcType=VARCHAR},
+      ORG_ADDRESS = #{orgAddress,jdbcType=VARCHAR},
       PARENT_ID = #{parentId,jdbcType=DECIMAL}
     where ID = #{id,jdbcType=DECIMAL}
   </update>

bsoft-api/src/main/resources/mapper/SysProjectMapper.xml

@@ -6,8 +6,8 @@
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="PROJECT_CODE" jdbcType="NVARCHAR2" property="projectCode" />
-    <result column="PROJECT_NAME" jdbcType="NVARCHAR2" property="projectName" />
+    <result column="PROJECT_CODE" jdbcType="VARCHAR" property="projectCode" />
+    <result column="PROJECT_NAME" jdbcType="VARCHAR" property="projectName" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     delete from LL.SYS_PROJECT
@@ -20,15 +20,15 @@
     insert into LL.SYS_PROJECT (CREATE_DATE, CREATE_USERID, STATE, 
       PROJECT_CODE, PROJECT_NAME)
     values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, 
-      #{projectCode,jdbcType=NVARCHAR2}, #{projectName,jdbcType=NVARCHAR2})
+      #{projectCode,jdbcType=VARCHAR}, #{projectName,jdbcType=VARCHAR})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysProject">
     update LL.SYS_PROJECT
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
       STATE = #{state,jdbcType=DECIMAL},
-      PROJECT_CODE = #{projectCode,jdbcType=NVARCHAR2},
-      PROJECT_NAME = #{projectName,jdbcType=NVARCHAR2}
+      PROJECT_CODE = #{projectCode,jdbcType=VARCHAR},
+      PROJECT_NAME = #{projectName,jdbcType=VARCHAR}
     where ID = #{id,jdbcType=DECIMAL}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">

bsoft-api/src/main/resources/mapper/SysRoleMapper.xml

@@ -6,7 +6,7 @@
     <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
     <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
     <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="ROLE_NAME" jdbcType="NVARCHAR2" property="roleName" />
+    <result column="ROLE_NAME" jdbcType="VARCHAR" property="roleName" />
     <result column="ROLE_CODE" jdbcType="DECIMAL" property="roleCode" />
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -20,14 +20,14 @@
     insert into LL.SYS_ROLE (CREATE_DATE, CREATE_USERID, STATE, 
       ROLE_NAME, ROLE_CODE)
     values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
-      #{roleName,jdbcType=NVARCHAR2}, #{roleCode,jdbcType=DECIMAL})
+      #{roleName,jdbcType=VARCHAR}, #{roleCode,jdbcType=DECIMAL})
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRole">
     update LL.SYS_ROLE
     set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
       CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
       STATE = #{state,jdbcType=DECIMAL},
-      ROLE_NAME = #{roleName,jdbcType=NVARCHAR2},
+      ROLE_NAME = #{roleName,jdbcType=VARCHAR},
       ROLE_CODE = #{roleCode,jdbcType=DECIMAL}
     where ID = #{id,jdbcType=DECIMAL}
   </update>

bsoft-api/src/main/resources/mapper/SysUserMapper.xml

@@ -11,17 +11,17 @@
         <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
         <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
         <result column="STATE" jdbcType="DECIMAL" property="state"/>
-        <result column="USER_CODE" jdbcType="NVARCHAR2" property="userCode"/>
-        <result column="USER_NAME" jdbcType="NVARCHAR2" property="userName"/>
-        <result column="PASSWORD" jdbcType="NVARCHAR2" property="password"/>
-        <result column="IDCARD" jdbcType="NVARCHAR2" property="idcard"/>
-        <result column="SEX" jdbcType="NVARCHAR2" property="sex"/>
-        <result column="MOBILE" jdbcType="NVARCHAR2" property="mobile"/>
+        <result column="USER_CODE" jdbcType="VARCHAR" property="userCode"/>
+        <result column="USER_NAME" jdbcType="VARCHAR" property="userName"/>
+        <result column="PASSWORD" jdbcType="VARCHAR" property="password"/>
+        <result column="IDCARD" jdbcType="VARCHAR" property="idcard"/>
+        <result column="SEX" jdbcType="VARCHAR" property="sex"/>
+        <result column="MOBILE" jdbcType="VARCHAR" property="mobile"/>
         <result column="PAGE_COUNT" jdbcType="DECIMAL" property="pageCount"/>
         <result column="ERROR_COUNT" jdbcType="DECIMAL" property="errorCount"/>
         <result column="ERROR_TIME" jdbcType="TIMESTAMP" property="errorTime"/>
         <result column="LAST_TIME" jdbcType="TIMESTAMP" property="lastTime"/>
-        <result column="LAST_IP" jdbcType="NVARCHAR2" property="lastIp"/>
+        <result column="LAST_IP" jdbcType="VARCHAR" property="lastIp"/>
     </resultMap>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         <!--
@@ -47,10 +47,10 @@
         PAGE_COUNT, ERROR_COUNT, ERROR_TIME,
         LAST_TIME, LAST_IP)
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
-        #{userCode,jdbcType=NVARCHAR2}, #{userName,jdbcType=NVARCHAR2}, #{password,jdbcType=NVARCHAR2},
-        #{idcard,jdbcType=NVARCHAR2}, #{sex,jdbcType=NVARCHAR2}, #{mobile,jdbcType=NVARCHAR2},
+        #{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
+        #{idcard,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
         #{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP},
-        #{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=NVARCHAR2})
+        #{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR})
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysUser">
         <!--
@@ -62,17 +62,17 @@
         set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
         CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
         STATE = #{state,jdbcType=DECIMAL},
-        USER_CODE = #{userCode,jdbcType=NVARCHAR2},
-        USER_NAME = #{userName,jdbcType=NVARCHAR2},
-        PASSWORD = #{password,jdbcType=NVARCHAR2},
-        IDCARD = #{idcard,jdbcType=NVARCHAR2},
-        SEX = #{sex,jdbcType=NVARCHAR2},
-        MOBILE = #{mobile,jdbcType=NVARCHAR2},
+        USER_CODE = #{userCode,jdbcType=VARCHAR},
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+        PASSWORD = #{password,jdbcType=VARCHAR},
+        IDCARD = #{idcard,jdbcType=VARCHAR},
+        SEX = #{sex,jdbcType=VARCHAR},
+        MOBILE = #{mobile,jdbcType=VARCHAR},
         PAGE_COUNT = #{pageCount,jdbcType=DECIMAL},
         ERROR_COUNT = #{errorCount,jdbcType=DECIMAL},
         ERROR_TIME = #{errorTime,jdbcType=TIMESTAMP},
         LAST_TIME = #{lastTime,jdbcType=TIMESTAMP},
-        LAST_IP = #{lastIp,jdbcType=NVARCHAR2}
+        LAST_IP = #{lastIp,jdbcType=VARCHAR}
         where ID = #{id,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">

bsoft-api/src/test/resources/generatorConfig.xml

@@ -38,58 +38,58 @@
         <!-- 生成映射接口配置 -->
         <javaClientGenerator targetPackage="com.bsoft.api.mapper" targetProject="src/main/java" type="XMLMAPPER"/>
 
-        <table tableName="sys_user" schema="ll" >
-            <!-- 主键生成方式 -->
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_ID.nextval from dual" identity="true" />
-        </table>
+<!--        <table tableName="sys_user" schema="ll" >-->
+<!--            &lt;!&ndash; 主键生成方式 &ndash;&gt;-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
         <table tableName="DIC_DIM" schema="ll" >
             <generatedKey column="id" sqlStatement="select SEQ_DIC_DIM_ID.nextval from dual" identity="true" />
         </table>
-        <table tableName="DIC_IND" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_DIC_IND_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="DIC_ORG" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_DIC_ORG_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SER_BLOCK_IND_RS" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SER_ BLOCK_IND_RS_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SER_BLOCK" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SER_BLOCK_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SER_PAGE" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SER_PAGE_BLOCK_RS" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_BLOCK_RS_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SER_PAGE_DIM_RS" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_DIM_RS_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SYS_MENU" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_MENU_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SYS_ORG" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_ORG_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SYS_PROJECT" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_PROJECT_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SYS_ROLE" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_ROLE_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SYS_ROLE_MENU_RS" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_ROLE_MENU_RS_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SYS_USER_MENU_RS" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_MENU_RS_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SYS_USER_ORG_RS" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_ORG_RS_ID.nextval from dual" identity="true" />
-        </table>
-        <table tableName="SYS_USER_ROLE_RS" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_ROLE_RS_ID.nextval from dual" identity="true" />
-        </table>
+<!--        <table tableName="DIC_IND" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_DIC_IND_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="DIC_ORG" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_DIC_ORG_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SER_BLOCK_IND_RS" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SER_ BLOCK_IND_RS_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SER_BLOCK" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SER_BLOCK_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SER_PAGE" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SER_PAGE_BLOCK_RS" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_BLOCK_RS_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SER_PAGE_DIM_RS" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SER_PAGE_DIM_RS_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SYS_MENU" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_MENU_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SYS_ORG" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_ORG_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SYS_PROJECT" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_PROJECT_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SYS_ROLE" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_ROLE_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SYS_ROLE_MENU_RS" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_ROLE_MENU_RS_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SYS_USER_MENU_RS" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_MENU_RS_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SYS_USER_ORG_RS" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_ORG_RS_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+<!--        <table tableName="SYS_USER_ROLE_RS" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_ROLE_RS_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
     </context>
     <!--<context id="sqlserver" targetRuntime="MyBatis3Simple" defaultModelType="flat">-->
     <!--<property enName="beginningDelimiter" value="["/>-->