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-12 17:01:04 +08:00
parent 5997e45639
commit 9a608d0c21
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,7 +150,7 @@ public class GridController extends DefaultBaseController {
@GetMapping("listpage") @GetMapping("listpage")
public SuccessResultList<List<GridDTO>> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) { public SuccessResultList<List<GridDTO>> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) {
if (!StringUtils.isBlank(areaCodeLike)) { if (!StringUtils.isBlank(areaCodeLike)) {
areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0'); areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0', 3);
} }
Map<String, Object> params = requestParams(); Map<String, Object> params = requestParams();
params.put("areaCodeLike", areaCodeLike); params.put("areaCodeLike", areaCodeLike);

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

@ -92,7 +92,7 @@ public class GridAppController extends DefaultBaseController {
@GetMapping("listpage") @GetMapping("listpage")
public SuccessResultList<List<GridDTO>> listPage(@RequestHeader("token") String token, @RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) { public SuccessResultList<List<GridDTO>> listPage(@RequestHeader("token") String token, @RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) {
if (!StringUtils.isBlank(areaCodeLike)) { if (!StringUtils.isBlank(areaCodeLike)) {
areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0'); areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0', 3);
} }
Map<String, Object> params = requestParams(); Map<String, Object> params = requestParams();
params.put("areaCodeLike", areaCodeLike); params.put("areaCodeLike", areaCodeLike);

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

@ -111,7 +111,7 @@ public class GridResourceController extends DefaultBaseController {
@GetMapping("listpage") @GetMapping("listpage")
public SuccessResultList<List<GridDTO>> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) { public SuccessResultList<List<GridDTO>> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) {
if (!StringUtils.isBlank(areaCodeLike)) { if (!StringUtils.isBlank(areaCodeLike)) {
areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0'); areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0', 3);
} }
Map<String, Object> params = requestParams(); Map<String, Object> params = requestParams();
params.put("areaCodeLike", areaCodeLike); params.put("areaCodeLike", areaCodeLike);

4
module-map/src/main/java/ink/wgink/module/map/service/grid/impl/GridServiceImpl.java
View File

@ -389,7 +389,7 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService
@Override @Override
public List<GridDTO> listSubByAreaCode(String areaCode, Map<String, Object> params) { public List<GridDTO> listSubByAreaCode(String areaCode, Map<String, Object> params) {
params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3));
params.put("excludeAreaCode", areaCode); params.put("excludeAreaCode", areaCode);
return list(params); return list(params);
} }
@ -411,7 +411,7 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService
@Override @Override
public List<GridDTO> listAllWithPointByAreaCode(String areaCode, Map<String, Object> params) { public List<GridDTO> listAllWithPointByAreaCode(String areaCode, Map<String, Object> params) {
params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3));
return list(params, false, true); return list(params, false, true);
} }

6
module-map/src/main/resources/templates/grid/grid/default/save.html
View File

@ -200,9 +200,7 @@
function initGridBG(areaCode) { function initGridBG(areaCode) {
baiduMap.clearMap(); baiduMap.clearMap();
var layIndex; var layIndex;
top.restAjax.get(top.restAjax.path('api/grid/list', []), { top.restAjax.get(top.restAjax.path('api/grid/list-all-with-point/area-code/{areaCode}', [areaCode]), {}, null, function(code, data) {
areaCode: areaCode
}, null, function(code, data) {
var gridArray = []; var gridArray = [];
for(var i = 0, item; item = data[i++];) { for(var i = 0, item; item = data[i++];) {
var pointArray = []; var pointArray = [];
@ -212,7 +210,7 @@
gridArray.push({ gridArray.push({
id: item.gridId, id: item.gridId,
label: item.gridName, label: item.gridName,
fillColor: item.fillColor, fillColor: '#ffffff',
pointArray: pointArray pointArray: pointArray
}) })
} }