diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/CustomBooleanToInt2TypeHandler.java b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/CustomBooleanToInt2TypeHandler.java new file mode 100644 index 0000000..de8ee8a --- /dev/null +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/CustomBooleanToInt2TypeHandler.java @@ -0,0 +1,59 @@ +package org.jeecg.config.mybatis; + +import lombok.val; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; + +public class CustomBooleanToInt2TypeHandler extends BaseTypeHandler { + + /** + * @param ps + * @param i + * @param parameter + * @param jdbcType + * @throws SQLException + */ + @Override + public void setNonNullParameter(PreparedStatement ps, int i, Boolean parameter, JdbcType jdbcType) throws SQLException { + ps.setInt(i,parameter==true?1:0); + } + + /** + * @param rs + * @param columnName + * @return + * @throws SQLException + */ + @Override + public Boolean getNullableResult(ResultSet rs, String columnName) throws SQLException { + int value = rs.getInt(columnName); + return value==1; + } + + /** + * @param rs + * @param columnIndex + * @return + * @throws SQLException + */ + @Override + public Boolean getNullableResult(ResultSet rs, int columnIndex) throws SQLException { + return null; + } + + /** + * @param cs + * @param columnIndex + * @return + * @throws SQLException + */ + @Override + public Boolean getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + return null; + } +} diff --git a/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java b/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java index 3e46323..e78d72a 100644 --- a/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java +++ b/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java @@ -1,16 +1,10 @@ package org.jeecg.config; -import feign.Feign; import feign.RequestTemplate; import jakarta.servlet.http.HttpServletRequest; -import org.apache.http.HttpHeaders; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import feign.Logger; import feign.RequestInterceptor; import lombok.extern.slf4j.Slf4j; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java index f88774f..4869154 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysPermission.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.common.aspect.annotation.Dict; +import org.jeecg.config.mybatis.CustomBooleanToInt2TypeHandler; import org.jeecg.modules.system.constant.DefIndexConst; /** @@ -89,20 +90,20 @@ public class SysPermission implements Serializable { /** * 是否叶子节点: 1:是 0:不是 */ - @TableField(value="is_leaf") + @TableField(value="is_leaf",typeHandler = CustomBooleanToInt2TypeHandler.class) private boolean leaf; /** * 是否路由菜单: 0:不是 1:是（默认值1） */ - @TableField(value="is_route") + @TableField(value="is_route",typeHandler = CustomBooleanToInt2TypeHandler.class) private boolean route; /** * 是否缓存页面: 0:不是 1:是（默认值1） */ - @TableField(value="keep_alive") + @TableField(value="keep_alive",typeHandler = CustomBooleanToInt2TypeHandler.class) private boolean keepAlive; /** @@ -128,11 +129,13 @@ public class SysPermission implements Serializable { /** * 是否隐藏路由菜单: 0否,1是（默认值0） */ + @TableField(value="hidden",typeHandler = CustomBooleanToInt2TypeHandler.class) private boolean hidden; /** * 是否隐藏Tab: 0否,1是（默认值0） */ + @TableField(value="hide_tab",typeHandler = CustomBooleanToInt2TypeHandler.class) private boolean hideTab; /** @@ -154,10 +157,12 @@ public class SysPermission implements Serializable { private java.lang.String status; /**alwaysShow*/ + @TableField(value = "always_show",typeHandler = CustomBooleanToInt2TypeHandler.class) private boolean alwaysShow; /*update_begin author:wuxianquan date:20190908 for:实体增加字段 */ /** 外链菜单打开方式 0/内部打开 1/外部打开 */ + @TableField(value = "internal_or_external",typeHandler = CustomBooleanToInt2TypeHandler.class) private boolean internalOrExternal; /*update_end author:wuxianquan date:20190908 for:实体增加字段 */ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java index 3876ee0..477fd9e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysPermissionServiceImpl.java @@ -311,7 +311,7 @@ public class SysPermissionServiceImpl extends ServiceImpl qw=new QueryWrapper(); - qw.lambda().eq(true,SysPermission::getUrl,url).ne(oConvertUtils.isNotEmpty(id),SysPermission::getId,id).eq(true,SysPermission::isAlwaysShow,alwaysShow); + qw.lambda().eq(true,SysPermission::getUrl,url).ne(oConvertUtils.isNotEmpty(id),SysPermission::getId,id).eq(true,SysPermission::isAlwaysShow,alwaysShow==true?1:0); return count(qw)==0; }