开发区围栏完善
This commit is contained in:
+17
-2
@@ -4,9 +4,13 @@ import com.fangjia.bkoff.model.DevelopmentZoneModel;
|
||||
import com.fangjia.bkoff.model.JsonModel;
|
||||
import com.fangjia.bkoff.model.LatlngPolygonModel;
|
||||
import com.fangjia.core.util.GeoUtils;
|
||||
import com.fangjia.core.util.ThreadLocalData;
|
||||
import com.fangjia.core.util.ThreadLocalKey;
|
||||
import com.fangjia.dal.mongo.model.DevelopmentZone;
|
||||
import com.fangjia.dal.mongo.model.LatlngPolygon;
|
||||
import com.fangjia.dal.mongo.model.StatsIndex;
|
||||
import com.fangjia.dal.mongo.model.bkoff.BkoffUsers;
|
||||
import com.fangjia.service.mongo.bkoff.BkoffUsersService;
|
||||
import com.fangjia.service.mongo.fangjia.DevelopmentZoneService;
|
||||
import com.fangjia.service.mongo.fangjia.LatlngPolygonService;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
@@ -22,6 +26,7 @@ import static com.fangjia.core.util.GeoUtils.LNG;
|
||||
*/
|
||||
public class DevelopmentZoneController {
|
||||
private DevelopmentZoneService developmentZoneService;
|
||||
private BkoffUsersService bkoffUsersService;
|
||||
|
||||
public Object listAction(DevelopmentZoneModel model) {
|
||||
Pager pager = model.getPager(30);
|
||||
@@ -62,18 +67,20 @@ public class DevelopmentZoneController {
|
||||
}
|
||||
|
||||
public Object saveOrUpdateAction(DevelopmentZoneModel model) {
|
||||
String userId = (String) ThreadLocalData.getInstance().get(ThreadLocalKey.UserId);
|
||||
BkoffUsers user = bkoffUsersService.findBkoffUsersById(userId);
|
||||
JsonModel ret = new JsonModel();
|
||||
Map<String, Object> data = new HashMap<String, Object>();
|
||||
ret.setJsonModel(data);
|
||||
// name province bdLocation level 不能为空
|
||||
if (StringUtils.isBlank(model.getProvince()) || StringUtils.isBlank(model.getName()) || model.getBdShape() == null || model.getBdShape().toString().equals("[]") || StringUtils.isBlank(model.getLevel())) {
|
||||
data.put("msg", "保存失败");
|
||||
data.put("msg", "保存失败(开发区名称,所在省份,级别,围栏不能为空)");
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (model.getId() == null) {
|
||||
DevelopmentZone entity = new DevelopmentZone();
|
||||
// name province bdLocation level 不能为空
|
||||
// name province bdLocation level 不能为空/
|
||||
entity.setName(model.getName());
|
||||
entity.setProvince(model.getProvince());
|
||||
String locationStr = model.getBdShape().toString().replaceAll("\\[", "").replaceAll("\\]", "").replaceAll(" ", "");
|
||||
@@ -109,6 +116,8 @@ 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.setOperator(user.getRealName());
|
||||
developmentZoneService.saveDevelopmentZone(entity);
|
||||
data.put("msg", "保存成功");
|
||||
} else {
|
||||
@@ -151,6 +160,8 @@ 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.setOperator(user.getRealName());
|
||||
developmentZoneService.updateDevelopmentZone(entity);
|
||||
data.put("msg", "保存成功");
|
||||
}
|
||||
@@ -162,6 +173,10 @@ public class DevelopmentZoneController {
|
||||
public void setDevelopmentZoneService(DevelopmentZoneService developmentZoneService) {
|
||||
this.developmentZoneService = developmentZoneService;
|
||||
}
|
||||
|
||||
public void setBkoffUsersService(BkoffUsersService bkoffUsersService) {
|
||||
this.bkoffUsersService = bkoffUsersService;
|
||||
}
|
||||
//将百度坐标转为高德坐标
|
||||
|
||||
public List<List<Double>> convertGeoList(List<List<Double>> bdLocationList) {
|
||||
|
||||
@@ -57,13 +57,13 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
|
||||
<script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
|
||||
<!--加载鼠标绘制工具-->
|
||||
<script type="text/javascript" src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
|
||||
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
|
||||
<script type="text/javascript" src="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
|
||||
<link rel="stylesheet" href="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css" />
|
||||
<!--加载检索信息窗口-->
|
||||
<script type="text/javascript" src="http://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.js"></script>
|
||||
<link rel="stylesheet" href="http://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.css" />
|
||||
<script type="text/javascript" src="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.js"></script>
|
||||
<link rel="stylesheet" href="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.css" />
|
||||
|
||||
<script type="application/javascript">
|
||||
var map = new BMap.Map("allmap"); // 创建Map实例
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
<th>名称</th>
|
||||
<th>级别</th>
|
||||
<th>省份</th>
|
||||
<th style="width: 160px">建立时间</th>
|
||||
<th style="width: 160px">操作人员</th>
|
||||
<th style="width: 120px;">操作</th>
|
||||
</tr>
|
||||
<#list developmentZoneList as it>
|
||||
@@ -44,12 +44,12 @@
|
||||
<td>${it.level!}</td>
|
||||
<td>${it.province!}</td>
|
||||
<td>
|
||||
${it.buildDate}
|
||||
${it.operator!}
|
||||
</td>
|
||||
<td>
|
||||
<a href="show?id=${it.id!}" target="_blank">查看</a>
|
||||
<a href="../developmentZone/edit?id=${it.id!}" target="_blank">新建围栏</a>
|
||||
<a name="del${it_index}" href="javascript:;" ref="delete?id=${it.id!}">删除</a>
|
||||
<#-- <a name="del${it_index}" href="javascript:;" ref="delete?id=${it.id!}">删除</a>-->
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
|
||||
@@ -54,15 +54,15 @@
|
||||
</div>
|
||||
|
||||
<script type="text/javascript"
|
||||
src="http://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
|
||||
src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"></script>
|
||||
<!--加载鼠标绘制工具-->
|
||||
<script type="text/javascript"
|
||||
src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
|
||||
<link rel="stylesheet" href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"/>
|
||||
src="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
|
||||
<link rel="stylesheet" href="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"/>
|
||||
<!--加载检索信息窗口-->
|
||||
<script type="text/javascript"
|
||||
src="http://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.js"></script>
|
||||
<link rel="stylesheet" href="http://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.css"/>
|
||||
src="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.js"></script>
|
||||
<link rel="stylesheet" href="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.css"/>
|
||||
|
||||
<script type="application/javascript">
|
||||
var map = new BMap.Map("allmap"); // 创建Map实例
|
||||
|
||||
@@ -31,6 +31,7 @@ public class DevelopmentZone implements MongoEntity {
|
||||
private Map<String, Object> bdShape;
|
||||
|
||||
private String block;
|
||||
private String operator;
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
||||
@@ -170,4 +171,13 @@ public class DevelopmentZone implements MongoEntity {
|
||||
public void setBlock(String block) {
|
||||
this.block = block;
|
||||
}
|
||||
|
||||
@Column(name = "operator")
|
||||
public String getOperator() {
|
||||
return operator;
|
||||
}
|
||||
|
||||
public void setOperator(String operator) {
|
||||
this.operator = operator;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user