From d90d639f81004eb835f7954a35e8a89bba82559a Mon Sep 17 00:00:00 2001 From: majintao Date: Thu, 4 Jul 2024 17:37:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=8C=BA=E7=9C=81=E5=B8=82?= =?UTF-8?q?=E5=8C=BA=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevelopmentZoneController.java | 34 +- .../src/main/webapp/developmentZone/edit.ftl | 504 +++++++++++------- .../mongo/AdministrativeMappingDaoImpl.java | 9 + .../mongo/dao/AdministrativeMappingDao.java | 9 + .../mongo/model/AdministrativeMapping.java | 255 +++++++++ .../mongo/fangjia/DevelopmentZoneService.java | 4 +- .../fangjia/DevelopmentZoneServiceImpl.java | 45 ++ 7 files changed, 660 insertions(+), 200 deletions(-) create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/AdministrativeMappingDaoImpl.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/dao/AdministrativeMappingDao.java create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AdministrativeMapping.java diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java index b5832cb81..e0138b63e 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DevelopmentZoneController.java @@ -33,9 +33,9 @@ public class DevelopmentZoneController { if (pager.getCurrentPage() > 100) { pager.setCurrentPage(1); } - long countDev = developmentZoneService.countDev(model.getProvince(),model.getName(), model.getLevel()); + long countDev = developmentZoneService.countDev(model.getProvince(), model.getName(), model.getLevel()); pager.setTotalRows((int) countDev); - List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(),model.getName(), model.getLevel(), pager); + List developmentZones = developmentZoneService.findDevelopmentZone(model.getProvince(), model.getName(), model.getLevel(), pager); model.setDevelopmentZoneList(developmentZones); model.setPager(pager); return model; @@ -113,7 +113,7 @@ public class DevelopmentZoneController { } entity.setLevel(model.getLevel()); - String aliasString = model.getAlias().replaceAll("£¬",","); + String aliasString = model.getAlias().replaceAll("£¬", ","); List alias = Arrays.asList(aliasString.split("\\s*,\\s*")); entity.setAlias(alias); entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress()); @@ -126,6 +126,7 @@ public class DevelopmentZoneController { entity.setType(StringUtils.isBlank(model.getType()) ? "" : model.getType()); entity.setUrl(StringUtils.isBlank(model.getUrl()) ? "" : model.getUrl()); entity.setCityName(StringUtils.isBlank(model.getCityName()) ? "" : model.getCityName()); + entity.setDistrict(StringUtils.isBlank(model.getDistrict()) ? "" : model.getDistrict()); //¼Ç¼²Ù×÷ÈËԱ entity.setOperator(user.getRealName()); developmentZoneService.saveDevelopmentZone(entity); @@ -168,8 +169,8 @@ public class DevelopmentZoneController { shape.put("coordinates", coordinates); udata.put("shape", shape); } - if (StringUtils.isNotBlank(model.getAlias()) ){ - String aliasString = model.getAlias().replaceAll(",","£¬"); + if (StringUtils.isNotBlank(model.getAlias())) { + String aliasString = model.getAlias().replaceAll(",", "£¬"); List alias = Arrays.asList(aliasString.split("\\s*£¬\\s*")); udata.put("alias", alias); } @@ -200,6 +201,9 @@ public class DevelopmentZoneController { if (StringUtils.isNotBlank(model.getCityName())) { udata.put("cityName", model.getCityName()); } + if (StringUtils.isNotBlank(model.getDistrict())){ + udata.put("district", model.getDistrict()); + } udata.put("createTime", new Date()); //¼Ç¼²Ù×÷ÈËԱ udata.put("operator", user.getRealName()); @@ -210,6 +214,26 @@ public class DevelopmentZoneController { return ret; } + public JsonModel provincesAction() { + JsonModel model = new JsonModel(); + List provinces = developmentZoneService.findProvinces(); + model.setJsonModel(provinces); + return model; + } + + public JsonModel citiesAction(DevelopmentZoneModel model) { + JsonModel jsonModel = new JsonModel(); + List cities = developmentZoneService.findCities(model.getProvince()); + jsonModel.setJsonModel(cities); + return jsonModel; + } + + public JsonModel districtsAction(DevelopmentZoneModel model) { + JsonModel jsonModel = new JsonModel(); + List districts = developmentZoneService.findDistricts(model.getCityName()); + jsonModel.setJsonModel(districts); + return jsonModel; + } public void setDevelopmentZoneService(DevelopmentZoneService developmentZoneService) { this.developmentZoneService = developmentZoneService; diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index 00e260c6d..006225cb1 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -1,218 +1,334 @@ <#ftl attributes={"content_type":"text/html; charset=UTF-8"}> <#compress> - - - - - 开发区围栏列表 - - - - -<#include "/common_js.ftl" /> -<#include "/layout/header.ftl" /> -
-