diff --git a/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java b/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java index cacdf4d5..f760e11b 100644 --- a/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java +++ b/app/src/main/java/com/tinyengine/it/config/filter/WebConfig.java @@ -16,35 +16,31 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import org.springframework.web.filter.CorsFilter; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.cors.reactive.CorsWebFilter; +import org.springframework.web.reactive.config.WebFluxConfigurer; import java.util.Arrays; import java.util.List; @Configuration -public class WebConfig implements WebMvcConfigurer { +public class WebConfig implements WebFluxConfigurer { @Value("${cors.allowed-origins}") private String allowedOrigins; @Bean - public CorsFilter corsFilter() { - // 跨域配置地址 + public CorsWebFilter corsFilter() { List crosDomainList = Arrays.asList(allowedOrigins.split(",")); CorsConfiguration corsConfiguration = new CorsConfiguration(); - // 1、允许来源 corsConfiguration.setAllowedOriginPatterns(crosDomainList); - // 2、允许任何请求头 corsConfiguration.addAllowedHeader(CorsConfiguration.ALL); - // 3、允许任何方法 corsConfiguration.addAllowedMethod(CorsConfiguration.ALL); - // 4、允许凭证 corsConfiguration.setAllowCredentials(true); - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource source = + new org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", corsConfiguration); - return new CorsFilter(source); + + return new CorsWebFilter(source); } -} +} \ No newline at end of file diff --git a/base/src/main/java/com/tinyengine/it/service/app/AppExtensionService.java b/base/src/main/java/com/tinyengine/it/service/app/AppExtensionService.java index 3d9e217b..1eef9ae7 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/AppExtensionService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/AppExtensionService.java @@ -12,11 +12,10 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.AppExtension; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -24,7 +23,7 @@ * * @since 2024-10-20 */ -public interface AppExtensionService { +public interface AppExtensionService extends IService { /** * 查询表t_app_extension所有信息 * @@ -38,7 +37,7 @@ public interface AppExtensionService { * @param id the id * @return the app extension */ - AppExtension findAppExtensionById(@Param("id") Integer id); + AppExtension findAppExtensionById(Integer id); /** * 根据条件查询表t_app_extension信息 @@ -54,7 +53,7 @@ public interface AppExtensionService { * @param id the id * @return the result */ - Result deleteAppExtensionById(@Param("id") Integer id); + Result deleteAppExtensionById(Integer id); /** * 根据主键id更新表t_app_extension信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/AppService.java b/base/src/main/java/com/tinyengine/it/service/app/AppService.java index 93c4d650..ccfb7c19 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/AppService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/AppService.java @@ -12,14 +12,13 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.dto.I18nEntryDto; import com.tinyengine.it.model.dto.PreviewDto; import com.tinyengine.it.model.dto.SchemaI18n; import com.tinyengine.it.model.entity.App; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -27,7 +26,7 @@ * * @since 2024-10-20 */ -public interface AppService { +public interface AppService extends IService { /** * 查询表t_app所有信息 * @@ -41,7 +40,7 @@ public interface AppService { * @param id the id * @return the result */ - Result queryAppById(@Param("id") Integer id); + Result queryAppById(Integer id); /** * 根据条件查询表t_app信息 @@ -57,7 +56,7 @@ public interface AppService { * @param id the id * @return the result */ - Result deleteAppById(@Param("id") Integer id); + Result deleteAppById(Integer id); /** * 根据主键id更新表t_app信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/DatasourceService.java b/base/src/main/java/com/tinyengine/it/service/app/DatasourceService.java index bbdf5836..e7e24fcb 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/DatasourceService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/DatasourceService.java @@ -12,11 +12,10 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.Datasource; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -24,14 +23,14 @@ * * @since 2024-10-20 */ -public interface DatasourceService { +public interface DatasourceService extends IService { /** * 根据主键id查询表t_datasource信息 * * @param id the id * @return the datasource */ - Datasource queryDatasourceById(@Param("id") Integer id); + Datasource queryDatasourceById(Integer id); /** * 根据条件查询表t_datasource信息 @@ -47,7 +46,7 @@ public interface DatasourceService { * @param id the id * @return the result */ - Result deleteDatasourceById(@Param("id") Integer id); + Result deleteDatasourceById(Integer id); /** * 根据主键id更新表t_datasource信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/I18nEntryService.java b/base/src/main/java/com/tinyengine/it/service/app/I18nEntryService.java index 02671578..5da44b4a 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/I18nEntryService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/I18nEntryService.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.dto.DeleteI18nEntry; import com.tinyengine.it.model.dto.FileResult; @@ -22,7 +23,6 @@ import com.tinyengine.it.model.dto.SchemaI18n; import com.tinyengine.it.model.entity.I18nEntry; -import org.apache.ibatis.annotations.Param; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -32,7 +32,7 @@ * * @since 2024-10-20 */ -public interface I18nEntryService { +public interface I18nEntryService extends IService { /** * 查询表t_i18n_entry所有信息 * @@ -46,7 +46,7 @@ public interface I18nEntryService { * @param id the id * @return the 18 n entry */ - I18nEntryDto findI18nEntryById(@Param("id") Integer id); + I18nEntryDto findI18nEntryById(Integer id); /** * 根据条件查询表t_i18n_entry信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/I18nLangService.java b/base/src/main/java/com/tinyengine/it/service/app/I18nLangService.java index 495a816c..0d61d0d6 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/I18nLangService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/I18nLangService.java @@ -12,10 +12,9 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.I18nLang; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -23,7 +22,7 @@ * * @since 2024-10-20 */ -public interface I18nLangService { +public interface I18nLangService extends IService { /** * 查询表t_i18n_lang所有信息 * @@ -37,7 +36,7 @@ public interface I18nLangService { * @param id the id * @return the 18 n lang */ - I18nLang queryI18nLangById(@Param("id") Integer id); + I18nLang queryI18nLangById(Integer id); /** * 根据条件查询表t_i18n_lang信息 @@ -53,7 +52,7 @@ public interface I18nLangService { * @param id the id * @return the integer */ - Integer deleteI18nLangById(@Param("id") Integer id); + Integer deleteI18nLangById(Integer id); /** * 根据主键id更新表t_i18n_lang信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/PageHistoryService.java b/base/src/main/java/com/tinyengine/it/service/app/PageHistoryService.java index 3e0a1f9c..803370c8 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/PageHistoryService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/PageHistoryService.java @@ -13,12 +13,11 @@ package com.tinyengine.it.service.app; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.PageQueryVo; import com.tinyengine.it.model.dto.PublishedPageVo; import com.tinyengine.it.model.entity.PageHistory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -26,7 +25,7 @@ * * @since 2024-10-20 */ -public interface PageHistoryService { +public interface PageHistoryService extends IService { /** * 查询表t_page_history所有信息 * @@ -56,7 +55,7 @@ public interface PageHistoryService { * @param id the id * @return the integer */ - Integer deletePageHistoryById(@Param("id") Integer id); + Integer deletePageHistoryById(Integer id); /** * 根据主键id更新表t_page_history信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/PageService.java b/base/src/main/java/com/tinyengine/it/service/app/PageService.java index 56ae37ee..6373add6 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/PageService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/PageService.java @@ -12,13 +12,12 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.dto.PreviewDto; import com.tinyengine.it.model.dto.PreviewParam; import com.tinyengine.it.model.entity.Page; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -26,7 +25,7 @@ * * @since 2024-10-20 */ -public interface PageService { +public interface PageService extends IService { /** * 查询表t_page所有信息 * @@ -41,7 +40,7 @@ public interface PageService { * @param id the id * @return the page */ - Page queryPageById(@Param("id") Integer id); + Page queryPageById(Integer id); /** * 根据条件查询表t_page信息 @@ -57,7 +56,7 @@ public interface PageService { * @param id the id * @return the result */ - Result delPage(@Param("id") Integer id); + Result delPage(Integer id); /** * 创建页面 diff --git a/base/src/main/java/com/tinyengine/it/service/app/PageTemplateService.java b/base/src/main/java/com/tinyengine/it/service/app/PageTemplateService.java index da2405a5..080775a1 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/PageTemplateService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/PageTemplateService.java @@ -12,11 +12,10 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.PageTemplate; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -24,7 +23,7 @@ * * @since 2024-10-20 */ -public interface PageTemplateService { +public interface PageTemplateService extends IService { /** * 查询表page_template所有信息 * @@ -40,7 +39,7 @@ public interface PageTemplateService { * @param id the id * @return the page template */ - Result queryPageTemplateById(@Param("id") Integer id); + Result queryPageTemplateById(Integer id); /** * 根据条件查询表page_template信息 @@ -56,7 +55,7 @@ public interface PageTemplateService { * @param ids id * @return the integer */ - Result deletePageTemplateByIds(@Param("ids") List ids); + Result deletePageTemplateByIds(List ids); /** * 根据主键id更新表page_template信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/TaskRecordService.java b/base/src/main/java/com/tinyengine/it/service/app/TaskRecordService.java index a260528a..bbee91a2 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/TaskRecordService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/TaskRecordService.java @@ -12,10 +12,9 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.TaskRecord; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -23,7 +22,7 @@ * * @since 2024-10-20 */ -public interface TaskRecordService { +public interface TaskRecordService extends IService { /** * 查询表t_task_record所有信息 * @@ -37,7 +36,7 @@ public interface TaskRecordService { * @param id the id * @return the task record */ - TaskRecord queryTaskRecordById(@Param("id") Integer id); + TaskRecord queryTaskRecordById(Integer id); /** * 根据条件查询表t_task_record信息 @@ -53,7 +52,7 @@ public interface TaskRecordService { * @param id the id * @return the integer */ - Integer deleteTaskRecordById(@Param("id") Integer id); + Integer deleteTaskRecordById(Integer id); /** * 根据主键id更新表t_task_record信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/UserService.java b/base/src/main/java/com/tinyengine/it/service/app/UserService.java index e812d159..2d102be7 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/UserService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/UserService.java @@ -12,10 +12,9 @@ package com.tinyengine.it.service.app; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.User; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -23,7 +22,7 @@ * * @since 2024-10-20 */ -public interface UserService { +public interface UserService extends IService { /** * 查询表t_user所有信息 * @@ -37,7 +36,7 @@ public interface UserService { * @param id the id * @return the user */ - User queryUserById(@Param("id") String id); + User queryUserById(String id); /** * 根据条件查询表t_user信息 @@ -53,7 +52,7 @@ public interface UserService { * @param id the id * @return the integer */ - Integer deleteUserById(@Param("id") String id); + Integer deleteUserById(String id); /** * 根据主键id更新表t_user信息 diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/AppExtensionServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/AppExtensionServiceImpl.java index a688766e..667bfd5e 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/AppExtensionServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/AppExtensionServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.app.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.log.SystemServiceLog; @@ -21,8 +22,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -34,10 +33,7 @@ */ @Service @Slf4j -public class AppExtensionServiceImpl implements AppExtensionService { - @Autowired - private AppExtensionMapper appExtensionMapper; - +public class AppExtensionServiceImpl extends ServiceImpl implements AppExtensionService { /** * 查询表t_app_extension所有数据 * @@ -46,7 +42,7 @@ public class AppExtensionServiceImpl implements AppExtensionService { @Override @SystemServiceLog(description = "应用扩展列表查询实现方法") public Result> findAllAppExtension() { - List appExtensionList = appExtensionMapper.queryAllAppExtension(); + List appExtensionList = baseMapper.queryAllAppExtension(); return Result.success(appExtensionList); } @@ -58,8 +54,8 @@ public Result> findAllAppExtension() { */ @Override @SystemServiceLog(description = "应用扩展id查询实现方法") - public AppExtension findAppExtensionById(@Param("id") Integer id) { - return appExtensionMapper.queryAppExtensionById(id); + public AppExtension findAppExtensionById(Integer id) { + return baseMapper.queryAppExtensionById(id); } /** @@ -71,7 +67,7 @@ public AppExtension findAppExtensionById(@Param("id") Integer id) { @Override @SystemServiceLog(description = "应用扩展条件查询实现方法") public List findAppExtensionByCondition(AppExtension appExtension) { - return appExtensionMapper.queryAppExtensionByCondition(appExtension); + return baseMapper.queryAppExtensionByCondition(appExtension); } /** @@ -82,10 +78,10 @@ public List findAppExtensionByCondition(AppExtension appExtension) */ @Override @SystemServiceLog(description = "应用扩展删除实现方法") - public Result deleteAppExtensionById(@Param("id") Integer id) { - AppExtension appExtension = appExtensionMapper.queryAppExtensionById(id); + public Result deleteAppExtensionById(Integer id) { + AppExtension appExtension = baseMapper.queryAppExtensionById(id); if (appExtension != null) { - appExtensionMapper.deleteAppExtensionById(id); + baseMapper.deleteAppExtensionById(id); return Result.success(appExtension); } return Result.failed(ExceptionEnum.CM009); @@ -100,9 +96,9 @@ public Result deleteAppExtensionById(@Param("id") Integer id) { @Override @SystemServiceLog(description = "应用扩展修改实现方法") public Result updateAppExtensionById(AppExtension appExtension) { - int result = appExtensionMapper.updateAppExtensionById(appExtension); + int result = baseMapper.updateAppExtensionById(appExtension); if (result == 1) { - AppExtension data = appExtensionMapper.queryAppExtensionById(appExtension.getId()); + AppExtension data = baseMapper.queryAppExtensionById(appExtension.getId()); return Result.success(data); } return Result.failed(ExceptionEnum.CM001); @@ -117,11 +113,11 @@ public Result updateAppExtensionById(AppExtension appExtension) { @Override @SystemServiceLog(description = "应用扩展创建实现方法") public Result createAppExtension(AppExtension appExtension) { - List appExtensionResult = appExtensionMapper.queryAppExtensionByCondition(appExtension); + List appExtensionResult = baseMapper.queryAppExtensionByCondition(appExtension); if (!appExtensionResult.isEmpty()) { return Result.failed(ExceptionEnum.CM003); } - int result = appExtensionMapper.createAppExtension(appExtension); + int result = baseMapper.createAppExtension(appExtension); if (result == 1) { return Result.success(appExtension); } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java index 5db38537..578887d7 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.app.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.enums.Enums; import com.tinyengine.it.common.exception.ExceptionEnum; @@ -29,13 +30,10 @@ import com.tinyengine.it.service.app.AppService; import com.tinyengine.it.service.app.I18nEntryService; import com.tinyengine.it.service.app.impl.v1.AppV1ServiceImpl; -import com.tinyengine.it.service.material.impl.BlockGroupServiceImpl; -import com.tinyengine.it.service.material.impl.BlockServiceImpl; import com.tinyengine.it.service.platform.PlatformService; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,13 +48,7 @@ */ @Service @Slf4j -public class AppServiceImpl implements AppService { - /** - * The App mapper. - */ - @Autowired - private AppMapper appMapper; - +public class AppServiceImpl extends ServiceImpl implements AppService { /** * The Platform service. */ @@ -81,18 +73,6 @@ public class AppServiceImpl implements AppService { @Autowired private AppV1ServiceImpl appV1ServiceImpl; - /** - * The Block service. - */ - @Autowired - private BlockServiceImpl blockServiceImpl; - - /** - * The Block group service. - */ - @Autowired - private BlockGroupServiceImpl blockGroupServiceImpl; - /** * 查询表t_app所有数据 * @@ -100,7 +80,7 @@ public class AppServiceImpl implements AppService { */ @Override public List queryAllApp() { - return appMapper.queryAllApp(); + return baseMapper.queryAllApp(); } /** @@ -111,8 +91,8 @@ public List queryAllApp() { */ @Override @SystemServiceLog(description = "通过id查询应用实现方法") - public Result queryAppById(@Param("id") Integer id) { - App app = appMapper.queryAppById(id); + public Result queryAppById(Integer id) { + App app = baseMapper.queryAppById(id); if (app == null) { return Result.failed(ExceptionEnum.CM009); } @@ -127,7 +107,7 @@ public Result queryAppById(@Param("id") Integer id) { */ @Override public List queryAppByCondition(App app) { - return appMapper.queryAppByCondition(app); + return baseMapper.queryAppByCondition(app); } /** @@ -138,9 +118,9 @@ public List queryAppByCondition(App app) { */ @Override @SystemServiceLog(description = "应用删除实现方法") - public Result deleteAppById(@Param("id") Integer id) { - App app = appMapper.queryAppById(id); - int result = appMapper.deleteAppById(id); + public Result deleteAppById(Integer id) { + App app = baseMapper.queryAppById(id); + int result = baseMapper.deleteAppById(id); if (result < 1) { return Result.failed(ExceptionEnum.CM009); } @@ -158,17 +138,17 @@ public Result deleteAppById(@Param("id") Integer id) { public Result updateAppById(App app) { // 如果更新extend_config字段，从platform获取数据，继承非route部分 if (app.getExtendConfig() != null && !app.getExtendConfig().isEmpty()) { - App appResult = appMapper.queryAppById(app.getId()); + App appResult = baseMapper.queryAppById(app.getId()); Platform platform = platformService.queryPlatformById(appResult.getPlatformId()); Map appExtendConfig = platform.getAppExtendConfig(); appExtendConfig.remove("route"); app.getExtendConfig().putAll(appExtendConfig); } - int result = appMapper.updateAppById(app); + int result = baseMapper.updateAppById(app); if (result < 1) { return Result.failed(ExceptionEnum.CM001); } - App selectedApp = appMapper.queryAppById(app.getId()); + App selectedApp = baseMapper.queryAppById(app.getId()); return Result.success(selectedApp); } @@ -181,12 +161,12 @@ public Result updateAppById(App app) { @Override @SystemServiceLog(description = "应用创建实现方法") public Result createApp(App app) { - List appResult = appMapper.queryAppByCondition(app); + List appResult = baseMapper.queryAppByCondition(app); if (!appResult.isEmpty()) { return Result.failed(ExceptionEnum.CM003); } app.setIsPublish(false); - int result = appMapper.createApp(app); + int result = baseMapper.createApp(app); if (result < 1) { return Result.failed(ExceptionEnum.CM001); } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/DatasourceServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/DatasourceServiceImpl.java index ecbc777e..dfbc753d 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/DatasourceServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/DatasourceServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.app.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.mapper.DatasourceMapper; @@ -20,8 +21,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -33,10 +32,7 @@ */ @Service @Slf4j -public class DatasourceServiceImpl implements DatasourceService { - @Autowired - private DatasourceMapper datasourceMapper; - +public class DatasourceServiceImpl extends ServiceImpl implements DatasourceService { /** * 根据主键id查询表t_datasource信息 * @@ -44,8 +40,8 @@ public class DatasourceServiceImpl implements DatasourceService { * @return query result */ @Override - public Datasource queryDatasourceById(@Param("id") Integer id) { - return datasourceMapper.queryDatasourceById(id); + public Datasource queryDatasourceById(Integer id) { + return baseMapper.queryDatasourceById(id); } /** @@ -56,7 +52,7 @@ public Datasource queryDatasourceById(@Param("id") Integer id) { */ @Override public List queryDatasourceByCondition(Datasource datasource) { - return datasourceMapper.queryDatasourceByCondition(datasource); + return baseMapper.queryDatasourceByCondition(datasource); } /** @@ -66,10 +62,10 @@ public List queryDatasourceByCondition(Datasource datasource) { * @return Datasource */ @Override - public Result deleteDatasourceById(@Param("id") Integer id) { + public Result deleteDatasourceById(Integer id) { Datasource sources = queryDatasourceById(id); if (sources != null) { - datasourceMapper.deleteDatasourceById(id); + baseMapper.deleteDatasourceById(id); return Result.success(sources); } return Result.failed(ExceptionEnum.CM009); @@ -83,7 +79,7 @@ public Result deleteDatasourceById(@Param("id") Integer id) { */ @Override public Result updateDatasourceById(Datasource datasource) { - int res = datasourceMapper.updateDatasourceById(datasource); + int res = baseMapper.updateDatasourceById(datasource); if (res == 1) { return Result.success(queryDatasourceById(datasource.getId())); } @@ -101,7 +97,7 @@ public Result createDatasource(Datasource datasource) { Integer appId = datasource.getApp(); String name = datasource.getName(); if (appId != 0 && String.valueOf(appId).matches("^[0-9]+$") && !name.isEmpty()) { - int res = datasourceMapper.createDatasource(datasource); + int res = baseMapper.createDatasource(datasource); if (res == 1) { int id = datasource.getId(); return Result.success(queryDatasourceById(id)); diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java index 4ade2134..f258e5d3 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImpl.java @@ -13,6 +13,7 @@ package com.tinyengine.it.service.app.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -43,7 +44,6 @@ import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -65,12 +65,9 @@ */ @Service @Slf4j -public class I18nEntryServiceImpl implements I18nEntryService { +public class I18nEntryServiceImpl extends ServiceImpl implements I18nEntryService { private static final Logger logger = LoggerFactory.getLogger(I18nEntryServiceImpl.class); - @Autowired - private I18nEntryMapper i18nEntryMapper; - @Autowired private I18nLangMapper i18nLangMapper; @@ -88,7 +85,7 @@ public I18nEntryListResult findAllI18nEntry() { return i18nEntriesListResult; } // 获取词条列表 - List i18nEntriesList = i18nEntryMapper.queryAllI18nEntry(); + List i18nEntriesList = baseMapper.queryAllI18nEntry(); if (i18nEntriesList == null) { return i18nEntriesListResult; } @@ -154,7 +151,7 @@ public List create(OperateI18nEntries operateI18nEntries) { } List i18nEntriesList = fillParam(operateI18nEntries, langsDic); - i18nEntriesList.stream().map(entry -> i18nEntryMapper.createI18nEntry(entry)).collect(Collectors.toList()); + i18nEntriesList.stream().map(entry -> baseMapper.createI18nEntry(entry)).collect(Collectors.toList()); return i18nEntriesList; } @@ -199,7 +196,7 @@ public List bulkCreate(OperateI18nBatchEntries operateI18nBatchEntrie List i18nEntriesList = getEntriesParam(operateI18nBatchEntries); // bulkCreateEntries - i18nEntriesList.stream().map(entry -> i18nEntryMapper.createI18nEntry(entry)).collect(Collectors.toList()); + i18nEntriesList.stream().map(entry -> baseMapper.createI18nEntry(entry)).collect(Collectors.toList()); return i18nEntriesList; } @@ -260,7 +257,7 @@ public List bulkUpdate(OperateI18nEntries operateI18nEntries) { i18nEntries.setHostType(operateI18nEntries.getHostType()); i18nEntries.setHost(Integer.valueOf(operateI18nEntries.getHost())); i18nEntries.setKey(operateI18nEntries.getKey()); - List i18nEntriesList = i18nEntryMapper.queryI18nEntryByCondition(i18nEntries); + List i18nEntriesList = baseMapper.queryI18nEntryByCondition(i18nEntries); if (i18nEntriesList.isEmpty()) { return create(operateI18nEntries); } @@ -285,7 +282,7 @@ public List bulkUpdateEntries(OperateI18nEntries operateI18nEntries) List i18nEntriesList = fillParam(operateI18nEntries, langsDic); // bulkCreateEntries for (I18nEntry i18Entries : i18nEntriesList) { - i18nEntryMapper.updateByEntry(i18Entries.getContent(), i18Entries.getHost(), i18Entries.getHostType(), + baseMapper.updateByEntry(i18Entries.getContent(), i18Entries.getHost(), i18Entries.getHostType(), i18Entries.getKey(), i18Entries.getLang()); } return i18nEntriesList; @@ -306,8 +303,8 @@ public List deleteI18nEntriesByHostAndHostTypeAndKey(DeleteI18nEnt i18nEntry.setHostType(deleteI18nEntry.getHostType()); i18nEntry.setHost(Integer.valueOf(deleteI18nEntry.getHost())); i18nEntry.setKey(key); - List i18nEntries = i18nEntryMapper.queryI18nEntryByCondition(i18nEntry); - i18nEntries.stream().forEach(i18nEntriesDto -> i18nEntryMapper.deleteI18nEntryById(i18nEntriesDto.getId())); + List i18nEntries = baseMapper.queryI18nEntryByCondition(i18nEntry); + i18nEntries.stream().forEach(i18nEntriesDto -> baseMapper.deleteI18nEntryById(i18nEntriesDto.getId())); i18nEntriesList.addAll(i18nEntries); } return i18nEntriesList; @@ -392,7 +389,7 @@ public I18nEntryListResult findI18nEntryByApp(Integer host, String hostType) { return i18nEntriesListResult; } // 获取词条列表 - List i18nEntriesList = i18nEntryMapper.findI18nEntriesByHostandHostType(host, hostType); + List i18nEntriesList = baseMapper.findI18nEntriesByHostandHostType(host, hostType); if (i18nEntriesList == null) { return i18nEntriesListResult; } @@ -446,15 +443,15 @@ public FileResult bulkInsertOrUpdate(List entries) { int updateNum = 0; for (I18nEntry entry : entries) { // 查询数据库中是否存在该记录 - List i18nEntryList = i18nEntryMapper.queryI18nEntryByCondition(entry); + List i18nEntryList = baseMapper.queryI18nEntryByCondition(entry); if (i18nEntryList.isEmpty()) { // 插入新记录 - i18nEntryMapper.createI18nEntry(entry); + baseMapper.createI18nEntry(entry); addNum = addNum + 1; } else { // 更新记录 entry.setId(i18nEntryList.get(0).getId()); - i18nEntryMapper.updateI18nEntryById(entry); + baseMapper.updateI18nEntryById(entry); updateNum = updateNum + 1; } } @@ -520,8 +517,8 @@ public List parseZip(FileInfo fileInfo) throws ServiceException { * @throws ServiceException ServiceException */ @Override - public I18nEntryDto findI18nEntryById(@Param("id") Integer id) throws ServiceException { - return i18nEntryMapper.queryI18nEntryById(id); + public I18nEntryDto findI18nEntryById(Integer id) throws ServiceException { + return baseMapper.queryI18nEntryById(id); } /** @@ -533,7 +530,7 @@ public I18nEntryDto findI18nEntryById(@Param("id") Integer id) throws ServiceExc */ @Override public List findI18nEntryByCondition(I18nEntry i18nEntry) throws ServiceException { - return i18nEntryMapper.queryI18nEntryByCondition(i18nEntry); + return baseMapper.queryI18nEntryByCondition(i18nEntry); } /** @@ -544,7 +541,7 @@ public List findI18nEntryByCondition(I18nEntry i18nEntry) throws S */ @Override public Integer updateI18nEntryById(I18nEntry i18nEntry) { - return i18nEntryMapper.updateI18nEntryById(i18nEntry); + return baseMapper.updateI18nEntryById(i18nEntry); } /** diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/I18nLangServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/I18nLangServiceImpl.java index a7a36505..ec6454fd 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/I18nLangServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/I18nLangServiceImpl.java @@ -12,14 +12,13 @@ package com.tinyengine.it.service.app.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.mapper.I18nLangMapper; import com.tinyengine.it.model.entity.I18nLang; import com.tinyengine.it.service.app.I18nLangService; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -31,10 +30,7 @@ */ @Service @Slf4j -public class I18nLangServiceImpl implements I18nLangService { - @Autowired - private I18nLangMapper i18nLangMapper; - +public class I18nLangServiceImpl extends ServiceImpl implements I18nLangService { /** * 查询表t_i18n_lang所有数据 * @@ -42,7 +38,7 @@ public class I18nLangServiceImpl implements I18nLangService { */ @Override public List queryAllI18nLang() { - return i18nLangMapper.queryAllI18nLang(); + return baseMapper.queryAllI18nLang(); } /** @@ -52,8 +48,8 @@ public List queryAllI18nLang() { * @return query result */ @Override - public I18nLang queryI18nLangById(@Param("id") Integer id) { - return i18nLangMapper.queryI18nLangById(id); + public I18nLang queryI18nLangById(Integer id) { + return baseMapper.queryI18nLangById(id); } /** @@ -64,7 +60,7 @@ public I18nLang queryI18nLangById(@Param("id") Integer id) { */ @Override public List queryI18nLangByCondition(I18nLang i18nLang) { - return i18nLangMapper.queryI18nLangByCondition(i18nLang); + return baseMapper.queryI18nLangByCondition(i18nLang); } /** @@ -74,8 +70,8 @@ public List queryI18nLangByCondition(I18nLang i18nLang) { * @return execute success data number */ @Override - public Integer deleteI18nLangById(@Param("id") Integer id) { - return i18nLangMapper.deleteI18nLangById(id); + public Integer deleteI18nLangById(Integer id) { + return baseMapper.deleteI18nLangById(id); } /** @@ -86,7 +82,7 @@ public Integer deleteI18nLangById(@Param("id") Integer id) { */ @Override public Integer updateI18nLangById(I18nLang i18nLang) { - return i18nLangMapper.updateI18nLangById(i18nLang); + return baseMapper.updateI18nLangById(i18nLang); } /** @@ -97,6 +93,6 @@ public Integer updateI18nLangById(I18nLang i18nLang) { */ @Override public Integer createI18nLang(I18nLang i18nLang) { - return i18nLangMapper.createI18nLang(i18nLang); + return baseMapper.createI18nLang(i18nLang); } } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java index 6f2b87c6..b32d5e96 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java @@ -13,6 +13,7 @@ package com.tinyengine.it.service.app.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.PageQueryVo; import com.tinyengine.it.common.log.SystemServiceLog; import com.tinyengine.it.mapper.PageHistoryMapper; @@ -22,8 +23,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -36,12 +35,9 @@ */ @Service @Slf4j -public class PageHistoryServiceImpl implements PageHistoryService { +public class PageHistoryServiceImpl extends ServiceImpl implements PageHistoryService { private static final String DEFAULT_PAGE_HISTORY_VERSION = "0"; - @Autowired - private PageHistoryMapper pageHistoryMapper; - /** * 查询表t_page_history所有数据 * @@ -49,7 +45,7 @@ public class PageHistoryServiceImpl implements PageHistoryService { */ @Override public List findAllPageHistory() { - return pageHistoryMapper.queryAllPageHistory(); + return baseMapper.queryAllPageHistory(); } /** @@ -60,7 +56,7 @@ public List findAllPageHistory() { */ @Override public PageHistory findPageHistoryById(Integer historyId) { - return pageHistoryMapper.queryPageHistoryById(historyId); + return baseMapper.queryPageHistoryById(historyId); } /** @@ -71,7 +67,7 @@ public PageHistory findPageHistoryById(Integer historyId) { */ @Override public List findPageHistoryByCondition(PageHistory pageHistory) { - return pageHistoryMapper.queryPageHistoryByCondition(pageHistory); + return baseMapper.queryPageHistoryByCondition(pageHistory); } /** @@ -81,8 +77,8 @@ public List findPageHistoryByCondition(PageHistory pageHistory) { * @return execute success data number */ @Override - public Integer deletePageHistoryById(@Param("id") Integer id) { - return pageHistoryMapper.deletePageHistoryById(id); + public Integer deletePageHistoryById(Integer id) { + return baseMapper.deletePageHistoryById(id); } /** @@ -93,7 +89,7 @@ public Integer deletePageHistoryById(@Param("id") Integer id) { */ @Override public Integer updatePageHistoryById(PageHistory pageHistory) { - return pageHistoryMapper.updatePageHistoryById(pageHistory); + return baseMapper.updatePageHistoryById(pageHistory); } /** @@ -106,7 +102,7 @@ public Integer updatePageHistoryById(PageHistory pageHistory) { @SystemServiceLog(description = "创建页面历史记录") public Integer createPageHistory(PageHistory pageHistory) { pageHistory.setIsPublished(true); - return pageHistoryMapper.createPageHistory(pageHistory); + return baseMapper.createPageHistory(pageHistory); } /** @@ -118,13 +114,13 @@ public Integer createPageHistory(PageHistory pageHistory) { */ @Override public List findPageHistoryByName(String name, Integer app) { - return pageHistoryMapper.queryPageHistoryByName(name, app); + return baseMapper.queryPageHistoryByName(name, app); } @Override public IPage findLatestPublishPage(PageQueryVo pageQueryVo) { PublishedPageVo queryData = pageQueryVo.getData(); - return pageHistoryMapper.findLatestPublishPage(pageQueryVo.getPage(), queryData); + return baseMapper.findLatestPublishPage(pageQueryVo.getPage(), queryData); } /** @@ -136,7 +132,7 @@ public IPage findLatestPublishPage(PageQueryVo */ @Override public String selectMaxVersionOfPageHistory(String name, Integer app) { - List pageHistories = pageHistoryMapper.queryPageHistoryByName(name, app); + List pageHistories = baseMapper.queryPageHistoryByName(name, app); if (CollectionUtils.isEmpty(pageHistories)) { return DEFAULT_PAGE_HISTORY_VERSION; } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java index 620fbfc9..9659b671 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.context.LoginUserContext; import com.tinyengine.it.common.enums.Enums; @@ -50,7 +51,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; @@ -71,13 +71,7 @@ */ @Service @Slf4j -public class PageServiceImpl implements PageService { - /** - * The Page mapper. - */ - @Autowired - private PageMapper pageMapper; - +public class PageServiceImpl extends ServiceImpl implements PageService { /** * The App service. */ @@ -159,7 +153,7 @@ public class PageServiceImpl implements PageService { @Override @SystemServiceLog(description = "通过appId查询page所有数据实现方法") public List queryAllPage(Integer aid) { - List pageList = pageMapper.queryPageByApp(aid); + List pageList = baseMapper.queryPageByApp(aid); if (pageList == null) { return null; } @@ -180,8 +174,8 @@ public List queryAllPage(Integer aid) { */ @Override @SystemServiceLog(description = "通过Id查询page数据实现方法") - public Page queryPageById(@Param("id") Integer id) { - Page pageInfo = pageMapper.queryPageById(id); + public Page queryPageById(Integer id) { + Page pageInfo = baseMapper.queryPageById(id); // 获取schemaMeta进行获取materialHistory中的framework进行判断 String framework = appMapper.queryAppById(pageInfo.getApp()).getFramework(); if (framework.isEmpty()) { @@ -206,7 +200,7 @@ public Page queryPageById(@Param("id") Integer id) { @Override @SystemServiceLog(description = "通过条件查询page数据实现方法") public List queryPageByCondition(Page page) { - return pageMapper.queryPageByCondition(page); + return baseMapper.queryPageByCondition(page); } /** @@ -226,8 +220,8 @@ public Result delPage(Integer id) { return del(id); } // 删除 - Page pageResult = pageMapper.queryPageById(id); - int result = pageMapper.deletePageById(id); + Page pageResult = baseMapper.queryPageById(id); + int result = baseMapper.deletePageById(id); if (result < 1) { return Result.failed(ExceptionEnum.CM001); } @@ -261,7 +255,7 @@ public Result createPage(Page page) { if (!pageResult.isEmpty()) { return Result.failed(ExceptionEnum.CM003); } - int result = pageMapper.createPage(page); + int result = baseMapper.createPage(page); if (result < 1) { return Result.failed(ExceptionEnum.CM001); } @@ -299,7 +293,7 @@ private List queryPages(Page page) { Page pageParam = new Page(); pageParam.setName(page.getName()); pageParam.setApp(page.getApp()); - return pageMapper.queryPageByCondition(pageParam); + return baseMapper.queryPageByCondition(pageParam); } /** @@ -328,7 +322,7 @@ public Result createFolder(Page page) { if (!pageResult.isEmpty()) { return Result.failed(ExceptionEnum.CM003); } - int result = pageMapper.createPage(page); + int result = baseMapper.createPage(page); if (result < 1) { return Result.failed(ExceptionEnum.CM001); } @@ -451,7 +445,7 @@ public boolean setAppHomePage(int appId, int pageId) { // 执行页面更新操作 private Result performUpdate(Page page) { - int result = pageMapper.updatePageById(page); + int result = baseMapper.updatePageById(page); if (result < 1) { return Result.failed(ExceptionEnum.CM001); } @@ -472,7 +466,7 @@ public Result getDepth(String parentId) { return Result.success(0); } // getFolder 获取父类信息 - Page parentInfo = pageMapper.queryPageById(parent); + Page parentInfo = baseMapper.queryPageById(parent); int depth = parentInfo.getDepth(); return Result.success(depth); } @@ -525,7 +519,7 @@ public Result del(Integer id) { // 这里只需要判断page表中是否存在子节点即可 Page page = new Page(); page.setParentId(id.toString()); - List subFolders = pageMapper.queryPageByCondition(page); + List subFolders = baseMapper.queryPageByCondition(page); if (!subFolders.isEmpty()) { return Result.failed("此文件夹不是空文件夹，不能删除！"); } @@ -547,12 +541,12 @@ public Result checkDelete(Integer id) { user.setId(loginUserContext.getLoginUserId()); user.setUsername(loginUserContext.getLoginUserId()); } - Page page = pageMapper.queryPageById(id); + Page page = baseMapper.queryPageById(id); User occupier = page.getOccupier(); // 如果当前页面没人占用 或者是自己占用 可以删除该页面 if (iCanDoIt(occupier, user)) { - pageMapper.deletePageById(id); + baseMapper.deletePageById(id); return Result.success(page); } @@ -595,7 +589,7 @@ public boolean protectDefaultPage(Page page) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("id", subPageId).set("is_default", false); - int result = pageMapper.update(null, updateWrapper); + int result = baseMapper.update(null, updateWrapper); if (result < 1) { return false; @@ -610,7 +604,7 @@ public boolean protectDefaultPage(Page page) { * @return parentId the parentId */ private String getParentPage(String parentId) { - Page page = pageMapper.queryPageById(Integer.parseInt(parentId)); + Page page = baseMapper.queryPageById(Integer.parseInt(parentId)); if (page.getIsPage() || "0".equals(page.getParentId())) { return parentId; } @@ -631,7 +625,7 @@ private int getSubPage(String parentId) { // 查找子页面列表 Page pageParam = new Page(); pageParam.setParentId(parentId); - List pageList = pageMapper.queryPageByCondition(pageParam); + List pageList = baseMapper.queryPageByCondition(pageParam); // 遍历页面列表，查找默认的子页面 for (Page page : pageList) { @@ -693,7 +687,7 @@ public Result checkUpdate(Page page) { if (!loginUserContext.getLoginUserId().equals(page.getOccupierBy())) { Result.failed("The current page is being edited by" + page.getOccupierBy()); } - pageMapper.updatePageById(page); + baseMapper.updatePageById(page); // 修改完返回页面还是返回dto，为了下次修改每次参数属性一致 Page pagesResult = queryPageById(page.getId()); return Result.success(pagesResult); @@ -779,7 +773,7 @@ public List getChildrenId(List pids) { // 构建查询条件 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("parent_id", pids); - List children = pageMapper.selectList(queryWrapper); + List children = baseMapper.selectList(queryWrapper); if (children.isEmpty()) { return new ArrayList<>(); } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageTemplateServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageTemplateServiceImpl.java index 27ecd151..8e852af5 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageTemplateServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageTemplateServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.app.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.exception.ServiceException; @@ -22,8 +23,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -36,10 +35,7 @@ */ @Service @Slf4j -public class PageTemplateServiceImpl implements PageTemplateService { - @Autowired - private PageTemplateMapper pageTemplateMapper; - +public class PageTemplateServiceImpl extends ServiceImpl implements PageTemplateService { /** * 查询表page_template所有数据 * @@ -53,10 +49,10 @@ public class PageTemplateServiceImpl implements PageTemplateService { public Result> queryAllPageTemplate(String name, String type) throws ServiceException { List pageTemplates = new ArrayList<>(); if (name == null || name.isEmpty()) { - pageTemplates = pageTemplateMapper.queryAllPageTemplate(type); + pageTemplates = baseMapper.queryAllPageTemplate(type); return Result.success(pageTemplates); } - pageTemplates = pageTemplateMapper.queryPageTemplateByName(name, type); + pageTemplates = baseMapper.queryPageTemplateByName(name, type); return Result.success(pageTemplates); } @@ -69,8 +65,8 @@ public Result> queryAllPageTemplate(String name, String type) */ @Override @SystemServiceLog(description = "根据id获取页面模版详情实现方法") - public Result queryPageTemplateById(@Param("id") Integer id) throws ServiceException { - PageTemplate pageTemplate = pageTemplateMapper.queryPageTemplateById(id); + public Result queryPageTemplateById(Integer id) throws ServiceException { + PageTemplate pageTemplate = baseMapper.queryPageTemplateById(id); return Result.success(pageTemplate); } @@ -84,7 +80,7 @@ public Result queryPageTemplateById(@Param("id") Integer id) throw @Override @SystemServiceLog(description = "获取页面模版条件查询实现方法") public List queryPageTemplateByCondition(PageTemplate pageTemplate) throws ServiceException { - return pageTemplateMapper.queryPageTemplateByCondition(pageTemplate); + return baseMapper.queryPageTemplateByCondition(pageTemplate); } /** @@ -96,11 +92,11 @@ public List queryPageTemplateByCondition(PageTemplate pageTemplate */ @Override @SystemServiceLog(description = "批量删除页面模版实现方法") - public Result deletePageTemplateByIds(@Param("ids") List ids) throws ServiceException { + public Result deletePageTemplateByIds(List ids) throws ServiceException { if (ids.isEmpty()) { return Result.failed(ExceptionEnum.CM002); } - Integer result = pageTemplateMapper.deletePageTemplateByIds(ids); + Integer result = baseMapper.deletePageTemplateByIds(ids); if (result != ids.size()) { return Result.failed(ExceptionEnum.CM001); } @@ -115,7 +111,7 @@ public Result deletePageTemplateByIds(@Param("ids") List ids) */ @Override public Integer updatePageTemplateById(PageTemplate pageTemplate) { - return pageTemplateMapper.updatePageTemplateById(pageTemplate); + return baseMapper.updatePageTemplateById(pageTemplate); } /** @@ -130,15 +126,15 @@ public Integer updatePageTemplateById(PageTemplate pageTemplate) { public Result createPageTemplate(PageTemplate pageTemplate) throws ServiceException { PageTemplate queryPageTemplate = new PageTemplate(); queryPageTemplate.setName(pageTemplate.getName()); - List pageTemplateResult = pageTemplateMapper.queryPageTemplateByCondition(queryPageTemplate); + List pageTemplateResult = baseMapper.queryPageTemplateByCondition(queryPageTemplate); if (!pageTemplateResult.isEmpty()) { return Result.failed(ExceptionEnum.CM003); } - int result = pageTemplateMapper.createPageTemplate(pageTemplate); + int result = baseMapper.createPageTemplate(pageTemplate); if (result < 1) { return Result.failed(ExceptionEnum.CM001); } - PageTemplate templateResult = pageTemplateMapper.queryPageTemplateById(pageTemplate.getId()); + PageTemplate templateResult = baseMapper.queryPageTemplateById(pageTemplate.getId()); return Result.success(templateResult); } } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/TaskRecordServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/TaskRecordServiceImpl.java index b4394766..678926cf 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/TaskRecordServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/TaskRecordServiceImpl.java @@ -12,14 +12,13 @@ package com.tinyengine.it.service.app.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.mapper.TaskRecordMapper; import com.tinyengine.it.model.entity.TaskRecord; import com.tinyengine.it.service.app.TaskRecordService; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -31,10 +30,7 @@ */ @Service @Slf4j -public class TaskRecordServiceImpl implements TaskRecordService { - @Autowired - private TaskRecordMapper taskRecordMapper; - +public class TaskRecordServiceImpl extends ServiceImpl implements TaskRecordService { /** * 查询表t_task_record所有数据 * @@ -42,7 +38,7 @@ public class TaskRecordServiceImpl implements TaskRecordService { */ @Override public List queryAllTaskRecord() { - return taskRecordMapper.queryAllTaskRecord(); + return baseMapper.queryAllTaskRecord(); } /** @@ -52,8 +48,8 @@ public List queryAllTaskRecord() { * @return query result */ @Override - public TaskRecord queryTaskRecordById(@Param("id") Integer id) { - return taskRecordMapper.queryTaskRecordById(id); + public TaskRecord queryTaskRecordById(Integer id) { + return baseMapper.queryTaskRecordById(id); } /** @@ -64,7 +60,7 @@ public TaskRecord queryTaskRecordById(@Param("id") Integer id) { */ @Override public List queryTaskRecordByCondition(TaskRecord taskRecord) { - return taskRecordMapper.queryTaskRecordByCondition(taskRecord); + return baseMapper.queryTaskRecordByCondition(taskRecord); } /** @@ -74,8 +70,8 @@ public List queryTaskRecordByCondition(TaskRecord taskRecord) { * @return execute success data number */ @Override - public Integer deleteTaskRecordById(@Param("id") Integer id) { - return taskRecordMapper.deleteTaskRecordById(id); + public Integer deleteTaskRecordById(Integer id) { + return baseMapper.deleteTaskRecordById(id); } /** @@ -86,7 +82,7 @@ public Integer deleteTaskRecordById(@Param("id") Integer id) { */ @Override public Integer updateTaskRecordById(TaskRecord taskRecord) { - return taskRecordMapper.updateTaskRecordById(taskRecord); + return baseMapper.updateTaskRecordById(taskRecord); } /** @@ -97,6 +93,6 @@ public Integer updateTaskRecordById(TaskRecord taskRecord) { */ @Override public Integer createTaskRecord(TaskRecord taskRecord) { - return taskRecordMapper.createTaskRecord(taskRecord); + return baseMapper.createTaskRecord(taskRecord); } } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/UserServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/UserServiceImpl.java index d247c784..cca22b0c 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/UserServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/UserServiceImpl.java @@ -12,13 +12,13 @@ package com.tinyengine.it.service.app.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.mapper.UserMapper; import com.tinyengine.it.model.entity.User; import com.tinyengine.it.service.app.UserService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -30,10 +30,7 @@ */ @Service @Slf4j -public class UserServiceImpl implements UserService { - @Autowired - private UserMapper userMapper; - +public class UserServiceImpl extends ServiceImpl implements UserService { /** * 查询表t_user所有数据 * @@ -41,7 +38,7 @@ public class UserServiceImpl implements UserService { */ @Override public List queryAllUser() { - return userMapper.queryAllUser(); + return baseMapper.queryAllUser(); } /** @@ -52,7 +49,7 @@ public List queryAllUser() { */ @Override public User queryUserById(String id) { - return userMapper.queryUserById(id); + return baseMapper.queryUserById(id); } /** @@ -63,7 +60,7 @@ public User queryUserById(String id) { */ @Override public List queryUserByCondition(User user) { - return userMapper.queryUserByCondition(user); + return baseMapper.queryUserByCondition(user); } /** @@ -74,7 +71,7 @@ public List queryUserByCondition(User user) { */ @Override public Integer deleteUserById(String id) { - return userMapper.deleteUserById(id); + return baseMapper.deleteUserById(id); } /** @@ -85,7 +82,7 @@ public Integer deleteUserById(String id) { */ @Override public Integer updateUserById(User user) { - return userMapper.updateUserById(user); + return baseMapper.updateUserById(user); } /** @@ -96,6 +93,6 @@ public Integer updateUserById(User user) { */ @Override public Integer createUser(User user) { - return userMapper.createUser(user); + return baseMapper.createUser(user); } } diff --git a/base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java b/base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java index bf6d321c..c9fea682 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java @@ -12,12 +12,11 @@ package com.tinyengine.it.service.material; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.dto.BlockGroupDto; import com.tinyengine.it.model.entity.BlockGroup; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -25,7 +24,7 @@ * * @since 2024-10-20 */ -public interface BlockGroupService { +public interface BlockGroupService extends IService { /** * 查询表t_block_group所有信息 * @@ -39,7 +38,7 @@ public interface BlockGroupService { * @param id the id * @return the block group dto */ - BlockGroup findBlockGroupById(@Param("id") Integer id); + BlockGroup findBlockGroupById(Integer id); /** * 根据条件查询表t_block_group信息 @@ -55,7 +54,7 @@ public interface BlockGroupService { * @param id the id * @return the integer */ - Integer deleteBlockGroupById(@Param("id") Integer id); + Integer deleteBlockGroupById(Integer id); /** * 根据主键id更新表t_block_group信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/BlockHistoryService.java b/base/src/main/java/com/tinyengine/it/service/material/BlockHistoryService.java index 42a43382..9d22a6ad 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/BlockHistoryService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/BlockHistoryService.java @@ -12,10 +12,9 @@ package com.tinyengine.it.service.material; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.BlockHistory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -23,7 +22,7 @@ * * @since 2024-10-20 */ -public interface BlockHistoryService { +public interface BlockHistoryService extends IService { /** * 查询表t_block_history所有信息 * @@ -37,7 +36,7 @@ public interface BlockHistoryService { * @param id the id * @return the block history */ - BlockHistory findBlockHistoryById(@Param("id") Integer id); + BlockHistory findBlockHistoryById(Integer id); /** * 根据条件查询表t_block_history信息 @@ -53,7 +52,7 @@ public interface BlockHistoryService { * @param id the id * @return the integer */ - Integer deleteBlockHistoryById(@Param("id") Integer id); + Integer deleteBlockHistoryById(Integer id); /** * 根据主键id更新表t_block_history信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/BlockService.java b/base/src/main/java/com/tinyengine/it/service/material/BlockService.java index 49f13f45..efc62c24 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/BlockService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/BlockService.java @@ -13,6 +13,7 @@ package com.tinyengine.it.service.material; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.dto.BlockBuildDto; import com.tinyengine.it.model.dto.BlockDto; @@ -22,8 +23,6 @@ import com.tinyengine.it.model.entity.Block; import com.tinyengine.it.model.entity.User; -import org.apache.ibatis.annotations.Param; - import java.util.List; import java.util.Map; @@ -32,7 +31,7 @@ * * @since 2024-10-20 */ -public interface BlockService { +public interface BlockService extends IService { /** * 查询表t_block所有信息 * @@ -46,7 +45,7 @@ public interface BlockService { * @param id the id * @return the BlockDto */ - BlockDto queryBlockById(@Param("id") Integer id); + BlockDto queryBlockById(Integer id); /** * 根据条件查询表t_block信息 @@ -62,7 +61,7 @@ public interface BlockService { * @param id the id * @return the integer */ - Integer deleteBlockById(@Param("id") Integer id); + Integer deleteBlockById(Integer id); /** * 根据主键id更新表t_block信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/BusinessCategoryService.java b/base/src/main/java/com/tinyengine/it/service/material/BusinessCategoryService.java index 10330c7b..95b51c4b 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/BusinessCategoryService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/BusinessCategoryService.java @@ -12,10 +12,9 @@ package com.tinyengine.it.service.material; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.BusinessCategory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -23,7 +22,7 @@ * * @since 2024-10-20 */ -public interface BusinessCategoryService { +public interface BusinessCategoryService extends IService { /** * 查询表t_business_category所有信息 * @@ -37,7 +36,7 @@ public interface BusinessCategoryService { * @param id the id * @return the business category */ - BusinessCategory queryBusinessCategoryById(@Param("id") Integer id); + BusinessCategory queryBusinessCategoryById(Integer id); /** * 根据条件查询表t_business_category信息 @@ -53,7 +52,7 @@ public interface BusinessCategoryService { * @param id the id * @return the integer */ - Integer deleteBusinessCategoryById(@Param("id") Integer id); + Integer deleteBusinessCategoryById(Integer id); /** * 根据主键id更新表t_business_category信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/ComponentLibraryService.java b/base/src/main/java/com/tinyengine/it/service/material/ComponentLibraryService.java index 71f44294..a32153ec 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/ComponentLibraryService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/ComponentLibraryService.java @@ -12,11 +12,10 @@ package com.tinyengine.it.service.material; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.ComponentLibrary; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -24,7 +23,7 @@ * * @since 2025-4-02 */ -public interface ComponentLibraryService { +public interface ComponentLibraryService extends IService { /** * 查询表t_component_library所有信息 * @@ -38,7 +37,7 @@ public interface ComponentLibraryService { * @param id the id * @return the material */ - Result queryComponentLibraryById(@Param("id") Integer id); + Result queryComponentLibraryById(Integer id); /** * 根据条件查询表t_component_library信息 @@ -54,7 +53,7 @@ public interface ComponentLibraryService { * @param id the id * @return the integer */ - Result deleteComponentLibraryById(@Param("id") Integer id); + Result deleteComponentLibraryById(Integer id); /** * 根据主键id更新表t_component_library信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/ComponentService.java b/base/src/main/java/com/tinyengine/it/service/material/ComponentService.java index 354abbd9..f0fd434e 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/ComponentService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/ComponentService.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.material; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.dto.BundleDto; import com.tinyengine.it.model.dto.BundleResultDto; @@ -19,7 +20,6 @@ import com.tinyengine.it.model.dto.FileResult; import com.tinyengine.it.model.entity.Component; -import org.apache.ibatis.annotations.Param; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -29,7 +29,7 @@ * * @since 2024-10-20 */ -public interface ComponentService { +public interface ComponentService extends IService { /** * 查询表t_component所有信息 * @@ -43,7 +43,7 @@ public interface ComponentService { * @param id the id * @return the component */ - Component findComponentById(@Param("id") Integer id); + Component findComponentById(Integer id); /** * 根据条件查询表t_component信息 @@ -59,7 +59,7 @@ public interface ComponentService { * @param id the id * @return the integer */ - Integer deleteComponentById(@Param("id") Integer id); + Integer deleteComponentById(Integer id); /** * 根据主键id更新表t_component信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/MaterialHistoryService.java b/base/src/main/java/com/tinyengine/it/service/material/MaterialHistoryService.java index 54a508c6..7ad562f3 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/MaterialHistoryService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/MaterialHistoryService.java @@ -12,11 +12,10 @@ package com.tinyengine.it.service.material; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.MaterialHistory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -24,7 +23,7 @@ * * @since 2024-10-20 */ -public interface MaterialHistoryService { +public interface MaterialHistoryService extends IService { /** * 查询表t_material_history所有信息 * @@ -38,7 +37,7 @@ public interface MaterialHistoryService { * @param id the id * @return the material history */ - Result findMaterialHistoryById(@Param("id") Integer id); + Result findMaterialHistoryById(Integer id); /** * 根据条件查询表t_material_history信息 @@ -54,7 +53,7 @@ public interface MaterialHistoryService { * @param id the id * @return the integer */ - Result deleteMaterialHistoryById(@Param("id") Integer id); + Result deleteMaterialHistoryById(Integer id); /** * 根据主键id更新表t_material_history信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/MaterialService.java b/base/src/main/java/com/tinyengine/it/service/material/MaterialService.java index 7adf7792..bb55c9c1 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/MaterialService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/MaterialService.java @@ -12,11 +12,10 @@ package com.tinyengine.it.service.material; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.Material; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -24,7 +23,7 @@ * * @since 2024-10-20 */ -public interface MaterialService { +public interface MaterialService extends IService { /** * 查询表t_material所有信息 * @@ -38,7 +37,7 @@ public interface MaterialService { * @param id the id * @return the material */ - Result queryMaterialById(@Param("id") Integer id); + Result queryMaterialById(Integer id); /** * 根据条件查询表t_material信息 @@ -54,7 +53,7 @@ public interface MaterialService { * @param id the id * @return the integer */ - Result deleteMaterialById(@Param("id") Integer id); + Result deleteMaterialById(Integer id); /** * 根据主键id更新表t_material信息 diff --git a/base/src/main/java/com/tinyengine/it/service/material/TaskRecordService.java b/base/src/main/java/com/tinyengine/it/service/material/TaskRecordService.java index 351356c1..6d791c82 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/TaskRecordService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/TaskRecordService.java @@ -12,10 +12,9 @@ package com.tinyengine.it.service.material; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.TaskRecord; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -26,14 +25,14 @@ * @author zhangjuncao * @since 2024-10-17 */ -public interface TaskRecordService { +public interface TaskRecordService extends IService { /** * 根据主键id查询表task_record信息 * * @param id id * @return the task record */ - TaskRecord queryTaskRecordById(@Param("id") Integer id); + TaskRecord queryTaskRecordById(Integer id); /** * 获取任务状态 diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java index dfd9650f..e5ee1f94 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.material.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.context.LoginUserContext; import com.tinyengine.it.common.enums.Enums; @@ -28,7 +29,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,10 +43,7 @@ */ @Service @Slf4j -public class BlockGroupServiceImpl implements BlockGroupService { - @Autowired - private BlockGroupMapper blockGroupMapper; - +public class BlockGroupServiceImpl extends ServiceImpl implements BlockGroupService { @Autowired private BlockCarriersRelationMapper blockCarriersRelationMapper; @@ -63,7 +60,7 @@ public class BlockGroupServiceImpl implements BlockGroupService { */ @Override public List findAllBlockGroup() { - return blockGroupMapper.queryAllBlockGroup(); + return baseMapper.queryAllBlockGroup(); } /** @@ -73,8 +70,8 @@ public List findAllBlockGroup() { * @return block group */ @Override - public BlockGroup findBlockGroupById(@Param("id") Integer id) { - BlockGroup blockGroupResult = blockGroupMapper.queryBlockGroupAndBlockById(id, null, + public BlockGroup findBlockGroupById(Integer id) { + BlockGroup blockGroupResult = baseMapper.queryBlockGroupAndBlockById(id, null, loginUserContext.getLoginUserId()); // 对查询的结果的区块赋值current_version if (blockGroupResult == null || blockGroupResult.getBlocks().isEmpty()) { @@ -104,7 +101,7 @@ public BlockGroup findBlockGroupById(@Param("id") Integer id) { */ @Override public List findBlockGroupByCondition(BlockGroup blockGroup) { - return blockGroupMapper.queryBlockGroupByCondition(blockGroup); + return baseMapper.queryBlockGroupByCondition(blockGroup); } /** @@ -114,8 +111,8 @@ public List findBlockGroupByCondition(BlockGroup blockGroup) { * @return delete number */ @Override - public Integer deleteBlockGroupById(@Param("id") Integer id) { - return blockGroupMapper.deleteBlockGroupById(id); + public Integer deleteBlockGroupById(Integer id) { + return baseMapper.deleteBlockGroupById(id); } /** @@ -141,7 +138,7 @@ public Integer updateBlockGroupById(BlockGroup blockGroup) { blockCarriersRelationMapper.deleteBlockCarriersRelation(blockGroup.getId(), hostType, null); // 删除区块分组与区块关系 blockGroupBlockMapper.deleteBlockGroupBlockByGroupId(blockGroup.getId()); - return blockGroupMapper.updateBlockGroupById(blockGroup); + return baseMapper.updateBlockGroupById(blockGroup); } // 处理参数分组区块 List blockIds = blockList.stream().map(Block::getId).collect(Collectors.toList()); @@ -160,7 +157,7 @@ public Integer updateBlockGroupById(BlockGroup blockGroup) { if (result > 0) { blockCarriersRelationMapper.deleteBlockCarriersRelation(blockGroup.getId(), hostType, result); } - return blockGroupMapper.updateBlockGroupById(blockGroup); + return baseMapper.updateBlockGroupById(blockGroup); } /** @@ -171,9 +168,9 @@ public Integer updateBlockGroupById(BlockGroup blockGroup) { */ @Override public Result createBlockGroup(BlockGroup blockGroup) { - List blockGroupsList = blockGroupMapper.queryBlockGroupByCondition(blockGroup); + List blockGroupsList = baseMapper.queryBlockGroupByCondition(blockGroup); if (blockGroupsList.isEmpty()) { - blockGroupMapper.createBlockGroup(blockGroup); + baseMapper.createBlockGroup(blockGroup); } else { return Result.failed(ExceptionEnum.CM003); } @@ -202,15 +199,15 @@ public List getBlockGroupByIdsOrAppId(List ids, Integer app BlockGroup blockGroup = new BlockGroup(); if (ids != null) { for (int blockgroupId : ids) { - blockGroup = blockGroupMapper.queryBlockGroupAndBlockById(blockgroupId, blockCreatedBy, groupCreatedBy); + blockGroup = baseMapper.queryBlockGroupAndBlockById(blockgroupId, blockCreatedBy, groupCreatedBy); blockGroupsListResult.add(blockGroup); } } if (appId != null) { - blockGroupsListResult = blockGroupMapper.queryBlockGroupByAppId(appId, blockCreatedBy, groupCreatedBy); + blockGroupsListResult = baseMapper.queryBlockGroupByAppId(appId, blockCreatedBy, groupCreatedBy); } if (ids == null && appId == null) { - blockGroupsListResult = blockGroupMapper.queryAllBlockGroupAndBlock(blockCreatedBy, groupCreatedBy); + blockGroupsListResult = baseMapper.queryAllBlockGroupAndBlock(blockCreatedBy, groupCreatedBy); } if (blockGroupsListResult.isEmpty() || blockGroupsListResult.get(0).getId() == null) { diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockHistoryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockHistoryServiceImpl.java index b19424f2..f1225bbb 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockHistoryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockHistoryServiceImpl.java @@ -12,14 +12,13 @@ package com.tinyengine.it.service.material.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.mapper.BlockHistoryMapper; import com.tinyengine.it.model.entity.BlockHistory; import com.tinyengine.it.service.material.BlockHistoryService; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -31,10 +30,7 @@ */ @Service @Slf4j -public class BlockHistoryServiceImpl implements BlockHistoryService { - @Autowired - private BlockHistoryMapper blockHistoryMapper; - +public class BlockHistoryServiceImpl extends ServiceImpl implements BlockHistoryService { /** * 查询表t_block_history所有数据 * @@ -42,7 +38,7 @@ public class BlockHistoryServiceImpl implements BlockHistoryService { */ @Override public List findAllBlockHistory() { - return blockHistoryMapper.queryAllBlockHistory(); + return baseMapper.queryAllBlockHistory(); } /** @@ -52,8 +48,8 @@ public List findAllBlockHistory() { * @return block history */ @Override - public BlockHistory findBlockHistoryById(@Param("id") Integer id) { - return blockHistoryMapper.queryBlockHistoryById(id); + public BlockHistory findBlockHistoryById(Integer id) { + return baseMapper.queryBlockHistoryById(id); } /** @@ -64,7 +60,7 @@ public BlockHistory findBlockHistoryById(@Param("id") Integer id) { */ @Override public List findBlockHistoryByCondition(BlockHistory blockHistory) { - return blockHistoryMapper.queryBlockHistoryByCondition(blockHistory); + return baseMapper.queryBlockHistoryByCondition(blockHistory); } /** @@ -74,8 +70,8 @@ public List findBlockHistoryByCondition(BlockHistory blockHistory) * @return execute success data number */ @Override - public Integer deleteBlockHistoryById(@Param("id") Integer id) { - return blockHistoryMapper.deleteBlockHistoryById(id); + public Integer deleteBlockHistoryById(Integer id) { + return baseMapper.deleteBlockHistoryById(id); } /** @@ -86,7 +82,7 @@ public Integer deleteBlockHistoryById(@Param("id") Integer id) { */ @Override public Integer updateBlockHistoryById(BlockHistory blockHistory) { - return blockHistoryMapper.updateBlockHistoryById(blockHistory); + return baseMapper.updateBlockHistoryById(blockHistory); } /** @@ -97,6 +93,6 @@ public Integer updateBlockHistoryById(BlockHistory blockHistory) { */ @Override public Integer createBlockHistory(BlockHistory blockHistory) { - return blockHistoryMapper.createBlockHistory(blockHistory); + return baseMapper.createBlockHistory(blockHistory); } } diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java index e35e3c41..20191322 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BlockServiceImpl.java @@ -16,6 +16,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -50,7 +51,6 @@ import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -76,10 +76,7 @@ */ @Service @Slf4j -public class BlockServiceImpl implements BlockService { - @Autowired - private BlockMapper blockMapper; - +public class BlockServiceImpl extends ServiceImpl implements BlockService { @Autowired private UserMapper userMapper; @@ -111,7 +108,7 @@ public class BlockServiceImpl implements BlockService { */ @Override public List queryAllBlock() { - return blockMapper.queryAllBlock(); + return baseMapper.queryAllBlock(); } /** @@ -121,8 +118,8 @@ public List queryAllBlock() { * @return block */ @Override - public BlockDto queryBlockById(@Param("id") Integer id) { - BlockDto blockDto = blockMapper.findBlockAndGroupAndHistoByBlockId(id); + public BlockDto queryBlockById(Integer id) { + BlockDto blockDto = baseMapper.findBlockAndGroupAndHistoByBlockId(id); if (blockDto == null) { return blockDto; } @@ -145,7 +142,7 @@ public BlockDto queryBlockById(@Param("id") Integer id) { */ @Override public List queryBlockByCondition(Block block) { - return blockMapper.queryBlockByCondition(block); + return baseMapper.queryBlockByCondition(block); } /** @@ -155,8 +152,8 @@ public List queryBlockByCondition(Block block) { * @return execute success data number */ @Override - public Integer deleteBlockById(@Param("id") Integer id) { - return blockMapper.deleteBlockById(id); + public Integer deleteBlockById(Integer id) { + return baseMapper.deleteBlockById(id); } /** @@ -171,7 +168,7 @@ public Result updateBlockById(BlockParam blockParam, Integer appId) { if (blockParam == null || blockParam.getId() == null) { return Result.failed(ExceptionEnum.CM002); } - Block blockResult = blockMapper.queryBlockById(blockParam.getId()); + Block blockResult = baseMapper.queryBlockById(blockParam.getId()); if (blockResult == null) { return Result.failed(ExceptionEnum.CM001); } @@ -192,7 +189,7 @@ public Result updateBlockById(BlockParam blockParam, Integer appId) { } if (blockParam.getGroups() == null) { - blockMapper.updateBlockById(blocks); + baseMapper.updateBlockById(blocks); BlockDto blockDtoResult = queryBlockById(blocks.getId()); return Result.success(blockDtoResult); } @@ -208,7 +205,7 @@ public Result updateBlockById(BlockParam blockParam, Integer appId) { } } // 更新区块 - blockMapper.updateBlockById(blocks); + baseMapper.updateBlockById(blocks); BlockDto blockDtoResult = new BlockDto(); // 参数存在区块分组且无值 if (blockParam.getGroups().isEmpty()) { @@ -249,7 +246,7 @@ public Result createBlock(BlockParam blockParam) { blocks.setIsOfficial(false); blocks.setPlatformId(loginUserContext.getPlatformId()); // 新建区块给默认值 - int result = blockMapper.createBlock(blocks); + int result = baseMapper.createBlock(blocks); if (result < 1) { return Result.failed(ExceptionEnum.CM001); } @@ -342,7 +339,7 @@ public List getBlockInfo(List block, String framework) { } // 执行查询并返回结果 - return blockMapper.selectList(queryWrapper); + return baseMapper.selectList(queryWrapper); } /** @@ -429,7 +426,7 @@ public IPage findBlocksByPagetionList(BlockParamDto blockParamDto) { int pageNum = start == 0 && limit == 0 ? 1 : (start / limit) + 1; int pageSize = limit == 0 ? 10 : limit; Page page = new Page<>(pageNum, pageSize); - return blockMapper.selectPage(page, queryWrapper); + return baseMapper.selectPage(page, queryWrapper); } /** @@ -442,7 +439,7 @@ public IPage findBlocksByPagetionList(BlockParamDto blockParamDto) { public List allTags() { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.select("tags").isNotNull("tags"); - List allBlocksList = blockMapper.selectList(queryWrapper); + List allBlocksList = baseMapper.selectList(queryWrapper); return allBlocksList.stream() .flatMap(blocks -> blocks.getTags().stream()) .collect(Collectors.toList()); @@ -457,7 +454,7 @@ public List allTags() { @SystemServiceLog(description = "getNotInGroupBlocks 获取不在分组内的区块 实现类") @Override public List getNotInGroupBlocks(NotGroupDto notGroupDto) { - List blocksList = blockMapper.findBlocksReturn(notGroupDto); + List blocksList = baseMapper.findBlocksReturn(notGroupDto); if (blocksList == null || blocksList.isEmpty()) { return blocksList; } @@ -500,7 +497,7 @@ public Result getBlockByLabel(String label, Integer appId) { Block block = new Block(); block.setLabel(label); block.setAppId(appId); - List blockList = blockMapper.queryBlockByCondition(block); + List blockList = baseMapper.queryBlockByCondition(block); if (blockList.isEmpty()) { return Result.success(); } @@ -595,9 +592,9 @@ public IPage findBlocksByConditionPagetion(Map request) { .or() .like(StringUtils.isNotEmpty(description), "description", description) ); - List blocksList = blockMapper.selectList(queryWrapper); + List blocksList = baseMapper.selectList(queryWrapper); Page page = new Page<>(1, blocksList.size()); - return blockMapper.selectPage(page, queryWrapper); + return baseMapper.selectPage(page, queryWrapper); } /** @@ -649,7 +646,7 @@ public Result> listNew(String appId, String groupId) { List blocksList = new ArrayList<>(); // 如果有 groupId, 只查group下的block,以及自己创建的区块 if (groupIdTemp != 0) { - blocksList = blockMapper.findBlockByBlockGroupId(groupIdTemp, loginUserContext.getLoginUserId()); + blocksList = baseMapper.findBlockByBlockGroupId(groupIdTemp, loginUserContext.getLoginUserId()); return Result.success(blocksList); } // 如果没有 groupId @@ -657,7 +654,7 @@ public Result> listNew(String appId, String groupId) { // 2. 组合 groups 下的所有 block // 3. 查询个人创建的 blocks // 4. 将个人的和 groups 下的 blocks 合并去重 - blocksList = blockMapper.findBlocksByBlockGroupIdAppId(appIdTemp); + blocksList = baseMapper.findBlocksByBlockGroupIdAppId(appIdTemp); List appBlocks = blocksList; // 通过createBy查询区块表数据 Block blocks = new Block(); @@ -702,7 +699,7 @@ public int ensureBlockId(BlockDto blockDto) { queryBlock.setLabel(blockDto.getLabel()); queryBlock.setFramework(blockDto.getFramework()); queryBlock.setCreatedBy(loginUserContext.getLoginUserId()); - List blockList = blockMapper.queryBlockByCondition(queryBlock); + List blockList = baseMapper.queryBlockByCondition(queryBlock); List groups = blockDto.getGroups().stream().map(BlockGroup::getId).collect(Collectors.toList()); ; blockDto.setGroups(null); diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/BusinessCategoryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/BusinessCategoryServiceImpl.java index 518b6ae4..ee900055 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/BusinessCategoryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/BusinessCategoryServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.material.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.exception.ServiceException; import com.tinyengine.it.mapper.BusinessCategoryMapper; import com.tinyengine.it.model.entity.BusinessCategory; @@ -19,8 +20,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -32,10 +31,7 @@ */ @Service @Slf4j -public class BusinessCategoryServiceImpl implements BusinessCategoryService { - @Autowired - private BusinessCategoryMapper businessCategoryMapper; - +public class BusinessCategoryServiceImpl extends ServiceImpl implements BusinessCategoryService { /** * 查询表t_business_category所有数据 * @@ -43,7 +39,7 @@ public class BusinessCategoryServiceImpl implements BusinessCategoryService { */ @Override public List queryAllBusinessCategory() { - return businessCategoryMapper.queryAllBusinessCategory(); + return baseMapper.queryAllBusinessCategory(); } /** @@ -53,8 +49,8 @@ public List queryAllBusinessCategory() { * @return BusinessCategory */ @Override - public BusinessCategory queryBusinessCategoryById(@Param("id") Integer id) { - return businessCategoryMapper.queryBusinessCategoryById(id); + public BusinessCategory queryBusinessCategoryById(Integer id) { + return baseMapper.queryBusinessCategoryById(id); } /** @@ -67,7 +63,7 @@ public BusinessCategory queryBusinessCategoryById(@Param("id") Integer id) { @Override public List queryBusinessCategoryByCondition(BusinessCategory businessCategory) throws ServiceException { - return businessCategoryMapper.queryBusinessCategoryByCondition(businessCategory); + return baseMapper.queryBusinessCategoryByCondition(businessCategory); } /** @@ -77,8 +73,8 @@ public List queryBusinessCategoryByCondition(BusinessCategory * @return execute success data number */ @Override - public Integer deleteBusinessCategoryById(@Param("id") Integer id) { - return businessCategoryMapper.deleteBusinessCategoryById(id); + public Integer deleteBusinessCategoryById(Integer id) { + return baseMapper.deleteBusinessCategoryById(id); } /** @@ -89,7 +85,7 @@ public Integer deleteBusinessCategoryById(@Param("id") Integer id) { */ @Override public Integer updateBusinessCategoryById(BusinessCategory businessCategory) { - return businessCategoryMapper.updateBusinessCategoryById(businessCategory); + return baseMapper.updateBusinessCategoryById(businessCategory); } /** @@ -100,6 +96,6 @@ public Integer updateBusinessCategoryById(BusinessCategory businessCategory) { */ @Override public Integer createBusinessCategory(BusinessCategory businessCategory) { - return businessCategoryMapper.createBusinessCategory(businessCategory); + return baseMapper.createBusinessCategory(businessCategory); } } diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentLibraryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentLibraryServiceImpl.java index cea1690f..84c1f9ae 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentLibraryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentLibraryServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.material.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.mapper.ComponentLibraryMapper; @@ -20,8 +21,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -33,10 +32,7 @@ */ @Service @Slf4j -public class ComponentLibraryServiceImpl implements ComponentLibraryService { - @Autowired - private ComponentLibraryMapper componentLibraryMapper; - +public class ComponentLibraryServiceImpl extends ServiceImpl implements ComponentLibraryService { /** * 查询表t_component_library所有数据 * @@ -44,7 +40,7 @@ public class ComponentLibraryServiceImpl implements ComponentLibraryService { */ @Override public List queryAllComponentLibrary() { - return componentLibraryMapper.queryAllComponentLibrary(); + return baseMapper.queryAllComponentLibrary(); } /** @@ -54,8 +50,8 @@ public List queryAllComponentLibrary() { * @return query result */ @Override - public Result queryComponentLibraryById(@Param("id") Integer id) { - ComponentLibrary material = componentLibraryMapper.queryComponentLibraryById(id); + public Result queryComponentLibraryById(Integer id) { + ComponentLibrary material = baseMapper.queryComponentLibraryById(id); return Result.success(material); } @@ -67,7 +63,7 @@ public Result queryComponentLibraryById(@Param("id") Integer i */ @Override public List queryComponentLibraryByCondition(ComponentLibrary componentLibrary) { - return componentLibraryMapper.queryComponentLibraryByCondition(componentLibrary); + return baseMapper.queryComponentLibraryByCondition(componentLibrary); } /** @@ -77,12 +73,12 @@ public List queryComponentLibraryByCondition(ComponentLibrary * @return execute success data number */ @Override - public Result deleteComponentLibraryById(@Param("id") Integer id) { + public Result deleteComponentLibraryById(Integer id) { Result result = this.queryComponentLibraryById(id); if (result.getData() == null || result.getData().getId() == null) { return Result.success(); } - int deleteResult = componentLibraryMapper.deleteComponentLibraryById(id); + int deleteResult = baseMapper.deleteComponentLibraryById(id); if (deleteResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -98,7 +94,7 @@ public Result deleteComponentLibraryById(@Param("id") Integer */ @Override public Result updateComponentLibraryById(ComponentLibrary componentLibrary) { - int updateResult = componentLibraryMapper.updateComponentLibraryById(componentLibrary); + int updateResult = baseMapper.updateComponentLibraryById(componentLibrary); if (updateResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -113,7 +109,7 @@ public Result updateComponentLibraryById(ComponentLibrary comp */ @Override public Result createComponentLibrary(ComponentLibrary componentLibrary) { - int createResult = componentLibraryMapper.createComponentLibrary(componentLibrary); + int createResult = baseMapper.createComponentLibrary(componentLibrary); if (createResult != 1) { return Result.failed(ExceptionEnum.CM008); } diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java index 8fde5817..ccf1f334 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.material.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.log.SystemServiceLog; @@ -34,7 +35,6 @@ import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -44,6 +44,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * The type Component service. @@ -52,13 +53,7 @@ */ @Service @Slf4j -public class ComponentServiceImpl implements ComponentService { - /** - * The component mapper. - */ - @Autowired - private ComponentMapper componentMapper; - +public class ComponentServiceImpl extends ServiceImpl implements ComponentService { /** * The component library mapper. */ @@ -72,7 +67,7 @@ public class ComponentServiceImpl implements ComponentService { */ @Override public List findAllComponent() { - return componentMapper.queryAllComponent(); + return baseMapper.queryAllComponent(); } /** @@ -82,8 +77,8 @@ public List findAllComponent() { * @return query result */ @Override - public Component findComponentById(@Param("id") Integer id) { - return componentMapper.queryComponentById(id); + public Component findComponentById(Integer id) { + return baseMapper.queryComponentById(id); } /** @@ -94,7 +89,7 @@ public Component findComponentById(@Param("id") Integer id) { */ @Override public List findComponentByCondition(Component component) { - return componentMapper.queryComponentByCondition(component); + return baseMapper.queryComponentByCondition(component); } /** @@ -104,8 +99,8 @@ public List findComponentByCondition(Component component) { * @return execute success data number */ @Override - public Integer deleteComponentById(@Param("id") Integer id) { - return componentMapper.deleteComponentById(id); + public Integer deleteComponentById(Integer id) { + return baseMapper.deleteComponentById(id); } /** @@ -116,7 +111,7 @@ public Integer deleteComponentById(@Param("id") Integer id) { */ @Override public Integer updateComponentById(Component component) { - return componentMapper.updateComponentById(component); + return baseMapper.updateComponentById(component); } /** @@ -127,7 +122,7 @@ public Integer updateComponentById(Component component) { */ @Override public Integer createComponent(Component component) { - return componentMapper.createComponent(component); + return baseMapper.createComponent(component); } /** @@ -309,11 +304,11 @@ public Result bulkCreate(List componentList) { MaterialComponent materialComponent = new MaterialComponent(); materialComponent.setMaterialId(1); materialComponent.setComponentId(component.getId()); - componentMapper.createMaterialComponent(materialComponent); + baseMapper.createMaterialComponent(materialComponent); MaterialHistoryComponent materialHistoryComponent = new MaterialHistoryComponent(); materialHistoryComponent.setComponentId(component.getId()); materialHistoryComponent.setMaterialHistoryId(1); - componentMapper.createMaterialHistoryComponent(materialHistoryComponent); + baseMapper.createMaterialHistoryComponent(materialHistoryComponent); } addNum = addNum + 1; } else { @@ -375,10 +370,12 @@ private List buildComponentList(BundleDto bundleDto, List snippetMap = BeanUtil.beanToMap(snippet); - component.setSnippets(Arrays.asList(snippetMap)); - + if (snippet == null) { + continue; + } + Map snippetMap = BeanUtil.beanToMap(snippet); + component.setSnippets(Arrays.asList(snippetMap)); + if(Objects.isNull(component.getCategory())) { component.setCategory(child.getGroup()); } } diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialHistoryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialHistoryServiceImpl.java index 4cac2e09..7a6e0b13 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialHistoryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialHistoryServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.material.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.exception.ServiceException; @@ -21,8 +22,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -34,13 +33,7 @@ */ @Service @Slf4j -public class MaterialHistoryServiceImpl implements MaterialHistoryService { - /** - * The material history mapper. - */ - @Autowired - private MaterialHistoryMapper materialHistoryMapper; - +public class MaterialHistoryServiceImpl extends ServiceImpl implements MaterialHistoryService { /** * 查询表t_material_history所有数据 * @@ -48,7 +41,7 @@ public class MaterialHistoryServiceImpl implements MaterialHistoryService { */ @Override public List findAllMaterialHistory() { - return materialHistoryMapper.queryAllMaterialHistory(); + return baseMapper.queryAllMaterialHistory(); } /** @@ -58,8 +51,8 @@ public List findAllMaterialHistory() { * @return query result */ @Override - public Result findMaterialHistoryById(@Param("id") Integer id) { - MaterialHistory materialHistory = materialHistoryMapper.queryMaterialHistoryById(id); + public Result findMaterialHistoryById(Integer id) { + MaterialHistory materialHistory = baseMapper.queryMaterialHistoryById(id); return Result.success(materialHistory); } @@ -73,7 +66,7 @@ public Result findMaterialHistoryById(@Param("id") Integer id) @Override public List findMaterialHistoryByCondition(MaterialHistory materialHistory) throws ServiceException { - return materialHistoryMapper.queryMaterialHistoryByCondition(materialHistory); + return baseMapper.queryMaterialHistoryByCondition(materialHistory); } /** @@ -83,9 +76,9 @@ public List findMaterialHistoryByCondition(MaterialHistory mate * @return execute success data number */ @Override - public Result deleteMaterialHistoryById(@Param("id") Integer id) { + public Result deleteMaterialHistoryById(Integer id) { Result result = this.findMaterialHistoryById(id); - int deleteResult = materialHistoryMapper.deleteMaterialHistoryById(id); + int deleteResult = baseMapper.deleteMaterialHistoryById(id); if (deleteResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -100,7 +93,7 @@ public Result deleteMaterialHistoryById(@Param("id") Integer id */ @Override public Result updateMaterialHistoryById(MaterialHistory materialHistory) { - int updateResult = materialHistoryMapper.updateMaterialHistoryById(materialHistory); + int updateResult = baseMapper.updateMaterialHistoryById(materialHistory); if (updateResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -115,7 +108,7 @@ public Result updateMaterialHistoryById(MaterialHistory materia */ @Override public Result createMaterialHistory(MaterialHistory materialHistory) { - int createResult = materialHistoryMapper.createMaterialHistory(materialHistory); + int createResult = baseMapper.createMaterialHistory(materialHistory); if (createResult != 1) { return Result.failed(ExceptionEnum.CM008); } diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialServiceImpl.java index 640a495e..c26f01f6 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/MaterialServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.material.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.mapper.MaterialMapper; @@ -20,8 +21,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -33,10 +32,7 @@ */ @Service @Slf4j -public class MaterialServiceImpl implements MaterialService { - @Autowired - private MaterialMapper materialMapper; - +public class MaterialServiceImpl extends ServiceImpl implements MaterialService { /** * 查询表t_material所有数据 * @@ -44,7 +40,7 @@ public class MaterialServiceImpl implements MaterialService { */ @Override public List queryAllMaterial() { - return materialMapper.queryAllMaterial(); + return baseMapper.queryAllMaterial(); } /** @@ -54,8 +50,8 @@ public List queryAllMaterial() { * @return query result */ @Override - public Result queryMaterialById(@Param("id") Integer id) { - Material material = materialMapper.queryMaterialById(id); + public Result queryMaterialById(Integer id) { + Material material = baseMapper.queryMaterialById(id); return Result.success(material); } @@ -67,7 +63,7 @@ public Result queryMaterialById(@Param("id") Integer id) { */ @Override public List queryMaterialByCondition(Material material) { - return materialMapper.queryMaterialByCondition(material); + return baseMapper.queryMaterialByCondition(material); } /** @@ -77,8 +73,8 @@ public List queryMaterialByCondition(Material material) { * @return execute success data number */ @Override - public Result deleteMaterialById(@Param("id") Integer id) { - int deleteResult = materialMapper.deleteMaterialById(id); + public Result deleteMaterialById(Integer id) { + int deleteResult = baseMapper.deleteMaterialById(id); if (deleteResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -94,7 +90,7 @@ public Result deleteMaterialById(@Param("id") Integer id) { */ @Override public Result updateMaterialById(Material material) { - int updateResult = materialMapper.updateMaterialById(material); + int updateResult = baseMapper.updateMaterialById(material); if (updateResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -109,7 +105,7 @@ public Result updateMaterialById(Material material) { */ @Override public Result createMaterial(Material material) { - int createResult = materialMapper.createMaterial(material); + int createResult = baseMapper.createMaterial(material); if (createResult != 1) { return Result.failed(ExceptionEnum.CM008); } diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/TaskRecordMaterialServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/TaskRecordMaterialServiceImpl.java index 5e69f27c..f5398a57 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/TaskRecordMaterialServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/TaskRecordMaterialServiceImpl.java @@ -12,14 +12,13 @@ package com.tinyengine.it.service.material.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.exception.ServiceException; import com.tinyengine.it.common.log.SystemServiceLog; import com.tinyengine.it.mapper.TaskRecordMapper; import com.tinyengine.it.model.entity.TaskRecord; import com.tinyengine.it.service.material.TaskRecordService; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Arrays; @@ -36,10 +35,7 @@ * @since 2024-10-17 */ @Service -public class TaskRecordMaterialServiceImpl implements TaskRecordService { - @Autowired - TaskRecordMapper taskRecordMapper; - +public class TaskRecordMaterialServiceImpl extends ServiceImpl implements TaskRecordService { /** * 根据主键id查询表task_record信息 * @@ -48,8 +44,8 @@ public class TaskRecordMaterialServiceImpl implements TaskRecordService { * @throws ServiceException serviceException */ @Override - public TaskRecord queryTaskRecordById(@Param("id") Integer id) throws ServiceException { - return taskRecordMapper.queryTaskRecordById(id); + public TaskRecord queryTaskRecordById(Integer id) throws ServiceException { + return baseMapper.queryTaskRecordById(id); } /** @@ -68,7 +64,7 @@ public List> status(int taskTypeId, String uniqueIds) { List>> queryPromises = uniqueIdsList.stream() .map(uniqueId -> CompletableFuture.supplyAsync(() -> { // 根据taskTypeId、uniqueId、created_at按照条件查询 - return taskRecordMapper.findTaskRecordByTaskIdAndUniqueid(taskTypeId, uniqueId); + return baseMapper.findTaskRecordByTaskIdAndUniqueid(taskTypeId, uniqueId); })) .collect(Collectors.toList()); return queryPromises.stream() diff --git a/base/src/main/java/com/tinyengine/it/service/platform/PlatformHistoryService.java b/base/src/main/java/com/tinyengine/it/service/platform/PlatformHistoryService.java index ef3ad33b..5ba22c78 100644 --- a/base/src/main/java/com/tinyengine/it/service/platform/PlatformHistoryService.java +++ b/base/src/main/java/com/tinyengine/it/service/platform/PlatformHistoryService.java @@ -12,11 +12,10 @@ package com.tinyengine.it.service.platform; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.PlatformHistory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -24,7 +23,7 @@ * * @since 2025-05-09 */ -public interface PlatformHistoryService { +public interface PlatformHistoryService extends IService { /** * 查询表t_platform_history所有信息 * @@ -38,7 +37,7 @@ public interface PlatformHistoryService { * @param id the id * @return the platformHistory */ - PlatformHistory queryPlatformHistoryById(@Param("id") Integer id); + PlatformHistory queryPlatformHistoryById(Integer id); /** * 根据条件查询表t_platform_history信息 @@ -54,7 +53,7 @@ public interface PlatformHistoryService { * @param id the id * @return the Result */ - Result deletePlatformHistoryById(@Param("id") Integer id); + Result deletePlatformHistoryById(Integer id); /** * 根据主键id更新表t_platform_history信息 diff --git a/base/src/main/java/com/tinyengine/it/service/platform/PlatformService.java b/base/src/main/java/com/tinyengine/it/service/platform/PlatformService.java index 552b9e7a..9f2db52b 100644 --- a/base/src/main/java/com/tinyengine/it/service/platform/PlatformService.java +++ b/base/src/main/java/com/tinyengine/it/service/platform/PlatformService.java @@ -12,11 +12,10 @@ package com.tinyengine.it.service.platform; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.Platform; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -24,7 +23,7 @@ * * @since 2024-10-20 */ -public interface PlatformService { +public interface PlatformService extends IService { /** * 查询表t_platform所有信息 * @@ -38,7 +37,7 @@ public interface PlatformService { * @param id the id * @return the platform */ - Platform queryPlatformById(@Param("id") Integer id); + Platform queryPlatformById(Integer id); /** * 根据条件查询表t_platform信息 @@ -54,7 +53,7 @@ public interface PlatformService { * @param id the id * @return the Result */ - Result deletePlatformById(@Param("id") Integer id); + Result deletePlatformById(Integer id); /** * 根据主键id更新表t_platform信息 diff --git a/base/src/main/java/com/tinyengine/it/service/platform/TenantService.java b/base/src/main/java/com/tinyengine/it/service/platform/TenantService.java index 61c6c3c6..0d0b07c7 100644 --- a/base/src/main/java/com/tinyengine/it/service/platform/TenantService.java +++ b/base/src/main/java/com/tinyengine/it/service/platform/TenantService.java @@ -12,10 +12,9 @@ package com.tinyengine.it.service.platform; +import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.Tenant; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -23,7 +22,7 @@ * * @since 2024-10-20 */ -public interface TenantService { +public interface TenantService extends IService { /** * 查询表t_tenant所有信息 * @@ -37,7 +36,7 @@ public interface TenantService { * @param id the id * @return the tenant */ - Tenant findTenantById(@Param("id") Integer id); + Tenant findTenantById(Integer id); /** * 根据条件查询表t_tenant信息 @@ -53,7 +52,7 @@ public interface TenantService { * @param id the id * @return the integer */ - Integer deleteTenantById(@Param("id") Integer id); + Integer deleteTenantById(Integer id); /** * 根据主键id更新表t_tenant信息 diff --git a/base/src/main/java/com/tinyengine/it/service/platform/impl/PlatformHistoryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/platform/impl/PlatformHistoryServiceImpl.java index f3c3f777..dcaac1f0 100644 --- a/base/src/main/java/com/tinyengine/it/service/platform/impl/PlatformHistoryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/platform/impl/PlatformHistoryServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.platform.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.mapper.PlatformHistoryMapper; @@ -20,7 +21,6 @@ import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -32,10 +32,7 @@ */ @Service @Slf4j -public class PlatformHistoryServiceImpl implements PlatformHistoryService { - @Autowired - private PlatformHistoryMapper platformHistoryMapper; - +public class PlatformHistoryServiceImpl extends ServiceImpl implements PlatformHistoryService { /** * 查询表t_platform_history所有信息 * @@ -43,7 +40,7 @@ public class PlatformHistoryServiceImpl implements PlatformHistoryService { */ @Override public List queryAllPlatformHistory() { - return platformHistoryMapper.queryAllPlatformHistory(); + return baseMapper.queryAllPlatformHistory(); } /** @@ -54,7 +51,7 @@ public List queryAllPlatformHistory() { */ @Override public PlatformHistory queryPlatformHistoryById(Integer id) { - return platformHistoryMapper.queryPlatformHistoryById(id); + return baseMapper.queryPlatformHistoryById(id); } /** @@ -65,7 +62,7 @@ public PlatformHistory queryPlatformHistoryById(Integer id) { */ @Override public List queryPlatformHistoryByCondition(PlatformHistory platformHistory) { - return platformHistoryMapper.queryPlatformHistoryByCondition(platformHistory); + return baseMapper.queryPlatformHistoryByCondition(platformHistory); } /** @@ -80,7 +77,7 @@ public Result deletePlatformHistoryById(Integer id) { if (platformHistory == null || platformHistory.getId() == null) { return Result.success(); } - int deleteResult = platformHistoryMapper.deletePlatformHistoryById(id); + int deleteResult = baseMapper.deletePlatformHistoryById(id); if (deleteResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -98,7 +95,7 @@ public Result updatePlatformHistoryById(PlatformHistory platfor if (platformHistory == null || platformHistory.getId() == null) { return Result.failed(ExceptionEnum.CM002); } - int updateResult = platformHistoryMapper.updatePlatformHistoryById(platformHistory); + int updateResult = baseMapper.updatePlatformHistoryById(platformHistory); if (updateResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -129,7 +126,7 @@ public Result createPlatformHistory(PlatformHistory platformHis if (platformHistory.getMaterialHistoryId() == null) { return Result.failed(ExceptionEnum.CM002); } - int createResult = platformHistoryMapper.createPlatformHistory(platformHistory); + int createResult = baseMapper.createPlatformHistory(platformHistory); if (createResult != 1) { return Result.failed(ExceptionEnum.CM008); } diff --git a/base/src/main/java/com/tinyengine/it/service/platform/impl/PlatformServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/platform/impl/PlatformServiceImpl.java index 3d80bec6..4317e34d 100644 --- a/base/src/main/java/com/tinyengine/it/service/platform/impl/PlatformServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/platform/impl/PlatformServiceImpl.java @@ -12,6 +12,7 @@ package com.tinyengine.it.service.platform.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.mapper.PlatformMapper; @@ -20,8 +21,6 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -33,10 +32,7 @@ */ @Service @Slf4j -public class PlatformServiceImpl implements PlatformService { - @Autowired - private PlatformMapper platformMapper; - +public class PlatformServiceImpl extends ServiceImpl implements PlatformService { /** * 查询表t_platform所有数据 * @@ -44,7 +40,7 @@ public class PlatformServiceImpl implements PlatformService { */ @Override public List queryAllPlatform() { - return platformMapper.queryAllPlatform(); + return baseMapper.queryAllPlatform(); } /** @@ -54,8 +50,8 @@ public List queryAllPlatform() { * @return query result */ @Override - public Platform queryPlatformById(@Param("id") Integer id) { - return platformMapper.queryPlatformById(id); + public Platform queryPlatformById(Integer id) { + return baseMapper.queryPlatformById(id); } /** @@ -66,7 +62,7 @@ public Platform queryPlatformById(@Param("id") Integer id) { */ @Override public List queryPlatformByCondition(Platform platform) { - return platformMapper.queryPlatformByCondition(platform); + return baseMapper.queryPlatformByCondition(platform); } /** @@ -76,12 +72,12 @@ public List queryPlatformByCondition(Platform platform) { * @return execute success data number */ @Override - public Result deletePlatformById(@Param("id") Integer id) { + public Result deletePlatformById(Integer id) { Platform platform = this.queryPlatformById(id); if (platform == null || platform.getId() == null) { return Result.success(); } - int deleteResult = platformMapper.deletePlatformById(id); + int deleteResult = baseMapper.deletePlatformById(id); if (deleteResult != 1) { return Result.failed(ExceptionEnum.CM008); } @@ -99,11 +95,11 @@ public Result updatePlatformById(Platform platform) { if (platform == null || platform.getId() == null) { return Result.failed(ExceptionEnum.CM002); } - int updateResult = platformMapper.updatePlatformById(platform); + int updateResult = baseMapper.updatePlatformById(platform); if (updateResult != 1) { return Result.failed(ExceptionEnum.CM008); } - Platform platformResult = platformMapper.queryPlatformById(platform.getId()); + Platform platformResult = baseMapper.queryPlatformById(platform.getId()); return Result.success(platformResult); } @@ -121,7 +117,7 @@ public Result createPlatform(Platform platform) { if (platform.getName() == null || platform.getName().isEmpty()) { return Result.failed(ExceptionEnum.CM002); } - int createResult = platformMapper.createPlatform(platform); + int createResult = baseMapper.createPlatform(platform); if (createResult != 1) { return Result.failed(ExceptionEnum.CM008); } diff --git a/base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java index 6a9ed143..b78601d0 100644 --- a/base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/platform/impl/TenantServiceImpl.java @@ -12,14 +12,13 @@ package com.tinyengine.it.service.platform.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.tinyengine.it.mapper.TenantMapper; import com.tinyengine.it.model.entity.Tenant; import com.tinyengine.it.service.platform.TenantService; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -32,10 +31,7 @@ @Service @Slf4j -public class TenantServiceImpl implements TenantService { - @Autowired - private TenantMapper tenantMapper; - +public class TenantServiceImpl extends ServiceImpl implements TenantService { /** * 查询表t_tenant所有数据 * @@ -43,7 +39,7 @@ public class TenantServiceImpl implements TenantService { */ @Override public List findAllTenant() { - return tenantMapper.queryAllTenant(); + return baseMapper.queryAllTenant(); } /** @@ -53,8 +49,8 @@ public List findAllTenant() { * @return query result */ @Override - public Tenant findTenantById(@Param("id") Integer id) { - return tenantMapper.queryTenantById(id); + public Tenant findTenantById(Integer id) { + return baseMapper.queryTenantById(id); } /** @@ -65,7 +61,7 @@ public Tenant findTenantById(@Param("id") Integer id) { */ @Override public List findTenantByCondition(Tenant tenant) { - return tenantMapper.queryTenantByCondition(tenant); + return baseMapper.queryTenantByCondition(tenant); } /** @@ -75,8 +71,8 @@ public List findTenantByCondition(Tenant tenant) { * @return execute success data number */ @Override - public Integer deleteTenantById(@Param("id") Integer id) { - return tenantMapper.deleteTenantById(id); + public Integer deleteTenantById(Integer id) { + return baseMapper.deleteTenantById(id); } /** @@ -87,7 +83,7 @@ public Integer deleteTenantById(@Param("id") Integer id) { */ @Override public Integer updateTenantById(Tenant tenant) { - return tenantMapper.updateTenantById(tenant); + return baseMapper.updateTenantById(tenant); } /** @@ -98,6 +94,6 @@ public Integer updateTenantById(Tenant tenant) { */ @Override public Integer createTenant(Tenant tenant) { - return tenantMapper.createTenant(tenant); + return baseMapper.createTenant(tenant); } } diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/AppExtensionServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/AppExtensionServiceImplTest.java index 03a1f84e..d9ef4805 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/AppExtensionServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/AppExtensionServiceImplTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.mapper.AppExtensionMapper; import com.tinyengine.it.model.entity.AppExtension; @@ -38,12 +39,14 @@ class AppExtensionServiceImplTest { @Mock private AppExtensionMapper appExtensionMapper; + @InjectMocks - private AppExtensionServiceImpl appExtensionServiceImpl; + AppExtensionServiceImpl appExtensionServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(appExtensionServiceImpl, "baseMapper", appExtensionMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/AppServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/AppServiceImplTest.java index 8b1537bb..e78f8c66 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/AppServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/AppServiceImplTest.java @@ -17,6 +17,7 @@ import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.mapper.AppMapper; import com.tinyengine.it.mapper.I18nEntryMapper; @@ -29,8 +30,6 @@ import com.tinyengine.it.model.entity.Platform; import com.tinyengine.it.service.app.I18nEntryService; import com.tinyengine.it.service.app.impl.v1.AppV1ServiceImpl; -import com.tinyengine.it.service.material.impl.BlockGroupServiceImpl; -import com.tinyengine.it.service.material.impl.BlockServiceImpl; import com.tinyengine.it.service.platform.PlatformService; import org.junit.jupiter.api.Assertions; @@ -53,31 +52,22 @@ class AppServiceImplTest { @Mock private AppMapper appMapper; - @Mock private PlatformService platformService; - @Mock private I18nEntryService i18nEntryService; - @Mock private I18nEntryMapper i18nEntryMapper; - @Mock private AppV1ServiceImpl appV1ServiceImpl; - @Mock - private BlockServiceImpl blockServiceImpl; - - @Mock - private BlockGroupServiceImpl blockGroupServiceImpl; - @InjectMocks private AppServiceImpl appServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(appServiceImpl, "baseMapper", appMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/DatasourceServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/DatasourceServiceImplTest.java index 26ec6a68..7cf6cea1 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/DatasourceServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/DatasourceServiceImplTest.java @@ -16,6 +16,7 @@ import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.mapper.DatasourceMapper; import com.tinyengine.it.model.entity.Datasource; @@ -38,12 +39,14 @@ class DatasourceServiceImplTest { @Mock private DatasourceMapper datasourceMapper; + @InjectMocks private DatasourceServiceImpl datasourceServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(datasourceServiceImpl, "baseMapper", datasourceMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImplTest.java index 8ca96f85..29021ab0 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/I18nEntryServiceImplTest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.tinyengine.it.common.base.Result; @@ -72,12 +73,14 @@ class I18nEntryServiceImplTest { private I18nEntryMapper i18nEntryMapper; @Mock private I18nLangMapper i18nLangMapper; + @InjectMocks private I18nEntryServiceImpl i18nEntryServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(i18nEntryServiceImpl, "baseMapper", i18nEntryMapper); } diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/I18nLangServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/I18nLangServiceImplTest.java index d639ea2e..dfa78c0b 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/I18nLangServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/I18nLangServiceImplTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.mapper.I18nLangMapper; import com.tinyengine.it.model.entity.I18nLang; @@ -35,12 +36,14 @@ class I18nLangServiceImplTest { @Mock private I18nLangMapper i18nLangMapper; + @InjectMocks private I18nLangServiceImpl i18nLangServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(i18nLangServiceImpl, "baseMapper", i18nLangMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImplTest.java index de9c452a..2e1fdf81 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImplTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.mapper.PageHistoryMapper; import com.tinyengine.it.model.entity.PageHistory; @@ -36,12 +37,14 @@ class PageHistoryServiceImplTest { @Mock private PageHistoryMapper pageHistoryMapper; + @InjectMocks private PageHistoryServiceImpl pageHistoryServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(pageHistoryServiceImpl, "baseMapper", pageHistoryMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/PageServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/PageServiceImplTest.java index 17032cc3..73769274 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/PageServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/PageServiceImplTest.java @@ -19,21 +19,23 @@ import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.context.LoginUserContext; +import com.tinyengine.it.common.enums.Enums; import com.tinyengine.it.mapper.AppExtensionMapper; import com.tinyengine.it.mapper.AppMapper; -import com.tinyengine.it.mapper.BlockHistoryMapper; import com.tinyengine.it.mapper.BlockMapper; import com.tinyengine.it.mapper.I18nEntryMapper; -import com.tinyengine.it.mapper.PageHistoryMapper; import com.tinyengine.it.mapper.PageMapper; import com.tinyengine.it.model.dto.PreviewDto; import com.tinyengine.it.model.dto.PreviewParam; +import com.tinyengine.it.model.dto.SchemaI18n; import com.tinyengine.it.model.dto.TreeNodeCollection; import com.tinyengine.it.model.dto.TreeNodeDto; import com.tinyengine.it.model.entity.App; +import com.tinyengine.it.model.entity.AppExtension; import com.tinyengine.it.model.entity.Block; import com.tinyengine.it.model.entity.Page; import com.tinyengine.it.model.entity.PageHistory; @@ -77,15 +79,12 @@ class PageServiceImplTest { @Mock private PageHistoryService pageHistoryService; @Mock - private PageHistoryMapper pageHistoryMapper; - @Mock private AppV1ServiceImpl appV1ServiceImpl; @Mock - private BlockHistoryMapper blockHistoryMapper; - @Mock private AppExtensionMapper appExtensionMapper; @Mock private I18nEntryMapper i18nEntryMapper; + @InjectMocks private PageServiceImpl pageServiceImpl; @@ -95,6 +94,7 @@ class PageServiceImplTest { @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(pageServiceImpl, "baseMapper", pageMapper); } @Test @@ -365,7 +365,13 @@ void testGetBlockPreviewMetaData() { block.setContent(content); when(blockMapper.queryBlockById(1)).thenReturn(block); when(appV1ServiceImpl.getSchemaExtensions(any(List.class))).thenReturn(new HashMap()); - + AppExtension appExtension = new AppExtension(); + when(appExtensionMapper.queryAppExtensionByCondition(appExtension)).thenReturn(new ArrayList<>()); + when(i18nEntryMapper.findI18nEntriesByHostandHostType(param.getId(), "block")) + .thenReturn(new ArrayList<>()); + SchemaI18n schemaI18n = new SchemaI18n(); + when(appService.formatI18nEntrites(new ArrayList<>(), Enums.I18Belongs.BLOCK.getValue(), param.getId())) + .thenReturn(schemaI18n); PreviewDto result = pageServiceImpl.getBlockPreviewMetaData(param); assertEquals(datasource, result.getDataSource()); } diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/PageTemplateServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/PageTemplateServiceImplTest.java index ca723380..0684482a 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/PageTemplateServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/PageTemplateServiceImplTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.mapper.PageTemplateMapper; import com.tinyengine.it.model.entity.PageTemplate; @@ -38,12 +39,14 @@ class PageTemplateServiceImplTest { @Mock private PageTemplateMapper pageTemplateMapper; + @InjectMocks private PageTemplateServiceImpl pageTemplateServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(pageTemplateServiceImpl, "baseMapper", pageTemplateMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/TaskRecordServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/TaskRecordServiceImplTest.java index 040a6848..c7277319 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/TaskRecordServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/TaskRecordServiceImplTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.mapper.TaskRecordMapper; import com.tinyengine.it.model.entity.TaskRecord; @@ -35,12 +36,14 @@ class TaskRecordServiceImplTest { @Mock private TaskRecordMapper taskRecordMapper; + @InjectMocks private TaskRecordServiceImpl taskRecordServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(taskRecordServiceImpl, "baseMapper", taskRecordMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/UserServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/UserServiceImplTest.java index 6b842871..e0eff4f6 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/UserServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/UserServiceImplTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.mapper.UserMapper; import com.tinyengine.it.model.entity.User; @@ -35,12 +36,14 @@ class UserServiceImplTest { @Mock private UserMapper userMapper; + @InjectMocks private UserServiceImpl userServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(userServiceImpl, "baseMapper", userMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java index 848ee062..accbecf2 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java @@ -14,6 +14,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.context.LoginUserContext; import com.tinyengine.it.mapper.BlockCarriersRelationMapper; @@ -58,6 +59,7 @@ class BlockGroupServiceImplTest { @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(blockGroupServiceImpl, "baseMapper", blockGroupMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/BlockHistoryServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/BlockHistoryServiceImplTest.java index 426c1545..8a470952 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/BlockHistoryServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/BlockHistoryServiceImplTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.mapper.BlockHistoryMapper; import com.tinyengine.it.model.entity.BlockHistory; @@ -35,12 +36,14 @@ class BlockHistoryServiceImplTest { @Mock private BlockHistoryMapper blockHistoryMapper; + @InjectMocks private BlockHistoryServiceImpl blockHistoryServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(blockHistoryServiceImpl, "baseMapper", blockHistoryMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/BlockServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/BlockServiceImplTest.java index ffed18e9..e561482e 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/BlockServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/BlockServiceImplTest.java @@ -19,6 +19,7 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -59,24 +60,23 @@ class BlockServiceImplTest { @Mock private BlockMapper blockMapper; - - @InjectMocks - private BlockServiceImpl blockServiceImpl; - @Mock private UserMapper userMapper; @Mock private AppMapper appMapper; @Mock private BlockGroupMapper blockGroupMapper; - @Mock private LoginUserContext loginUserContext; + @InjectMocks + private BlockServiceImpl blockServiceImpl; + @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); when(loginUserContext.getLoginUserId()).thenReturn("1"); + ReflectUtil.setFieldValue(blockServiceImpl, "baseMapper", blockMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/BusinessCategoryServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/BusinessCategoryServiceImplTest.java index 0645b95e..7f4e0453 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/BusinessCategoryServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/BusinessCategoryServiceImplTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.mapper.BusinessCategoryMapper; import com.tinyengine.it.model.entity.BusinessCategory; @@ -35,12 +36,14 @@ class BusinessCategoryServiceImplTest { @Mock private BusinessCategoryMapper businessCategoryMapper; + @InjectMocks private BusinessCategoryServiceImpl businessCategoryServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(businessCategoryServiceImpl, "baseMapper", businessCategoryMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/ComponentServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/ComponentServiceImplTest.java index e0006732..42519187 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/ComponentServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/ComponentServiceImplTest.java @@ -16,6 +16,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.utils.Utils; import com.tinyengine.it.mapper.ComponentLibraryMapper; @@ -54,12 +55,14 @@ class ComponentServiceImplTest { private ComponentMapper componentMapper; @Mock private ComponentLibraryMapper componentLibraryMapper; + @InjectMocks private ComponentServiceImpl componentServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(componentServiceImpl, "baseMapper", componentMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialHistoryServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialHistoryServiceImplTest.java index 442ff2e4..ef54d5c3 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialHistoryServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialHistoryServiceImplTest.java @@ -13,6 +13,7 @@ import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.mapper.MaterialHistoryMapper; import com.tinyengine.it.model.entity.MaterialHistory; @@ -35,12 +36,14 @@ class MaterialHistoryServiceImplTest { @Mock private MaterialHistoryMapper materialHistoryMapper; + @InjectMocks private MaterialHistoryServiceImpl materialHistoryServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(materialHistoryServiceImpl, "baseMapper", materialHistoryMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialServiceImplTest.java index f9ce548d..2e1f3dd9 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/MaterialServiceImplTest.java @@ -13,6 +13,7 @@ import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.mapper.MaterialMapper; import com.tinyengine.it.model.entity.Material; @@ -42,6 +43,7 @@ class MaterialServiceImplTest { @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(materialServiceImpl, "baseMapper", materialMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/material/impl/TaskRecordMaterialServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/material/impl/TaskRecordMaterialServiceImplTest.java index 0a34af9f..21ba8b1e 100644 --- a/base/src/test/java/com/tinyengine/it/service/material/impl/TaskRecordMaterialServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/material/impl/TaskRecordMaterialServiceImplTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.mapper.TaskRecordMapper; import com.tinyengine.it.model.entity.TaskRecord; @@ -36,12 +37,14 @@ class TaskRecordMaterialServiceImplTest { @Mock TaskRecordMapper taskRecordMapper; + @InjectMocks TaskRecordMaterialServiceImpl taskRecordMaterialServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(taskRecordMaterialServiceImpl, "baseMapper", taskRecordMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/platform/impl/PlatformServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/platform/impl/PlatformServiceImplTest.java index 9e9868fc..47b39d89 100644 --- a/base/src/test/java/com/tinyengine/it/service/platform/impl/PlatformServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/platform/impl/PlatformServiceImplTest.java @@ -14,6 +14,7 @@ import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.mapper.PlatformMapper; import com.tinyengine.it.model.entity.Platform; @@ -36,12 +37,14 @@ class PlatformServiceImplTest { @Mock private PlatformMapper platformMapper; + @InjectMocks private PlatformServiceImpl platformServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(platformServiceImpl, "baseMapper", platformMapper); } @Test diff --git a/base/src/test/java/com/tinyengine/it/service/platform/impl/TenantServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/platform/impl/TenantServiceImplTest.java index 71030303..bc170124 100644 --- a/base/src/test/java/com/tinyengine/it/service/platform/impl/TenantServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/platform/impl/TenantServiceImplTest.java @@ -15,6 +15,7 @@ import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; +import cn.hutool.core.util.ReflectUtil; import com.tinyengine.it.mapper.TenantMapper; import com.tinyengine.it.model.entity.Tenant; @@ -36,12 +37,14 @@ class TenantServiceImplTest { @Mock private TenantMapper tenantMapper; + @InjectMocks private TenantServiceImpl tenantServiceImpl; @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); + ReflectUtil.setFieldValue(tenantServiceImpl, "baseMapper", tenantMapper); } @Test diff --git a/pom.xml b/pom.xml index 89eb8621..c6d4b3b3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,16 +30,12 @@ 3.3.3 2.3.32 2.5.4 - 1.6.14 + 2.5.0 4.11.0 6.1.0 1.0-SNAPSHOT - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot spring-boot-starter-aop @@ -106,8 +102,8 @@ org.springdoc - springdoc-openapi-ui - ${springdoc-openapi-ui.version} + springdoc-openapi-starter-webflux-ui + ${springdoc-openapi-starter-webflux-ui.version}