From 2927e249abc414b446e38c8c8498ca9edb781bf2 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Fri, 13 Jun 2025 02:17:32 -0700 Subject: [PATCH 01/12] feat: Service extends IService --- .../com/tinyengine/it/service/app/AppExtensionService.java | 3 ++- .../main/java/com/tinyengine/it/service/app/AppService.java | 3 ++- .../java/com/tinyengine/it/service/app/DatasourceService.java | 3 ++- .../java/com/tinyengine/it/service/app/I18nEntryService.java | 3 ++- .../java/com/tinyengine/it/service/app/I18nLangService.java | 3 ++- .../com/tinyengine/it/service/app/PageHistoryService.java | 3 ++- .../main/java/com/tinyengine/it/service/app/PageService.java | 3 ++- .../com/tinyengine/it/service/app/PageTemplateService.java | 3 ++- .../java/com/tinyengine/it/service/app/TaskRecordService.java | 3 ++- .../main/java/com/tinyengine/it/service/app/UserService.java | 3 ++- .../it/service/app/impl/AppExtensionServiceImpl.java | 3 ++- .../com/tinyengine/it/service/app/impl/AppServiceImpl.java | 3 ++- .../tinyengine/it/service/app/impl/DatasourceServiceImpl.java | 3 ++- .../tinyengine/it/service/app/impl/I18nEntryServiceImpl.java | 3 ++- .../tinyengine/it/service/app/impl/I18nLangServiceImpl.java | 3 ++- .../it/service/app/impl/PageHistoryServiceImpl.java | 3 ++- .../com/tinyengine/it/service/app/impl/PageServiceImpl.java | 3 ++- .../it/service/app/impl/PageTemplateServiceImpl.java | 3 ++- .../tinyengine/it/service/app/impl/TaskRecordServiceImpl.java | 3 ++- .../com/tinyengine/it/service/app/impl/UserServiceImpl.java | 3 ++- .../com/tinyengine/it/service/material/BlockGroupService.java | 3 ++- .../tinyengine/it/service/material/BlockHistoryService.java | 3 ++- .../java/com/tinyengine/it/service/material/BlockService.java | 3 ++- .../it/service/material/BusinessCategoryService.java | 3 ++- .../it/service/material/ComponentLibraryService.java | 3 ++- .../com/tinyengine/it/service/material/ComponentService.java | 3 ++- .../it/service/material/MaterialHistoryService.java | 3 ++- .../com/tinyengine/it/service/material/MaterialService.java | 3 ++- .../com/tinyengine/it/service/material/TaskRecordService.java | 3 ++- .../it/service/material/impl/BlockGroupServiceImpl.java | 3 ++- .../it/service/material/impl/BlockHistoryServiceImpl.java | 3 ++- .../tinyengine/it/service/material/impl/BlockServiceImpl.java | 3 ++- .../it/service/material/impl/BusinessCategoryServiceImpl.java | 3 ++- .../it/service/material/impl/ComponentLibraryServiceImpl.java | 3 ++- .../it/service/material/impl/ComponentServiceImpl.java | 3 ++- .../it/service/material/impl/MaterialHistoryServiceImpl.java | 3 ++- .../it/service/material/impl/MaterialServiceImpl.java | 3 ++- .../service/material/impl/TaskRecordMaterialServiceImpl.java | 3 ++- .../it/service/platform/PlatformHistoryService.java | 3 ++- .../com/tinyengine/it/service/platform/PlatformService.java | 3 ++- .../com/tinyengine/it/service/platform/TenantService.java | 3 ++- .../it/service/platform/impl/PlatformHistoryServiceImpl.java | 3 ++- .../it/service/platform/impl/PlatformServiceImpl.java | 3 ++- .../it/service/platform/impl/TenantServiceImpl.java | 3 ++- pom.xml | 4 ++-- 45 files changed, 90 insertions(+), 46 deletions(-) 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..9d67c890 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,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.entity.AppExtension; @@ -24,7 +25,7 @@ * * @since 2024-10-20 */ -public interface AppExtensionService { +public interface AppExtensionService extends IService { /** * 查询表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..bb06514e 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,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.I18nEntryDto; import com.tinyengine.it.model.dto.PreviewDto; @@ -27,7 +28,7 @@ * * @since 2024-10-20 */ -public interface AppService { +public interface AppService extends IService { /** * 查询表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..e73b31b0 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,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.entity.Datasource; @@ -24,7 +25,7 @@ * * @since 2024-10-20 */ -public interface DatasourceService { +public interface DatasourceService extends IService { /** * 根据主键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..fe8e3869 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; @@ -32,7 +33,7 @@ * * @since 2024-10-20 */ -public interface I18nEntryService { +public interface I18nEntryService extends IService { /** * 查询表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..3f2ab946 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,6 +12,7 @@ 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; @@ -23,7 +24,7 @@ * * @since 2024-10-20 */ -public interface I18nLangService { +public interface I18nLangService extends IService { /** * 查询表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..57da5a8b 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,6 +13,7 @@ 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; @@ -26,7 +27,7 @@ * * @since 2024-10-20 */ -public interface PageHistoryService { +public interface PageHistoryService extends IService { /** * 查询表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..e1b66b70 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,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.PreviewDto; import com.tinyengine.it.model.dto.PreviewParam; @@ -26,7 +27,7 @@ * * @since 2024-10-20 */ -public interface PageService { +public interface PageService extends IService { /** * 查询表t_page所有信息 * 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..c146b2f1 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,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.entity.PageTemplate; @@ -24,7 +25,7 @@ * * @since 2024-10-20 */ -public interface PageTemplateService { +public interface PageTemplateService extends IService { /** * 查询表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..1b5d835c 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,6 +12,7 @@ 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; @@ -23,7 +24,7 @@ * * @since 2024-10-20 */ -public interface TaskRecordService { +public interface TaskRecordService extends IService { /** * 查询表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..a97a61ee 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,6 +12,7 @@ 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; @@ -23,7 +24,7 @@ * * @since 2024-10-20 */ -public interface UserService { +public interface UserService extends IService { /** * 查询表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..f24057dd 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; @@ -34,7 +35,7 @@ */ @Service @Slf4j -public class AppExtensionServiceImpl implements AppExtensionService { +public class AppExtensionServiceImpl extends ServiceImpl implements AppExtensionService { @Autowired private AppExtensionMapper appExtensionMapper; 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..66f17e5d 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; @@ -50,7 +51,7 @@ */ @Service @Slf4j -public class AppServiceImpl implements AppService { +public class AppServiceImpl extends ServiceImpl implements AppService { /** * The App mapper. */ 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..bf462aa1 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; @@ -33,7 +34,7 @@ */ @Service @Slf4j -public class DatasourceServiceImpl implements DatasourceService { +public class DatasourceServiceImpl extends ServiceImpl implements DatasourceService { @Autowired private DatasourceMapper datasourceMapper; 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..8c3bcba8 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; @@ -65,7 +66,7 @@ */ @Service @Slf4j -public class I18nEntryServiceImpl implements I18nEntryService { +public class I18nEntryServiceImpl extends ServiceImpl implements I18nEntryService { private static final Logger logger = LoggerFactory.getLogger(I18nEntryServiceImpl.class); @Autowired 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..56242169 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,6 +12,7 @@ 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; @@ -31,7 +32,7 @@ */ @Service @Slf4j -public class I18nLangServiceImpl implements I18nLangService { +public class I18nLangServiceImpl extends ServiceImpl implements I18nLangService { @Autowired private I18nLangMapper i18nLangMapper; 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..a9295dfb 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; @@ -36,7 +37,7 @@ */ @Service @Slf4j -public class PageHistoryServiceImpl implements PageHistoryService { +public class PageHistoryServiceImpl extends ServiceImpl implements PageHistoryService { private static final String DEFAULT_PAGE_HISTORY_VERSION = "0"; @Autowired 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..1e057c1d 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; @@ -71,7 +72,7 @@ */ @Service @Slf4j -public class PageServiceImpl implements PageService { +public class PageServiceImpl extends ServiceImpl implements PageService { /** * The Page mapper. */ 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..4714e2cb 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; @@ -36,7 +37,7 @@ */ @Service @Slf4j -public class PageTemplateServiceImpl implements PageTemplateService { +public class PageTemplateServiceImpl extends ServiceImpl implements PageTemplateService { @Autowired private PageTemplateMapper pageTemplateMapper; 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..713fd962 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,6 +12,7 @@ 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; @@ -31,7 +32,7 @@ */ @Service @Slf4j -public class TaskRecordServiceImpl implements TaskRecordService { +public class TaskRecordServiceImpl extends ServiceImpl implements TaskRecordService { @Autowired private TaskRecordMapper taskRecordMapper; 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..2996c89e 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,6 +12,7 @@ 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; @@ -30,7 +31,7 @@ */ @Service @Slf4j -public class UserServiceImpl implements UserService { +public class UserServiceImpl extends ServiceImpl implements UserService { @Autowired private UserMapper userMapper; 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..b7b982fe 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,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.BlockGroupDto; import com.tinyengine.it.model.entity.BlockGroup; @@ -25,7 +26,7 @@ * * @since 2024-10-20 */ -public interface BlockGroupService { +public interface BlockGroupService extends IService { /** * 查询表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..41e47373 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,6 +12,7 @@ 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; @@ -23,7 +24,7 @@ * * @since 2024-10-20 */ -public interface BlockHistoryService { +public interface BlockHistoryService extends IService { /** * 查询表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..ae848eac 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; @@ -32,7 +33,7 @@ * * @since 2024-10-20 */ -public interface BlockService { +public interface BlockService extends IService { /** * 查询表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..aebcfa14 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,6 +12,7 @@ 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; @@ -23,7 +24,7 @@ * * @since 2024-10-20 */ -public interface BusinessCategoryService { +public interface BusinessCategoryService extends IService { /** * 查询表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..fdd0a447 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,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.entity.ComponentLibrary; @@ -24,7 +25,7 @@ * * @since 2025-4-02 */ -public interface ComponentLibraryService { +public interface ComponentLibraryService extends IService { /** * 查询表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..134f1b21 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; @@ -29,7 +30,7 @@ * * @since 2024-10-20 */ -public interface ComponentService { +public interface ComponentService extends IService { /** * 查询表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..348cf086 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,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.entity.MaterialHistory; @@ -24,7 +25,7 @@ * * @since 2024-10-20 */ -public interface MaterialHistoryService { +public interface MaterialHistoryService extends IService { /** * 查询表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..d3b85bcb 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,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.entity.Material; @@ -24,7 +25,7 @@ * * @since 2024-10-20 */ -public interface MaterialService { +public interface MaterialService extends IService { /** * 查询表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..bdf54b13 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,6 +12,7 @@ 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; @@ -26,7 +27,7 @@ * @author zhangjuncao * @since 2024-10-17 */ -public interface TaskRecordService { +public interface TaskRecordService extends IService { /** * 根据主键id查询表task_record信息 * 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..64afb75d 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; @@ -43,7 +44,7 @@ */ @Service @Slf4j -public class BlockGroupServiceImpl implements BlockGroupService { +public class BlockGroupServiceImpl extends ServiceImpl implements BlockGroupService { @Autowired private BlockGroupMapper blockGroupMapper; 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..ac5b44de 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,6 +12,7 @@ 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; @@ -31,7 +32,7 @@ */ @Service @Slf4j -public class BlockHistoryServiceImpl implements BlockHistoryService { +public class BlockHistoryServiceImpl extends ServiceImpl implements BlockHistoryService { @Autowired private BlockHistoryMapper blockHistoryMapper; 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..07ac6caf 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; @@ -76,7 +77,7 @@ */ @Service @Slf4j -public class BlockServiceImpl implements BlockService { +public class BlockServiceImpl extends ServiceImpl implements BlockService { @Autowired private BlockMapper blockMapper; 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..66f5a068 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; @@ -32,7 +33,7 @@ */ @Service @Slf4j -public class BusinessCategoryServiceImpl implements BusinessCategoryService { +public class BusinessCategoryServiceImpl extends ServiceImpl implements BusinessCategoryService { @Autowired private BusinessCategoryMapper businessCategoryMapper; 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..9dca75ac 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; @@ -33,7 +34,7 @@ */ @Service @Slf4j -public class ComponentLibraryServiceImpl implements ComponentLibraryService { +public class ComponentLibraryServiceImpl extends ServiceImpl implements ComponentLibraryService { @Autowired private ComponentLibraryMapper componentLibraryMapper; 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..292d3a5f 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; @@ -52,7 +53,7 @@ */ @Service @Slf4j -public class ComponentServiceImpl implements ComponentService { +public class ComponentServiceImpl extends ServiceImpl implements ComponentService { /** * The component mapper. */ 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..2a397378 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; @@ -34,7 +35,7 @@ */ @Service @Slf4j -public class MaterialHistoryServiceImpl implements MaterialHistoryService { +public class MaterialHistoryServiceImpl extends ServiceImpl implements MaterialHistoryService { /** * The material history mapper. */ 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..5af6cdfe 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; @@ -33,7 +34,7 @@ */ @Service @Slf4j -public class MaterialServiceImpl implements MaterialService { +public class MaterialServiceImpl extends ServiceImpl implements MaterialService { @Autowired private MaterialMapper materialMapper; 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..ac4c7b72 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,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.common.log.SystemServiceLog; import com.tinyengine.it.mapper.TaskRecordMapper; @@ -36,7 +37,7 @@ * @since 2024-10-17 */ @Service -public class TaskRecordMaterialServiceImpl implements TaskRecordService { +public class TaskRecordMaterialServiceImpl extends ServiceImpl implements TaskRecordService { @Autowired TaskRecordMapper taskRecordMapper; 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..fcfa975b 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,6 +12,7 @@ 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; @@ -24,7 +25,7 @@ * * @since 2025-05-09 */ -public interface PlatformHistoryService { +public interface PlatformHistoryService extends IService { /** * 查询表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..dbca3156 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,6 +12,7 @@ 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; @@ -24,7 +25,7 @@ * * @since 2024-10-20 */ -public interface PlatformService { +public interface PlatformService extends IService { /** * 查询表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..949a9915 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,6 +12,7 @@ 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; @@ -23,7 +24,7 @@ * * @since 2024-10-20 */ -public interface TenantService { +public interface TenantService extends IService { /** * 查询表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..78b87f41 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; @@ -32,7 +33,7 @@ */ @Service @Slf4j -public class PlatformHistoryServiceImpl implements PlatformHistoryService { +public class PlatformHistoryServiceImpl extends ServiceImpl implements PlatformHistoryService { @Autowired private PlatformHistoryMapper platformHistoryMapper; 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..2a21f2b3 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; @@ -33,7 +34,7 @@ */ @Service @Slf4j -public class PlatformServiceImpl implements PlatformService { +public class PlatformServiceImpl extends ServiceImpl implements PlatformService { @Autowired private PlatformMapper platformMapper; 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..7eb9f584 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,6 +12,7 @@ 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; @@ -32,7 +33,7 @@ @Service @Slf4j -public class TenantServiceImpl implements TenantService { +public class TenantServiceImpl extends ServiceImpl implements TenantService { @Autowired private TenantMapper tenantMapper; diff --git a/pom.xml b/pom.xml index 89eb8621..0ed82f2d 100644 --- a/pom.xml +++ b/pom.xml @@ -106,8 +106,8 @@ org.springdoc - springdoc-openapi-ui - ${springdoc-openapi-ui.version} + springdoc-openapi-starter-webmvc-ui + 2.5.0 From 67daf4e1345f89ca1b6232ac52c2523ae2955d42 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Fri, 13 Jun 2025 02:21:14 -0700 Subject: [PATCH 02/12] feat: Service extends IService --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0ed82f2d..8b6712ea 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 3.3.3 2.3.32 2.5.4 - 1.6.14 + 2.5.0 4.11.0 6.1.0 1.0-SNAPSHOT @@ -107,7 +107,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - 2.5.0 + ${springdoc-openapi-starter-webmvc-ui.version} From bbd19f2078b1575c6c97bcab7879b7fb9b332e0a Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Sun, 15 Jun 2025 20:32:09 -0700 Subject: [PATCH 03/12] feat: Service extends IService --- .../it/config/filter/WebConfig.java | 4 +- .../it/service/app/AppExtensionService.java | 6 +-- .../tinyengine/it/service/app/AppService.java | 6 +-- .../it/service/app/DatasourceService.java | 6 +-- .../it/service/app/I18nEntryService.java | 3 +- .../it/service/app/I18nLangService.java | 6 +-- .../it/service/app/PageHistoryService.java | 4 +- .../it/service/app/PageService.java | 6 +-- .../it/service/app/PageTemplateService.java | 6 +-- .../it/service/app/TaskRecordService.java | 6 +-- .../it/service/app/UserService.java | 6 +-- .../app/impl/AppExtensionServiceImpl.java | 27 +++++------ .../it/service/app/impl/AppServiceImpl.java | 45 +++++-------------- .../app/impl/DatasourceServiceImpl.java | 19 +++----- .../app/impl/I18nEntryServiceImpl.java | 34 +++++++------- .../service/app/impl/I18nLangServiceImpl.java | 21 ++++----- .../app/impl/PageHistoryServiceImpl.java | 25 +++++------ .../it/service/app/impl/PageServiceImpl.java | 45 ++++++++----------- .../app/impl/PageTemplateServiceImpl.java | 27 +++++------ .../app/impl/TaskRecordServiceImpl.java | 21 ++++----- .../it/service/app/impl/UserServiceImpl.java | 16 +++---- .../service/material/BlockGroupService.java | 6 +-- .../service/material/BlockHistoryService.java | 6 +-- .../it/service/material/BlockService.java | 6 +-- .../material/BusinessCategoryService.java | 6 +-- .../material/ComponentLibraryService.java | 6 +-- .../it/service/material/ComponentService.java | 5 +-- .../material/MaterialHistoryService.java | 6 +-- .../it/service/material/MaterialService.java | 6 +-- .../service/material/TaskRecordService.java | 4 +- .../material/impl/BlockGroupServiceImpl.java | 30 ++++++------- .../impl/BlockHistoryServiceImpl.java | 21 ++++----- .../material/impl/BlockServiceImpl.java | 44 +++++++++--------- .../impl/BusinessCategoryServiceImpl.java | 21 ++++----- .../impl/ComponentLibraryServiceImpl.java | 21 ++++----- .../material/impl/ComponentServiceImpl.java | 27 +++++------ .../impl/MaterialHistoryServiceImpl.java | 24 ++++------ .../material/impl/MaterialServiceImpl.java | 21 ++++----- .../impl/TaskRecordMaterialServiceImpl.java | 11 ++--- .../platform/PlatformHistoryService.java | 6 +-- .../it/service/platform/PlatformService.java | 6 +-- .../it/service/platform/TenantService.java | 6 +-- .../impl/PlatformHistoryServiceImpl.java | 16 +++---- .../platform/impl/PlatformServiceImpl.java | 23 ++++------ .../platform/impl/TenantServiceImpl.java | 21 ++++----- pom.xml | 10 ++--- 46 files changed, 262 insertions(+), 436 deletions(-) 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..a41a5c20 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 @@ -18,13 +18,13 @@ 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.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; 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 9d67c890..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 @@ -16,8 +16,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.AppExtension; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -39,7 +37,7 @@ public interface AppExtensionService extends IService { * @param id the id * @return the app extension */ - AppExtension findAppExtensionById(@Param("id") Integer id); + AppExtension findAppExtensionById(Integer id); /** * 根据条件查询表t_app_extension信息 @@ -55,7 +53,7 @@ public interface AppExtensionService extends IService { * @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 bb06514e..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 @@ -19,8 +19,6 @@ import com.tinyengine.it.model.dto.SchemaI18n; import com.tinyengine.it.model.entity.App; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -42,7 +40,7 @@ public interface AppService extends IService { * @param id the id * @return the result */ - Result queryAppById(@Param("id") Integer id); + Result queryAppById(Integer id); /** * 根据条件查询表t_app信息 @@ -58,7 +56,7 @@ public interface AppService extends IService { * @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 e73b31b0..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 @@ -16,8 +16,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.Datasource; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -32,7 +30,7 @@ public interface DatasourceService extends IService { * @param id the id * @return the datasource */ - Datasource queryDatasourceById(@Param("id") Integer id); + Datasource queryDatasourceById(Integer id); /** * 根据条件查询表t_datasource信息 @@ -48,7 +46,7 @@ public interface DatasourceService extends IService { * @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 fe8e3869..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 @@ -23,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; @@ -47,7 +46,7 @@ public interface I18nEntryService extends IService { * @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 3f2ab946..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 @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.I18nLang; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -38,7 +36,7 @@ public interface I18nLangService extends IService { * @param id the id * @return the 18 n lang */ - I18nLang queryI18nLangById(@Param("id") Integer id); + I18nLang queryI18nLangById(Integer id); /** * 根据条件查询表t_i18n_lang信息 @@ -54,7 +52,7 @@ public interface I18nLangService extends IService { * @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 57da5a8b..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 @@ -18,8 +18,6 @@ import com.tinyengine.it.model.dto.PublishedPageVo; import com.tinyengine.it.model.entity.PageHistory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -57,7 +55,7 @@ public interface PageHistoryService extends IService { * @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 e1b66b70..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 @@ -18,8 +18,6 @@ import com.tinyengine.it.model.dto.PreviewParam; import com.tinyengine.it.model.entity.Page; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -42,7 +40,7 @@ public interface PageService extends IService { * @param id the id * @return the page */ - Page queryPageById(@Param("id") Integer id); + Page queryPageById(Integer id); /** * 根据条件查询表t_page信息 @@ -58,7 +56,7 @@ public interface PageService extends IService { * @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 c146b2f1..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 @@ -16,8 +16,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.PageTemplate; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -41,7 +39,7 @@ public interface PageTemplateService extends IService { * @param id the id * @return the page template */ - Result queryPageTemplateById(@Param("id") Integer id); + Result queryPageTemplateById(Integer id); /** * 根据条件查询表page_template信息 @@ -57,7 +55,7 @@ public interface PageTemplateService extends IService { * @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 1b5d835c..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 @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.TaskRecord; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -38,7 +36,7 @@ public interface TaskRecordService extends IService { * @param id the id * @return the task record */ - TaskRecord queryTaskRecordById(@Param("id") Integer id); + TaskRecord queryTaskRecordById(Integer id); /** * 根据条件查询表t_task_record信息 @@ -54,7 +52,7 @@ public interface TaskRecordService extends IService { * @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 a97a61ee..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 @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.User; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -38,7 +36,7 @@ public interface UserService extends IService { * @param id the id * @return the user */ - User queryUserById(@Param("id") String id); + User queryUserById(String id); /** * 根据条件查询表t_user信息 @@ -54,7 +52,7 @@ public interface UserService extends IService { * @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 f24057dd..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 @@ -22,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; @@ -36,9 +34,6 @@ @Service @Slf4j public class AppExtensionServiceImpl extends ServiceImpl implements AppExtensionService { - @Autowired - private AppExtensionMapper appExtensionMapper; - /** * 查询表t_app_extension所有数据 * @@ -47,7 +42,7 @@ public class AppExtensionServiceImpl extends ServiceImpl> findAllAppExtension() { - List appExtensionList = appExtensionMapper.queryAllAppExtension(); + List appExtensionList = baseMapper.queryAllAppExtension(); return Result.success(appExtensionList); } @@ -59,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); } /** @@ -72,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); } /** @@ -83,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); @@ -101,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); @@ -118,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 66f17e5d..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 @@ -30,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; @@ -52,12 +49,6 @@ @Service @Slf4j public class AppServiceImpl extends ServiceImpl implements AppService { - /** - * The App mapper. - */ - @Autowired - private AppMapper appMapper; - /** * The Platform service. */ @@ -82,18 +73,6 @@ public class AppServiceImpl extends ServiceImpl implements AppSe @Autowired private AppV1ServiceImpl appV1ServiceImpl; - /** - * The Block service. - */ - @Autowired - private BlockServiceImpl blockServiceImpl; - - /** - * The Block group service. - */ - @Autowired - private BlockGroupServiceImpl blockGroupServiceImpl; - /** * 查询表t_app所有数据 * @@ -101,7 +80,7 @@ public class AppServiceImpl extends ServiceImpl implements AppSe */ @Override public List queryAllApp() { - return appMapper.queryAllApp(); + return baseMapper.queryAllApp(); } /** @@ -112,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); } @@ -128,7 +107,7 @@ public Result queryAppById(@Param("id") Integer id) { */ @Override public List queryAppByCondition(App app) { - return appMapper.queryAppByCondition(app); + return baseMapper.queryAppByCondition(app); } /** @@ -139,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); } @@ -159,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); } @@ -182,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 bf462aa1..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 @@ -21,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; @@ -35,9 +33,6 @@ @Service @Slf4j public class DatasourceServiceImpl extends ServiceImpl implements DatasourceService { - @Autowired - private DatasourceMapper datasourceMapper; - /** * 根据主键id查询表t_datasource信息 * @@ -45,8 +40,8 @@ public class DatasourceServiceImpl extends ServiceImpl queryDatasourceByCondition(Datasource datasource) { - return datasourceMapper.queryDatasourceByCondition(datasource); + return baseMapper.queryDatasourceByCondition(datasource); } /** @@ -67,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); @@ -84,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())); } @@ -102,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 8c3bcba8..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 @@ -44,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; @@ -69,9 +68,6 @@ public class I18nEntryServiceImpl extends ServiceImpl implements I18nEntryService { private static final Logger logger = LoggerFactory.getLogger(I18nEntryServiceImpl.class); - @Autowired - private I18nEntryMapper i18nEntryMapper; - @Autowired private I18nLangMapper i18nLangMapper; @@ -89,7 +85,7 @@ public I18nEntryListResult findAllI18nEntry() { return i18nEntriesListResult; } // 获取词条列表 - List i18nEntriesList = i18nEntryMapper.queryAllI18nEntry(); + List i18nEntriesList = baseMapper.queryAllI18nEntry(); if (i18nEntriesList == null) { return i18nEntriesListResult; } @@ -155,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; } @@ -200,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; } @@ -261,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); } @@ -286,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; @@ -307,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; @@ -393,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; } @@ -447,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; } } @@ -521,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); } /** @@ -534,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); } /** @@ -545,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 56242169..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 @@ -19,8 +19,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,9 +31,6 @@ @Service @Slf4j public class I18nLangServiceImpl extends ServiceImpl implements I18nLangService { - @Autowired - private I18nLangMapper i18nLangMapper; - /** * 查询表t_i18n_lang所有数据 * @@ -43,7 +38,7 @@ public class I18nLangServiceImpl extends ServiceImpl i */ @Override public List queryAllI18nLang() { - return i18nLangMapper.queryAllI18nLang(); + return baseMapper.queryAllI18nLang(); } /** @@ -53,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); } /** @@ -65,7 +60,7 @@ public I18nLang queryI18nLangById(@Param("id") Integer id) { */ @Override public List queryI18nLangByCondition(I18nLang i18nLang) { - return i18nLangMapper.queryI18nLangByCondition(i18nLang); + return baseMapper.queryI18nLangByCondition(i18nLang); } /** @@ -75,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); } /** @@ -87,7 +82,7 @@ public Integer deleteI18nLangById(@Param("id") Integer id) { */ @Override public Integer updateI18nLangById(I18nLang i18nLang) { - return i18nLangMapper.updateI18nLangById(i18nLang); + return baseMapper.updateI18nLangById(i18nLang); } /** @@ -98,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 a9295dfb..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 @@ -23,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; @@ -40,9 +38,6 @@ public class PageHistoryServiceImpl extends ServiceImpl implements PageHistoryService { private static final String DEFAULT_PAGE_HISTORY_VERSION = "0"; - @Autowired - private PageHistoryMapper pageHistoryMapper; - /** * 查询表t_page_history所有数据 * @@ -50,7 +45,7 @@ public class PageHistoryServiceImpl extends ServiceImpl findAllPageHistory() { - return pageHistoryMapper.queryAllPageHistory(); + return baseMapper.queryAllPageHistory(); } /** @@ -61,7 +56,7 @@ public List findAllPageHistory() { */ @Override public PageHistory findPageHistoryById(Integer historyId) { - return pageHistoryMapper.queryPageHistoryById(historyId); + return baseMapper.queryPageHistoryById(historyId); } /** @@ -72,7 +67,7 @@ public PageHistory findPageHistoryById(Integer historyId) { */ @Override public List findPageHistoryByCondition(PageHistory pageHistory) { - return pageHistoryMapper.queryPageHistoryByCondition(pageHistory); + return baseMapper.queryPageHistoryByCondition(pageHistory); } /** @@ -82,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); } /** @@ -94,7 +89,7 @@ public Integer deletePageHistoryById(@Param("id") Integer id) { */ @Override public Integer updatePageHistoryById(PageHistory pageHistory) { - return pageHistoryMapper.updatePageHistoryById(pageHistory); + return baseMapper.updatePageHistoryById(pageHistory); } /** @@ -107,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); } /** @@ -119,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); } /** @@ -137,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 1e057c1d..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 @@ -51,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; @@ -73,12 +72,6 @@ @Service @Slf4j public class PageServiceImpl extends ServiceImpl implements PageService { - /** - * The Page mapper. - */ - @Autowired - private PageMapper pageMapper; - /** * The App service. */ @@ -160,7 +153,7 @@ public class PageServiceImpl extends ServiceImpl implements Pa @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; } @@ -181,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()) { @@ -207,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); } /** @@ -227,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); } @@ -262,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); } @@ -300,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); } /** @@ -329,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); } @@ -452,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); } @@ -473,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); } @@ -526,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("此文件夹不是空文件夹，不能删除！"); } @@ -548,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); } @@ -596,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; @@ -611,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; } @@ -632,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) { @@ -694,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); @@ -780,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 4714e2cb..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 @@ -23,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; @@ -38,9 +36,6 @@ @Service @Slf4j public class PageTemplateServiceImpl extends ServiceImpl implements PageTemplateService { - @Autowired - private PageTemplateMapper pageTemplateMapper; - /** * 查询表page_template所有数据 * @@ -54,10 +49,10 @@ public class PageTemplateServiceImpl extends ServiceImpl> 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); } @@ -70,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); } @@ -85,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); } /** @@ -97,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); } @@ -116,7 +111,7 @@ public Result deletePageTemplateByIds(@Param("ids") List ids) */ @Override public Integer updatePageTemplateById(PageTemplate pageTemplate) { - return pageTemplateMapper.updatePageTemplateById(pageTemplate); + return baseMapper.updatePageTemplateById(pageTemplate); } /** @@ -131,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 713fd962..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 @@ -19,8 +19,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,9 +31,6 @@ @Service @Slf4j public class TaskRecordServiceImpl extends ServiceImpl implements TaskRecordService { - @Autowired - private TaskRecordMapper taskRecordMapper; - /** * 查询表t_task_record所有数据 * @@ -43,7 +38,7 @@ public class TaskRecordServiceImpl extends ServiceImpl queryAllTaskRecord() { - return taskRecordMapper.queryAllTaskRecord(); + return baseMapper.queryAllTaskRecord(); } /** @@ -53,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); } /** @@ -65,7 +60,7 @@ public TaskRecord queryTaskRecordById(@Param("id") Integer id) { */ @Override public List queryTaskRecordByCondition(TaskRecord taskRecord) { - return taskRecordMapper.queryTaskRecordByCondition(taskRecord); + return baseMapper.queryTaskRecordByCondition(taskRecord); } /** @@ -75,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); } /** @@ -87,7 +82,7 @@ public Integer deleteTaskRecordById(@Param("id") Integer id) { */ @Override public Integer updateTaskRecordById(TaskRecord taskRecord) { - return taskRecordMapper.updateTaskRecordById(taskRecord); + return baseMapper.updateTaskRecordById(taskRecord); } /** @@ -98,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 2996c89e..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 @@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -32,9 +31,6 @@ @Service @Slf4j public class UserServiceImpl extends ServiceImpl implements UserService { - @Autowired - private UserMapper userMapper; - /** * 查询表t_user所有数据 * @@ -42,7 +38,7 @@ public class UserServiceImpl extends ServiceImpl implements Us */ @Override public List queryAllUser() { - return userMapper.queryAllUser(); + return baseMapper.queryAllUser(); } /** @@ -53,7 +49,7 @@ public List queryAllUser() { */ @Override public User queryUserById(String id) { - return userMapper.queryUserById(id); + return baseMapper.queryUserById(id); } /** @@ -64,7 +60,7 @@ public User queryUserById(String id) { */ @Override public List queryUserByCondition(User user) { - return userMapper.queryUserByCondition(user); + return baseMapper.queryUserByCondition(user); } /** @@ -75,7 +71,7 @@ public List queryUserByCondition(User user) { */ @Override public Integer deleteUserById(String id) { - return userMapper.deleteUserById(id); + return baseMapper.deleteUserById(id); } /** @@ -86,7 +82,7 @@ public Integer deleteUserById(String id) { */ @Override public Integer updateUserById(User user) { - return userMapper.updateUserById(user); + return baseMapper.updateUserById(user); } /** @@ -97,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 b7b982fe..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 @@ -17,8 +17,6 @@ import com.tinyengine.it.model.dto.BlockGroupDto; import com.tinyengine.it.model.entity.BlockGroup; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -40,7 +38,7 @@ public interface BlockGroupService extends IService { * @param id the id * @return the block group dto */ - BlockGroup findBlockGroupById(@Param("id") Integer id); + BlockGroup findBlockGroupById(Integer id); /** * 根据条件查询表t_block_group信息 @@ -56,7 +54,7 @@ public interface BlockGroupService extends IService { * @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 41e47373..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 @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.BlockHistory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -38,7 +36,7 @@ public interface BlockHistoryService extends IService { * @param id the id * @return the block history */ - BlockHistory findBlockHistoryById(@Param("id") Integer id); + BlockHistory findBlockHistoryById(Integer id); /** * 根据条件查询表t_block_history信息 @@ -54,7 +52,7 @@ public interface BlockHistoryService extends IService { * @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 ae848eac..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 @@ -23,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; @@ -47,7 +45,7 @@ public interface BlockService extends IService { * @param id the id * @return the BlockDto */ - BlockDto queryBlockById(@Param("id") Integer id); + BlockDto queryBlockById(Integer id); /** * 根据条件查询表t_block信息 @@ -63,7 +61,7 @@ public interface BlockService extends IService { * @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 aebcfa14..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 @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.BusinessCategory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -38,7 +36,7 @@ public interface BusinessCategoryService extends IService { * @param id the id * @return the business category */ - BusinessCategory queryBusinessCategoryById(@Param("id") Integer id); + BusinessCategory queryBusinessCategoryById(Integer id); /** * 根据条件查询表t_business_category信息 @@ -54,7 +52,7 @@ public interface BusinessCategoryService extends IService { * @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 fdd0a447..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 @@ -16,8 +16,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.ComponentLibrary; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -39,7 +37,7 @@ public interface ComponentLibraryService extends IService { * @param id the id * @return the material */ - Result queryComponentLibraryById(@Param("id") Integer id); + Result queryComponentLibraryById(Integer id); /** * 根据条件查询表t_component_library信息 @@ -55,7 +53,7 @@ public interface ComponentLibraryService extends IService { * @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 134f1b21..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 @@ -20,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; @@ -44,7 +43,7 @@ public interface ComponentService extends IService { * @param id the id * @return the component */ - Component findComponentById(@Param("id") Integer id); + Component findComponentById(Integer id); /** * 根据条件查询表t_component信息 @@ -60,7 +59,7 @@ public interface ComponentService extends IService { * @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 348cf086..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 @@ -16,8 +16,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.MaterialHistory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -39,7 +37,7 @@ public interface MaterialHistoryService extends IService { * @param id the id * @return the material history */ - Result findMaterialHistoryById(@Param("id") Integer id); + Result findMaterialHistoryById(Integer id); /** * 根据条件查询表t_material_history信息 @@ -55,7 +53,7 @@ public interface MaterialHistoryService extends IService { * @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 d3b85bcb..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 @@ -16,8 +16,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.Material; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -39,7 +37,7 @@ public interface MaterialService extends IService { * @param id the id * @return the material */ - Result queryMaterialById(@Param("id") Integer id); + Result queryMaterialById(Integer id); /** * 根据条件查询表t_material信息 @@ -55,7 +53,7 @@ public interface MaterialService extends IService { * @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 bdf54b13..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 @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.TaskRecord; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -34,7 +32,7 @@ public interface TaskRecordService extends IService { * @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 64afb75d..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 @@ -29,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; @@ -45,9 +44,6 @@ @Service @Slf4j public class BlockGroupServiceImpl extends ServiceImpl implements BlockGroupService { - @Autowired - private BlockGroupMapper blockGroupMapper; - @Autowired private BlockCarriersRelationMapper blockCarriersRelationMapper; @@ -64,7 +60,7 @@ public class BlockGroupServiceImpl extends ServiceImpl findAllBlockGroup() { - return blockGroupMapper.queryAllBlockGroup(); + return baseMapper.queryAllBlockGroup(); } /** @@ -74,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()) { @@ -105,7 +101,7 @@ public BlockGroup findBlockGroupById(@Param("id") Integer id) { */ @Override public List findBlockGroupByCondition(BlockGroup blockGroup) { - return blockGroupMapper.queryBlockGroupByCondition(blockGroup); + return baseMapper.queryBlockGroupByCondition(blockGroup); } /** @@ -115,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); } /** @@ -142,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()); @@ -161,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); } /** @@ -172,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); } @@ -203,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 ac5b44de..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 @@ -19,8 +19,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,9 +31,6 @@ @Service @Slf4j public class BlockHistoryServiceImpl extends ServiceImpl implements BlockHistoryService { - @Autowired - private BlockHistoryMapper blockHistoryMapper; - /** * 查询表t_block_history所有数据 * @@ -43,7 +38,7 @@ public class BlockHistoryServiceImpl extends ServiceImpl findAllBlockHistory() { - return blockHistoryMapper.queryAllBlockHistory(); + return baseMapper.queryAllBlockHistory(); } /** @@ -53,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); } /** @@ -65,7 +60,7 @@ public BlockHistory findBlockHistoryById(@Param("id") Integer id) { */ @Override public List findBlockHistoryByCondition(BlockHistory blockHistory) { - return blockHistoryMapper.queryBlockHistoryByCondition(blockHistory); + return baseMapper.queryBlockHistoryByCondition(blockHistory); } /** @@ -75,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); } /** @@ -87,7 +82,7 @@ public Integer deleteBlockHistoryById(@Param("id") Integer id) { */ @Override public Integer updateBlockHistoryById(BlockHistory blockHistory) { - return blockHistoryMapper.updateBlockHistoryById(blockHistory); + return baseMapper.updateBlockHistoryById(blockHistory); } /** @@ -98,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 07ac6caf..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 @@ -51,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; @@ -78,9 +77,6 @@ @Service @Slf4j public class BlockServiceImpl extends ServiceImpl implements BlockService { - @Autowired - private BlockMapper blockMapper; - @Autowired private UserMapper userMapper; @@ -112,7 +108,7 @@ public class BlockServiceImpl extends ServiceImpl implements */ @Override public List queryAllBlock() { - return blockMapper.queryAllBlock(); + return baseMapper.queryAllBlock(); } /** @@ -122,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; } @@ -146,7 +142,7 @@ public BlockDto queryBlockById(@Param("id") Integer id) { */ @Override public List queryBlockByCondition(Block block) { - return blockMapper.queryBlockByCondition(block); + return baseMapper.queryBlockByCondition(block); } /** @@ -156,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); } /** @@ -172,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); } @@ -193,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); } @@ -209,7 +205,7 @@ public Result updateBlockById(BlockParam blockParam, Integer appId) { } } // 更新区块 - blockMapper.updateBlockById(blocks); + baseMapper.updateBlockById(blocks); BlockDto blockDtoResult = new BlockDto(); // 参数存在区块分组且无值 if (blockParam.getGroups().isEmpty()) { @@ -250,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); } @@ -343,7 +339,7 @@ public List getBlockInfo(List block, String framework) { } // 执行查询并返回结果 - return blockMapper.selectList(queryWrapper); + return baseMapper.selectList(queryWrapper); } /** @@ -430,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); } /** @@ -443,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()); @@ -458,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; } @@ -501,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(); } @@ -596,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); } /** @@ -650,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 @@ -658,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(); @@ -703,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 66f5a068..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 @@ -20,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; @@ -34,9 +32,6 @@ @Service @Slf4j public class BusinessCategoryServiceImpl extends ServiceImpl implements BusinessCategoryService { - @Autowired - private BusinessCategoryMapper businessCategoryMapper; - /** * 查询表t_business_category所有数据 * @@ -44,7 +39,7 @@ public class BusinessCategoryServiceImpl extends ServiceImpl queryAllBusinessCategory() { - return businessCategoryMapper.queryAllBusinessCategory(); + return baseMapper.queryAllBusinessCategory(); } /** @@ -54,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); } /** @@ -68,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); } /** @@ -78,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); } /** @@ -90,7 +85,7 @@ public Integer deleteBusinessCategoryById(@Param("id") Integer id) { */ @Override public Integer updateBusinessCategoryById(BusinessCategory businessCategory) { - return businessCategoryMapper.updateBusinessCategoryById(businessCategory); + return baseMapper.updateBusinessCategoryById(businessCategory); } /** @@ -101,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 9dca75ac..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 @@ -21,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; @@ -35,9 +33,6 @@ @Service @Slf4j public class ComponentLibraryServiceImpl extends ServiceImpl implements ComponentLibraryService { - @Autowired - private ComponentLibraryMapper componentLibraryMapper; - /** * 查询表t_component_library所有数据 * @@ -45,7 +40,7 @@ public class ComponentLibraryServiceImpl extends ServiceImpl queryAllComponentLibrary() { - return componentLibraryMapper.queryAllComponentLibrary(); + return baseMapper.queryAllComponentLibrary(); } /** @@ -55,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); } @@ -68,7 +63,7 @@ public Result queryComponentLibraryById(@Param("id") Integer i */ @Override public List queryComponentLibraryByCondition(ComponentLibrary componentLibrary) { - return componentLibraryMapper.queryComponentLibraryByCondition(componentLibrary); + return baseMapper.queryComponentLibraryByCondition(componentLibrary); } /** @@ -78,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); } @@ -99,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); } @@ -114,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 292d3a5f..9a873d1f 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 @@ -35,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; @@ -54,12 +53,6 @@ @Service @Slf4j public class ComponentServiceImpl extends ServiceImpl implements ComponentService { - /** - * The component mapper. - */ - @Autowired - private ComponentMapper componentMapper; - /** * The component library mapper. */ @@ -73,7 +66,7 @@ public class ComponentServiceImpl extends ServiceImpl findAllComponent() { - return componentMapper.queryAllComponent(); + return baseMapper.queryAllComponent(); } /** @@ -83,8 +76,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); } /** @@ -95,7 +88,7 @@ public Component findComponentById(@Param("id") Integer id) { */ @Override public List findComponentByCondition(Component component) { - return componentMapper.queryComponentByCondition(component); + return baseMapper.queryComponentByCondition(component); } /** @@ -105,8 +98,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); } /** @@ -117,7 +110,7 @@ public Integer deleteComponentById(@Param("id") Integer id) { */ @Override public Integer updateComponentById(Component component) { - return componentMapper.updateComponentById(component); + return baseMapper.updateComponentById(component); } /** @@ -128,7 +121,7 @@ public Integer updateComponentById(Component component) { */ @Override public Integer createComponent(Component component) { - return componentMapper.createComponent(component); + return baseMapper.createComponent(component); } /** @@ -310,11 +303,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 { 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 2a397378..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 @@ -22,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; @@ -36,12 +34,6 @@ @Service @Slf4j public class MaterialHistoryServiceImpl extends ServiceImpl implements MaterialHistoryService { - /** - * The material history mapper. - */ - @Autowired - private MaterialHistoryMapper materialHistoryMapper; - /** * 查询表t_material_history所有数据 * @@ -49,7 +41,7 @@ public class MaterialHistoryServiceImpl extends ServiceImpl findAllMaterialHistory() { - return materialHistoryMapper.queryAllMaterialHistory(); + return baseMapper.queryAllMaterialHistory(); } /** @@ -59,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); } @@ -74,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); } /** @@ -84,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); } @@ -101,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); } @@ -116,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 5af6cdfe..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 @@ -21,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; @@ -35,9 +33,6 @@ @Service @Slf4j public class MaterialServiceImpl extends ServiceImpl implements MaterialService { - @Autowired - private MaterialMapper materialMapper; - /** * 查询表t_material所有数据 * @@ -45,7 +40,7 @@ public class MaterialServiceImpl extends ServiceImpl i */ @Override public List queryAllMaterial() { - return materialMapper.queryAllMaterial(); + return baseMapper.queryAllMaterial(); } /** @@ -55,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); } @@ -68,7 +63,7 @@ public Result queryMaterialById(@Param("id") Integer id) { */ @Override public List queryMaterialByCondition(Material material) { - return materialMapper.queryMaterialByCondition(material); + return baseMapper.queryMaterialByCondition(material); } /** @@ -78,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); } @@ -95,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); } @@ -110,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 ac4c7b72..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 @@ -19,8 +19,6 @@ 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; @@ -38,9 +36,6 @@ */ @Service public class TaskRecordMaterialServiceImpl extends ServiceImpl implements TaskRecordService { - @Autowired - TaskRecordMapper taskRecordMapper; - /** * 根据主键id查询表task_record信息 * @@ -49,8 +44,8 @@ public class TaskRecordMaterialServiceImpl extends ServiceImpl> 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 fcfa975b..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 @@ -16,8 +16,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.PlatformHistory; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -39,7 +37,7 @@ public interface PlatformHistoryService extends IService { * @param id the id * @return the platformHistory */ - PlatformHistory queryPlatformHistoryById(@Param("id") Integer id); + PlatformHistory queryPlatformHistoryById(Integer id); /** * 根据条件查询表t_platform_history信息 @@ -55,7 +53,7 @@ public interface PlatformHistoryService extends IService { * @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 dbca3156..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 @@ -16,8 +16,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.model.entity.Platform; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -39,7 +37,7 @@ public interface PlatformService extends IService { * @param id the id * @return the platform */ - Platform queryPlatformById(@Param("id") Integer id); + Platform queryPlatformById(Integer id); /** * 根据条件查询表t_platform信息 @@ -55,7 +53,7 @@ public interface PlatformService extends IService { * @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 949a9915..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 @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.tinyengine.it.model.entity.Tenant; -import org.apache.ibatis.annotations.Param; - import java.util.List; /** @@ -38,7 +36,7 @@ public interface TenantService extends IService { * @param id the id * @return the tenant */ - Tenant findTenantById(@Param("id") Integer id); + Tenant findTenantById(Integer id); /** * 根据条件查询表t_tenant信息 @@ -54,7 +52,7 @@ public interface TenantService extends IService { * @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 78b87f41..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 @@ -21,7 +21,6 @@ import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -34,9 +33,6 @@ @Service @Slf4j public class PlatformHistoryServiceImpl extends ServiceImpl implements PlatformHistoryService { - @Autowired - private PlatformHistoryMapper platformHistoryMapper; - /** * 查询表t_platform_history所有信息 * @@ -44,7 +40,7 @@ public class PlatformHistoryServiceImpl extends ServiceImpl queryAllPlatformHistory() { - return platformHistoryMapper.queryAllPlatformHistory(); + return baseMapper.queryAllPlatformHistory(); } /** @@ -55,7 +51,7 @@ public List queryAllPlatformHistory() { */ @Override public PlatformHistory queryPlatformHistoryById(Integer id) { - return platformHistoryMapper.queryPlatformHistoryById(id); + return baseMapper.queryPlatformHistoryById(id); } /** @@ -66,7 +62,7 @@ public PlatformHistory queryPlatformHistoryById(Integer id) { */ @Override public List queryPlatformHistoryByCondition(PlatformHistory platformHistory) { - return platformHistoryMapper.queryPlatformHistoryByCondition(platformHistory); + return baseMapper.queryPlatformHistoryByCondition(platformHistory); } /** @@ -81,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); } @@ -99,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); } @@ -130,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 2a21f2b3..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 @@ -21,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; @@ -35,9 +33,6 @@ @Service @Slf4j public class PlatformServiceImpl extends ServiceImpl implements PlatformService { - @Autowired - private PlatformMapper platformMapper; - /** * 查询表t_platform所有数据 * @@ -45,7 +40,7 @@ public class PlatformServiceImpl extends ServiceImpl i */ @Override public List queryAllPlatform() { - return platformMapper.queryAllPlatform(); + return baseMapper.queryAllPlatform(); } /** @@ -55,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); } /** @@ -67,7 +62,7 @@ public Platform queryPlatformById(@Param("id") Integer id) { */ @Override public List queryPlatformByCondition(Platform platform) { - return platformMapper.queryPlatformByCondition(platform); + return baseMapper.queryPlatformByCondition(platform); } /** @@ -77,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); } @@ -100,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); } @@ -122,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 7eb9f584..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 @@ -19,8 +19,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,9 +32,6 @@ @Service @Slf4j public class TenantServiceImpl extends ServiceImpl implements TenantService { - @Autowired - private TenantMapper tenantMapper; - /** * 查询表t_tenant所有数据 * @@ -44,7 +39,7 @@ public class TenantServiceImpl extends ServiceImpl impleme */ @Override public List findAllTenant() { - return tenantMapper.queryAllTenant(); + return baseMapper.queryAllTenant(); } /** @@ -54,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); } /** @@ -66,7 +61,7 @@ public Tenant findTenantById(@Param("id") Integer id) { */ @Override public List findTenantByCondition(Tenant tenant) { - return tenantMapper.queryTenantByCondition(tenant); + return baseMapper.queryTenantByCondition(tenant); } /** @@ -76,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); } /** @@ -88,7 +83,7 @@ public Integer deleteTenantById(@Param("id") Integer id) { */ @Override public Integer updateTenantById(Tenant tenant) { - return tenantMapper.updateTenantById(tenant); + return baseMapper.updateTenantById(tenant); } /** @@ -99,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/pom.xml b/pom.xml index 8b6712ea..c6d4b3b3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,16 +30,12 @@ 3.3.3 2.3.32 2.5.4 - 2.5.0 + 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-starter-webmvc-ui - ${springdoc-openapi-starter-webmvc-ui.version} + springdoc-openapi-starter-webflux-ui + ${springdoc-openapi-starter-webflux-ui.version} From e6e5331e4006ed6612edb5fc60bc14bff1c3c1d6 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Mon, 16 Jun 2025 20:32:55 -0700 Subject: [PATCH 04/12] fix: Modify unit testing --- .../material/impl/ComponentServiceImpl.java | 11 ++++++---- .../app/impl/AppExtensionServiceImplTest.java | 5 ++++- .../service/app/impl/AppServiceImplTest.java | 14 ++----------- .../app/impl/DatasourceServiceImplTest.java | 3 +++ .../app/impl/I18nEntryServiceImplTest.java | 3 +++ .../app/impl/I18nLangServiceImplTest.java | 3 +++ .../app/impl/PageHistoryServiceImplTest.java | 3 +++ .../service/app/impl/PageServiceImplTest.java | 20 ++++++++++++------- .../app/impl/PageTemplateServiceImplTest.java | 3 +++ .../app/impl/TaskRecordServiceImplTest.java | 3 +++ .../service/app/impl/UserServiceImplTest.java | 3 +++ .../impl/BlockGroupServiceImplTest.java | 2 ++ .../impl/BlockHistoryServiceImplTest.java | 3 +++ .../material/impl/BlockServiceImplTest.java | 10 +++++----- .../impl/BusinessCategoryServiceImplTest.java | 3 +++ .../impl/ComponentServiceImplTest.java | 3 +++ .../impl/MaterialHistoryServiceImplTest.java | 3 +++ .../impl/MaterialServiceImplTest.java | 2 ++ .../TaskRecordMaterialServiceImplTest.java | 3 +++ .../impl/PlatformServiceImplTest.java | 3 +++ .../platform/impl/TenantServiceImplTest.java | 3 +++ 21 files changed, 77 insertions(+), 29 deletions(-) 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 9a873d1f..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 @@ -44,6 +44,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; /** * The type Component service. @@ -369,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/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 From 159897a2bdcf7293c1c05987fdb07301f26cdabc Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Mon, 16 Jun 2025 23:05:01 -0700 Subject: [PATCH 05/12] fix: Modify web config --- .../tinyengine/it/config/filter/WebConfig.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) 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 a41a5c20..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,8 +16,7 @@ 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.cors.reactive.CorsWebFilter; import org.springframework.web.reactive.config.WebFluxConfigurer; import java.util.Arrays; @@ -29,22 +28,19 @@ public class WebConfig implements WebFluxConfigurer { 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 From 61cf638afb30f4bedf7a48afe84e650a99847168 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Fri, 20 Jun 2025 01:40:30 -0700 Subject: [PATCH 06/12] feat: Add JsonUtils and modify related methods --- .../it/config/filter/FilterConfig.java | 14 - .../it/config/filter/WebConfig.java | 27 +- .../it/common/handler/ListTypeHandler.java | 10 +- .../it/common/handler/MapTypeHandler.java | 10 +- .../tinyengine/it/common/utils/JsonUtils.java | 344 ++++++++++++++++++ .../it/common/utils/MapperFactory.java | 93 +++++ .../utils/OffsetDateTimeDeserializer.java | 68 ++++ .../common/utils/SecurityFileCheckUtil.java | 4 +- .../com/tinyengine/it/common/utils/Utils.java | 22 +- .../it/controller/BlockController.java | 17 +- .../it/controller/PageController.java | 11 +- .../it/controller/PageHistoryController.java | 17 +- .../it/controller/PageTemplateController.java | 12 +- .../it/gateway/ai/AiChatClient.java | 49 +-- .../app/impl/I18nEntryServiceImpl.java | 5 +- .../service/app/impl/v1/AppV1ServiceImpl.java | 6 +- .../it/service/material/BlockService.java | 4 +- .../material/impl/BlockServiceImpl.java | 24 +- .../material/impl/ComponentServiceImpl.java | 3 +- .../tinyengine/it/common/utils/UtilsTest.java | 8 - .../it/controller/BlockControllerTest.java | 17 +- .../it/controller/PageControllerTest.java | 9 +- .../controller/PageHistoryControllerTest.java | 13 +- .../PageTemplateControllerTest.java | 11 +- .../it/gateway/ai/AiChatClientTest.java | 89 ++--- .../app/impl/v1/AppV1ServiceImplTest.java | 5 +- .../material/impl/BlockServiceImplTest.java | 3 +- pom.xml | 14 +- 28 files changed, 706 insertions(+), 203 deletions(-) create mode 100644 base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java create mode 100644 base/src/main/java/com/tinyengine/it/common/utils/MapperFactory.java create mode 100644 base/src/main/java/com/tinyengine/it/common/utils/OffsetDateTimeDeserializer.java diff --git a/app/src/main/java/com/tinyengine/it/config/filter/FilterConfig.java b/app/src/main/java/com/tinyengine/it/config/filter/FilterConfig.java index d8ee5648..827082e9 100644 --- a/app/src/main/java/com/tinyengine/it/config/filter/FilterConfig.java +++ b/app/src/main/java/com/tinyengine/it/config/filter/FilterConfig.java @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; @@ -56,16 +54,4 @@ public FilterRegistrationBean requestIdFilter() { registrationBean.setFilter(new RequestIdFilter()); return registrationBean; } - - /** - * Object mapper object mapper. - * - * @return the object mapper - */ - @Bean - public ObjectMapper objectMapper() { - ObjectMapper mapper = new ObjectMapper(); - mapper.registerModule(new JavaTimeModule()); - return mapper; - } } 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 f760e11b..839421f0 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 @@ -1,13 +1,12 @@ /** * Copyright (c) 2023 - present TinyEngine Authors. * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. - * + *

* Use of this source code is governed by an MIT-style license. - * + *

* THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. - * */ package com.tinyengine.it.config.filter; @@ -16,31 +15,35 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.reactive.CorsWebFilter; -import org.springframework.web.reactive.config.WebFluxConfigurer; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.util.Arrays; import java.util.List; @Configuration -public class WebConfig implements WebFluxConfigurer { +public class WebConfig implements WebMvcConfigurer { @Value("${cors.allowed-origins}") private String allowedOrigins; @Bean - public CorsWebFilter corsFilter() { + public CorsFilter 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); - org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource source = - new org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource(); + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", corsConfiguration); - - return new CorsWebFilter(source); + return new CorsFilter(source); } -} \ No newline at end of file +} diff --git a/base/src/main/java/com/tinyengine/it/common/handler/ListTypeHandler.java b/base/src/main/java/com/tinyengine/it/common/handler/ListTypeHandler.java index f76053d5..2464b066 100644 --- a/base/src/main/java/com/tinyengine/it/common/handler/ListTypeHandler.java +++ b/base/src/main/java/com/tinyengine/it/common/handler/ListTypeHandler.java @@ -14,8 +14,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.tinyengine.it.common.utils.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.type.BaseTypeHandler; @@ -38,14 +38,12 @@ */ @Slf4j public class ListTypeHandler extends BaseTypeHandler> { - private final ObjectMapper objectMapper = new ObjectMapper(); - @Override public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException { // 将 List 转换为字符串，并设置到 PreparedStatement 中的相应参数 try { - String json = objectMapper.writeValueAsString(parameter); + String json = JsonUtils.MAPPER.writeValueAsString(parameter); ps.setString(i, json); } catch (IOException e) { throw new SQLException("Error converting List to JSON", e); @@ -90,10 +88,10 @@ private List convetJsonList(String jsonString) throws JsonProcessingException return Collections.emptyList(); } else if (jsonString.startsWith("[{") && jsonString.endsWith("}]")) { // 尝试将 JSON 字符串转换为 List> - return objectMapper.readValue(jsonString, new TypeReference>>() {}); + return JsonUtils.MAPPER.readValue(jsonString, new TypeReference>>() {}); } else { // 尝试将 JSON 字符串转换为 List - return objectMapper.readValue(jsonString, new TypeReference>() {}); + return JsonUtils.MAPPER.readValue(jsonString, new TypeReference>() {}); } } } diff --git a/base/src/main/java/com/tinyengine/it/common/handler/MapTypeHandler.java b/base/src/main/java/com/tinyengine/it/common/handler/MapTypeHandler.java index 3ea157cb..67a0a105 100644 --- a/base/src/main/java/com/tinyengine/it/common/handler/MapTypeHandler.java +++ b/base/src/main/java/com/tinyengine/it/common/handler/MapTypeHandler.java @@ -15,8 +15,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.tinyengine.it.common.utils.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.type.BaseTypeHandler; @@ -37,13 +37,11 @@ */ @Slf4j public class MapTypeHandler extends BaseTypeHandler> { - private final ObjectMapper objectMapper = new ObjectMapper(); - @Override public void setNonNullParameter(PreparedStatement ps, int i, Map parameter, JdbcType jdbcType) throws SQLException { try { - String json = objectMapper.writeValueAsString(parameter); + String json = JsonUtils.MAPPER.writeValueAsString(parameter); ps.setString(i, json); } catch (JsonProcessingException e) { throw new SQLException("Error converting Map to JSON", e); @@ -71,9 +69,9 @@ private Map parseJson(String json) throws SQLException { return new HashMap<>(); } try { - JsonNode jsonNode = objectMapper.readTree(json); + JsonNode jsonNode = JsonUtils.MAPPER.readTree(json); if (jsonNode.isObject()) { - return objectMapper.readValue(json, new TypeReference>() {}); + return JsonUtils.MAPPER.readValue(json, new TypeReference>() {}); } else { // 非对象类型也返回空的 Map return new HashMap<>(); diff --git a/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java b/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java new file mode 100644 index 00000000..bb2c2f1e --- /dev/null +++ b/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java @@ -0,0 +1,344 @@ +/** + * Copyright (c) 2023 - present TinyEngine Authors. + * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ + +package com.tinyengine.it.common.utils; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.core.util.DefaultIndenter; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.tinyengine.it.common.exception.ExceptionEnum; +import com.tinyengine.it.common.exception.ServiceException; +import com.tinyengine.it.common.log.SystemLogAspect; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufInputStream; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; +import java.net.URL; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.stream.Collectors; + +/** + * The type json Utils. + * + * @since 2025-06-19 + */ +public class JsonUtils { + public static final ObjectMapper MAPPER = MapperFactory.getDefaultMapper(); + public static final ObjectMapper PRETTY_MAPPER = MapperFactory.getDefaultMapper(); + public static final DefaultPrettyPrinter PRINTER = new DefaultPrettyPrinter(); + private static final Logger LOGGER = LoggerFactory.getLogger(SystemLogAspect.class); + + public JsonUtils() { + } + + private static void initialize() { + SimpleModule module = new SimpleModule(); + MAPPER.findAndRegisterModules(); + MAPPER.registerModule(module); + MAPPER.registerModule(new JavaTimeModule()); + PRETTY_MAPPER.configure(JsonParser.Feature.ALLOW_COMMENTS, true); + PRETTY_MAPPER.configure(SerializationFeature.INDENT_OUTPUT, true); + PRETTY_MAPPER.registerModule(module); + PRETTY_MAPPER.findAndRegisterModules(); + PRINTER.indentObjectsWith(new DefaultIndenter(" ", "\n")); + PRETTY_MAPPER.setDefaultPrettyPrinter(PRINTER); + } + + private static T invoke(Callable callable) { + try { + return callable.call(); + } catch (Exception var2) { + Exception e = var2; + throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg()); + } + } + + /** + * To mapper. + * + * @return the MAPPER + */ + public static ObjectMapper mapper() { + return MAPPER; + } + + /** + * To pretty mapper. + * + * @return the string + */ + public static ObjectMapper prettyMapper() { + return PRETTY_MAPPER; + } + + /** + * To encode. + * + * @param obj the obj + * @return the string + */ + public static String encode(Object obj) { + return (String) invoke(() -> { + return MAPPER.writeValueAsString(obj); + }); + } + + /** + * To encode prettily. + * + * @param obj the obj + * @return the string + */ + public static String encodePrettily(Object obj) { + return (String) invoke(() -> { + return PRETTY_MAPPER.writeValueAsString(obj); + }); + } + + /** + * To encode as bytes. + * + * @param obj the obj + * @return the byte + */ + public static byte[] encodeAsBytes(Object obj) { + return (byte[]) invoke(() -> { + return MAPPER.writeValueAsBytes(obj); + }); + } + + /** + * To decode. + * + * @param src the src + * @return the T + */ + public static T decode(byte[] src) { + return (T) decode(src, Object.class); + } + + /** + * To decode. + * + * @param src the src + * @param valueType the valueType + * @return the T + */ + public static T decode(byte[] src, Class valueType) { + return invoke(() -> { + return MAPPER.readValue(src, valueType); + }); + } + + /** + * To decode. + * + * @param src the src + * @param valueTypeRef the valueTypeRef + * @return the T + */ + public static T decode(byte[] src, TypeReference valueTypeRef) { + return invoke(() -> { + return MAPPER.readValue(src, valueTypeRef); + }); + } + + /** + * To decode. + * + * @param url the url + * @param valueType the valueType + * @return the T + */ + public static T decode(URL url, Class valueType) { + return invoke(() -> { + return MAPPER.readValue(url, valueType); + }); + } + + /** + * To decode. + * + * @param src the src + * @return the T + */ + public static T decode(String src) { + return (T) decode(src, Object.class); + } + + /** + * To decode. + * + * @param src the src + * @param valueType the valueType + * @return the T + */ + public static T decode(String src, Class valueType) { + return invoke(() -> { + return MAPPER.readValue(src, valueType); + }); + } + + /** + * To decode. + * + * @param src the src + * @param valueType the valueType + * @return the T + */ + public static T decode(String src, JavaType valueType) { + return invoke(() -> { + return MAPPER.readValue(src, valueType); + }); + } + + /** + * To decode. + * + * @param src the src + * @param valueTypeRef the valueTypeRef + * @return the T + */ + public static T decode(String src, TypeReference valueTypeRef) { + return invoke(() -> { + return MAPPER.readValue(src, valueTypeRef); + }); + } + + /** + * To decode. + * + * @param src the src + * @param valueType the valueType + * @return the T + */ + public static T decode(ByteBuf src, Class valueType) { + return (T) invoke(() -> { + InputStream inputStream = new ByteBufInputStream(src); + Object var3; + try { + var3 = MAPPER.readValue(inputStream, valueType); + } catch (Throwable var6) { + try { + inputStream.close(); + } catch (Throwable var5) { + var6.addSuppressed(var5); + } + throw var6; + } + inputStream.close(); + return var3; + }); + } + + /** + * To decode. + * + * @param src the src + * @param valueType the valueType + * @return the T + */ + public static T decode(InputStream src, Class valueType) { + return invoke(() -> { + return MAPPER.readValue(src, valueType); + }); + } + + /** + * To convert value. + * + * @param fromValue the fromValue + * @param toValueType the toValueType + * @return the T + */ + public static T convertValue(Object fromValue, Class toValueType) { + return invoke(() -> { + return MAPPER.convertValue(fromValue, toValueType); + }); + } + + /** + * To convert value. + * + * @param fromValue the fromValue + * @param toValueType the toValueType + * @return the T + */ + public static T convertValue(Object fromValue, JavaType toValueType) { + return invoke(() -> { + return MAPPER.convertValue(fromValue, toValueType); + }); + } + + /** + * To convert value. + * + * @param fromValue the fromValue + * @param toValueType the toValueType + * @return the T + */ + public static T convertValue(Object fromValue, TypeReference toValueType) { + return invoke(() -> { + return MAPPER.convertValue(fromValue, toValueType); + }); + } + + /** + * To get List. + * + * @param inputs the inputs + * @return the List + */ + public static List getList(Object inputs) { + if (inputs == null) { + return Collections.emptyList(); + } + + // 处理 Array → List + if (inputs.getClass().isArray()) { + inputs = Arrays.asList((Object[]) inputs); + } + + // 处理 String → List + if (inputs instanceof String) { + return Arrays.stream(((String) inputs).split(",")) + .map(String::trim) + .collect(Collectors.toList()); + } + + // 处理 List → List + if (inputs instanceof List) { + return ((List) inputs).stream() + .map(Object::toString) + .map(String::trim) + .collect(Collectors.toList()); + } + + LOGGER.error("Bad data type: {}, it should be String, Array, or List.", inputs.getClass().getName()); + return Collections.emptyList(); + } + + static { + initialize(); + } +} diff --git a/base/src/main/java/com/tinyengine/it/common/utils/MapperFactory.java b/base/src/main/java/com/tinyengine/it/common/utils/MapperFactory.java new file mode 100644 index 00000000..ae3dfffb --- /dev/null +++ b/base/src/main/java/com/tinyengine/it/common/utils/MapperFactory.java @@ -0,0 +1,93 @@ +/** + * Copyright (c) 2023 - present TinyEngine Authors. + * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ + +package com.tinyengine.it.common.utils; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.springframework.core.io.support.SpringFactoriesLoader; + +import java.time.OffsetDateTime; +import java.util.List; + +/** + * The type mapper Factory. + * + * @since 2025-06-19 + */ +public class MapperFactory { + public MapperFactory() { + } + + /** + * To register modules. + * + * @param mapper the mapper + * @return + */ + public static void registerModules(ObjectMapper mapper) { + List modules = SpringFactoriesLoader.loadFactories(Module.class, (ClassLoader) null); + mapper.registerModules((Module[]) modules.toArray(new Module[0])); + mapper.registerModule(new SimpleModule()); + mapper.registerModule(new JavaTimeModule()); + mapper.registerModules(new Module[]{(new SimpleModule()).addDeserializer(OffsetDateTime.class, + new OffsetDateTimeDeserializer())}); + } + + /** + * To get default builder. + * + * @return JsonMapper.Builder the JsonMapper.Builder + */ + public static JsonMapper.Builder getDefaultBuilder() { + return (JsonMapper.Builder) ((JsonMapper.Builder) ((JsonMapper.Builder) + ((JsonMapper.Builder) ((JsonMapper.Builder) ((JsonMapper.Builder) + ((JsonMapper.Builder) ((JsonMapper.Builder) ((JsonMapper.Builder) JsonMapper.builder() + .disable(new DeserializationFeature[]{DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES})) + .disable(new SerializationFeature[] {SerializationFeature.FAIL_ON_EMPTY_BEANS})) + .disable(new MapperFeature[]{MapperFeature.DEFAULT_VIEW_INCLUSION})) + .disable(new SerializationFeature[]{SerializationFeature.WRITE_DATES_AS_TIMESTAMPS})) + .disable(new JsonParser.Feature[]{JsonParser.Feature.AUTO_CLOSE_SOURCE})) + .serializationInclusion(JsonInclude.Include.NON_NULL)) + .enable(new DeserializationFeature[]{DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS})) + .enable(new DeserializationFeature[]{DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY})) + .enable(new DeserializationFeature[]{DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT}); + } + + /** + * To get default mapper. + * + * @return ObjectMapper the ObjectMapper. + */ + public static ObjectMapper getDefaultMapper() { + return getDefaultBuilder().build(); + } + + /** + * To get modules registered mapper. + * + * @return ObjectMapper the ObjectMapper. + */ + public static ObjectMapper getModulesRegisteredMapper() { + ObjectMapper mapper = getDefaultMapper(); + registerModules(mapper); + return mapper; + } +} diff --git a/base/src/main/java/com/tinyengine/it/common/utils/OffsetDateTimeDeserializer.java b/base/src/main/java/com/tinyengine/it/common/utils/OffsetDateTimeDeserializer.java new file mode 100644 index 00000000..e8e36ab4 --- /dev/null +++ b/base/src/main/java/com/tinyengine/it/common/utils/OffsetDateTimeDeserializer.java @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2023 - present TinyEngine Authors. + * Copyright (c) 2023 - present Huawei Cloud Computing Technologies Co., Ltd. + * + * Use of this source code is governed by an MIT-style license. + * + * THE OPEN SOURCE SOFTWARE IN THIS PRODUCT IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, + * BUT WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR + * A PARTICULAR PURPOSE. SEE THE APPLICABLE LICENSES FOR MORE DETAILS. + * + */ + +package com.tinyengine.it.common.utils; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import org.springframework.util.StringUtils; + +import java.io.IOException; +import java.time.LocalDateTime; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.temporal.TemporalAccessor; + +/** + * The type offset date time Deserializer. + * + * @since 2025-06-19 + */ +public class OffsetDateTimeDeserializer extends JsonDeserializer { + private static final DateTimeFormatter ISO_8601_FORMATTER; + + public OffsetDateTimeDeserializer() { + } + + /** + * To Deserialize. + * + * @param jsonParser the jsonParser + * @param deserializationContext the deserializationContext + * @return OffsetDateTime yhe OffsetDateTime + */ + @Override + public OffsetDateTime deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException { + if (StringUtils.isEmpty(jsonParser.getText())) { + return null; + } else { + TemporalAccessor temporalAccessor = ISO_8601_FORMATTER.parseBest(jsonParser.getText(), ZonedDateTime::from, LocalDateTime::from); + if (temporalAccessor instanceof ZonedDateTime) { + return ((ZonedDateTime) temporalAccessor).toOffsetDateTime(); + } else { + return temporalAccessor instanceof LocalDateTime ? ((LocalDateTime) temporalAccessor).atOffset(ZoneOffset.UTC) : null; + } + } + + } + + static { + ISO_8601_FORMATTER = (new DateTimeFormatterBuilder().parseCaseInsensitive() + .append(DateTimeFormatter.ISO_LOCAL_DATE).optionalStart() + .appendLiteral('T').optionalEnd().optionalStart().appendLiteral(' ').optionalEnd() + .append(DateTimeFormatter.ISO_LOCAL_TIME).optionalStart().appendOffsetId().optionalEnd().toFormatter()); + } +} diff --git a/base/src/main/java/com/tinyengine/it/common/utils/SecurityFileCheckUtil.java b/base/src/main/java/com/tinyengine/it/common/utils/SecurityFileCheckUtil.java index deae55e3..820315ab 100644 --- a/base/src/main/java/com/tinyengine/it/common/utils/SecurityFileCheckUtil.java +++ b/base/src/main/java/com/tinyengine/it/common/utils/SecurityFileCheckUtil.java @@ -12,7 +12,6 @@ package com.tinyengine.it.common.utils; import cn.hutool.core.util.ObjectUtil; -import com.fasterxml.jackson.databind.ObjectMapper; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.exception.ServiceException; import org.springframework.util.StringUtils; @@ -190,10 +189,9 @@ private static String getFileName(String filePath) { * @param file the file */ public static void isValidJson(MultipartFile file) { - ObjectMapper objectMapper = new ObjectMapper(); try { // 将 MultipartFile 转换为 InputStream 并解析 JSON - objectMapper.readTree(file.getInputStream()); + JsonUtils.MAPPER.readTree(file.getInputStream()); } catch (IOException e) { throw new ServiceException(ExceptionEnum.CM308.getResultCode(), ExceptionEnum.CM308.getResultMsg()); } diff --git a/base/src/main/java/com/tinyengine/it/common/utils/Utils.java b/base/src/main/java/com/tinyengine/it/common/utils/Utils.java index af23969c..b7836835 100644 --- a/base/src/main/java/com/tinyengine/it/common/utils/Utils.java +++ b/base/src/main/java/com/tinyengine/it/common/utils/Utils.java @@ -13,9 +13,6 @@ package com.tinyengine.it.common.utils; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.enums.Enums; import com.tinyengine.it.common.exception.ExceptionEnum; @@ -161,22 +158,6 @@ public static String toLine(String name) { return result.toString(); } - /** - * Convert map. - * - * @param obj the obj - * @return the map - */ - // 对象转map - public static Map convert(Object obj) { - ObjectMapper objectMapper = new ObjectMapper(); - - objectMapper.registerModule(new JavaTimeModule()); - objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); - // 将对象转换为 JSON 字符串，然后再解析为 Map - return objectMapper.convertValue(obj, Map.class); - } - /** * 解压并处理zip文件，把读取到的JSON文件内容以字符串返回 * @@ -386,9 +367,8 @@ public static Result parseJsonFileStream(MultipartFile file) { String jsonContent = new String(fileBytes, StandardCharsets.UTF_8); String jsonString = removeBOM(jsonContent); - ObjectMapper objectMapper = new ObjectMapper(); Map jsonData = - objectMapper.readValue(jsonString, new TypeReference>() { + JsonUtils.MAPPER.readValue(jsonString, new TypeReference>() { }); jsonFile.setFileName(fileName); diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockController.java b/base/src/main/java/com/tinyengine/it/controller/BlockController.java index 8665b243..d3b86c92 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockController.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.log.SystemControllerLog; +import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.mapper.BlockMapper; import com.tinyengine.it.mapper.TenantMapper; import com.tinyengine.it.model.dto.BlockBuildDto; @@ -33,6 +34,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +48,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -344,7 +349,7 @@ public Result> getBlockGroups(@Valid @RequestParam(required = false) /** * 修改block * - * @param blockParam blockParam + * @param request request * @param id id * @return block dto */ @@ -358,10 +363,14 @@ public Result> getBlockGroups(@Valid @RequestParam(required = false) }) @SystemControllerLog(description = "区块修改api") @PostMapping("/block/update/{id}") - public Result updateBlocks(@Valid @RequestBody BlockParam blockParam, @PathVariable Integer id, - @RequestParam(value = "appId", required = false) Integer appId) { + public Result updateBlocks(HttpServletRequest request, @PathVariable Integer id, + @RequestParam(value = "appId", required = false) Integer appId) throws IOException { + InputStream inputStream = request.getInputStream(); + String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + BlockParam blockParam = JsonUtils.decode(json, BlockParam.class); blockParam.setId(id); - return blockService.updateBlockById(blockParam, appId); + blockParam.setAppId(appId); + return blockService.updateBlockById(blockParam); } /** diff --git a/base/src/main/java/com/tinyengine/it/controller/PageController.java b/base/src/main/java/com/tinyengine/it/controller/PageController.java index 208c7baa..1b81d6ed 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageController.java @@ -13,6 +13,7 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.log.SystemControllerLog; +import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.model.dto.PreviewDto; import com.tinyengine.it.model.dto.PreviewParam; import com.tinyengine.it.model.entity.Page; @@ -26,6 +27,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +40,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.List; /** @@ -135,7 +139,7 @@ public Result createPage(@Valid @RequestBody Page page) throws Exception { /** * 修改页面 * - * @param page the page + * @param request the request * @return result * @throws Exception the exception */ @@ -148,7 +152,10 @@ public Result createPage(@Valid @RequestBody Page page) throws Exception { }) @SystemControllerLog(description = "修改页面") @PostMapping("/pages/update/{id}") - public Result updatePage(@RequestBody Page page) throws Exception { + public Result updatePage(HttpServletRequest request) throws Exception { + InputStream inputStream = request.getInputStream(); + String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + Page page = JsonUtils.decode(json, Page.class); page.setLastUpdatedTime(null); page.setCreatedTime(null); page.setLastUpdatedBy(null); diff --git a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java index b156c418..c32f7c9f 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java @@ -16,6 +16,7 @@ import com.tinyengine.it.common.base.PageQueryVo; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.log.SystemControllerLog; +import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.model.dto.PublishedPageVo; import com.tinyengine.it.model.entity.PageHistory; import com.tinyengine.it.service.app.PageHistoryService; @@ -26,7 +27,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -38,6 +39,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.regex.Pattern; @@ -124,7 +127,7 @@ public Result getPageHistoryById(@PathVariable Integer historyId) { /** * 创建页面历史记录 * - * @param pageHistory the page history + * @param request the request * @return result */ @Operation(summary = "创建页面历史记录", description = "创建页面历史记录", parameters = { @@ -136,17 +139,19 @@ public Result getPageHistoryById(@PathVariable Integer historyId) { }) @SystemControllerLog(description = "创建页面历史记录") @PostMapping("/pages/history/create") - public Result createPageHistory(@Valid @RequestBody PageHistory pageHistory) { - PageHistory result; + public Result createPageHistory(HttpServletRequest request) throws Exception { + InputStream inputStream = request.getInputStream(); + String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + PageHistory pageHistory = JsonUtils.decode(json, PageHistory.class); if (pageHistory.getPage() != null && Pattern.matches("^[0-9]+$", pageHistory.getPage().toString()) && pageHistory.getPageContent() != null) { pageHistoryService.createPageHistory(pageHistory); int historyId = pageHistory.getId(); - result = pageHistoryService.findPageHistoryById(historyId); + pageHistory = pageHistoryService.findPageHistoryById(historyId); } else { return Result.failed("The request body is missing some parameters"); } - return Result.success(result); + return Result.success(pageHistory); } /** diff --git a/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java b/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java index f490d1fd..f9bdd642 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java @@ -14,6 +14,7 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.log.SystemControllerLog; +import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.model.entity.PageTemplate; import com.tinyengine.it.service.app.PageTemplateService; @@ -23,7 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -35,6 +36,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; import java.util.List; /** @@ -59,7 +62,7 @@ public class PageTemplateController { /** * 创建pageTemplate * - * @param pageTemplate pageTemplate + * @param request request * @return pageTemplate信息 */ @Operation(summary = "创建页面模版", description = "创建页面模版", parameters = { @@ -71,7 +74,10 @@ public class PageTemplateController { }) @SystemControllerLog(description = "创建页面模版") @PostMapping("/page-template/create") - public Result createPageTemplate(@Valid @RequestBody PageTemplate pageTemplate) { + public Result createPageTemplate(HttpServletRequest request) throws Exception { + InputStream inputStream = request.getInputStream(); + String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + PageTemplate pageTemplate = JsonUtils.decode(json, PageTemplate.class); return pageTemplateService.createPageTemplate(pageTemplate); } diff --git a/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java b/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java index 0433f3b2..1f4c9bbb 100644 --- a/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java +++ b/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java @@ -12,20 +12,21 @@ package com.tinyengine.it.gateway.ai; -import static com.tinyengine.it.common.exception.ExceptionEnum.CM322; - -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.exception.ServiceException; +import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.config.AiChatConfig; import com.tinyengine.it.model.dto.AiParam; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import reactor.core.publisher.Mono; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; import java.util.Collections; import java.util.Map; @@ -38,7 +39,9 @@ @Slf4j public class AiChatClient { private final Map config; - private WebClient webClient; + // 新增 Setter 方法，便于测试时注入 Mock 对象 + @Setter + private RestTemplate restTemplate; /** * Instantiates a new Ai chat client. @@ -47,8 +50,8 @@ public class AiChatClient { */ public AiChatClient(String model, String token) { this.config = AiChatConfig.getAiChatConfig(model, token); - // Optional: Default base URL - this.webClient = WebClient.builder().baseUrl("https://default.api.url").build(); + // Use RestTemplate for WebMVC + this.restTemplate = new RestTemplate(); } /** @@ -72,26 +75,12 @@ public Map executeChatRequest(AiParam openAiBodyDto) { log.info("Headers: " + configData.headers); HttpMethod method = "POST".equalsIgnoreCase(httpRequestOption.method) ? HttpMethod.POST : HttpMethod.GET; - WebClient.RequestHeadersSpec requestSpec = webClient.method(method).uri(httpRequestUrl); - - for (Map.Entry header : configData.headers.entrySet()) { - requestSpec.header(header.getKey(), header.getValue()); - } + HttpHeaders headers = new HttpHeaders(); + configData.headers.forEach(headers::set); - if ("POST".equalsIgnoreCase(httpRequestOption.method) && !openAiBodyDto.getMessages().isEmpty()) { - if (requestSpec instanceof WebClient.RequestBodySpec) { - requestSpec = ((WebClient.RequestBodySpec) requestSpec).bodyValue(openAiBodyDto); - // Add request body - } - } - - Mono stringMono = requestSpec.retrieve().bodyToMono(String.class); - return stringMono.map(response -> { - try { - return new ObjectMapper().readValue(response, new TypeReference>() {}); - } catch (JsonProcessingException e) { - throw new ServiceException(CM322.getResultCode(), e.getMessage()); - } - }).block(); // 等待结果 + HttpEntity entity = new HttpEntity<>(openAiBodyDto, headers); + ResponseEntity responseEntity = restTemplate.exchange(httpRequestUrl, method, entity, String.class); + return JsonUtils.decode(responseEntity.getBody(), new TypeReference>() {}); } -} + +} \ No newline at end of file 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 f258e5d3..cc305cc2 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 @@ -16,12 +16,12 @@ 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; import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.enums.Enums; import com.tinyengine.it.common.exception.ExceptionEnum; import com.tinyengine.it.common.exception.ServiceException; import com.tinyengine.it.common.log.SystemServiceLog; +import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.common.utils.SecurityFileCheckUtil; import com.tinyengine.it.common.utils.Utils; import com.tinyengine.it.mapper.I18nEntryMapper; @@ -492,12 +492,11 @@ public List parseZipFileStream(MultipartFile file) throws Exception */ public List parseZip(FileInfo fileInfo) throws ServiceException { List entriesItems = new ArrayList<>(); - ObjectMapper objectMapper = new ObjectMapper(); if (!fileInfo.getIsDirectory()) { EntriesItem entriesItem = setLang(fileInfo.getName()); // 处理 JSON 内容 try { - Map jsonData = objectMapper.readValue(fileInfo.getContent(), + Map jsonData = JsonUtils.MAPPER.readValue(fileInfo.getContent(), new TypeReference>() {}); entriesItem.setEntries(Utils.flat(jsonData)); } catch (JsonProcessingException e) { diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java index b7f60f03..d2846ed0 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java @@ -12,8 +12,10 @@ package com.tinyengine.it.service.app.impl.v1; +import static com.tinyengine.it.common.utils.JsonUtils.convertValue; import static com.tinyengine.it.common.utils.Utils.findMaxVersion; +import com.fasterxml.jackson.core.type.TypeReference; import com.tinyengine.it.common.exception.ServiceException; import com.tinyengine.it.common.log.SystemServiceLog; import com.tinyengine.it.common.utils.Schema; @@ -235,7 +237,7 @@ private void mergeMaps(Map source, Map target) { private SchemaMeta getSchemaMeta(MetaDto metaDto) { App metaDtoApp = metaDto.getApp(); - Map appData = Utils.convert(metaDtoApp); + Map appData = convertValue(metaDtoApp, new TypeReference>() {}); Map config = new HashMap<>(); config.put("sdkVersion", "1.0.3"); config.put("historyMode", "hash"); @@ -464,7 +466,7 @@ public List getSchemaComponentsTree(MetaDto metaDto) { resKeys.add("is_page"); resKeys.add("is_default"); for (Page pageInfo : pageList) { - Map data = Utils.convert(pageInfo); + Map data = convertValue(pageInfo, new TypeReference>() {}); boolean isToLine = false; Map page = formatDataFields(data, resKeys, isToLine); if (app.getHomePage() != null) { 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 efc62c24..0b14e77c 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 @@ -65,11 +65,11 @@ public interface BlockService extends IService { /** * 根据主键id更新表t_block信息 - * @param appId appId + * * @param blockParam the block param * @return the BlockDto */ - Result updateBlockById(BlockParam blockParam, Integer appId); + Result updateBlockById(BlockParam blockParam); /** * 新增表t_block数据 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 20191322..5ac83521 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 @@ -19,12 +19,12 @@ 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; 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.common.exception.ExceptionEnum; import com.tinyengine.it.common.log.SystemServiceLog; +import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.mapper.AppMapper; import com.tinyengine.it.mapper.BlockGroupBlockMapper; import com.tinyengine.it.mapper.BlockGroupMapper; @@ -160,11 +160,10 @@ public Integer deleteBlockById(Integer id) { * 根据主键id更新表t_block数据 * * @param blockParam blockParam - * @param appId * @return blockDto */ @Override - public Result updateBlockById(BlockParam blockParam, Integer appId) { + public Result updateBlockById(BlockParam blockParam) { if (blockParam == null || blockParam.getId() == null) { return Result.failed(ExceptionEnum.CM002); } @@ -172,7 +171,7 @@ public Result updateBlockById(BlockParam blockParam, Integer appId) { if (blockResult == null) { return Result.failed(ExceptionEnum.CM001); } - if (!Objects.equals(blockResult.getAppId(), appId)) { + if (!Objects.equals(blockResult.getAppId(), blockParam.getAppId())) { return Result.failed(ExceptionEnum.CM007); } // 把前端传参赋值给实体 @@ -277,10 +276,9 @@ public Result createBlock(BlockParam blockParam) { */ public Map> getBlockAssets(Map pageContent, String framework) { List block = new ArrayList<>(); - ObjectMapper objectMapper = new ObjectMapper(); try { - traverseBlocks(objectMapper.writeValueAsString(pageContent), block); + traverseBlocks(JsonUtils.MAPPER.writeValueAsString(pageContent), block); } catch (JsonProcessingException e) { log.error(e.getMessage()); } @@ -350,23 +348,22 @@ public List getBlockInfo(List block, String framework) { * @throws JsonProcessingException the json processing exception */ public void traverseBlocks(String content, List block) throws JsonProcessingException { - ObjectMapper objectMapper = new ObjectMapper(); - JsonNode jsonNode = objectMapper.readTree(content); + JsonNode jsonNode = JsonUtils.MAPPER.readTree(content); // 判断传过来的参数是JSON数组还是JSON对象 if (content != null && jsonNode.isArray()) { - List schema = objectMapper.readValue(content, List.class); + List schema = JsonUtils.MAPPER.readValue(content, List.class); for (Object prop : schema) { - traverseBlocks(objectMapper.writeValueAsString(prop), block); + traverseBlocks(JsonUtils.MAPPER.writeValueAsString(prop), block); } } else { - Map schemaMap = objectMapper.readValue(content, Map.class); + Map schemaMap = JsonUtils.MAPPER.readValue(content, Map.class); if (isBlock(schemaMap) && !block.contains(schemaMap.get("componentName"))) { if (schemaMap.get("componentName") instanceof String) { block.add((String) schemaMap.get("componentName")); } } if (schemaMap.containsKey("children") && schemaMap.get("children") instanceof List) { - traverseBlocks(objectMapper.writeValueAsString(schemaMap.get("children")), block); + traverseBlocks(JsonUtils.MAPPER.writeValueAsString(schemaMap.get("children")), block); } } } @@ -563,8 +560,9 @@ public Result deploy(BlockBuildDto blockBuildDto) { blockParam.setLatestHistoryId(blockHistory); blockParam.setLatestVersion(blockHistory.getVersion()); blockParam.setId(blockDto.getId()); + blockParam.setAppId(blockDto.getAppId()); blockParam.setGroups(null); - return updateBlockById(blockParam, blockDto.getAppId()); + return updateBlockById(blockParam); } catch (Exception e) { return Result.failed(ExceptionEnum.CM001); } 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 ccf1f334..14d50aa0 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 @@ -147,7 +147,8 @@ public Result readFileAndBulkCreate(MultipartFile file) { componentLibrary.setIsOfficial(true); ComponentLibrary library = new ComponentLibrary(); library.setName(componentLibrary.getName()); - library.setVersion(componentLibrary.getVersion()); + // 默认覆盖更新 其他业务需求多版本组件可放开 + // library.setVersion(componentLibrary.getVersion()); // 查询是否存在组件库 List componentLibraryList = componentLibraryMapper.queryComponentLibraryByCondition( library); diff --git a/base/src/test/java/com/tinyengine/it/common/utils/UtilsTest.java b/base/src/test/java/com/tinyengine/it/common/utils/UtilsTest.java index c3171e2d..b32bc49a 100644 --- a/base/src/test/java/com/tinyengine/it/common/utils/UtilsTest.java +++ b/base/src/test/java/com/tinyengine/it/common/utils/UtilsTest.java @@ -62,14 +62,6 @@ void testToLine() { assertEquals("name", result); } - @Test - void testConvert() { - Map mapData = new HashMap(); - mapData.put("key", "value"); - Map result = Utils.convert(mapData); - assertEquals("value", result.get("key")); - } - @Test void testFlat() { Map mapData = new HashMap(); diff --git a/base/src/test/java/com/tinyengine/it/controller/BlockControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/BlockControllerTest.java index 2372099d..c16c54dd 100644 --- a/base/src/test/java/com/tinyengine/it/controller/BlockControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/BlockControllerTest.java @@ -13,7 +13,6 @@ package com.tinyengine.it.controller; import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; @@ -40,7 +39,10 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.mock.web.MockHttpServletRequest; +import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -194,17 +196,18 @@ void testGetAllBlockCategories() { } @Test - void testUpdateBlocks() { + void testUpdateBlocks() throws IOException { BlockParam blockParam = new BlockParam(); blockParam.setName("Updated Block"); BlockDto returnData = new BlockDto(); returnData.setName("Updated Block"); - when(blockService.updateBlockById(any(BlockParam.class), anyInt())).thenReturn(Result.success(returnData)); + when(blockService.updateBlockById(any(BlockParam.class))).thenReturn(Result.success(returnData)); when(blockService.queryBlockById(anyInt())).thenReturn(returnData); - - Result result = blockController.updateBlocks(blockParam, Integer.valueOf(0), Integer.valueOf(1)); + String json = "{\"isDefault\":true}"; + MockHttpServletRequest request = new MockHttpServletRequest(); + request.setContent(json.getBytes(StandardCharsets.UTF_8)); // 设置请求体 + request.setContentType("application/json"); + Result result = blockController.updateBlocks(request, Integer.valueOf(0), Integer.valueOf(1)); Assertions.assertEquals(returnData, result.getData()); - verify(blockService).updateBlockById( - argThat(param -> param.getName().equals("Updated Block") && param.getId().equals(0)), eq(1)); } } diff --git a/base/src/test/java/com/tinyengine/it/controller/PageControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/PageControllerTest.java index 04758f1e..403c8e34 100644 --- a/base/src/test/java/com/tinyengine/it/controller/PageControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/PageControllerTest.java @@ -27,7 +27,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.mock.web.MockHttpServletRequest; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; @@ -79,10 +81,13 @@ void testCreatePage() throws Exception { @Test void testUpdatePage() throws Exception { when(pageService.updatePage(any(Page.class))).thenReturn(new Result()); - + String json = "{\"isPage\":true}"; + MockHttpServletRequest request = new MockHttpServletRequest(); + request.setContent(json.getBytes(StandardCharsets.UTF_8)); // 设置请求体 + request.setContentType("application/json"); Page page = new Page(); page.setIsPage(true); - Result result = pageController.updatePage(page); + Result result = pageController.updatePage(request); Assertions.assertNull(result.getData()); } diff --git a/base/src/test/java/com/tinyengine/it/controller/PageHistoryControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/PageHistoryControllerTest.java index 86a942ef..b66dfb58 100644 --- a/base/src/test/java/com/tinyengine/it/controller/PageHistoryControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/PageHistoryControllerTest.java @@ -26,7 +26,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.mock.web.MockHttpServletRequest; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -67,15 +69,18 @@ void testGetPageHistoryById() { } @Test - void testCreatePageHistory() { + void testCreatePageHistory() throws Exception { PageHistory mockData = new PageHistory(); mockData.setPage(1); mockData.setId(1); mockData.setPageContent(new HashMap<>()); when(pageHistoryService.findPageHistoryById(anyInt())).thenReturn(mockData); - when(pageHistoryService.createPageHistory(any(PageHistory.class))).thenReturn(Integer.valueOf(0)); - - Result result = pageHistoryController.createPageHistory(mockData); + when(pageHistoryService.createPageHistory(any(PageHistory.class))).thenReturn(1); + String json = "{\"id\": 1, \"page\": 1, \"isPage\": true, \"page_content\": {\"id\": 1}}"; + MockHttpServletRequest request = new MockHttpServletRequest(); + request.setContent(json.getBytes(StandardCharsets.UTF_8)); // 设置请求体 + request.setContentType("application/json"); + Result result = pageHistoryController.createPageHistory(request); Assertions.assertEquals(mockData, result.getData()); } diff --git a/base/src/test/java/com/tinyengine/it/controller/PageTemplateControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/PageTemplateControllerTest.java index 243a2f71..7696d4ee 100644 --- a/base/src/test/java/com/tinyengine/it/controller/PageTemplateControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/PageTemplateControllerTest.java @@ -27,7 +27,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.mock.web.MockHttpServletRequest; +import java.nio.charset.StandardCharsets; import java.util.List; /** @@ -47,11 +49,14 @@ void setUp() { } @Test - void testCreatePageTemplate() { + void testCreatePageTemplate() throws Exception { when(pageTemplateService.createPageTemplate(any(PageTemplate.class))) .thenReturn(new Result()); - - Result result = pageTemplateController.createPageTemplate(new PageTemplate()); + String json = "{\"isPage\":true}"; + MockHttpServletRequest request = new MockHttpServletRequest(); + request.setContent(json.getBytes(StandardCharsets.UTF_8)); // 设置请求体 + request.setContentType("application/json"); + Result result = pageTemplateController.createPageTemplate(request); Assertions.assertEquals(new Result(), result); } diff --git a/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java b/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java index 7918bc4e..7f829d04 100644 --- a/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java +++ b/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java @@ -12,9 +12,13 @@ package com.tinyengine.it.gateway.ai; +import static javax.management.Query.eq; +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.tinyengine.it.common.utils.TestUtil; @@ -22,8 +26,6 @@ import com.tinyengine.it.model.dto.AiMessages; import com.tinyengine.it.model.dto.AiParam; -import reactor.core.publisher.Mono; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -31,11 +33,13 @@ import org.mockito.InjectMocks; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; -import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; -import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -45,52 +49,51 @@ * @since 2024-10-29 */ class AiChatClientTest { - @InjectMocks - private AiChatClient aiChatClient; - @BeforeEach void setUp() { MockitoAnnotations.openMocks(this); } @Test - void testExecuteChatRequest() throws NoSuchFieldException, IllegalAccessException { - HashMap headers = new HashMap() { - { - put("headers", "headers"); - } - }; + void testExecuteChatRequest() { + // 1. 构造测试数据 String modelName = "ERNIE-4.0-8K"; + Map headers = new HashMap<>(); + headers.put("Content-Type", "application/json"); + AiChatConfig.HttpRequestOption option = new AiChatConfig.HttpRequestOption("POST", "json", "json", 100); - AiChatConfig.AiChatConfigData configData = new AiChatConfig.AiChatConfigData("httpRequestUrl", option, headers, - null); - Map config = new HashMap<>(); - config.put(modelName, configData); - WebClient mockClient = Mockito.mock(WebClient.class, Answers.RETURNS_DEEP_STUBS); - WebClient.RequestBodyUriSpec bodyUriSpec = Mockito.mock(WebClient.RequestBodyUriSpec.class, RETURNS_DEEP_STUBS); - Mono mono = Mockito.mock(Mono.class, RETURNS_DEEP_STUBS); - Map result = new HashMap<>(); - result.put("data", "data"); - when(mono.map(any()).block()).thenReturn(result); - when(mockClient.method(any(HttpMethod.class)).uri(anyString())).thenReturn(bodyUriSpec); - WebClient.RequestHeadersSpec headersSpec = Mockito.mock(WebClient.RequestHeadersSpec.class, RETURNS_DEEP_STUBS); - when(bodyUriSpec.bodyValue(any())).thenReturn(headersSpec); - when(headersSpec.retrieve().bodyToMono(String.class)).thenReturn(mono); + AiChatConfig.AiChatConfigData configData = new AiChatConfig.AiChatConfigData( + "http://mock-api-url", option, headers, null); + + // 2. 构造 AiParam 请求参数 + Map foundationModel = new HashMap<>(); + foundationModel.put("model", modelName); + foundationModel.put("token", "mock-token"); + + AiMessages message = new AiMessages(); + message.setRole("user"); + message.setContent("Hello, AI!"); + AiParam param = new AiParam(foundationModel, Collections.singletonList(message)); + + // 3. Mock RestTemplate 的行为 + RestTemplate mockRestTemplate = Mockito.mock(RestTemplate.class); + ResponseEntity mockResponse = new ResponseEntity<>( + "{\"data\":\"mock-response\"}", HttpStatus.OK); + + // 关键点：设置 Mock 行为，匹配任意参数 + when(mockRestTemplate.exchange( + anyString(), // 任意 URL + any(HttpMethod.class), // 任意 HTTP 方法 + any(HttpEntity.class), // 任意请求体 + any(Class.class) // 任意返回类型（如 String.class） + )).thenReturn(mockResponse); - HashMap foundationModel = new HashMap<>(); - foundationModel.put("model", "ERNIE-4.0-8K"); - foundationModel.put("token", "asdf"); + // 4. 创建 AiChatClient 并注入 Mock 的 RestTemplate + AiChatClient aiChatClient = new AiChatClient("ERNIE-4.0-8K", "mock-token"); + aiChatClient.setRestTemplate(mockRestTemplate); - ArrayList messages = new ArrayList<>(); - AiMessages aiMessages = new AiMessages(); - aiMessages.setContent("dddd编码时遵从以下几条要求aaa"); - aiMessages.setName("John"); - aiMessages.setRole("user"); - messages.add(aiMessages); - AiParam param = new AiParam(foundationModel, Arrays.asList(aiMessages)); - TestUtil.setPrivateValue(aiChatClient, "config", config); - TestUtil.setPrivateValue(aiChatClient, "webClient", mockClient); - Map returnData = aiChatClient.executeChatRequest(param); - Assertions.assertEquals("data", returnData.get("data")); + // 5. 调用方法并验证结果 + Map result = aiChatClient.executeChatRequest(param); + assertEquals("mock-response", result.get("data")); // 验证返回的数据 } -} +} \ No newline at end of file diff --git a/base/src/test/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImplTest.java b/base/src/test/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImplTest.java index 469b210b..02a1d11b 100644 --- a/base/src/test/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImplTest.java +++ b/base/src/test/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImplTest.java @@ -18,7 +18,7 @@ import static org.mockito.Mockito.when; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.mapper.AppExtensionMapper; import com.tinyengine.it.mapper.AppMapper; import com.tinyengine.it.mapper.BlockGroupMapper; @@ -116,8 +116,7 @@ void testAppSchema() throws JsonProcessingException { String json = "{\"dataHandler\":{\"type\":\"JSFunction\",\"value\":\"function dataHanlder(res){\\n return res;\\n}\"}}"; - ObjectMapper objectMapper = new ObjectMapper(); - Map dataSourceGlobal = objectMapper.readValue(json, Map.class); + Map dataSourceGlobal = JsonUtils.MAPPER.readValue(json, Map.class); app.setDataSourceGlobal(dataSourceGlobal); when(appMapper.queryAppById(anyInt())).thenReturn(app); 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 e561482e..57e3c6c0 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 @@ -138,13 +138,14 @@ void testCreateBlock() { @Test void testUpdateBlockById() { BlockParam blockParam = new BlockParam(); + blockParam.setAppId(1); when(blockMapper.updateBlockById(any())).thenReturn(1); when(blockMapper.findBlockAndGroupAndHistoByBlockId(anyInt())).thenReturn(new BlockDto()); Block block = new Block(); block.setAppId(1); when(blockMapper.queryBlockById(blockParam.getId())).thenReturn(block); - Result result = blockServiceImpl.updateBlockById(blockParam, 1); + Result result = blockServiceImpl.updateBlockById(blockParam); Assertions.assertEquals(null, result.getData()); } diff --git a/pom.xml b/pom.xml index c6d4b3b3..be68c86c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,9 +30,10 @@ 3.3.3 2.3.32 2.5.4 - 2.5.0 + 2.5.0 4.11.0 6.1.0 + 4.1.118.Final 1.0-SNAPSHOT @@ -42,7 +43,7 @@ org.springframework.boot - spring-boot-starter-webflux + spring-boot-starter-web org.springframework.boot @@ -102,8 +103,8 @@ org.springdoc - springdoc-openapi-starter-webflux-ui - ${springdoc-openapi-starter-webflux-ui.version} + springdoc-openapi-starter-webmvc-ui + ${springdoc-openapi-starter-webmvc-ui.version} @@ -129,6 +130,11 @@ test ${mockito-inline.version} + + io.netty + netty-buffer + ${netty-buffer-version} + org.junit.vintage junit-vintage-engine From 3fb5982003ea2cc6cc37f9b2ed646b1ebb968745 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Fri, 20 Jun 2025 02:41:57 -0700 Subject: [PATCH 07/12] feat: Add JsonUtils and modify related methods --- .../tinyengine/it/common/utils/JsonUtils.java | 19 ++++++---- .../it/controller/BlockController.java | 13 ++++++- .../it/controller/PageController.java | 37 ++++++++++++------- .../it/controller/PageHistoryController.java | 16 +++++++- .../it/controller/PageTemplateController.java | 13 ++++++- 5 files changed, 74 insertions(+), 24 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java b/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java index bb2c2f1e..ea72cb32 100644 --- a/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java +++ b/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java @@ -69,7 +69,7 @@ private static T invoke(Callable callable) { return callable.call(); } catch (Exception var2) { Exception e = var2; - throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg()); + throw new ServiceException(ExceptionEnum.CM001.getResultCode(), ExceptionEnum.CM001.getResultMsg() + e.getMessage()); } } @@ -304,29 +304,34 @@ public static T convertValue(Object fromValue, TypeReference toValueType) } /** - * To get List. + * Converts various input types (String, Array, List) to a trimmed List of Strings. * * @param inputs the inputs - * @return the List + * @return List of trimmed strings, empty list if input is null or unsupported type */ public static List getList(Object inputs) { if (inputs == null) { return Collections.emptyList(); } - // 处理 Array → List + // Handle Array → List if (inputs.getClass().isArray()) { - inputs = Arrays.asList((Object[]) inputs); + if (inputs instanceof Object[]) { + inputs = Arrays.asList((Object[]) inputs); + } else { + // Handle primitive arrays by converting to string representation + inputs = Collections.singletonList(inputs.toString()); + } } - // 处理 String → List + // Handle String → List if (inputs instanceof String) { return Arrays.stream(((String) inputs).split(",")) .map(String::trim) .collect(Collectors.toList()); } - // 处理 List → List + // Handle List → List if (inputs instanceof List) { return ((List) inputs).stream() .map(Object::toString) diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockController.java b/base/src/main/java/com/tinyengine/it/controller/BlockController.java index d3b86c92..bbcfa8dd 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockController.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.tinyengine.it.common.base.Result; +import com.tinyengine.it.common.enums.Enums; import com.tinyengine.it.common.log.SystemControllerLog; import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.mapper.BlockMapper; @@ -365,9 +366,19 @@ public Result> getBlockGroups(@Valid @RequestParam(required = false) @PostMapping("/block/update/{id}") public Result updateBlocks(HttpServletRequest request, @PathVariable Integer id, @RequestParam(value = "appId", required = false) Integer appId) throws IOException { + // Validate content type + String contentType = request.getContentType(); + if (contentType == null || !contentType.contains(Enums.FileType.JSON.getValue())) { + return Result.failed("Content-Type must be application/json"); + } InputStream inputStream = request.getInputStream(); String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); - BlockParam blockParam = JsonUtils.decode(json, BlockParam.class); + BlockParam blockParam = null; + try { + blockParam = JsonUtils.decode(json, BlockParam.class); + } catch (Exception e) { + return Result.failed("Invalid JSON format: " + e.getMessage()); + } blockParam.setId(id); blockParam.setAppId(appId); return blockService.updateBlockById(blockParam); diff --git a/base/src/main/java/com/tinyengine/it/controller/PageController.java b/base/src/main/java/com/tinyengine/it/controller/PageController.java index 1b81d6ed..c2166b9c 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageController.java @@ -12,6 +12,7 @@ package com.tinyengine.it.controller; import com.tinyengine.it.common.base.Result; +import com.tinyengine.it.common.enums.Enums; import com.tinyengine.it.common.log.SystemControllerLog; import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.model.dto.PreviewDto; @@ -40,6 +41,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.List; @@ -152,19 +154,28 @@ public Result createPage(@Valid @RequestBody Page page) throws Exception { }) @SystemControllerLog(description = "修改页面") @PostMapping("/pages/update/{id}") - public Result updatePage(HttpServletRequest request) throws Exception { - InputStream inputStream = request.getInputStream(); - String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); - Page page = JsonUtils.decode(json, Page.class); - page.setLastUpdatedTime(null); - page.setCreatedTime(null); - page.setLastUpdatedBy(null); - if (page.getIsPage()) { - // 更新页面 - return pageService.updatePage(page); - } else { - // 更新文件夹 - return pageService.update(page); + public Result updatePage(HttpServletRequest request) throws IOException { + // Validate content type + String contentType = request.getContentType(); + if (contentType == null || !contentType.contains(Enums.FileType.JSON.getValue())) { + return Result.failed("Content-Type must be application/json"); + } + try (InputStream inputStream = request.getInputStream()) { + String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + Page page = JsonUtils.decode(json, Page.class); + page.setLastUpdatedTime(null); + page.setLastUpdatedTime(null); + page.setCreatedTime(null); + page.setLastUpdatedBy(null); + if (page.getIsPage()) { + // 更新页面 + return pageService.updatePage(page); + } else { + // 更新文件夹 + return pageService.update(page); + } + } catch (IOException e) { + return Result.failed("Failed to read request body: " + e.getMessage()); } } diff --git a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java index c32f7c9f..bce7300a 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java @@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.tinyengine.it.common.base.PageQueryVo; import com.tinyengine.it.common.base.Result; +import com.tinyengine.it.common.enums.Enums; import com.tinyengine.it.common.log.SystemControllerLog; import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.model.dto.PublishedPageVo; @@ -39,6 +40,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.List; @@ -139,10 +141,20 @@ public Result getPageHistoryById(@PathVariable Integer historyId) { }) @SystemControllerLog(description = "创建页面历史记录") @PostMapping("/pages/history/create") - public Result createPageHistory(HttpServletRequest request) throws Exception { + public Result createPageHistory(HttpServletRequest request) throws IOException { + // Validate content type + String contentType = request.getContentType(); + if (contentType == null || !contentType.contains(Enums.FileType.JSON.getValue())) { + return Result.failed("Content-Type must be application/json"); + } InputStream inputStream = request.getInputStream(); String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); - PageHistory pageHistory = JsonUtils.decode(json, PageHistory.class); + PageHistory pageHistory = null; + try { + pageHistory = JsonUtils.decode(json, PageHistory.class); + } catch (Exception e) { + return Result.failed("Invalid JSON format: " + e.getMessage()); + } if (pageHistory.getPage() != null && Pattern.matches("^[0-9]+$", pageHistory.getPage().toString()) && pageHistory.getPageContent() != null) { pageHistoryService.createPageHistory(pageHistory); diff --git a/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java b/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java index f9bdd642..53cb2342 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java @@ -13,6 +13,7 @@ package com.tinyengine.it.controller; import com.tinyengine.it.common.base.Result; +import com.tinyengine.it.common.enums.Enums; import com.tinyengine.it.common.log.SystemControllerLog; import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.model.entity.PageTemplate; @@ -75,9 +76,19 @@ public class PageTemplateController { @SystemControllerLog(description = "创建页面模版") @PostMapping("/page-template/create") public Result createPageTemplate(HttpServletRequest request) throws Exception { + // Validate content type + String contentType = request.getContentType(); + if (contentType == null || !contentType.contains(Enums.FileType.JSON.getValue())) { + return Result.failed("Content-Type must be application/json"); + } InputStream inputStream = request.getInputStream(); String json = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); - PageTemplate pageTemplate = JsonUtils.decode(json, PageTemplate.class); + PageTemplate pageTemplate = null; + try { + pageTemplate = JsonUtils.decode(json, PageTemplate.class); + } catch (Exception e) { + return Result.failed("Invalid JSON format: " + e.getMessage()); + } return pageTemplateService.createPageTemplate(pageTemplate); } From 4aacc25c24a05565bfdd0f71a4d6a39a49f46a45 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Thu, 26 Jun 2025 18:49:13 -0700 Subject: [PATCH 08/12] fix: Modify code format --- .../java/com/tinyengine/it/gateway/ai/AiChatClient.java | 4 +--- .../com/tinyengine/it/gateway/ai/AiChatClientTest.java | 8 -------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java b/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java index 1f4c9bbb..5e5b47ae 100644 --- a/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java +++ b/base/src/main/java/com/tinyengine/it/gateway/ai/AiChatClient.java @@ -13,8 +13,6 @@ package com.tinyengine.it.gateway.ai; import com.fasterxml.jackson.core.type.TypeReference; -import com.tinyengine.it.common.exception.ExceptionEnum; -import com.tinyengine.it.common.exception.ServiceException; import com.tinyengine.it.common.utils.JsonUtils; import com.tinyengine.it.config.AiChatConfig; import com.tinyengine.it.model.dto.AiParam; @@ -39,7 +37,7 @@ @Slf4j public class AiChatClient { private final Map config; - // 新增 Setter 方法，便于测试时注入 Mock 对象 + @Setter private RestTemplate restTemplate; diff --git a/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java b/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java index 7f829d04..428dccb0 100644 --- a/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java +++ b/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java @@ -12,25 +12,17 @@ package com.tinyengine.it.gateway.ai; -import static javax.management.Query.eq; import static org.junit.Assert.assertEquals; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.tinyengine.it.common.utils.TestUtil; import com.tinyengine.it.config.AiChatConfig; import com.tinyengine.it.model.dto.AiMessages; import com.tinyengine.it.model.dto.AiParam; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.Answers; -import org.mockito.InjectMocks; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.springframework.http.HttpEntity; From 6fa623a0d1c702f65b225f8211cb6646268912ab Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Thu, 26 Jun 2025 19:40:05 -0700 Subject: [PATCH 09/12] fix: Modify code format --- .../main/java/com/tinyengine/it/common/utils/JsonUtils.java | 2 +- .../it/service/material/impl/ComponentServiceImpl.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java b/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java index ea72cb32..2d5948d0 100644 --- a/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java +++ b/base/src/main/java/com/tinyengine/it/common/utils/JsonUtils.java @@ -244,7 +244,7 @@ public static T decode(ByteBuf src, Class valueType) { } catch (Throwable var5) { var6.addSuppressed(var5); } - throw var6; + throw new ServiceException(ExceptionEnum.CM001.getResultCode(),var6.getMessage()); } inputStream.close(); return var3; 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 14d50aa0..3e23828e 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 @@ -147,8 +147,7 @@ public Result readFileAndBulkCreate(MultipartFile file) { componentLibrary.setIsOfficial(true); ComponentLibrary library = new ComponentLibrary(); library.setName(componentLibrary.getName()); - // 默认覆盖更新 其他业务需求多版本组件可放开 - // library.setVersion(componentLibrary.getVersion()); + // 默认覆盖更新 其他业务需求多版本组件可放开 library.setVersion(componentLibrary.getVersion()); // 查询是否存在组件库 List componentLibraryList = componentLibraryMapper.queryComponentLibraryByCondition( library); @@ -376,7 +375,7 @@ private List buildComponentList(BundleDto bundleDto, List snippetMap = BeanUtil.beanToMap(snippet); component.setSnippets(Arrays.asList(snippetMap)); - if(Objects.isNull(component.getCategory())) { + if (Objects.isNull(component.getCategory())) { component.setCategory(child.getGroup()); } } From e599d34ca839d88df0743eaa931879be0667e4e1 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 8 Jul 2025 19:38:33 -0700 Subject: [PATCH 10/12] fix: Fix block update bug --- .../tinyengine/it/mapper/BlockGroupBlockMapper.java | 10 +++++++++- .../it/service/material/impl/BlockServiceImpl.java | 5 +++-- .../it/service/material/impl/BlockServiceImplTest.java | 5 +++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java b/base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java index 2318bb27..3fb854b8 100644 --- a/base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java +++ b/base/src/main/java/com/tinyengine/it/mapper/BlockGroupBlockMapper.java @@ -94,8 +94,16 @@ public interface BlockGroupBlockMapper extends BaseMapper { * 通过区块分组id和区块删除区块与分组关联关系 * @param blockId the block id * @param groupId the block group id - * @return the list + * @return the Integer */ @Delete("delete from r_block_group_block where block_group_id = #{groupId} and block_id = #{blockId}") Integer deleteByGroupIdAndBlockId(Integer groupId, Integer blockId); + + /** + * 通过区块id删除区块与分组关联关系 + * @param blockId the block id + * @return the Integer + */ + @Delete("delete from r_block_group_block where block_id = #{blockId}") + Integer deleteByBlockId(Integer blockId); } 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 5ac83521..7a3867b0 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 @@ -153,7 +153,8 @@ public List queryBlockByCondition(Block block) { */ @Override public Integer deleteBlockById(Integer id) { - return baseMapper.deleteBlockById(id); + baseMapper.deleteBlockById(id); + return blockGroupBlockMapper.deleteByBlockId(id); } /** @@ -171,7 +172,7 @@ public Result updateBlockById(BlockParam blockParam) { if (blockResult == null) { return Result.failed(ExceptionEnum.CM001); } - if (!Objects.equals(blockResult.getAppId(), blockParam.getAppId())) { + if (!Objects.equals(blockResult.getOccupierBy(), loginUserContext.getLoginUserId())) { return Result.failed(ExceptionEnum.CM007); } // 把前端传参赋值给实体 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 57e3c6c0..a633c0dd 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 @@ -27,6 +27,7 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.common.context.LoginUserContext; import com.tinyengine.it.mapper.AppMapper; +import com.tinyengine.it.mapper.BlockGroupBlockMapper; import com.tinyengine.it.mapper.BlockGroupMapper; import com.tinyengine.it.mapper.BlockMapper; import com.tinyengine.it.mapper.UserMapper; @@ -69,6 +70,9 @@ class BlockServiceImplTest { @Mock private LoginUserContext loginUserContext; + @Mock + private BlockGroupBlockMapper blockGroupBlockMapper; + @InjectMocks private BlockServiceImpl blockServiceImpl; @@ -110,6 +114,7 @@ void testQueryBlockByCondition() { @Test void testDeleteBlockById() { when(blockMapper.deleteBlockById(123)).thenReturn(1); + when(blockGroupBlockMapper.deleteByBlockId(123)).thenReturn(1); Integer result = blockServiceImpl.deleteBlockById(123); Assertions.assertEquals(1, result); From b18d29e062a7a36efad1e99c8d6e0d1b45f5462f Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 8 Jul 2025 23:06:02 -0700 Subject: [PATCH 11/12] fix: Fix block update bug --- .../com/tinyengine/it/controller/BlockController.java | 8 ++++++++ .../java/com/tinyengine/it/mapper/BlockMapper.java | 10 ++++++---- .../java/com/tinyengine/it/model/dto/NotGroupDto.java | 6 +++++- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockController.java b/base/src/main/java/com/tinyengine/it/controller/BlockController.java index bbcfa8dd..047041c2 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockController.java @@ -53,8 +53,10 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 区块 @@ -255,13 +257,19 @@ public Result> allTags() { @GetMapping("/block/notgroup/{groupId}") public Result> findBlocksNotInGroup(@PathVariable Integer groupId, @RequestParam(value = "label_contains", required = false) String label, + @RequestParam(value = "name_cn_contains", required = false) String name, @RequestParam(value = "tags_contains", required = false) String[] tags, @RequestParam(value = "createdBy", required = false) String createdBy) { NotGroupDto notGroupDto = new NotGroupDto(); notGroupDto.setGroupId(groupId); notGroupDto.setLabel(label); + notGroupDto.setName(name); notGroupDto.setCreatedBy(createdBy); notGroupDto.setTags(null); + if (tags != null && tags.length > 0) { + notGroupDto.setTags(JsonUtils.encode(tags)); // 将数组转换为有效的 JSON 字符串 + } + List blocksList = blockService.getNotInGroupBlocks(notGroupDto); return Result.success(blocksList); diff --git a/base/src/main/java/com/tinyengine/it/mapper/BlockMapper.java b/base/src/main/java/com/tinyengine/it/mapper/BlockMapper.java index 3ce63173..b2a2c61d 100644 --- a/base/src/main/java/com/tinyengine/it/mapper/BlockMapper.java +++ b/base/src/main/java/com/tinyengine/it/mapper/BlockMapper.java @@ -156,11 +156,13 @@ public interface BlockMapper extends BaseMapper { }) @Select("") + + " OR b.created_by LIKE CONCAT('%', #{notGroupDto.createdBy}, '%') " + " " + + " " + + " OR JSON_CONTAINS(b.tags, #{notGroupDto.tags})" + " " + "" + "") List findBlocksReturn(@Param("notGroupDto") NotGroupDto notGroupDto); /** diff --git a/base/src/main/java/com/tinyengine/it/model/dto/NotGroupDto.java b/base/src/main/java/com/tinyengine/it/model/dto/NotGroupDto.java index 451dd26e..27f34d26 100644 --- a/base/src/main/java/com/tinyengine/it/model/dto/NotGroupDto.java +++ b/base/src/main/java/com/tinyengine/it/model/dto/NotGroupDto.java @@ -31,9 +31,13 @@ public class NotGroupDto { @Schema(name = "label", description = "区块编码") private String label; + @Schema(name = "name", description = "区块名称") + private String name; + + @Schema(name = "createdBY", description = "创建人id") private String createdBy; @Schema(name = "tags", description = "区块标签") - private String [] tags; + private String tags; } From 7b7c3d38a8dc78c1044d64f4e492591664b31020 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 8 Jul 2025 23:10:45 -0700 Subject: [PATCH 12/12] fix: Fix block update bug --- .../main/java/com/tinyengine/it/controller/BlockController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockController.java b/base/src/main/java/com/tinyengine/it/controller/BlockController.java index 047041c2..62adf9ea 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockController.java @@ -53,10 +53,8 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * 区块