From f6a646bb51e9e422a235c1a7e50e40a18e2a823a Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Mon, 20 May 2024 15:48:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=8C=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9F=8E=E5=B8=82=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevelopmentZoneController.java | 10 +++++++--- .../bkoff/model/DevelopmentZoneModel.java | 19 +++++++++--------- .../src/main/webapp/developmentZone/edit.ftl | 2 +- .../src/main/webapp/developmentZone/list.ftl | 10 +++++++++- .../dal/mongo/model/DevelopmentZone.java | 20 +++++++++---------- 5 files changed, 36 insertions(+), 25 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 6d03dbc52..b5832cb81 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 @@ -113,7 +113,9 @@ public class DevelopmentZoneController { } entity.setLevel(model.getLevel()); - entity.setAlias(model.getAlias()); + String aliasString = model.getAlias().replaceAll("£¬",","); + List alias = Arrays.asList(aliasString.split("\\s*,\\s*")); + entity.setAlias(alias); entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress()); entity.setArea(StringUtils.isBlank(model.getArea()) ? "" : model.getArea()); entity.setBlock(StringUtils.isBlank(model.getBlock()) ? "" : model.getBlock()); @@ -166,8 +168,10 @@ public class DevelopmentZoneController { shape.put("coordinates", coordinates); udata.put("shape", shape); } - if (StringUtils.isNotBlank(model.getAlias())) { - udata.put("alias", model.getAlias()); + if (StringUtils.isNotBlank(model.getAlias()) ){ + String aliasString = model.getAlias().replaceAll(",","£¬"); + List alias = Arrays.asList(aliasString.split("\\s*£¬\\s*")); + udata.put("alias", alias); } if (StringUtils.isNotBlank(model.getAddress())) { udata.put("address", model.getAddress()); 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 9cc08db3a..03460ae58 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 @@ -9,15 +9,6 @@ import java.util.Map; public class DevelopmentZoneModel extends BaseModel { private String id; - - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - private String address; private String buildDate; private Date createTime; @@ -27,6 +18,7 @@ public class DevelopmentZoneModel extends BaseModel { private String level; private String name; private String alias; +// private List addr_alias; private String nameEn; private String province; private String type; @@ -36,12 +28,19 @@ public class DevelopmentZoneModel extends BaseModel { List> shape; List> bdShape; - private String block; private DevelopmentZone developmentZone; private List developmentZoneList; + public String getAlias() { + return alias; + } + + public void setAlias(String alias) { + this.alias = alias; + } + public String getDistrict() { return district; } diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index 106b3af17..e2bc087c1 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -33,7 +33,7 @@ - +
diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl index d944f0c84..c4ada21b1 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/list.ftl @@ -51,7 +51,15 @@ <#list developmentZoneList as it> ${it.name!} - ${it.alias!} + + <#if it.alias??> + <#list it.alias as item> + ${item?string}<#if item_has_next>, + + + + + ${it.level!} ${it.province!} ${it.cityName!} 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 55d0065c5..ba4ca014d 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 @@ -36,7 +36,7 @@ public class DevelopmentZone implements MongoEntity { private String district; //Ôö¼ӱðÃû×ֶÎ - private String alias; + private List alias; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -195,15 +195,6 @@ public class DevelopmentZone implements MongoEntity { this.cityName = cityName; } - @Column(name = "alias") - public String getAlias() { - return alias; - } - - public void setAlias(String alias) { - this.alias = alias; - } - @Column(name = "district") public String getDistrict() { return district; @@ -212,4 +203,13 @@ public class DevelopmentZone implements MongoEntity { public void setDistrict(String district) { this.district = district; } + + @Column(name = "alias") + public List getAlias() { + return alias; + } + + public void setAlias(List alias) { + this.alias = alias; + } }