diff --git a/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridUserResourceController.java b/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridUserResourceController.java index 9b5caa9f..eadfe857 100644 --- a/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridUserResourceController.java +++ b/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridUserResourceController.java @@ -67,6 +67,13 @@ public class GridUserResourceController extends DefaultBaseController { return gridUserService.list(gridId, params); } + @ApiOperation(value = "网格用户列表", notes = "网格用户列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("list/grid-ids") + public List listByGridIds(@RequestBody IdsVO idsVO) { + return gridUserService.listByGridIds(idsVO.getIds()); + } + @ApiOperation(value = "网格用户分页列表", notes = "网格用户分页列表接口") @ApiImplicitParams({ @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query", required = true), diff --git a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridUserDao.java b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridUserDao.java index 66adbbe5..4cee6360 100644 --- a/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridUserDao.java +++ b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridUserDao.java @@ -1,5 +1,6 @@ package ink.wgink.module.map.dao.grid; +import ink.wgink.module.map.pojo.dtos.grid.GridUserDTO; import ink.wgink.pojo.dtos.user.UserDTO; import org.springframework.stereotype.Repository; @@ -8,6 +9,11 @@ import java.util.Map; @Repository public interface IGridUserDao { + + List listGridUser(Map params); + + List listUser(Map params); + } diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridUserService.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridUserService.java index 8e9f1602..7ea34b49 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridUserService.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridUserService.java @@ -59,6 +59,9 @@ public interface IGridUserService { */ List listUserId(String gridId, Map params); + List listGridUser(Map params); + + /** * 网格用户列表 * @@ -68,6 +71,11 @@ public interface IGridUserService { */ List list(String gridId, Map params); + + + List listByGridIds(List ids); + + /** * 网格用户分页列表 * @@ -78,4 +86,7 @@ public interface IGridUserService { SuccessResultList> listPage(String gridId, ListPage page); List listUser(Map params); + + + } diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridUserServiceImpl.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridUserServiceImpl.java index becf0d35..34a32ba7 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridUserServiceImpl.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridUserServiceImpl.java @@ -75,34 +75,22 @@ public class GridUserServiceImpl extends DefaultBaseService implements IGridUser return gridRelationService.listRelationId(gridId); } + @Override + public List listGridUser(Map params) { + return gridUserDao.listGridUser(params); + } + @Override public List list(String gridId, Map params) { - List gridRelationDTOs = gridRelationService.listByGridId(gridId); - if (gridRelationDTOs.isEmpty()) { - return new ArrayList(); - } - Set userIdSet = new HashSet<>(); - for (GridRelationDTO gridRelationDTO : gridRelationDTOs) { - userIdSet.add(gridRelationDTO.getRelationId()); - } - List userDTOs = userBaseService.listByUserIds(new ArrayList<>(userIdSet)); - if (userDTOs.isEmpty()) { - return new ArrayList<>(); - } - List gridUserDTOs = new ArrayList<>(); - for (UserDTO userDTO : userDTOs) { - GridUserDTO gridUserDTO = new GridUserDTO(); - gridUserDTO.setGridId(gridId); - BeanUtils.copyProperties(userDTO, gridUserDTO); - for (GridRelationDTO gridRelationDTO : gridRelationDTOs) { - if (StringUtils.equals(gridUserDTO.getUserId(), gridRelationDTO.getRelationId())) { - gridUserDTO.setGmtCreate(gridRelationDTO.getGmtCreate()); - break; - } - } - gridUserDTOs.add(gridUserDTO); - } - return gridUserDTOs; + params.put("gridId", gridId); + return listGridUser(params); + } + + @Override + public List listByGridIds(List gridIds) { + Map params = getHashMap(2); + params.put("gridIds", gridIds); + return listGridUser(params); } @Override @@ -117,4 +105,6 @@ public class GridUserServiceImpl extends DefaultBaseService implements IGridUser public List listUser(Map params) { return gridUserDao.listUser(params); } + + } diff --git a/module-map/src/main/resources/mybatis/mapper/grid/grid-user-mapper.xml b/module-map/src/main/resources/mybatis/mapper/grid/grid-user-mapper.xml index bba208e4..a02dd9b1 100644 --- a/module-map/src/main/resources/mybatis/mapper/grid/grid-user-mapper.xml +++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-user-mapper.xml @@ -2,6 +2,51 @@ + + + + + + + + + + +