修改区块分组问题 (#201)

* fix:fix page bug * fix:modify issues * fix:fix blockgroup issues * fix:fix issues

Author: zhangjuncao

app/src/main/java/com/tinyengine/it/config/context/DefaultLoginUserContext.java

@@ -43,4 +43,7 @@ public int getAppId() {
  public int getPlatformId() {
  return 1;
  }
+
+ @Override
+ public String getSiteId() { return "1"; }
 }

base/src/main/java/com/tinyengine/it/common/context/LoginUserContext.java

@@ -45,4 +45,6 @@ public interface LoginUserContext {
  * @return 设计器ID
  */
  public int getPlatformId();
+
+ public String getSiteId();
 }

base/src/main/java/com/tinyengine/it/common/handler/MyMetaObjectHandler.java

@@ -42,6 +42,8 @@ public void insertFill(MetaObject metaObject) {
  this.setFieldValByName("lastUpdatedBy", loginUserContext.getLoginUserId(), metaObject);
  this.setFieldValByName("tenantId", loginUserContext.getTenantId(), metaObject);
  this.setFieldValByName("renterId", loginUserContext.getRenterId(), metaObject);
+ this.setFieldValByName("siteId", loginUserContext.getSiteId(), metaObject);
+ this.setFieldValByName("platformId", loginUserContext.getPlatformId(), metaObject);
  }
 
  @Override

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

@@ -13,6 +13,7 @@
 package com.tinyengine.it.controller;
 
 import com.tinyengine.it.common.base.Result;
+import com.tinyengine.it.common.context.LoginUserContext;
 import com.tinyengine.it.common.exception.ExceptionEnum;
 import com.tinyengine.it.common.exception.ServiceException;
 import com.tinyengine.it.common.log.SystemControllerLog;
@@ -59,6 +60,8 @@ public class BlockGroupController {
  private BlockGroupService blockGroupService;
  @Autowired
  private BlockGroupMapper blockGroupMapper;
+ @Autowired
+ private LoginUserContext loginUserContext;
 
  /**
  * 获取区块分组
@@ -111,8 +114,7 @@ public Result<List<BlockGroup>> getAllBlockGroups(
  )
  @SystemControllerLog(description = "创建区块分组")
  @PostMapping("/block-groups/create")
- public Result<List<BlockGroup>> createBlockGroups(@Valid @RequestBody BlockGroup blockGroup) {
- blockGroup.setPlatformId(1);
+ public Result<BlockGroup> createBlockGroups(@Valid @RequestBody BlockGroup blockGroup) {
  return blockGroupService.createBlockGroup(blockGroup);
  }
 

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<List<BlockGroup>> createBlockGroup(BlockGroup blockGroup);
+ Result<BlockGroup> createBlockGroup(BlockGroup blockGroup);
 
  /**
  * 根据ids或者appId获取区块信息

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

@@ -164,7 +164,7 @@ public Integer updateBlockGroupById(BlockGroup blockGroup) {
  * @return insert number
  */
  @Override
- public Result<List<BlockGroup>> createBlockGroup(BlockGroup blockGroup) {
+ public Result<BlockGroup> createBlockGroup(BlockGroup blockGroup) {
  List<BlockGroupDto> blockGroupsList = blockGroupMapper.queryBlockGroupByCondition(blockGroup);
  if (blockGroupsList.isEmpty()) {
  blockGroupMapper.createBlockGroup(blockGroup);
@@ -173,7 +173,7 @@ public Result<List<BlockGroup>> createBlockGroup(BlockGroup blockGroup) {
  }
  // 页面返回数据显示
  BlockGroup blockGroupResult = findBlockGroupById(blockGroup.getId());
- return Result.success(Collections.singletonList(blockGroupResult));
+ return Result.success(blockGroupResult);
  }
 
  /**
@@ -213,7 +213,7 @@ public List<BlockGroup> getBlockGroupByIdsOrAppId(List<Integer> ids, Integer app
  for (Block block : blockGroupTemp.getBlocks()) {
  BlockCarriersRelation queryParam = new BlockCarriersRelation();
  queryParam.setBlockId(block.getId());
- queryParam.setHostId(blockGroup.getId());
+ queryParam.setHostId(blockGroupTemp.getId());
  queryParam.setHostType(Enums.BlockGroup.BLOCK_GROUP.getValue());
  List<BlockCarriersRelation> blockCarriersRelations = blockCarriersRelationMapper.queryBlockCarriersRelationByCondition(queryParam);
  if (blockCarriersRelations.isEmpty()) {

base/src/test/java/com/tinyengine/it/common/handler/MockUserContext.java

@@ -41,4 +41,7 @@ public int getAppId() {
  public int getPlatformId() {
  return 1;
  }
+
+ @Override
+ public String getSiteId() { return "1"; }
 }

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

@@ -63,10 +63,10 @@ void testGetAllBlockGroups() {
 
  @Test
  void testCreateBlockGroups() {
- when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result<List<BlockGroup>>());
+ when(blockGroupService.createBlockGroup(any(BlockGroup.class))).thenReturn(new Result<BlockGroup>());
 
- Result<List<BlockGroup>> result = blockGroupController.createBlockGroups(new BlockGroup());
- Assertions.assertEquals(new Result<List<BlockGroup>>(), result);
+ Result<BlockGroup> result = blockGroupController.createBlockGroups(new BlockGroup());
+ Assertions.assertEquals(new Result<BlockGroup>(), result);
  }
 
  @Test

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

@@ -111,7 +111,7 @@ void testCreateBlockGroup() {
  when(loginUserContext.getLoginUserId()).thenReturn("1");
  BlockGroup blockGroupParam = new BlockGroup();
  blockGroupParam.setId(1);
- Result<List<BlockGroup>> result = blockGroupServiceImpl.createBlockGroup(blockGroupParam);
+ Result<BlockGroup> result = blockGroupServiceImpl.createBlockGroup(blockGroupParam);
  Assertions.assertNotNull(result.getData());
  }