From df6867ee052790c3d690f341c422540e47ae5ec3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 16 一月 2023 10:52:14 +0800
Subject: [PATCH] update 优化 默认开启复杂结构 resultMap 自动映射 简化xml编码(多结构实体需带上主键id)
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 30 --------------
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml | 47 ++---------------------
ruoyi-admin/src/main/resources/application.yml | 2
3 files changed, 6 insertions(+), 73 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0468a33..fd93576 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -153,7 +153,7 @@
mapUnderscoreToCamelCase: true
# MyBatis 鑷姩鏄犲皠绛栫暐
# NONE锛氫笉鍚敤 PARTIAL锛氬彧瀵归潪宓屽 resultMap 鑷姩鏄犲皠 FULL锛氬鎵�鏈� resultMap 鑷姩鏄犲皠
- autoMappingBehavior: PARTIAL
+ autoMappingBehavior: FULL
# MyBatis 鑷姩鏄犲皠鏃舵湭鐭ュ垪鎴栨湭鐭ュ睘鎬у鐞嗙瓥
# NONE锛氫笉鍋氬鐞� WARNING锛氭墦鍗扮浉鍏宠鍛� FAILING锛氭姏鍑哄紓甯稿拰璇︾粏淇℃伅
autoMappingUnknownColumnBehavior: NONE
diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 21bd26b..4d4e68e 100644
--- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -4,53 +4,14 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.generator.mapper.GenTableMapper">
+ <!-- 澶氱粨鏋勫祵濂楄嚜鍔ㄦ槧灏勯渶甯︿笂姣忎釜瀹炰綋鐨勪富閿甶d 鍚﹀垯鏄犲皠浼氬け璐� -->
<resultMap type="com.ruoyi.generator.domain.GenTable" id="GenTableResult">
- <id property="tableId" column="table_id" />
- <result property="tableName" column="table_name" />
- <result property="tableComment" column="table_comment" />
- <result property="subTableName" column="sub_table_name" />
- <result property="subTableFkName" column="sub_table_fk_name" />
- <result property="className" column="class_name" />
- <result property="tplCategory" column="tpl_category" />
- <result property="packageName" column="package_name" />
- <result property="moduleName" column="module_name" />
- <result property="businessName" column="business_name" />
- <result property="functionName" column="function_name" />
- <result property="functionAuthor" column="function_author" />
- <result property="genType" column="gen_type" />
- <result property="genPath" column="gen_path" />
- <result property="options" column="options" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="remark" column="remark" />
- <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
+ <id property="tableId" column="table_id" />
+ <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult" />
</resultMap>
<resultMap type="com.ruoyi.generator.domain.GenTableColumn" id="GenTableColumnResult">
- <id property="columnId" column="column_id" />
- <result property="tableId" column="table_id" />
- <result property="columnName" column="column_name" />
- <result property="columnComment" column="column_comment" />
- <result property="columnType" column="column_type" />
- <result property="javaType" column="java_type" />
- <result property="javaField" column="java_field" />
- <result property="isPk" column="is_pk" />
- <result property="isIncrement" column="is_increment" />
- <result property="isRequired" column="is_required" />
- <result property="isInsert" column="is_insert" />
- <result property="isEdit" column="is_edit" />
- <result property="isList" column="is_list" />
- <result property="isQuery" column="is_query" />
- <result property="queryType" column="query_type" />
- <result property="htmlType" column="html_type" />
- <result property="dictType" column="dict_type" />
- <result property="sort" column="sort" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
+ <id property="columnId" column="column_id"/>
</resultMap>
<select id="selectPageDbTableList" resultMap="GenTableResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index f9ee5ab..a8a4a51 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -4,47 +4,19 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
+ <!-- 澶氱粨鏋勫祵濂楄嚜鍔ㄦ槧灏勯渶甯︿笂姣忎釜瀹炰綋鐨勪富閿甶d 鍚﹀垯鏄犲皠浼氬け璐� -->
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id"/>
- <result property="deptId" column="dept_id"/>
- <result property="userName" column="user_name"/>
- <result property="nickName" column="nick_name"/>
- <result property="userType" column="user_type"/>
- <result property="email" column="email"/>
- <result property="phonenumber" column="phonenumber"/>
- <result property="sex" column="sex"/>
- <result property="avatar" column="avatar"/>
- <result property="password" column="password"/>
- <result property="status" column="status"/>
- <result property="delFlag" column="del_flag"/>
- <result property="loginIp" column="login_ip"/>
- <result property="loginDate" column="login_date"/>
- <result property="createBy" column="create_by"/>
- <result property="createTime" column="create_time"/>
- <result property="updateBy" column="update_by"/>
- <result property="updateTime" column="update_time"/>
- <result property="remark" column="remark"/>
<association property="dept" column="dept_id" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
<resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
<id property="deptId" column="dept_id"/>
- <result property="parentId" column="parent_id"/>
- <result property="deptName" column="dept_name"/>
- <result property="ancestors" column="ancestors"/>
- <result property="orderNum" column="order_num"/>
- <result property="leader" column="leader"/>
- <result property="status" column="dept_status"/>
</resultMap>
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
<id property="roleId" column="role_id"/>
- <result property="roleName" column="role_name"/>
- <result property="roleKey" column="role_key"/>
- <result property="roleSort" column="role_sort"/>
- <result property="dataScope" column="data_scope"/>
- <result property="status" column="role_status"/>
</resultMap>
<sql id="selectUserVo">
--
Gitblit v1.9.3