开发区增加城市区域
This commit is contained in:
+7
-3
@@ -113,7 +113,9 @@ public class DevelopmentZoneController {
|
||||
}
|
||||
|
||||
entity.setLevel(model.getLevel());
|
||||
entity.setAlias(model.getAlias());
|
||||
String aliasString = model.getAlias().replaceAll(",",",");
|
||||
List<String> 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<String> alias = Arrays.asList(aliasString.split("\\s*,\\s*"));
|
||||
udata.put("alias", alias);
|
||||
}
|
||||
if (StringUtils.isNotBlank(model.getAddress())) {
|
||||
udata.put("address", model.getAddress());
|
||||
|
||||
+9
-10
@@ -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<String> addr_alias;
|
||||
private String nameEn;
|
||||
private String province;
|
||||
private String type;
|
||||
@@ -36,12 +28,19 @@ public class DevelopmentZoneModel extends BaseModel {
|
||||
List<List<Double>> shape;
|
||||
List<List<Double>> bdShape;
|
||||
|
||||
|
||||
private String block;
|
||||
|
||||
private DevelopmentZone developmentZone;
|
||||
private List<DevelopmentZone> developmentZoneList;
|
||||
|
||||
public String getAlias() {
|
||||
return alias;
|
||||
}
|
||||
|
||||
public void setAlias(String alias) {
|
||||
this.alias = alias;
|
||||
}
|
||||
|
||||
public String getDistrict() {
|
||||
return district;
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
</td>
|
||||
<td>
|
||||
<label for="name">开发区名称:</label> <input id="name" name="name" type="text" placeholder="必填" value="<#if developmentZone??>${developmentZone.name!}</#if>"/>
|
||||
<label for="alias">别名:</label> <input id="alias" name="alias" type="text" placeholder="多个别名用,隔开" value="<#if developmentZone??>${developmentZone.alias!}</#if>"/>
|
||||
<label for="alias">别名:</label> <input id="alias" name="alias" type="text" placeholder="多个别名用,隔开" value="<#if developmentZone??>${developmentZone.alias!}</#if>"/>
|
||||
<label for="nameEn">开发区名称拼音:</label> <input id="nameEn" name="nameEn" type="text" value="<#if developmentZone??>${developmentZone.nameEn!}</#if>"/>
|
||||
<label for="province">所在省份:</label> <input id="province" name="province" type="text" placeholder="必填" value="<#if developmentZone??>${developmentZone.province!}</#if>"/><br>
|
||||
<label for="cityName">城市:</label><input id="cityName" name="cityName" type="text" value="<#if developmentZone??>${developmentZone.cityName!}</#if>"/>
|
||||
|
||||
@@ -51,7 +51,15 @@
|
||||
<#list developmentZoneList as it>
|
||||
<tr>
|
||||
<td>${it.name!}</td>
|
||||
<td>${it.alias!}</td>
|
||||
<td>
|
||||
<#if it.alias??>
|
||||
<#list it.alias as item>
|
||||
${item?string}<#if item_has_next>, </#if>
|
||||
</#list>
|
||||
</#if>
|
||||
</td>
|
||||
|
||||
|
||||
<td>${it.level!}</td>
|
||||
<td>${it.province!}</td>
|
||||
<td>${it.cityName!}</td>
|
||||
|
||||
+10
-10
@@ -36,7 +36,7 @@ public class DevelopmentZone implements MongoEntity {
|
||||
private String district;
|
||||
|
||||
//增加别名字段
|
||||
private String alias;
|
||||
private List<String> 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<String> getAlias() {
|
||||
return alias;
|
||||
}
|
||||
|
||||
public void setAlias(List<String> alias) {
|
||||
this.alias = alias;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user