diff --git a/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java b/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java index 0d92b532..55607954 100644 --- a/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java +++ b/module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java @@ -84,6 +84,9 @@ public class GridController extends DefaultBaseController { } @ApiOperation(value = "网格列表", notes = "网格列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "areaCode", value = "地区编码", paramType = "path") + }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("list/area-code/{areaCode}") public List listByAreaCode(@PathVariable("areaCode") String areaCode) { @@ -91,6 +94,28 @@ public class GridController extends DefaultBaseController { return gridService.listByAreaCode(areaCode, params); } + @ApiOperation(value = "全部网格列表", notes = "全部网格列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "areaCode", value = "地区编码", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-all/area-code/{areaCode}") + public List listAllByAreaCode(@PathVariable("areaCode") String areaCode) { + Map params = requestParams(); + return gridService.listAllByAreaCode(areaCode, params); + } + + @ApiOperation(value = "子网格列表", notes = "网格列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "areaCode", value = "地区编码", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-sub/area-code/{areaCode}") + public List listSubByAreaCode(@PathVariable("areaCode") String areaCode) { + Map params = requestParams(); + return gridService.listSubByAreaCode(areaCode, params); + } + @ApiOperation(value = "网格(排除查询网格)列表", notes = "网格(排除查询网格)列表接口") @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("list/except/{gridId}") 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 new file mode 100644 index 00000000..26703a28 --- /dev/null +++ b/module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridResourceController.java @@ -0,0 +1,135 @@ +package ink.wgink.module.map.controller.resource.grid; + +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.module.map.pojo.dtos.grid.GridDTO; +import ink.wgink.module.map.service.grid.IGridService; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResultList; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * @ClassName: GridControler + * @Description: 网格管理 + * @Author: wanggeng + * @Date: 2021/10/19 10:21 下午 + * @Version: 1.0 + */ +@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "网格接口") +@RestController +@RequestMapping(ISystemConstant.RESOURCE_PREFIX + "/grid") +public class GridResourceController extends DefaultBaseController { + + @Autowired + private IGridService gridService; + + @ApiOperation(value = "网格详情", notes = "网格详情接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + @ApiImplicitParam(name = "gridIdId", value = "网格ID", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("get/{gridId}") + public GridDTO get(@PathVariable("gridId") String gridId) { + return gridService.get(gridId, true, true); + } + + @ApiOperation(value = "网格列表", notes = "网格列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list") + public List list() { + Map params = requestParams(); + return gridService.list(params); + } + + @ApiOperation(value = "网格列表", notes = "网格列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + @ApiImplicitParam(name = "areaCode", value = "地区编码", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list/area-code/{areaCode}") + public List listByAreaCode(@PathVariable("areaCode") String areaCode) { + Map params = requestParams(); + return gridService.listByAreaCode(areaCode, params); + } + + @ApiOperation(value = "全部网格列表", notes = "全部网格列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + @ApiImplicitParam(name = "areaCode", value = "地区编码", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-all/area-code/{areaCode}") + public List listAllByAreaCode(@PathVariable("areaCode") String areaCode) { + Map params = requestParams(); + return gridService.listAllByAreaCode(areaCode, params); + } + + @ApiOperation(value = "子网格列表", notes = "网格列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + @ApiImplicitParam(name = "areaCode", value = "地区编码", paramType = "path") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-sub/area-code/{areaCode}") + public List listSubByAreaCode(@PathVariable("areaCode") String areaCode) { + Map params = requestParams(); + return gridService.listSubByAreaCode(areaCode, params); + } + + @ApiOperation(value = "网格(排除查询网格)列表", notes = "网格(排除查询网格)列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list/except/{gridId}") + public List listExcept(@PathVariable("gridId") String gridId) { + Map params = requestParams(); + return gridService.listExcept(gridId, params); + } + + @ApiOperation(value = "网格分页列表", notes = "网格分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage") + public SuccessResultList> listPage(ListPage page) { + Map params = requestParams(); + page.setParams(params); + return gridService.listPage(page); + } + + @ApiOperation(value = "网格分页列表", notes = "网格分页列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listpage/area-code/{areaCode}") + public SuccessResultList> listPageByAreaCode(@PathVariable("areaCode") String areaCode, ListPage page) { + Map params = requestParams(); + page.setParams(params); + return gridService.listPageByAreaCode(areaCode, page); + } + +} diff --git a/module-map/src/main/java/ink/wgink/module/map/controller/resource/userlocation/UserLocationResourceController.java b/module-map/src/main/java/ink/wgink/module/map/controller/resource/userlocation/UserLocationResourceController.java index e9a18dbb..94ddb33f 100644 --- a/module-map/src/main/java/ink/wgink/module/map/controller/resource/userlocation/UserLocationResourceController.java +++ b/module-map/src/main/java/ink/wgink/module/map/controller/resource/userlocation/UserLocationResourceController.java @@ -36,8 +36,8 @@ public class UserLocationResourceController extends DefaultBaseController { @ApiOperation(value = "删除用户定位(id列表)", notes = "删除用户定位(id列表)接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "ids", value = "ID列表,用下划线分隔", paramType = "path", example = "1_2_3") + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query", required = true), + @ApiImplicitParam(name = "ids", value = "ID列表,用下划线分隔", paramType = "path", example = "1_2_3") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @DeleteMapping("remove/{ids}") @@ -48,8 +48,8 @@ public class UserLocationResourceController extends DefaultBaseController { @ApiOperation(value = "修改用户定位", notes = "修改用户定位接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "userLocationId", value = "用户定位ID", paramType = "path") + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query", required = true), + @ApiImplicitParam(name = "userLocationId", value = "用户定位ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @PutMapping("update/{userLocationId}") @@ -61,8 +61,8 @@ public class UserLocationResourceController extends DefaultBaseController { @ApiOperation(value = "用户定位详情", notes = "用户定位详情接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "userLocationId", value = "用户定位ID", paramType = "path") + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query", required = false), + @ApiImplicitParam(name = "userLocationId", value = "用户定位ID", paramType = "path") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("get/{userLocationId}") @@ -72,7 +72,7 @@ public class UserLocationResourceController extends DefaultBaseController { @ApiOperation(value = "用户定位列表", notes = "用户定位列表接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query") + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query", required = false) }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("list") @@ -83,12 +83,12 @@ public class UserLocationResourceController extends DefaultBaseController { @ApiOperation(value = "用户定位分页列表", notes = "用户定位分页列表接口") @ApiImplicitParams({ - @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), - @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), - @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), - @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), - @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query", required = false), + @ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "int", defaultValue = "1"), + @ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "int", defaultValue = "20"), + @ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listpage") @@ -99,6 +99,9 @@ public class UserLocationResourceController extends DefaultBaseController { } @ApiOperation(value = "用户定位统计", notes = "用户定位统计接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"), + }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("count") SuccessResultData count() { diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java index 81c8d604..fc7ec0bc 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java @@ -234,6 +234,24 @@ public interface IGridService { */ List listByAreaCode(String areaCode, Map params); + /** + * 网格列表 + * + * @param areaCode 区域编码 + * @param params + * @return + */ + List listAllByAreaCode(String areaCode, Map params); + + /** + * 子网格列表 + * + * @param areaCode 区域编码 + * @param params + * @return + */ + List listSubByAreaCode(String areaCode, Map params); + /** * 网格分页列表 * @@ -242,4 +260,5 @@ public interface IGridService { * @return */ SuccessResultList> listPageByAreaCode(String areaCode, ListPage page); + } diff --git a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java index 8a7fb1bf..205924a7 100644 --- a/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java +++ b/module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java @@ -351,6 +351,19 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService return list(params); } + @Override + public List listAllByAreaCode(String areaCode, Map params) { + params.put("areaCodeLike", areaCode); + return list(params); + } + + @Override + public List listSubByAreaCode(String areaCode, Map params) { + params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("excludeAreaCode", areaCode); + return list(params); + } + @Override public SuccessResultList> listPageByAreaCode(String areaCode, ListPage page) { page.getParams().put("areaCode", areaCode); diff --git a/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml b/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml index 6b04115b..dec0ba39 100644 --- a/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml +++ b/module-map/src/main/resources/mybatis/mapper/grid/grid-mapper.xml @@ -249,6 +249,14 @@ AND t1.area_code = #{areaCode} + + AND + t1.area_code LIKE CONCAT(#{areaCodeLike}, '%') + + + AND + t1.area_code != #{excludeAreaCode} +