From d4aacf7a147579dac983faabb48ff604450ad46a Mon Sep 17 00:00:00 2001 From: majintao Date: Thu, 4 Jul 2024 17:57:27 +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 | 8 +- .../bkoff/model/DevelopmentZoneModel.java | 10 + .../src/main/webapp/developmentZone/edit.ftl | 590 +++++++++--------- .../src/main/webapp/developmentZone/list.ftl | 2 +- .../src/main/webapp/developmentZone/show.ftl | 2 +- .../dal/mongo/model/DevelopmentZone.java | 14 +- 6 files changed, 313 insertions(+), 313 deletions(-) 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 e0138b63e..a1ca2e13d 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 @@ -125,7 +125,7 @@ public class DevelopmentZoneController { entity.setNameEn(StringUtils.isBlank(model.getNameEn()) ? "" : model.getNameEn()); 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.setCityName1(StringUtils.isBlank(model.getCityName1()) ? "" : model.getCityName1()); entity.setDistrict(StringUtils.isBlank(model.getDistrict()) ? "" : model.getDistrict()); //¼Ç¼²Ù×÷ÈËԱ entity.setOperator(user.getRealName()); @@ -198,8 +198,8 @@ public class DevelopmentZoneController { if (StringUtils.isNotBlank(model.getUrl())) { udata.put("url", model.getUrl()); } - if (StringUtils.isNotBlank(model.getCityName())) { - udata.put("cityName", model.getCityName()); + if (StringUtils.isNotBlank(model.getCityName1())) { + udata.put("city", model.getCityName1()); } if (StringUtils.isNotBlank(model.getDistrict())){ udata.put("district", model.getDistrict()); @@ -230,7 +230,7 @@ public class DevelopmentZoneController { public JsonModel districtsAction(DevelopmentZoneModel model) { JsonModel jsonModel = new JsonModel(); - List districts = developmentZoneService.findDistricts(model.getCityName()); + List districts = developmentZoneService.findDistricts(model.getCityName1()); jsonModel.setJsonModel(districts); return jsonModel; } diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java index 03460ae58..54f85ab42 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/DevelopmentZoneModel.java @@ -33,6 +33,8 @@ public class DevelopmentZoneModel extends BaseModel { private DevelopmentZone developmentZone; private List developmentZoneList; + private String cityName1; + public String getAlias() { return alias; } @@ -184,4 +186,12 @@ public class DevelopmentZoneModel extends BaseModel { public void setDevelopmentZoneList(List developmentZoneList) { this.developmentZoneList = developmentZoneList; } + + public String getCityName1() { + return cityName1; + } + + public void setCityName1(String cityName1) { + this.cityName1 = cityName1; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index 006225cb1..b64ba3bac 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -1,334 +1,320 @@ <#ftl attributes={"content_type":"text/html; charset=UTF-8"}> <#compress> - - - - - 开发区围栏列表 - - - - - <#include "/common_js.ftl" /> - <#include "/layout/header.ftl" /> -
- - -
-
- <#if developmentZone??> - - - - - - - - - - - - -
- <@d_city defaultValue="" callback="changeCity" callbackField="display" name="cityDisplay" /> - - - - - - - - - - - - -
- -
- - - -
- -
- -
- -
-
-
-
+ + + + + 开发区围栏列表 + + + + +<#include "/common_js.ftl" /> +<#include "/layout/header.ftl" /> +
+ - - + - - - - - - - - - - - - }); - // 更新表单中的多边形点位置数据 - function updatePolygonPoints() { - var polygons = map.getOverlays(BMap.Polygon); - for (var i = 0; i < polygons.length; i++) { - // 确保当前对象是一个多边形对象 - if (polygons[i] instanceof BMap.Polygon) { - var points = polygons[i].getPath(); - var bdShape = []; - for (var j = 0; j < points.length; j++) { - var location = []; - location.push(points[j].lng); - location.push(points[j].lat); - bdShape.push(location); - } - // 将更新后的点位置数据更新到表单中 - $("#bdShape").val(bdShape.join(";")); - } + + + + + + + + + + - - + + diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl index c4ada21b1..84c9bed96 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl @@ -62,7 +62,7 @@ ${it.level!} ${it.province!} - ${it.cityName!} + ${it.cityName1!} ${it.district!} ${it.block!} diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/show.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/show.ftl index 72fc93a1f..33dfbda28 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/show.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/show.ftl @@ -33,7 +33,7 @@ 城市 - ${developmentZone.cityName!} + ${developmentZone.cityName1!} 区域 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java index ba4ca014d..f0e2bcd88 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/DevelopmentZone.java @@ -32,7 +32,7 @@ public class DevelopmentZone implements MongoEntity { private String block; private String operator; - private String cityName; + private String cityName1; private String district; //Ôö¼ӱðÃû×ֶÎ @@ -186,15 +186,19 @@ public class DevelopmentZone implements MongoEntity { this.operator = operator; } + @Column(name = "city") - public String getCityName() { - return cityName; + public String getCityName1() { + return cityName1; } - public void setCityName(String cityName) { - this.cityName = cityName; + public void setCityName1(String cityName1) { + this.cityName1 = cityName1; } + + + @Column(name = "district") public String getDistrict() { return district;