瀏覽代碼

xml映射文件打包配置

raojiang 6 月之前
父節點
當前提交
fe551cd706

+ 12 - 0
common/common-core/pom.xml

@@ -155,4 +155,16 @@
 		</dependency>
 	</dependencies>
 
+	<build>
+		<resources>
+			<resource>
+				<!-- 打包MyBatis XML文件所在的目录 -->
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>mapper/*.xml</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
+
 </project>

+ 0 - 0
common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/mapping/DwdShbDsFeederBaseMapper.xml → common/common-core/src/main/resources/mapper/DwdShbDsFeederBaseMapper.xml


+ 0 - 0
common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/mapping/FhzgDistMappingFileMapper.xml → common/common-core/src/main/resources/mapper/FhzgDistMappingFileMapper.xml


+ 0 - 0
common/common-core/src/main/java/com/hdkj/lt/core/log/dao/mapping/FhzgLogInfoMapper.xml → common/common-core/src/main/resources/mapper/FhzgLogInfoMapper.xml


+ 0 - 0
common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/mapping/FhzgOrganSuffixMapper.xml → common/common-core/src/main/resources/mapper/FhzgOrganSuffixMapper.xml


+ 0 - 0
common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/mapping/FhzgSwitchProtectionSettingsMapper.xml → common/common-core/src/main/resources/mapper/FhzgSwitchProtectionSettingsMapper.xml


+ 1 - 1
common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/mapping/SysDictMapper.xml → common/common-core/src/main/resources/mapper/SysDictMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hdkj.lt.core.sys.dao.SysDictMapper">
 
-    <select id="getDictSingleByTypeName" resultType="com.jxdinfo.hussar.general.dict.model.DicSingle">
+    <select id="getDictSingleByTypeName" resultType="com.hdkj.lt.core.sys.model.po.DicSingle">
         SELECT
             sds.LABEL,
             sds.VALUE,

+ 0 - 0
common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/mapping/SysStruMapper.xml → common/common-core/src/main/resources/mapper/SysStruMapper.xml


+ 1 - 22
common/common-core/src/main/java/com/hdkj/lt/core/sys/dao/mapping/SysUserMapper.xml → common/common-core/src/main/resources/mapper/SysUserMapper.xml

@@ -2,27 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hdkj.lt.core.sys.dao.SysUserMapper">
 
-    <resultMap id="treeMap" type="com.jxdinfo.hussar.common.treemodel.JSTreeModel">
-        <id column="ID" property="id" />
-        <result column="TEXT" property="text" />
-        <result column="CODE" property="code" />
-        <result column="PARENT" property="parent" />
-        <result column="ORGANID" property="organId" />
-        <result column="STRUTYPE" property="struType" />
-        <result column="STRULEVEL" property="struLevel" />
-        <result column="STRUORDER" property="struOrder" />
-        <result column="FIRST_ORDER" property="firstOrder" />
-        <result column="MODELTYPE" property="type" />
-        <result column="ISEMPLOYEE" property="isEmployee" />
-        <result column="EMPLOYEEID" property="employeeId" />
-        <result column="PARENTTYPECODE" property="parentTypeCode" />
-        <result column="ISLEAF" property="isLeaf" />
-        <result column="SEQ" property="seq" />
-        <result column="ACCOUNTSTATUS" property="accountStatus" />
-        <result column="PRIME" property="prime" />
-        <result column="IMG_URL" property="imgUrl" />
-    </resultMap>
-
     <select id="listByCondition" resultType="com.hdkj.lt.core.sys.model.po.SysUser">
         SELECT u.*
         FROM SYS_USERS u
@@ -115,7 +94,7 @@
         ) t
     </select>
 
-    <select id="getLoadingUserTree" resultMap="treeMap">
+    <select id="getLoadingUserTree">
         SELECT *
         FROM (
         SELECT

+ 1 - 1
common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/config/MybatisConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  * @date 2021/9/15/0015
  */
 @Configuration
-@MapperScan(basePackages = "com.ruoyi.system.**.mapper")
+@MapperScan(basePackages = "com.hdkj.**.mapper")
 public class MybatisConfig {
 
     @Bean

+ 1 - 2
services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/StruServiceImpl.java

@@ -503,8 +503,7 @@ public class StruServiceImpl implements StruService {
         } else {
             throw new BusinessException("请先登录");
         }
-        List<StruTreeVO> result = getStruTreeById(currentStruId);
-        return result;
+        return getStruTreeById(currentStruId);
     }
 
     /**

+ 1 - 0
services/load-transfer-bf/src/main/resources/mapper/SystemThemeMapper.xml

@@ -29,6 +29,7 @@
             USER_SYS_COLOR usc ON usc.SYSTEM_COLOR =sds.`VALUE`
         WHERE sdt.TYPE_NAME = 'system_color' AND usc.USER_ID = #{userId}
     </select>
+
     <select id="getAllSort" resultType="java.lang.Integer">
         SELECT
             COUNT(1)

+ 1 - 1
services/pom.xml

@@ -181,7 +181,7 @@
                 <directory>src/main/resources/config/${environment}</directory>
             </resource>
             <resource>
-                <!-- 指定MyBatis XML文件所在的目录 -->
+                <!-- 打包MyBatis XML文件所在的目录 -->
                 <directory>src/main/resources</directory>
                 <includes>
                     <include>mapper/*.xml</include>