diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/CommonService.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/CommonService.java index af2cb446..377e7243 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/CommonService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/CommonService.java @@ -1,9 +1,11 @@ package com.ruoyi.common.core.service; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + /** * 通用service * * @author pinn */ -public class CommonService extends MybatiesPlusService { +public class CommonService, T> extends MybatiesPlusService { } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/MybatiesPlusService.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/MybatiesPlusService.java index dab81e0e..1ae43fc9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/MybatiesPlusService.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/service/MybatiesPlusService.java @@ -1,5 +1,6 @@ package com.ruoyi.common.core.service; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,5 +9,5 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; * * @author pinn */ -public abstract class MybatiesPlusService extends ServiceImpl implements IService { +public abstract class MybatiesPlusService, T> extends ServiceImpl implements IService { } diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm index 6f031790..bc5a0cde 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm @@ -1,6 +1,7 @@ package ${packageName}.mapper; import java.util.List; +import mapper.CommonMapper; import ${packageName}.domain.${ClassName}; #if($table.sub) import ${packageName}.domain.${subClassName}; @@ -12,7 +13,7 @@ import ${packageName}.domain.${subClassName}; * @author ${author} * @date ${datetime} */ -public interface ${ClassName}Mapper +public interface ${ClassName}Mapper extends CommonMapper<${ClassName}> { /** * 查询${functionName} diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm index 9cd8534b..b58cb4a6 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,6 +1,7 @@ package ${packageName}.service.impl; import java.util.List; +import com.ruoyi.common.core.service.CommonService; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') import com.ruoyi.common.core.utils.DateUtils; @@ -26,7 +27,7 @@ import ${packageName}.service.I${ClassName}Service; * @date ${datetime} */ @Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service +public class ${ClassName}ServiceImpl extends CommonService<${ClassName}Mapper, ${ClassName}> implements I${ClassName}Service { @Autowired private ${ClassName}Mapper ${className}Mapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index b78bd099..0f9945c2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.core.service.CommonService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,7 +24,7 @@ import com.ruoyi.system.service.ISysConfigService; * @author ruoyi */ @Service -public class SysConfigServiceImpl extends CommonService implements ISysConfigService +public class SysConfigServiceImpl extends CommonService implements ISysConfigService { @Autowired private SysConfigMapper configMapper;