Skip to content

Commit 0d2c0af

Browse files
lu-yglu-yg
authored
fix: Modify block group api (#182)
* fix: Modify block group api
1 parent 5bae788 commit 0d2c0af

File tree

7 files changed

+55
-35
lines changed

7 files changed

+55
-35
lines changed

‎.github/workflows/checkstyle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
# 安装依赖并运行 Checkstyle（如果是 Maven 项目）
2828
- name: Install dependencies and run Checkstyle
2929
run: |
30-
mvn checkstyle：check
30+
mvn clean package
3131
3232
# 查看 Checkstyle 检查报告
3333
- name: Upload Checkstyle report

‎base/src/main/java/com/tinyengine/it/common/base/HistoryEntity.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
package com.tinyengine.it.common.base;
1414

15+
import com.fasterxml.jackson.annotation.JsonProperty;
1516
import io.swagger.v3.oas.annotations.media.Schema;
1617
import lombok.Getter;
1718
import lombok.Setter;
@@ -24,7 +25,8 @@
2425
@Getter
2526
@Setter
2627
public class HistoryEntity extends BaseEntity {
27-
@Schema(name = "refId", description = "关联主表id")
28+
@Schema(name = "block_id", description = "关联主表id")
29+
@JsonProperty("block_id")
2830
private Integer refId;
2931

3032
@Schema(name = "version", description = "版本")

‎base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.springframework.web.bind.annotation.RequestParam;
3939
import org.springframework.web.bind.annotation.RestController;
4040

41+
import java.util.Collections;
4142
import java.util.List;
4243

4344
import javax.validation.Valid;
@@ -111,7 +112,7 @@ public Result<List<BlockGroup>> getAllBlockGroups(
111112
)
112113
@SystemControllerLog(description = "创建区块分组")
113114
@PostMapping("/block-groups/create")
114-
public Result<List<BlockGroupDto>> createBlockGroups(@Valid @RequestBody BlockGroup blockGroup) {
115+
public Result<List<BlockGroup>> createBlockGroups(@Valid @RequestBody BlockGroup blockGroup) {
115116
blockGroup.setPlatformId(1);
116117
return blockGroupService.createBlockGroup(blockGroup);
117118
}
@@ -137,13 +138,13 @@ public Result<List<BlockGroupDto>> createBlockGroups(@Valid @RequestBody BlockGr
137138
)
138139
@SystemControllerLog(description = "修改区块分组")
139140
@PostMapping("/block-groups/update/{id}")
140-
public Result<List<BlockGroupDto>> updateBlockGroups(@Valid @PathVariable Integer id,
141-
@RequestBody BlockGroup blockGroup) {
141+
public Result<List<BlockGroup>> updateBlockGroups(@Valid @PathVariable Integer id,
142+
@RequestBody BlockGroup blockGroup) {
142143
blockGroup.setId(id);
143144
blockGroupService.updateBlockGroupById(blockGroup);
144145
// 页面返回数据显示
145-
List<BlockGroupDto> blockGroupsListResult = blockGroupMapper.getBlockGroupsById(blockGroup.getId());
146-
return Result.success(blockGroupsListResult);
146+
BlockGroup blockGroupResult = blockGroupService.findBlockGroupById(id);
147+
return Result.success(Collections.singletonList(blockGroupResult));
147148
}
148149

149150
/**
@@ -166,14 +167,14 @@ public Result<List<BlockGroupDto>> updateBlockGroups(@Valid @PathVariable Intege
166167
)
167168
@SystemControllerLog(description = "根据id删除区块分组")
168169
@GetMapping("/block-groups/delete/{id}")
169-
public Result<List<BlockGroupDto>> deleteBlockGroups(@PathVariable Integer id) throws ServiceException {
170-
BlockGroup blockGroups = blockGroupService.findBlockGroupById(id);
171-
if (blockGroups == null) {
170+
public Result<List<BlockGroup>> deleteBlockGroups(@PathVariable Integer id) throws ServiceException {
171+
BlockGroup blockGroup = blockGroupService.findBlockGroupById(id);
172+
if (blockGroup == null) {
172173
return Result.failed(ExceptionEnum.CM009);
173174
}
174175
// 页面返回数据显示
175-
List<BlockGroupDto> blockGroupsListResult = blockGroupMapper.getBlockGroupsById(blockGroups.getId());
176176
blockGroupService.deleteBlockGroupById(id);
177-
return Result.success(blockGroupsListResult);
177+
return Result.success(Collections.singletonList(blockGroup));
178+
178179
}
179180
}

‎base/src/main/java/com/tinyengine/it/service/material/BlockGroupService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public interface BlockGroupService {
7171
* @param blockGroup the block group
7272
* @return the result
7373
*/
74-
Result<List<BlockGroupDto>> createBlockGroup(BlockGroup blockGroup);
74+
Result<List<BlockGroup>> createBlockGroup(BlockGroup blockGroup);
7575

7676
/**
7777
* 根据ids或者appId获取区块信息

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

+23-4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.springframework.stereotype.Service;
3333

3434
import java.util.ArrayList;
35+
import java.util.Collections;
3536
import java.util.List;
3637
import java.util.stream.Collectors;
3738

@@ -50,6 +51,7 @@ public class BlockGroupServiceImpl implements BlockGroupService {
5051
@Autowired
5152
private BlockGroupBlockMapper blockGroupBlockMapper;
5253

54+
private static final String DEFAULT_USER_ID = "1";
5355
/**
5456
* 查询表t_block_group所有数据
5557
*
@@ -68,7 +70,24 @@ public List<BlockGroup> findAllBlockGroup() {
6870
*/
6971
@Override
7072
public BlockGroup findBlockGroupById(@Param("id") Integer id) {
71-
return blockGroupMapper.queryBlockGroupById(id);
73+
BlockGroup blockGroupResult = blockGroupMapper.queryBlockGroupAndBlockById(id, null, DEFAULT_USER_ID);
74+
// 对查询的结果的区块赋值current_version
75+
if (blockGroupResult == null || blockGroupResult.getBlocks().isEmpty()) {
76+
return blockGroupResult;
77+
}
78+
for (Block block : blockGroupResult.getBlocks()) {
79+
BlockCarriersRelation queryParam = new BlockCarriersRelation();
80+
queryParam.setBlockId(block.getId());
81+
queryParam.setHostId(id);
82+
queryParam.setHostType(Enums.BlockGroup.BLOCK_GROUP.getValue());
83+
List<BlockCarriersRelation> blockCarriersRelations = blockCarriersRelationMapper.queryBlockCarriersRelationByCondition(queryParam);
84+
if (blockCarriersRelations.isEmpty()) {
85+
continue;
86+
}
87+
String version = blockCarriersRelations.get(0).getVersion();
88+
block.setCurrentVersion(version);
89+
}
90+
return blockGroupResult;
7291
}
7392

7493
/**
@@ -142,16 +161,16 @@ public Integer updateBlockGroupById(BlockGroup blockGroup) {
142161
* @return insert number
143162
*/
144163
@Override
145-
public Result<List<BlockGroupDto>> createBlockGroup(BlockGroup blockGroup) {
164+
public Result<List<BlockGroup>> createBlockGroup(BlockGroup blockGroup) {
146165
List<BlockGroupDto> blockGroupsList = blockGroupMapper.queryBlockGroupByCondition(blockGroup);
147166
if (blockGroupsList.isEmpty()) {
148167
blockGroupMapper.createBlockGroup(blockGroup);
149168
} else {
150169
return Result.failed(ExceptionEnum.CM003);
151170
}
152171
// 页面返回数据显示
153-
List<BlockGroupDto> blockGroupsListResult = blockGroupMapper.getBlockGroupsById(blockGroup.getId());
154-
return Result.success(blockGroupsListResult);
172+
BlockGroup blockGroupResult = findBlockGroupById(blockGroup.getId());
173+
return Result.success(Collections.singletonList(blockGroupResult));
155174
}
156175

157176
/**

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

+12-14
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.tinyengine.it.common.base.Result;
2020
import com.tinyengine.it.mapper.BlockGroupMapper;
21-
import com.tinyengine.it.model.dto.BlockGroupDto;
2221
import com.tinyengine.it.model.entity.BlockGroup;
2322
import com.tinyengine.it.service.material.BlockGroupService;
2423

@@ -30,6 +29,7 @@
3029
import org.mockito.MockitoAnnotations;
3130

3231
import java.util.Arrays;
32+
import java.util.Collections;
3333
import java.util.List;
3434

3535
/**
@@ -64,21 +64,21 @@ void testGetAllBlockGroups() {
6464

6565
@Test
6666
void testCreateBlockGroups() {
67-
when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result<List<BlockGroupDto>>());
67+
when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result<List<BlockGroup>>());
6868

69-
Result<List<BlockGroupDto>> result = blockGroupController.createBlockGroups(new BlockGroup());
70-
Assertions.assertEquals(new Result<List<BlockGroupDto>>(), result);
69+
Result<List<BlockGroup>> result = blockGroupController.createBlockGroups(new BlockGroup());
70+
Assertions.assertEquals(new Result<List<BlockGroup>>(), result);
7171
}
7272

7373
@Test
7474
void testUpdateBlockGroups() {
75-
when(blockGroupService.updateBlockGroupById(any(BlockGroup.class))).thenReturn(Integer.valueOf(0));
76-
BlockGroupDto blockGroupDto = new BlockGroupDto();
77-
when(blockGroupMapper.getBlockGroupsById(anyInt())).thenReturn(Arrays.<BlockGroupDto>asList(blockGroupDto));
75+
when(blockGroupService.updateBlockGroupById(any(BlockGroup.class))).thenReturn(1);
76+
BlockGroup blockGroup = new BlockGroup();
77+
when(blockGroupService.findBlockGroupById(1)).thenReturn(blockGroup);
7878

79-
Result<List<BlockGroupDto>> result =
80-
blockGroupController.updateBlockGroups(Integer.valueOf(0), new BlockGroup());
81-
Assertions.assertEquals(blockGroupDto, result.getData().get(0));
79+
Result<List<BlockGroup>> result =
80+
blockGroupController.updateBlockGroups(1, new BlockGroup());
81+
Assertions.assertEquals("200", result.getCode());
8282
}
8383

8484
@Test
@@ -87,10 +87,8 @@ void testDeleteBlockGroups() {
8787
mockData.setId(1);
8888
when(blockGroupService.findBlockGroupById(anyInt())).thenReturn(mockData);
8989
when(blockGroupService.deleteBlockGroupById(anyInt())).thenReturn(Integer.valueOf(0));
90-
BlockGroupDto resultData = new BlockGroupDto();
91-
when(blockGroupMapper.getBlockGroupsById(anyInt())).thenReturn(Arrays.<BlockGroupDto>asList(resultData));
9290

93-
Result<List<BlockGroupDto>> result = blockGroupController.deleteBlockGroups(1);
94-
Assertions.assertEquals(resultData, result.getData().get(0));
91+
Result<List<BlockGroup>> result = blockGroupController.deleteBlockGroups(1);
92+
Assertions.assertEquals("200", result.getCode());
9593
}
9694
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void testFindAllBlockGroup() {
6565
@Test
6666
void testFindBlockGroupById() {
6767
BlockGroup mockData = new BlockGroup();
68-
when(blockGroupMapper.queryBlockGroupById(1)).thenReturn(mockData);
68+
when(blockGroupMapper.queryBlockGroupAndBlockById(any(),any(),any())).thenReturn(mockData);
6969

7070
BlockGroup result = blockGroupServiceImpl.findBlockGroupById(1);
7171
Assertions.assertEquals(mockData, result);
@@ -83,10 +83,10 @@ void testFindBlockGroupByCondition() {
8383

8484
@Test
8585
void testDeleteBlockGroupById() {
86-
when(blockGroupMapper.deleteBlockGroupById(1)).thenReturn(2);
86+
when(blockGroupMapper.deleteBlockGroupById(any())).thenReturn(1);
8787

8888
Integer result = blockGroupServiceImpl.deleteBlockGroupById(1);
89-
Assertions.assertEquals(2, result);
89+
Assertions.assertEquals(1, result);
9090
}
9191

9292
@Test
@@ -107,7 +107,7 @@ void testCreateBlockGroup() {
107107
when(blockGroupMapper.createBlockGroup(param)).thenReturn(1);
108108
BlockGroup blockGroupParam = new BlockGroup();
109109
blockGroupParam.setId(1);
110-
Result<List<BlockGroupDto>> result = blockGroupServiceImpl.createBlockGroup(blockGroupParam);
110+
Result<List<BlockGroup>> result = blockGroupServiceImpl.createBlockGroup(blockGroupParam);
111111
Assertions.assertNotNull(result.getData());
112112
}
113113

0 commit comments

Comments
 (0)