From 9a608d0c2175effbc40145a7be63dfe7580f0f06 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Sat, 12 Feb 2022 17:01:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BD=91=E6=A0=BC=E7=BB=98?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/map/controller/api/grid/GridController.java | 2 +- .../map/controller/app/api/grid/GridAppController.java | 2 +- .../controller/resource/grid/GridResourceController.java | 2 +- .../wgink/module/map/service/grid/impl/GridServiceImpl.java | 4 ++-- .../main/resources/templates/grid/grid/default/save.html | 6 ++---- 5 files changed, 7 insertions(+), 9 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 26eb66d1..4ab68336 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 @@ -150,7 +150,7 @@ public class GridController extends DefaultBaseController { @GetMapping("listpage") public SuccessResultList> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) { if (!StringUtils.isBlank(areaCodeLike)) { - areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0'); + areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0', 3); } Map params = requestParams(); params.put("areaCodeLike", areaCodeLike); 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 5c75e764..13993e3c 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 @@ -92,7 +92,7 @@ public class GridAppController extends DefaultBaseController { @GetMapping("listpage") 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'); + areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0', 3); } Map params = requestParams(); params.put("areaCodeLike", areaCodeLike); 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 0cff7e74..13ee280d 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 @@ -111,7 +111,7 @@ public class GridResourceController extends DefaultBaseController { @GetMapping("listpage") public SuccessResultList> listPage(@RequestParam(name = "areaCodeLike", required = false) String areaCodeLike, ListPage page) { if (!StringUtils.isBlank(areaCodeLike)) { - areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0'); + areaCodeLike = WStringUtil.cutContinuityRepeatCharDesc(areaCodeLike, '0', 3); } Map params = requestParams(); params.put("areaCodeLike", areaCodeLike); 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 0de02a5e..e831d8a1 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 @@ -389,7 +389,7 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService @Override public List listSubByAreaCode(String areaCode, Map params) { - params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3)); params.put("excludeAreaCode", areaCode); return list(params); } @@ -411,7 +411,7 @@ public class GridServiceImpl extends DefaultBaseService implements IGridService @Override public List listAllWithPointByAreaCode(String areaCode, Map params) { - params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0')); + params.put("areaCodeLike", WStringUtil.cutContinuityRepeatCharDesc(areaCode, '0', 3)); return list(params, false, true); } diff --git a/module-map/src/main/resources/templates/grid/grid/default/save.html b/module-map/src/main/resources/templates/grid/grid/default/save.html index 532d2da0..36dddf48 100644 --- a/module-map/src/main/resources/templates/grid/grid/default/save.html +++ b/module-map/src/main/resources/templates/grid/grid/default/save.html @@ -200,9 +200,7 @@ function initGridBG(areaCode) { baiduMap.clearMap(); var layIndex; - top.restAjax.get(top.restAjax.path('api/grid/list', []), { - areaCode: areaCode - }, null, function(code, data) { + top.restAjax.get(top.restAjax.path('api/grid/list-all-with-point/area-code/{areaCode}', [areaCode]), {}, null, function(code, data) { var gridArray = []; for(var i = 0, item; item = data[i++];) { var pointArray = []; @@ -212,7 +210,7 @@ gridArray.push({ id: item.gridId, label: item.gridName, - fillColor: item.fillColor, + fillColor: '#ffffff', pointArray: pointArray }) }