From 58e501db38137ed3bfab2b4b53bd41af6a7219b1 Mon Sep 17 00:00:00 2001 From: mjt <13607600062@163.com> Date: Tue, 9 Apr 2024 10:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=8C=BA=E5=9B=B4=E6=A0=8F?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevelopmentZoneController.java | 19 +++++++++++++++++-- .../src/main/webapp/developmentZone/edit.ftl | 10 +++++----- .../src/main/webapp/developmentZone/list.ftl | 6 +++--- .../src/main/webapp/developmentZone/show.ftl | 10 +++++----- .../dal/mongo/model/DevelopmentZone.java | 10 ++++++++++ 5 files changed, 40 insertions(+), 15 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 71d4760c2..3a14b2f41 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 @@ -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 data = new HashMap(); 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> convertGeoList(List> bdLocationList) { diff --git a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl index 0d558d442..c10db896a 100644 --- a/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/developmentZone/edit.ftl @@ -57,13 +57,13 @@ - + - - + + - - + + + src="https://api.map.baidu.com/api?v=2.0&ak=3E63A744012f88c9a73a2f051aece58b"> - + src="https://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"> + - + src="https://api.map.baidu.com/library/SearchInfoWindow/1.4/src/SearchInfoWindow_min.js"> +