Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增网格列表区域筛选

Browse Source
This commit is contained in:
wanggeng 2022-02-11 11:34:39 +08:00
parent 55f721dd6b
commit b8fb98eaaa
6 changed files with 130 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module-map/src/main/java/ink/wgink/module/map/controller/api/grid/GridController.java
View File

@ -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<List<GridDTO>> listPage(ListPage page) {
public SuccessResultList<List<GridDTO>> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) {
if (!StringUtils.isBlank(areaCodeLike)) {
areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0');
}
Map<String, Object> params = requestParams();
params.put("areaCodeLike", areaCodeLike);
page.setParams(params);
return gridService.listPage(page);
}

11
module-map/src/main/java/ink/wgink/module/map/controller/app/api/grid/GridAppController.java
View File

@ -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<List<GridDTO>> listPage(@RequestHeader("token") String token, ListPage page) {
public SuccessResultList<List<GridDTO>> listPage(@RequestHeader("token") String token, @RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) {
if (!StringUtils.isBlank(areaCodeLike)) {
areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0');
}
Map<String, Object> params = requestParams();
params.put("areaCodeLike", areaCodeLike);
page.setParams(params);
return gridService.listPage(page);
}

16
module-map/src/main/java/ink/wgink/module/map/controller/resource/grid/GridResourceController.java
View File

@ -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<List<GridDTO>> listPage(ListPage page) {
public SuccessResultList<List<GridDTO>> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) {
if (!StringUtils.isBlank(areaCodeLike)) {
areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0');
}
Map<String, Object> params = requestParams();
params.put("areaCodeLike", areaCodeLike);
page.setParams(params);
return gridService.listPage(page);
}

1
module-map/src/main/java/ink/wgink/module/map/service/grid/IGridService.java
View File

@ -271,6 +271,7 @@ public interface IGridService {
/**
* 全部网格（带网格点）列表
*
* @param areaCode
* @param params
* @return

52
module-map/src/main/resources/templates/grid/grid/default/list.html
View File

@ -9,6 +9,11 @@
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<style>
.table-select-area {position: relative; width: 200px;}
.table-select-area #areaName {width: 64%}
.table-select-area .select-btn {position: absolute; top: 0px; right: 0px; width: 36%; border-color: #e6e6e6;}
</style>
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">
@ -20,6 +25,18 @@
<div class="layui-inline">
<input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
</div>
<div class="layui-inline table-select-area">
<input type="hidden" id="areaCode">
<input type="text" id="areaName" class="layui-input search-item search-item-width-300" placeholder="选择地区" readonly>
<div class="layui-btn-group select-btn">
<button type="button" id="areaSelectBtn" class="layui-btn layui-btn-sm layui-btn-primary" title="选择区域">
<i class="fa fa-circle-thin"></i>
</button>
<button type="button" id="areaCleanBtn" class="layui-btn layui-btn-sm layui-btn-primary" title="删除区域">
<i class="fa fa-times-circle"></i>
</button>
</div>
</div>
<div class="layui-btn-group">
<button type="button" id="search" class="layui-btn layui-btn-sm">
<i class="fa fa-lg fa-search"></i> 搜索
@ -191,7 +208,8 @@
where: {
keywords: $('#keywords').val(),
startTime: $('#startTime').val(),
endTime: $('#endTime').val()
endTime: $('#endTime').val(),
areaCodeLike: $('#areaCode').val()
},
page: {
curr: currentPage
@ -242,6 +260,38 @@
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);

50
module-map/src/main/resources/templates/grid/grid/super-map/list.html
View File

@ -9,6 +9,11 @@
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<style>
.table-select-area {position: relative; width: 200px;}
.table-select-area #areaName {width: 64%}
.table-select-area .select-btn {position: absolute; top: 0px; right: 0px; width: 36%; border-color: #e6e6e6;}
</style>
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">
@ -20,6 +25,18 @@
<div class="layui-inline">
<input type="text" id="keywords" class="layui-input search-item search-item-width-100" placeholder="输入关键字">
</div>
<div class="layui-inline table-select-area">
<input type="hidden" id="areaCode">
<input type="text" id="areaName" class="layui-input search-item search-item-width-300" placeholder="选择地区" readonly>
<div class="layui-btn-group select-btn">
<button type="button" id="areaSelectBtn" class="layui-btn layui-btn-sm layui-btn-primary" title="选择区域">
<i class="fa fa-circle-thin"></i>
</button>
<button type="button" id="areaCleanBtn" class="layui-btn layui-btn-sm layui-btn-primary" title="删除区域">
<i class="fa fa-times-circle"></i>
</button>
</div>
</div>
<button type="button" id="search" class="layui-btn layui-btn-sm">
<i class="fa fa-lg fa-search"></i> 搜索
</button>
@ -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);