Skip to content

Commit 50e94c7

Browse files
authored
fix: App v1 service (#207)
* fix: App v1 service
1 parent 4726931 commit 50e94c7

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

base/src/main/java/com/tinyengine/it/service/app/impl/v1/AppV1ServiceImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,11 @@ public List<Map<String, Object>> getSchemaComponentsMap(MetaDto metaDto) {
507507
// 合并两个 List
508508
List<Map<String, Object>> componentsMap = new ArrayList<>(componentsSchema);
509509
componentsMap.addAll(blocksSchema);
510-
return componentsMap;
510+
// 使用 Stream API 去重
511+
List<Map<String, Object>> uniqueComponents = componentsMap.stream()
512+
.distinct()
513+
.collect(Collectors.toList());
514+
return uniqueComponents;
511515
}
512516

513517
// 将区块组装成schema数据

base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ public Result<FileResult> readFileAndBulkCreate(MultipartFile file) {
148148
for (ComponentLibrary componentLibrary : packageList) {
149149
componentLibrary.setIsDefault(true);
150150
componentLibrary.setIsStarted(true);
151+
componentLibrary.setIsOfficial(true);
151152
ComponentLibrary library = new ComponentLibrary();
152153
library.setName(componentLibrary.getName());
153154
library.setVersion(componentLibrary.getVersion());

base/src/main/resources/mappers/ComponentMapper.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@
267267
<select id="findUserComponentsByMaterialHistoryId" resultMap="ComponentMap">
268268
SELECT C.*
269269
FROM t_component C
270-
JOIN r_material_history_component MHC ON C.id = MHC.`component_id`
270+
JOIN r_material_history_component MHC ON C.id = MHC.`component_id` AND C.is_official = true
271271
WHERE MHC.`material_history_id` = #{id}
272272
</select>
273273

base/src/test/java/com/tinyengine/it/controller/UserControllerTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static org.mockito.Mockito.when;
1717

1818
import com.tinyengine.it.common.base.Result;
19+
import com.tinyengine.it.common.context.LoginUserContext;
1920
import com.tinyengine.it.model.entity.User;
2021
import com.tinyengine.it.service.app.UserService;
2122

@@ -34,6 +35,8 @@
3435
class UserControllerTest {
3536
@Mock
3637
private UserService userService;
38+
@Mock
39+
private LoginUserContext loginUserContext;
3740
@InjectMocks
3841
private UserController userController;
3942

@@ -46,7 +49,7 @@ void setUp() {
4649
void testMe() {
4750
User mockData = new User();
4851
when(userService.queryUserById(anyInt())).thenReturn(mockData);
49-
52+
when(loginUserContext.getLoginUserId()).thenReturn("1");
5053
Result<User> result = userController.me();
5154
Assertions.assertEquals(mockData, result.getData());
5255
}

0 commit comments

Comments
 (0)