diff --git a/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridResourceController.java b/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridResourceController.java index 13ee280d..a614131a 100644 --- a/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridResourceController.java +++ b/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridResourceController.java @@ -136,4 +136,15 @@ public class GridResourceController extends DefaultBaseController { return gridService.listPageByAreaCode(areaCode, page); } + @ApiOperation(value = "网格列表", notes = "网格列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + @ApiImplicitParam(name = "relationId", value = "关联ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list/relation-id/{relationId}") + public List listByRelationId(@PathVariable("relationId") String relationId) { + return gridService.listByRelationId(relationId); + } + } 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 new file mode 100644 index 00000000..66adbbe5 --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/dao/grid/IGridUserDao.java @@ -0,0 +1,13 @@ +package ink.wgink.module.map.dao.grid; + +import ink.wgink.pojo.dtos.user.UserDTO; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +@Repository +public interface IGridUserDao { + List listUser(Map params); + +} diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java index f024ead2..27b448e9 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridRelationService.java @@ -1,6 +1,7 @@ package ink.wgink.module.map.service.grid; import ink.wgink.module.map.pojo.dtos.grid.GridRelationDTO; +import ink.wgink.pojo.dtos.user.UserDTO; import java.util.List; import java.util.Map; @@ -152,4 +153,5 @@ public interface IGridRelationService { */ GridRelationDTO getByGridIdAndRelationId(String gridId, String relationId); + } 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 74508baa..8e9f1602 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 @@ -2,6 +2,7 @@ package ink.wgink.module.map.service.grid; import ink.wgink.module.map.pojo.dtos.grid.GridUserDTO; import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.dtos.user.UserDTO; import ink.wgink.pojo.result.SuccessResultList; import ink.wgink.pojo.vos.IdsVO; @@ -76,4 +77,5 @@ 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 44afdc18..becf0d35 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 @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.exceptions.SearchException; import ink.wgink.interfaces.user.IUserBaseService; +import ink.wgink.module.map.dao.grid.IGridUserDao; import ink.wgink.module.map.pojo.dtos.grid.GridRelationDTO; import ink.wgink.module.map.pojo.dtos.grid.GridUserDTO; import ink.wgink.module.map.service.grid.IGridRelationService; @@ -30,6 +31,8 @@ import java.util.*; @Service public class GridUserServiceImpl extends DefaultBaseService implements IGridUserService { + @Autowired + private IGridUserDao gridUserDao; @Autowired private IUserBaseService userBaseService; @Autowired @@ -110,4 +113,8 @@ public class GridUserServiceImpl extends DefaultBaseService implements IGridUser return new SuccessResultList<>(gridUserDTOs, pageInfo.getPageNum(), pageInfo.getTotal()); } + @Override + 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 new file mode 100644 index 00000000..bba208e4 --- /dev/null +++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-user-mapper.xml @@ -0,0 +1,32 @@ + + + + + + + \ No newline at end of file