开发区增加别名
This commit is contained in:
+4
-1
@@ -110,6 +110,7 @@ public class DevelopmentZoneController {
|
|||||||
entity.setShape(shape);
|
entity.setShape(shape);
|
||||||
|
|
||||||
entity.setLevel(model.getLevel());
|
entity.setLevel(model.getLevel());
|
||||||
|
entity.setAlias(model.getAlias());
|
||||||
entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress());
|
entity.setAddress(StringUtils.isBlank(model.getAddress()) ? "" : model.getAddress());
|
||||||
entity.setArea(StringUtils.isBlank(model.getArea()) ? "" : model.getArea());
|
entity.setArea(StringUtils.isBlank(model.getArea()) ? "" : model.getArea());
|
||||||
entity.setBlock(StringUtils.isBlank(model.getBlock()) ? "" : model.getBlock());
|
entity.setBlock(StringUtils.isBlank(model.getBlock()) ? "" : model.getBlock());
|
||||||
@@ -162,7 +163,9 @@ public class DevelopmentZoneController {
|
|||||||
shape.put("coordinates", coordinates);
|
shape.put("coordinates", coordinates);
|
||||||
udata.put("shape", shape);
|
udata.put("shape", shape);
|
||||||
}
|
}
|
||||||
|
if (StringUtils.isNotBlank(model.getAlias())) {
|
||||||
|
udata.put("alias", model.getAlias());
|
||||||
|
}
|
||||||
if (StringUtils.isNotBlank(model.getAddress())) {
|
if (StringUtils.isNotBlank(model.getAddress())) {
|
||||||
udata.put("address", model.getAddress());
|
udata.put("address", model.getAddress());
|
||||||
}
|
}
|
||||||
|
|||||||
+10
@@ -9,6 +9,15 @@ import java.util.Map;
|
|||||||
|
|
||||||
public class DevelopmentZoneModel extends BaseModel {
|
public class DevelopmentZoneModel extends BaseModel {
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
|
public String getAlias() {
|
||||||
|
return alias;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAlias(String alias) {
|
||||||
|
this.alias = alias;
|
||||||
|
}
|
||||||
|
|
||||||
private String address;
|
private String address;
|
||||||
private String buildDate;
|
private String buildDate;
|
||||||
private Date createTime;
|
private Date createTime;
|
||||||
@@ -17,6 +26,7 @@ public class DevelopmentZoneModel extends BaseModel {
|
|||||||
|
|
||||||
private String level;
|
private String level;
|
||||||
private String name;
|
private String name;
|
||||||
|
private String alias;
|
||||||
private String nameEn;
|
private String nameEn;
|
||||||
private String province;
|
private String province;
|
||||||
private String type;
|
private String type;
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<label for="name">开发区名称:</label> <input id="name" name="name" type="text" placeholder="必填" value="<#if developmentZone??>${developmentZone.name!}</#if>"/>
|
<label for="name">开发区名称:</label> <input id="name" name="name" type="text" placeholder="必填" value="<#if developmentZone??>${developmentZone.name!}</#if>"/>
|
||||||
|
<label for="name">别名:</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="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>"/>
|
<label for="province">所在省份:</label> <input id="province" name="province" type="text" placeholder="必填" value="<#if developmentZone??>${developmentZone.province!}</#if>"/>
|
||||||
<label for="cityName">城市:</label><input id="cityName" name="cityName" type="text" value="<#if developmentZone??>${developmentZone.cityName!}</#if>"/>
|
<label for="cityName">城市:</label><input id="cityName" name="cityName" type="text" value="<#if developmentZone??>${developmentZone.cityName!}</#if>"/>
|
||||||
|
|||||||
@@ -37,16 +37,19 @@
|
|||||||
<table style="float:left;" name="reginTable" class="regionTab">
|
<table style="float:left;" name="reginTable" class="regionTab">
|
||||||
<tr>
|
<tr>
|
||||||
<th>名称</th>
|
<th>名称</th>
|
||||||
|
<th>别名</th>
|
||||||
<th>开发区级别</th>
|
<th>开发区级别</th>
|
||||||
<th>省份</th>
|
<th>省份</th>
|
||||||
<th>区块</th>
|
<th>区块</th>
|
||||||
<th>是否有围栏</th>
|
<th>是否有围栏</th>
|
||||||
<th style="width: 160px">操作人员</th>
|
<th>操作人员</th>
|
||||||
|
<th>修改日期</th>
|
||||||
<th style="width: 120px;">操作</th>
|
<th style="width: 120px;">操作</th>
|
||||||
</tr>
|
</tr>
|
||||||
<#list developmentZoneList as it>
|
<#list developmentZoneList as it>
|
||||||
<tr>
|
<tr>
|
||||||
<td>${it.name!}</td>
|
<td>${it.name!}</td>
|
||||||
|
<td>${it.alias!}</td>
|
||||||
<td>${it.level!}</td>
|
<td>${it.level!}</td>
|
||||||
<td>${it.province!}</td>
|
<td>${it.province!}</td>
|
||||||
<td>${it.block!}</td>
|
<td>${it.block!}</td>
|
||||||
@@ -56,6 +59,7 @@
|
|||||||
</#if>
|
</#if>
|
||||||
</td>
|
</td>
|
||||||
<td>${it.operator!}</td>
|
<td>${it.operator!}</td>
|
||||||
|
<td>${it.createTime!?string("yyyy-MM-dd HH:mm:ss")}</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="show?id=${it.id!}" target="_blank">查看</a>
|
<a href="show?id=${it.id!}" target="_blank">查看</a>
|
||||||
<a href="../developmentZone/edit?id=${it.id!}" target="_blank">新建围栏</a>
|
<a href="../developmentZone/edit?id=${it.id!}" target="_blank">新建围栏</a>
|
||||||
|
|||||||
@@ -39,6 +39,10 @@
|
|||||||
<td>名称</td>
|
<td>名称</td>
|
||||||
<td>${developmentZone.name!}</td>
|
<td>${developmentZone.name!}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>别名</td>
|
||||||
|
<td>${developmentZone.alias!}</td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>区块</td>
|
<td>区块</td>
|
||||||
<td>${developmentZone.block!}</td>
|
<td>${developmentZone.block!}</td>
|
||||||
|
|||||||
+10
-1
@@ -35,6 +35,9 @@ public class DevelopmentZone implements MongoEntity {
|
|||||||
private String cityName;
|
private String cityName;
|
||||||
private String district;
|
private String district;
|
||||||
|
|
||||||
|
//增加别名字段
|
||||||
|
private String alias;
|
||||||
|
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||||
@Column(name = "_id")
|
@Column(name = "_id")
|
||||||
@@ -192,8 +195,14 @@ public class DevelopmentZone implements MongoEntity {
|
|||||||
this.cityName = cityName;
|
this.cityName = cityName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Column(name = "alias")
|
||||||
|
public String getAlias() {
|
||||||
|
return alias;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAlias(String alias) {
|
||||||
|
this.alias = alias;
|
||||||
|
}
|
||||||
|
|
||||||
@Column(name = "district")
|
@Column(name = "district")
|
||||||
public String getDistrict() {
|
public String getDistrict() {
|
||||||
|
|||||||
Reference in New Issue
Block a user