diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java index f1e6a4422..3b5f87d2d 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java @@ -24,8 +24,8 @@ */ package cn.stylefeng.roses.kernel.system.modular.resource.mapper; +import cn.stylefeng.roses.kernel.db.mp.injector.CustomBaseMapper; import cn.stylefeng.roses.kernel.system.modular.resource.entity.SysResource; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 资源表 Mapper 接口 @@ -33,6 +33,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author fengshuonan * @date 2020/11/23 22:45 */ -public interface SysResourceMapper extends BaseMapper { +public interface SysResourceMapper extends CustomBaseMapper { } diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java index 634ecaf04..c12bd05ad 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java @@ -33,11 +33,14 @@ import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo; import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; +import cn.stylefeng.roses.kernel.db.api.pojo.druid.DruidProperties; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; +import cn.stylefeng.roses.kernel.rule.enums.DbTypeEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; +import cn.stylefeng.roses.kernel.rule.util.DatabaseTypeUtil; import cn.stylefeng.roses.kernel.scanner.api.ResourceReportApi; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ReportResourceParam; import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition; @@ -87,6 +90,9 @@ public class SysResourceServiceImpl extends ServiceImpl resourceCache; + @Resource + private DruidProperties druidProperties; + @Override public PageResult findPage(ResourceRequest resourceRequest) { LambdaQueryWrapper wrapper = createWrapper(resourceRequest); @@ -284,10 +290,10 @@ public class SysResourceServiceImpl extends ServiceImpl(); } - //根据project删除该项目下的所有资源 + // 根据project删除该项目下的所有资源 this.deleteResourceByProjectCode(projectCode); - //获取当前应用的所有资源 + // 获取当前应用的所有资源 ArrayList allResources = new ArrayList<>(); ArrayList resourceDefinitionArrayList = new ArrayList<>(); for (Map.Entry> appModularResources : resourceDefinitions.entrySet()) { @@ -299,10 +305,15 @@ public class SysResourceServiceImpl extends ServiceImpl resourceDefinitionMap = ResourceFactory.orderedResourceDefinition(resourceDefinitionArrayList); for (Map.Entry entry : resourceDefinitionMap.entrySet()) { resourceCache.put(entry.getKey(), entry.getValue());