From b8fb98eaaa2514d213f2b4c5d336fabe1902a422 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 11 Feb 2022 11:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BD=91=E6=A0=BC=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8C=BA=E5=9F=9F=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/grid/GridController.java | 11 +++- .../app/api/grid/GridAppController.java | 11 +++- .../resource/grid/GridResourceController.java | 16 +++--- .../module/map/service/grid/IGridService.java | 1 + .../templates/grid/grid/default/list.html | 52 ++++++++++++++++++- .../templates/grid/grid/super-map/list.html | 50 ++++++++++++++++++ 6 files changed, 130 insertions(+), 11 deletions(-) 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 79bd378e..26eb66d1 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 @@ -10,7 +10,9 @@ import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.util.string.WStringUtil; import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -141,12 +143,17 @@ public class GridController extends DefaultBaseController { @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 = "endTime", value = "结束时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "areaCodeLike", value = "地区编码", paramType = "query", dataType = "String") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listpage") - public SuccessResultList> listPage(ListPage page) { + public SuccessResultList> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) { + if (!StringUtils.isBlank(areaCodeLike)) { + areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0'); + } Map params = requestParams(); + params.put("areaCodeLike", areaCodeLike); page.setParams(params); return gridService.listPage(page); } diff --git a/module-map/src/main/java/ink/wgink/module/map/controller/app/api/grid/GridAppController.java b/module-map/src/main/java/ink/wgink/module/map/controller/app/api/grid/GridAppController.java index 37032951..5c75e764 100644 --- a/module-map/src/main/java/ink/wgink/module/map/controller/app/api/grid/GridAppController.java +++ b/module-map/src/main/java/ink/wgink/module/map/controller/app/api/grid/GridAppController.java @@ -7,7 +7,9 @@ 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 ink.wgink.util.string.WStringUtil; import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -83,12 +85,17 @@ public class GridAppController extends DefaultBaseController { @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 = "endTime", value = "结束时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "areaCodeLike", value = "地区编码", paramType = "query", dataType = "String") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listpage") - public SuccessResultList> listPage(@RequestHeader("token") String token, ListPage page) { + public SuccessResultList> listPage(@RequestHeader("token") String token, @RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) { + if (!StringUtils.isBlank(areaCodeLike)) { + areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0'); + } Map params = requestParams(); + params.put("areaCodeLike", areaCodeLike); page.setParams(params); return gridService.listPage(page); } 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 26703a28..0cff7e74 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 @@ -7,12 +7,11 @@ 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 ink.wgink.util.string.WStringUtil; import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; 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 org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; @@ -105,12 +104,17 @@ public class GridResourceController extends DefaultBaseController { @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 = "endTime", value = "结束时间", paramType = "query", dataType = "String"), + @ApiImplicitParam(name = "areaCodeLike", value = "地区编码", paramType = "query", dataType = "String") }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) @GetMapping("listpage") - public SuccessResultList> listPage(ListPage page) { + public SuccessResultList> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) { + if (!StringUtils.isBlank(areaCodeLike)) { + areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0'); + } Map params = requestParams(); + params.put("areaCodeLike", areaCodeLike); page.setParams(params); return gridService.listPage(page); } 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 387fd4dc..8777889f 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 @@ -271,6 +271,7 @@ public interface IGridService { /** * 全部网格（带网格点）列表 + * * @param areaCode * @param params * @return diff --git a/module-map/src/main/resources/templates/grid/grid/default/list.html b/module-map/src/main/resources/templates/grid/grid/default/list.html index 1ff0d61f..f24aa411 100644 --- a/module-map/src/main/resources/templates/grid/grid/default/list.html +++ b/module-map/src/main/resources/templates/grid/grid/default/list.html @@ -9,6 +9,11 @@ +
@@ -20,6 +25,18 @@
+
+ + +
+ + +
+
+ +
+
@@ -239,6 +256,39 @@ reloadTable(); }, 500); }); + + // 地区选择事件 + (function() { + $(document).on('click', '#areaSelectBtn', function() { + top.dialog.open({ + title: '选择地区', + url: top.restAjax.path('route/area/get-select', []), + width: '600px', + height: '225px', + onClose: function() { + var selectedAreaArray = top.dialog.dialogData.selectedAreaArray; + var areaCode = ''; + var areaName = ''; + if(selectedAreaArray.length > 0) { + areaCode = selectedAreaArray[selectedAreaArray.length - 1].areaCode; + for(var i = 0, item; item = selectedAreaArray[i++];) { + if(areaName) { + areaName += ' / '; + } + areaName += item.areaName; + } + $('#areaCode').val(areaCode); + $('#areaName').val(areaName); + } + } + }) + }); + $(document).on('click', '#areaCleanBtn', function () { + $('#areaCode').val(''); + $('#areaName').val(''); + }) + })() + // 事件 - 搜索 $(document).on('click', '#search', function() { reloadTable(1);