fix: Modify block group api

Author: lu-yg

.github/workflows/checkstyle.yml

@@ -27,7 +27,7 @@ jobs:
       # 安装依赖并运行 Checkstyle（如果是 Maven 项目）
       - name: Install dependencies and run Checkstyle
         run: |
-          mvn checkstyle：check
+          mvn clean package
 
       # 查看 Checkstyle 检查报告
       - name: Upload Checkstyle report

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

@@ -72,7 +72,7 @@ public List<BlockGroup> findAllBlockGroup() {
     public BlockGroup findBlockGroupById(@Param("id") Integer id) {
         BlockGroup blockGroupResult = blockGroupMapper.queryBlockGroupAndBlockById(id, null, DEFAULT_USER_ID);
         // 对查询的结果的区块赋值current_version
-        if (blockGroupResult.getBlocks().isEmpty()) {
+        if (blockGroupResult == null || blockGroupResult.getBlocks().isEmpty()) {
             return blockGroupResult;
         }
         for (Block block : blockGroupResult.getBlocks()) {

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

@@ -29,6 +29,7 @@
 import org.mockito.MockitoAnnotations;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -71,13 +72,13 @@ void testCreateBlockGroups() {
 
     @Test
     void testUpdateBlockGroups() {
-        when(blockGroupService.updateBlockGroupById(any(BlockGroup.class))).thenReturn(Integer.valueOf(0));
+        when(blockGroupService.updateBlockGroupById(any(BlockGroup.class))).thenReturn(1);
         BlockGroup blockGroup = new BlockGroup();
-        when(blockGroupMapper.queryBlockGroupAndBlockById(anyInt(), null, null)).thenReturn(blockGroup);
+        when(blockGroupService.findBlockGroupById(1)).thenReturn(blockGroup);
 
         Result<List<BlockGroup>> result =
-                blockGroupController.updateBlockGroups(Integer.valueOf(0), new BlockGroup());
-        Assertions.assertEquals(blockGroup, result.getData().get(0));
+                blockGroupController.updateBlockGroups(1, new BlockGroup());
+        Assertions.assertEquals("200", result.getCode());
     }
 
     @Test
@@ -86,9 +87,8 @@ void testDeleteBlockGroups() {
         mockData.setId(1);
         when(blockGroupService.findBlockGroupById(anyInt())).thenReturn(mockData);
         when(blockGroupService.deleteBlockGroupById(anyInt())).thenReturn(Integer.valueOf(0));
-        BlockGroup resultData = new BlockGroup();
 
         Result<List<BlockGroup>> result = blockGroupController.deleteBlockGroups(1);
-        Assertions.assertEquals(resultData, result.getData().get(0));
+        Assertions.assertEquals("200", result.getCode());
     }
 }

base/src/test/java/com/tinyengine/it/service/material/impl/BlockGroupServiceImplTest.java

@@ -65,7 +65,7 @@ void testFindAllBlockGroup() {
     @Test
     void testFindBlockGroupById() {
         BlockGroup mockData = new BlockGroup();
-        when(blockGroupMapper.queryBlockGroupById(1)).thenReturn(mockData);
+        when(blockGroupMapper.queryBlockGroupAndBlockById(any(),any(),any())).thenReturn(mockData);
 
         BlockGroup result = blockGroupServiceImpl.findBlockGroupById(1);
         Assertions.assertEquals(mockData, result);
@@ -83,10 +83,10 @@ void testFindBlockGroupByCondition() {
 
     @Test
     void testDeleteBlockGroupById() {
-        when(blockGroupMapper.deleteBlockGroupById(1)).thenReturn(2);
+        when(blockGroupMapper.deleteBlockGroupById(any())).thenReturn(1);
 
         Integer result = blockGroupServiceImpl.deleteBlockGroupById(1);
-        Assertions.assertEquals(2, result);
+        Assertions.assertEquals(1, result);
     }
 
     @Test