diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index c9650c31..a2f41cb3 100644 --- a/.github/workflows/checkstyle.yml +++ b/.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 diff --git a/base/src/main/java/com/tinyengine/it/common/base/HistoryEntity.java b/base/src/main/java/com/tinyengine/it/common/base/HistoryEntity.java index f1b891f4..1a430d8a 100644 --- a/base/src/main/java/com/tinyengine/it/common/base/HistoryEntity.java +++ b/base/src/main/java/com/tinyengine/it/common/base/HistoryEntity.java @@ -12,6 +12,7 @@ package com.tinyengine.it.common.base; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -24,7 +25,8 @@ @Getter @Setter public class HistoryEntity extends BaseEntity { - @Schema(name = "refId", description = "关联主表id") + @Schema(name = "block_id", description = "关联主表id") + @JsonProperty("block_id") private Integer refId; @Schema(name = "version", description = "版本") diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java index 8825d8b1..a8cc3ad9 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java @@ -38,6 +38,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Collections; import java.util.List; import javax.validation.Valid; @@ -111,7 +112,7 @@ public Result> getAllBlockGroups( ) @SystemControllerLog(description = "创建区块分组") @PostMapping("/block-groups/create") - public Result> createBlockGroups(@Valid @RequestBody BlockGroup blockGroup) { + public Result> createBlockGroups(@Valid @RequestBody BlockGroup blockGroup) { blockGroup.setPlatformId(1); return blockGroupService.createBlockGroup(blockGroup); } @@ -137,13 +138,13 @@ public Result> createBlockGroups(@Valid @RequestBody BlockGr ) @SystemControllerLog(description = "修改区块分组") @PostMapping("/block-groups/update/{id}") - public Result> updateBlockGroups(@Valid @PathVariable Integer id, - @RequestBody BlockGroup blockGroup) { + public Result> updateBlockGroups(@Valid @PathVariable Integer id, + @RequestBody BlockGroup blockGroup) { blockGroup.setId(id); blockGroupService.updateBlockGroupById(blockGroup); // 页面返回数据显示 - List blockGroupsListResult = blockGroupMapper.getBlockGroupsById(blockGroup.getId()); - return Result.success(blockGroupsListResult); + BlockGroup blockGroupResult = blockGroupService.findBlockGroupById(id); + return Result.success(Collections.singletonList(blockGroupResult)); } /** @@ -166,14 +167,14 @@ public Result> updateBlockGroups(@Valid @PathVariable Intege ) @SystemControllerLog(description = "根据id删除区块分组") @GetMapping("/block-groups/delete/{id}") - public Result> deleteBlockGroups(@PathVariable Integer id) throws ServiceException { - BlockGroup blockGroups = blockGroupService.findBlockGroupById(id); - if (blockGroups == null) { + public Result> deleteBlockGroups(@PathVariable Integer id) throws ServiceException { + BlockGroup blockGroup = blockGroupService.findBlockGroupById(id); + if (blockGroup == null) { return Result.failed(ExceptionEnum.CM009); } // 页面返回数据显示 - List blockGroupsListResult = blockGroupMapper.getBlockGroupsById(blockGroups.getId()); blockGroupService.deleteBlockGroupById(id); - return Result.success(blockGroupsListResult); + return Result.success(Collections.singletonList(blockGroup)); + } } 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 9605611f..b4d40294 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 @@ -71,7 +71,7 @@ public interface BlockGroupService { * @param blockGroup the block group * @return the result */ - Result> createBlockGroup(BlockGroup blockGroup); + Result> createBlockGroup(BlockGroup blockGroup); /** * 根据ids或者appId获取区块信息 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 3a6ef03f..6b9683cd 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 @@ -32,6 +32,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -50,6 +51,7 @@ public class BlockGroupServiceImpl implements BlockGroupService { @Autowired private BlockGroupBlockMapper blockGroupBlockMapper; + private static final String DEFAULT_USER_ID = "1"; /** * 查询表t_block_group所有数据 * @@ -68,7 +70,24 @@ public List findAllBlockGroup() { */ @Override public BlockGroup findBlockGroupById(@Param("id") Integer id) { - return blockGroupMapper.queryBlockGroupById(id); + BlockGroup blockGroupResult = blockGroupMapper.queryBlockGroupAndBlockById(id, null, DEFAULT_USER_ID); + // 对查询的结果的区块赋值current_version + if (blockGroupResult == null || blockGroupResult.getBlocks().isEmpty()) { + return blockGroupResult; + } + for (Block block : blockGroupResult.getBlocks()) { + BlockCarriersRelation queryParam = new BlockCarriersRelation(); + queryParam.setBlockId(block.getId()); + queryParam.setHostId(id); + queryParam.setHostType(Enums.BlockGroup.BLOCK_GROUP.getValue()); + List blockCarriersRelations = blockCarriersRelationMapper.queryBlockCarriersRelationByCondition(queryParam); + if (blockCarriersRelations.isEmpty()) { + continue; + } + String version = blockCarriersRelations.get(0).getVersion(); + block.setCurrentVersion(version); + } + return blockGroupResult; } /** @@ -142,7 +161,7 @@ public Integer updateBlockGroupById(BlockGroup blockGroup) { * @return insert number */ @Override - public Result> createBlockGroup(BlockGroup blockGroup) { + public Result> createBlockGroup(BlockGroup blockGroup) { List blockGroupsList = blockGroupMapper.queryBlockGroupByCondition(blockGroup); if (blockGroupsList.isEmpty()) { blockGroupMapper.createBlockGroup(blockGroup); @@ -150,8 +169,8 @@ public Result> createBlockGroup(BlockGroup blockGroup) { return Result.failed(ExceptionEnum.CM003); } // 页面返回数据显示 - List blockGroupsListResult = blockGroupMapper.getBlockGroupsById(blockGroup.getId()); - return Result.success(blockGroupsListResult); + BlockGroup blockGroupResult = findBlockGroupById(blockGroup.getId()); + return Result.success(Collections.singletonList(blockGroupResult)); } /** diff --git a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java index 3513b2bd..6deaa51b 100644 --- a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java @@ -18,7 +18,6 @@ import com.tinyengine.it.common.base.Result; import com.tinyengine.it.mapper.BlockGroupMapper; -import com.tinyengine.it.model.dto.BlockGroupDto; import com.tinyengine.it.model.entity.BlockGroup; import com.tinyengine.it.service.material.BlockGroupService; @@ -30,6 +29,7 @@ import org.mockito.MockitoAnnotations; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -64,21 +64,21 @@ void testGetAllBlockGroups() { @Test void testCreateBlockGroups() { - when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result>()); + when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result>()); - Result> result = blockGroupController.createBlockGroups(new BlockGroup()); - Assertions.assertEquals(new Result>(), result); + Result> result = blockGroupController.createBlockGroups(new BlockGroup()); + Assertions.assertEquals(new Result>(), result); } @Test void testUpdateBlockGroups() { - when(blockGroupService.updateBlockGroupById(any(BlockGroup.class))).thenReturn(Integer.valueOf(0)); - BlockGroupDto blockGroupDto = new BlockGroupDto(); - when(blockGroupMapper.getBlockGroupsById(anyInt())).thenReturn(Arrays.asList(blockGroupDto)); + when(blockGroupService.updateBlockGroupById(any(BlockGroup.class))).thenReturn(1); + BlockGroup blockGroup = new BlockGroup(); + when(blockGroupService.findBlockGroupById(1)).thenReturn(blockGroup); - Result> result = - blockGroupController.updateBlockGroups(Integer.valueOf(0), new BlockGroup()); - Assertions.assertEquals(blockGroupDto, result.getData().get(0)); + Result> result = + blockGroupController.updateBlockGroups(1, new BlockGroup()); + Assertions.assertEquals("200", result.getCode()); } @Test @@ -87,10 +87,8 @@ void testDeleteBlockGroups() { mockData.setId(1); when(blockGroupService.findBlockGroupById(anyInt())).thenReturn(mockData); when(blockGroupService.deleteBlockGroupById(anyInt())).thenReturn(Integer.valueOf(0)); - BlockGroupDto resultData = new BlockGroupDto(); - when(blockGroupMapper.getBlockGroupsById(anyInt())).thenReturn(Arrays.asList(resultData)); - Result> result = blockGroupController.deleteBlockGroups(1); - Assertions.assertEquals(resultData, result.getData().get(0)); + Result> result = blockGroupController.deleteBlockGroups(1); + Assertions.assertEquals("200", result.getCode()); } } 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 c1c4885b..ccd31939 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 @@ -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 @@ -107,7 +107,7 @@ void testCreateBlockGroup() { when(blockGroupMapper.createBlockGroup(param)).thenReturn(1); BlockGroup blockGroupParam = new BlockGroup(); blockGroupParam.setId(1); - Result> result = blockGroupServiceImpl.createBlockGroup(blockGroupParam); + Result> result = blockGroupServiceImpl.createBlockGroup(blockGroupParam); Assertions.assertNotNull(result.getData()); }