增加接口

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<GridDTO> listByRelationId(@PathVariable("relationId") String relationId) {
+        return gridService.listByRelationId(relationId);
+    }
+
 }

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<UserDTO> listUser(Map<String, Object> params);
+
+}

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);
 
+
 }

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<List<GridUserDTO>> listPage(String gridId, ListPage page);
 
+    List<UserDTO> listUser(Map<String, Object> params);
 }

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<UserDTO> listUser(Map<String, Object> params) {
+        return gridUserDao.listUser(params);
+    }
 }

module-map/src/main/resources/mybatis/mapper/grid/grid-user-mapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="ink.wgink.module.map.dao.grid.IGridUserDao">
+
+    <select id="listUser" parameterType="map" resultMap="ink.wgink.service.user.dao.IUserDao.userDTO">
+        SELECT
+            su.user_id,
+            su.user_username,
+            su.user_name,
+            su.user_email,
+            su.user_phone,
+            su.user_avatar
+        FROM
+            sys_user su
+        WHERE
+            su.is_delete = 0
+        AND
+            su.user_username != 'admin'
+        AND
+            su.user_id IN (
+                SELECT
+                    mgr.relation_id
+                FROM
+                    map_grid_relation mgr
+                INNER JOIN
+                    map_grid mg
+                WHERE
+                    mg.is_delete = 0
+            )
+    </select>
+
+</mapper>