From 1dcf48c4a76c634764b526e90057432ef86bcd3b Mon Sep 17 00:00:00 2001 From: Lemonbx <2583639560@qq.com> Date: Fri, 8 Nov 2024 08:47:15 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=99=A8=20=E5=9C=A8=E7=A6=81=E7=94=A8Service=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E7=94=9F=E6=88=90=E6=97=B6=EF=BC=8CserviceImpl?= =?UTF-8?q?=E5=8E=BB=E9=99=A4Service=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/enjoy/serviceImpl-Solon.tpl | 4 +- .../templates/enjoy/serviceImpl.kotlin.tpl | 2 + .../resources/templates/enjoy/serviceImpl.tpl | 41 ++++++++++++++++++- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl-Solon.tpl b/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl-Solon.tpl index c7e6ca02..6d40b932 100644 --- a/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl-Solon.tpl +++ b/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl-Solon.tpl @@ -3,7 +3,9 @@ package #(packageConfig.serviceImplPackage); import com.mybatisflex.solon.service.impl.ServiceImpl; import #(packageConfig.entityPackage).#(table.buildEntityClassName()); import #(packageConfig.mapperPackage).#(table.buildMapperClassName()); +#if(table.getGlobalConfig().isServiceGenerateEnable()) import #(packageConfig.servicePackage).#(table.buildServiceClassName()); +#end import org.noear.solon.annotation.Component; /** @@ -13,6 +15,6 @@ import org.noear.solon.annotation.Component; * @since #(javadocConfig.getSince()) */ @Component -public class #(table.buildServiceImplClassName()) extends ServiceImpl<#(table.buildMapperClassName()), #(table.buildEntityClassName())> implements #(table.buildServiceClassName()) { +public class #(table.buildServiceImplClassName()) extends ServiceImpl<#(table.buildMapperClassName()), #(table.buildEntityClassName())> #if(table.getGlobalConfig().isServiceGenerateEnable()) implements #(table.buildServiceClassName()) #end{ } diff --git a/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl.kotlin.tpl b/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl.kotlin.tpl index 518c5517..7fad1e10 100644 --- a/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl.kotlin.tpl +++ b/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl.kotlin.tpl @@ -3,7 +3,9 @@ package #(packageConfig.serviceImplPackage); import #(serviceImplConfig.buildSuperClassImport()); import #(packageConfig.entityPackage).#(table.buildEntityClassName()); import #(packageConfig.mapperPackage).#(table.buildMapperClassName()); +#if(table.getGlobalConfig().isServiceGenerateEnable()) import #(packageConfig.servicePackage).#(table.buildServiceClassName()); +#end import org.springframework.stereotype.Service; /** diff --git a/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl.tpl b/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl.tpl index 760a1a05..77242a7f 100644 --- a/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl.tpl +++ b/mybatis-flex-codegen/src/main/resources/templates/enjoy/serviceImpl.tpl @@ -6,7 +6,9 @@ package #(packageConfig.serviceImplPackage); import #(serviceImplConfig.buildSuperClassImport()); import #(packageConfig.entityPackage).#(table.buildEntityClassName()); import #(packageConfig.mapperPackage).#(table.buildMapperClassName()); +#if(table.getGlobalConfig().isServiceGenerateEnable()) import #(packageConfig.servicePackage).#(table.buildServiceClassName()); +#end import org.springframework.stereotype.Service; #if(isCacheExample) import com.mybatisflex.core.paginate.Page; @@ -30,94 +32,125 @@ import java.util.List; #if(isCacheExample) @CacheConfig(cacheNames = "#(firstCharToLowerCase(entityClassName))") #end -public class #(table.buildServiceImplClassName()) extends #(serviceImplConfig.buildSuperClassName())<#(table.buildMapperClassName()), #(table.buildEntityClassName())> implements #(table.buildServiceClassName()) { +public class #(table.buildServiceImplClassName()) extends #(serviceImplConfig.buildSuperClassName())<#(table.buildMapperClassName()), #(table.buildEntityClassName())> #if(table.getGlobalConfig().isServiceGenerateEnable()) implements #(table.buildServiceClassName())#end { #if(isCacheExample) + +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @CacheEvict(allEntries = true) public boolean remove(QueryWrapper query) { return super.remove(query); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @CacheEvict(key = "#id") public boolean removeById(Serializable id) { return super.removeById(id); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @CacheEvict(allEntries = true) public boolean removeByIds(Collection ids) { return super.removeByIds(ids); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @CacheEvict(allEntries = true) public boolean update(#(entityClassName) entity, QueryWrapper query) { return super.update(entity, query); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @CacheEvict(key = "#entity.#(primaryKey)") public boolean updateById(#(entityClassName) entity, boolean ignoreNulls) { return super.updateById(entity, ignoreNulls); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @CacheEvict(allEntries = true) public boolean updateBatch(Collection<#(entityClassName)> entities, int batchSize) { return super.updateBatch(entities, batchSize); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#id") public #(entityClassName) getById(Serializable id) { return super.getById(id); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public #(entityClassName) getOne(QueryWrapper query) { return super.getOne(query); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public R getOneAs(QueryWrapper query, Class asType) { return super.getOneAs(query, asType); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public Object getObj(QueryWrapper query) { return super.getObj(query); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public R getObjAs(QueryWrapper query, Class asType) { return super.getObjAs(query, asType); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public List objList(QueryWrapper query) { return super.objList(query); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public List objListAs(QueryWrapper query, Class asType) { return super.objListAs(query, asType); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public List<#(entityClassName)> list(QueryWrapper query) { return super.list(query); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public List listAs(QueryWrapper query, Class asType) { return super.listAs(query, asType); @@ -126,19 +159,25 @@ public class #(table.buildServiceImplClassName()) extends #(serviceImplConfig.bu /** * @deprecated 无法通过注解进行缓存操作。 */ +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Deprecated public List<#(entityClassName)> listByIds(Collection ids) { return super.listByIds(ids); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #query.toSQL()") public long count(QueryWrapper query) { return super.count(query); } +#if(table.getGlobalConfig().isServiceGenerateEnable()) @Override +#end @Cacheable(key = "#root.methodName + ':' + #page.getPageSize() + ':' + #page.getPageNumber() + ':' + #query.toSQL()") public Page pageAs(Page page, QueryWrapper query, Class asType) { return super.pageAs(page, query, asType);