fix bug

2021-12-29 15:21:51 +08:00
parent 88f7b0cbc8
commit 3033888256
13 changed files with 32 additions and 22 deletions
--- a/hcframe-parent/hcframe-base/pom.xml
+++ b/hcframe-parent/hcframe-base/pom.xml
@@ -116,6 +116,12 @@
            <artifactId>knife4j-spring-boot-starter</artifactId>
            <version>2.0.2</version>
        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
+<!--        <dependency>-->
+<!--            <groupId>com.baomidou</groupId>-->
+<!--            <artifactId>mybatis-plus-boot-starter</artifactId>-->
+<!--            <version>3.4.3.4</version>-->
+<!--        </dependency>-->
        <!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
        <dependency>
            <groupId>javax.validation</groupId>
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/MyMapper.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/common/MyMapper.java
@@ -6,7 +6,7 @@ import tk.mybatis.mapper.common.*;
 * @description 调用tkmapper进行接口封装
 * @param <T>
 */
-public interface Mapper<T> extends
+public interface MyMapper<T> extends
        BaseMapper<T>,
        ExampleMapper<T>,
        RowBoundsMapper<T>,
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/FtUserDao.java
@@ -1,6 +1,6 @@
 package com.hcframe.base.module.auth.dao;

-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.auth.entity.FtUser;

 /**
@@ -9,6 +9,6 @@ import com.hcframe.base.module.auth.entity.FtUser;
 * @author lhc
 * @since 2020-02-11 19:29:10
 */
-public interface FtUserDao extends Mapper<FtUser> {
+public interface FtUserDao extends MyMapper<FtUser> {

 }
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/auth/dao/OsSysMenuDao.java
@@ -1,6 +1,6 @@
 package com.hcframe.base.module.auth.dao;

-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.auth.entity.OsSysMenu;
 import org.apache.ibatis.annotations.Param;

@@ -13,7 +13,7 @@ import java.util.Set;
 * @author makejava
 * @since 2020-12-09 09:57:20
 */
-public interface OsSysMenuDao extends Mapper<OsSysMenu> {
+public interface OsSysMenuDao extends MyMapper<OsSysMenu> {

    List<OsSysMenu> selectMenu();

--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/config/DataSourceConfiguration.java
@@ -1,7 +1,7 @@
 package com.hcframe.base.module.datasource.config;

 import com.alibaba.druid.pool.DruidDataSource;
-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.datasource.dynamic.MyDynamicDataSource;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.annotation.MapperScan;
@@ -31,7 +31,7 @@ import java.util.Map;
 // 配置tk.mybatis参数及通用mapper,指定sqlSession工厂Bean
@tk.mybatis.spring.annotation.MapperScan(basePackages = "com.hcframe.**.dao",  //这里扫描dao层的接口
        sqlSessionFactoryRef = "sqlSessionFactoryBean222",
-        markerInterface = Mapper.class   //指定tkmybatis 中的通用mapper
+        markerInterface = MyMapper.class   //指定tkmybatis 中的通用mapper
 )
 // 配置mybatis参数，指定sqlSession工厂Bean
@MapperScan(basePackages = "com.hcframe.**.dao",sqlSessionFactoryRef = "sqlSessionFactoryBean222")
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceConfigDao.java
@@ -1,6 +1,6 @@
 package com.hcframe.base.module.datasource.dao;

-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.datasource.entity.DatasourceConfig;

 /**
@@ -9,7 +9,7 @@ import com.hcframe.base.module.datasource.entity.DatasourceConfig;
 * @author lhc
 * @since 2020-09-23 09:28:03
 */
-public interface DatasourceConfigDao extends Mapper<DatasourceConfig> {
+public interface DatasourceConfigDao extends MyMapper<DatasourceConfig> {


    int  getCount();
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTokenDao.java
@@ -1,6 +1,6 @@
 package com.hcframe.base.module.datasource.dao;

-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.datasource.entity.DatasourceToken;

 /**
@@ -9,6 +9,6 @@ import com.hcframe.base.module.datasource.entity.DatasourceToken;
 * @author makejava
 * @since 2020-10-10 10:35:49
 */
-public interface DatasourceTokenDao extends Mapper<DatasourceToken> {
+public interface DatasourceTokenDao extends MyMapper<DatasourceToken> {

 }
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/datasource/dao/DatasourceTypeDao.java
@@ -1,6 +1,6 @@
 package com.hcframe.base.module.datasource.dao;

-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.datasource.entity.DatasourceType;

 /**
@@ -9,7 +9,7 @@ import com.hcframe.base.module.datasource.entity.DatasourceType;
 * @author lhc
 * @since 2020-09-28 15:18:29
 */
-public interface DatasourceTypeDao extends Mapper<DatasourceType> {
+public interface DatasourceTypeDao extends MyMapper<DatasourceType> {


 }
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/shiro/dao/FtTokenDao.java
@@ -1,7 +1,7 @@
 package com.hcframe.base.module.shiro.dao;


-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.shiro.FtToken;

 /**
@@ -10,7 +10,7 @@ import com.hcframe.base.module.shiro.FtToken;
 * @author lhc
 * @since 2020-02-11 20:26:15
 */
-public interface FtTokenDao extends Mapper<FtToken> {
+public interface FtTokenDao extends MyMapper<FtToken> {


 }
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysFieldDao.java
@@ -1,8 +1,9 @@
 package com.hcframe.base.module.tableconfig.dao;


-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.tableconfig.entity.OsSysField;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

 import java.util.List;
@@ -13,8 +14,8 @@ import java.util.List;
 * @author lhc
 * @since 2020-03-17 17:26:53
 */
-public interface OsSysFieldDao extends Mapper<OsSysField> {
-
+@Mapper
+public interface OsSysFieldDao extends MyMapper<OsSysField> {
    List<String> getTableAlise(@Param("ids") String ids);

 }
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysSelectDao.java
@@ -1,7 +1,7 @@
 package com.hcframe.base.module.tableconfig.dao;


-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.tableconfig.entity.OsSysSelect;

 /**
@@ -10,7 +10,7 @@ import com.hcframe.base.module.tableconfig.entity.OsSysSelect;
 * @author lhc
 * @since 2020-03-17 17:42:34
 */
-public interface OsSysSelectDao extends Mapper<OsSysSelect> {
+public interface OsSysSelectDao extends MyMapper<OsSysSelect> {


 }
--- a/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java
+++ b/hcframe-parent/hcframe-base/src/main/java/com/hcframe/base/module/tableconfig/dao/OsSysTableMapper.java
@@ -1,10 +1,12 @@
 package com.hcframe.base.module.tableconfig.dao;

-import com.hcframe.base.common.Mapper;
+import com.hcframe.base.common.MyMapper;
 import com.hcframe.base.module.tableconfig.entity.OsSysTable;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

-public interface OsSysTableMapper extends Mapper<OsSysTable> {
+@Mapper
+public interface OsSysTableMapper extends MyMapper<OsSysTable> {


    OsSysTable getTableAllInfo(@Param("typeName") String typeName);
--- a/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml
+++ b/hcframe-parent/hcframe-base/src/main/resources/mapping/tableconfig/OsSysFieldMapper.xml
@@ -18,6 +18,7 @@
    <result column="FIELD_LOGIC" jdbcType="VARCHAR" property="logic" />
    <result column="FIELD_SIGN" jdbcType="VARCHAR" property="sign" />
    <result column="IS_SEARCH" jdbcType="VARCHAR" property="isSearch" />
+    <result column="IS_DETAILS" jdbcType="INTEGER" property="isDetails" />
    <result column="FK_KEY" jdbcType="VARCHAR" property="fkKey" />
    <result column="FK_VALUE" jdbcType="VARCHAR" property="fkValue" />
    <result column="WIDTH" jdbcType="INTEGER" property="width" />