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 cf55c7c4..3b8a4a03 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 @@ -507,7 +507,11 @@ public List> getSchemaComponentsMap(MetaDto metaDto) { // 合并两个 List List> componentsMap = new ArrayList<>(componentsSchema); componentsMap.addAll(blocksSchema); - return componentsMap; + // 使用 Stream API 去重 + List> uniqueComponents = componentsMap.stream() + .distinct() + .collect(Collectors.toList()); + return uniqueComponents; } // 将区块组装成schema数据 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 b7ec01db..33b733dd 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 @@ -148,6 +148,7 @@ public Result readFileAndBulkCreate(MultipartFile file) { for (ComponentLibrary componentLibrary : packageList) { componentLibrary.setIsDefault(true); componentLibrary.setIsStarted(true); + componentLibrary.setIsOfficial(true); ComponentLibrary library = new ComponentLibrary(); library.setName(componentLibrary.getName()); library.setVersion(componentLibrary.getVersion()); diff --git a/base/src/main/resources/mappers/ComponentMapper.xml b/base/src/main/resources/mappers/ComponentMapper.xml index 021caf7d..d4d59e96 100644 --- a/base/src/main/resources/mappers/ComponentMapper.xml +++ b/base/src/main/resources/mappers/ComponentMapper.xml @@ -267,7 +267,7 @@ diff --git a/base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java index 224ca517..3f485b91 100644 --- a/base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java @@ -16,6 +16,7 @@ import static org.mockito.Mockito.when; import com.tinyengine.it.common.base.Result; +import com.tinyengine.it.common.context.LoginUserContext; import com.tinyengine.it.model.entity.User; import com.tinyengine.it.service.app.UserService; @@ -34,6 +35,8 @@ class UserControllerTest { @Mock private UserService userService; + @Mock + private LoginUserContext loginUserContext; @InjectMocks private UserController userController; @@ -46,7 +49,7 @@ void setUp() { void testMe() { User mockData = new User(); when(userService.queryUserById(anyInt())).thenReturn(mockData); - + when(loginUserContext.getLoginUserId()).thenReturn("1"); Result result = userController.me(); Assertions.assertEquals(mockData, result.getData()); }