diff --git a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java index ee05fd9..43714d0 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java +++ b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java @@ -1,8 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -16,6 +18,7 @@ private String taskCode; private String markerName;//关联点的信息 private Long markerId; + private String markerIdReal; private Double longitude;//经度 private Double latitude;//纬度 private Integer isChecked;//是否巡检完成 @@ -44,6 +47,12 @@ return taskCode; } + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } public void setTaskCode(String taskCode) { this.taskCode = taskCode; } @@ -143,6 +152,7 @@ } taskDetailDto.setMarkerName(taskDetail.getMarkerName()); taskDetailDto.setMarkerId(taskDetail.getMarkerId()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); taskDetailDto.setLatitude(taskDetail.getLatitude()); taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; diff --git a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java index ee05fd9..43714d0 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java +++ b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java @@ -1,8 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -16,6 +18,7 @@ private String taskCode; private String markerName;//关联点的信息 private Long markerId; + private String markerIdReal; private Double longitude;//经度 private Double latitude;//纬度 private Integer isChecked;//是否巡检完成 @@ -44,6 +47,12 @@ return taskCode; } + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } public void setTaskCode(String taskCode) { this.taskCode = taskCode; } @@ -143,6 +152,7 @@ } taskDetailDto.setMarkerName(taskDetail.getMarkerName()); taskDetailDto.setMarkerId(taskDetail.getMarkerId()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); taskDetailDto.setLatitude(taskDetail.getLatitude()); taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index cd1be3b..3cb1745 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -20,6 +20,7 @@ private String imagePath; private String description; private Date finishTime; + private String markerIdReal;//物理上的标签ID，在移动端需要使用 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -51,6 +52,13 @@ this.markerName = markerName; } + @Column(name="markerIdReal") + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } @Column(name = "markerId") public Long getMarkerId() { return markerId; diff --git a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java index ee05fd9..43714d0 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java +++ b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java @@ -1,8 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -16,6 +18,7 @@ private String taskCode; private String markerName;//关联点的信息 private Long markerId; + private String markerIdReal; private Double longitude;//经度 private Double latitude;//纬度 private Integer isChecked;//是否巡检完成 @@ -44,6 +47,12 @@ return taskCode; } + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } public void setTaskCode(String taskCode) { this.taskCode = taskCode; } @@ -143,6 +152,7 @@ } taskDetailDto.setMarkerName(taskDetail.getMarkerName()); taskDetailDto.setMarkerId(taskDetail.getMarkerId()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); taskDetailDto.setLatitude(taskDetail.getLatitude()); taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index cd1be3b..3cb1745 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -20,6 +20,7 @@ private String imagePath; private String description; private Date finishTime; + private String markerIdReal;//物理上的标签ID，在移动端需要使用 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -51,6 +52,13 @@ this.markerName = markerName; } + @Column(name="markerIdReal") + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } @Column(name = "markerId") public Long getMarkerId() { return markerId; diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ce1e67c..6273013 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -195,9 +195,11 @@ task.setIsValid(1); List taskDetails = new ArrayList(); for (Marker m : markers) { +// if(m.getMarkerId()==null) continue; TaskDetail taskDetail = new TaskDetail(); // taskDetail.setMarkerName(m.getMarkerName()); taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); taskDetail.setLatitude(m.getLatitude()); taskDetail.setLongitude(m.getLongitude()); taskDetail.setTask(task); diff --git a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java index ee05fd9..43714d0 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java +++ b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java @@ -1,8 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -16,6 +18,7 @@ private String taskCode; private String markerName;//关联点的信息 private Long markerId; + private String markerIdReal; private Double longitude;//经度 private Double latitude;//纬度 private Integer isChecked;//是否巡检完成 @@ -44,6 +47,12 @@ return taskCode; } + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } public void setTaskCode(String taskCode) { this.taskCode = taskCode; } @@ -143,6 +152,7 @@ } taskDetailDto.setMarkerName(taskDetail.getMarkerName()); taskDetailDto.setMarkerId(taskDetail.getMarkerId()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); taskDetailDto.setLatitude(taskDetail.getLatitude()); taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index cd1be3b..3cb1745 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -20,6 +20,7 @@ private String imagePath; private String description; private Date finishTime; + private String markerIdReal;//物理上的标签ID，在移动端需要使用 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -51,6 +52,13 @@ this.markerName = markerName; } + @Column(name="markerIdReal") + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } @Column(name = "markerId") public Long getMarkerId() { return markerId; diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ce1e67c..6273013 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -195,9 +195,11 @@ task.setIsValid(1); List taskDetails = new ArrayList(); for (Marker m : markers) { +// if(m.getMarkerId()==null) continue; TaskDetail taskDetail = new TaskDetail(); // taskDetail.setMarkerName(m.getMarkerName()); taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); taskDetail.setLatitude(m.getLatitude()); taskDetail.setLongitude(m.getLongitude()); taskDetail.setTask(task); diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index 1ea91d0..1f61647 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -34,7 +34,7 @@ * @param user * @return */ - public User login(User user) { + public User login(User user) throws Exception{ Criteria criteria = this.createCriteria(User.class); criteria.add(Restrictions.eq("userName", user.getUserName())); criteria.add(Restrictions.eq("password", user.getPassword())); diff --git a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java index ee05fd9..43714d0 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java +++ b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java @@ -1,8 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -16,6 +18,7 @@ private String taskCode; private String markerName;//关联点的信息 private Long markerId; + private String markerIdReal; private Double longitude;//经度 private Double latitude;//纬度 private Integer isChecked;//是否巡检完成 @@ -44,6 +47,12 @@ return taskCode; } + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } public void setTaskCode(String taskCode) { this.taskCode = taskCode; } @@ -143,6 +152,7 @@ } taskDetailDto.setMarkerName(taskDetail.getMarkerName()); taskDetailDto.setMarkerId(taskDetail.getMarkerId()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); taskDetailDto.setLatitude(taskDetail.getLatitude()); taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index cd1be3b..3cb1745 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -20,6 +20,7 @@ private String imagePath; private String description; private Date finishTime; + private String markerIdReal;//物理上的标签ID，在移动端需要使用 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -51,6 +52,13 @@ this.markerName = markerName; } + @Column(name="markerIdReal") + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } @Column(name = "markerId") public Long getMarkerId() { return markerId; diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ce1e67c..6273013 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -195,9 +195,11 @@ task.setIsValid(1); List taskDetails = new ArrayList(); for (Marker m : markers) { +// if(m.getMarkerId()==null) continue; TaskDetail taskDetail = new TaskDetail(); // taskDetail.setMarkerName(m.getMarkerName()); taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); taskDetail.setLatitude(m.getLatitude()); taskDetail.setLongitude(m.getLongitude()); taskDetail.setTask(task); diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index 1ea91d0..1f61647 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -34,7 +34,7 @@ * @param user * @return */ - public User login(User user) { + public User login(User user) throws Exception{ Criteria criteria = this.createCriteria(User.class); criteria.add(Restrictions.eq("userName", user.getUserName())); criteria.add(Restrictions.eq("password", user.getPassword())); diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java index 2760860..99a7ddd 100644 --- a/src/main/java/com/casic/accessControl/user/web/UserController.java +++ b/src/main/java/com/casic/accessControl/user/web/UserController.java @@ -45,7 +45,14 @@ @ResponseBody public Map login(@ModelAttribute User userInfo, HttpSession session) { Map result = new HashMap(); - User user = userManager.login(userInfo); + User user = null; + try{ + user = userManager.login(userInfo); + }catch(Exception e){ + result.put("success", false); + return result; + } + if (user == null) {//登录失败 logger.warn("登录失败，请检查用户名或密码是否正确,当前用户名：{},密码：{}", userInfo.getUserName(), userInfo.getPassword()); result.put("success", false); diff --git a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java index ee05fd9..43714d0 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java +++ b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java @@ -1,8 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -16,6 +18,7 @@ private String taskCode; private String markerName;//关联点的信息 private Long markerId; + private String markerIdReal; private Double longitude;//经度 private Double latitude;//纬度 private Integer isChecked;//是否巡检完成 @@ -44,6 +47,12 @@ return taskCode; } + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } public void setTaskCode(String taskCode) { this.taskCode = taskCode; } @@ -143,6 +152,7 @@ } taskDetailDto.setMarkerName(taskDetail.getMarkerName()); taskDetailDto.setMarkerId(taskDetail.getMarkerId()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); taskDetailDto.setLatitude(taskDetail.getLatitude()); taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index cd1be3b..3cb1745 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -20,6 +20,7 @@ private String imagePath; private String description; private Date finishTime; + private String markerIdReal;//物理上的标签ID，在移动端需要使用 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -51,6 +52,13 @@ this.markerName = markerName; } + @Column(name="markerIdReal") + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } @Column(name = "markerId") public Long getMarkerId() { return markerId; diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ce1e67c..6273013 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -195,9 +195,11 @@ task.setIsValid(1); List taskDetails = new ArrayList(); for (Marker m : markers) { +// if(m.getMarkerId()==null) continue; TaskDetail taskDetail = new TaskDetail(); // taskDetail.setMarkerName(m.getMarkerName()); taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); taskDetail.setLatitude(m.getLatitude()); taskDetail.setLongitude(m.getLongitude()); taskDetail.setTask(task); diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index 1ea91d0..1f61647 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -34,7 +34,7 @@ * @param user * @return */ - public User login(User user) { + public User login(User user) throws Exception{ Criteria criteria = this.createCriteria(User.class); criteria.add(Restrictions.eq("userName", user.getUserName())); criteria.add(Restrictions.eq("password", user.getPassword())); diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java index 2760860..99a7ddd 100644 --- a/src/main/java/com/casic/accessControl/user/web/UserController.java +++ b/src/main/java/com/casic/accessControl/user/web/UserController.java @@ -45,7 +45,14 @@ @ResponseBody public Map login(@ModelAttribute User userInfo, HttpSession session) { Map result = new HashMap(); - User user = userManager.login(userInfo); + User user = null; + try{ + user = userManager.login(userInfo); + }catch(Exception e){ + result.put("success", false); + return result; + } + if (user == null) {//登录失败 logger.warn("登录失败，请检查用户名或密码是否正确,当前用户名：{},密码：{}", userInfo.getUserName(), userInfo.getPassword()); result.put("success", false); diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js index cbe6b60..17e976b 100644 --- a/src/main/webapp/s/app/ems/ems.js +++ b/src/main/webapp/s/app/ems/ems.js @@ -169,28 +169,23 @@ initMap: function () { map = new BMap.Map("container"); // 创建地图实例 + + //右键删除操作 var menu = new BMap.ContextMenu(); var txtMenuItem = [ { text: '删除', callback: function (e) { - //判断右键位置是否在覆盖物内，如果在就展示菜单，如果不在就不展示 + //判断右键位置是否在覆盖物内，如果在就删除覆盖物 for (var i = 0; i < drawOverlays.length; i++) { var layer = drawOverlays[i]; - var type = drawOverlays[i].oQ; - if (type == "Circle") { - if (BMapLib.GeoUtils.isPointInCircle(e, layer)) { - map.removeOverlay(drawOverlays[i]); + if (BMapLib.GeoUtils.isPointInPolygon(e, layer) || BMapLib.GeoUtils.isPointInRect(e, layer)||BMapLib.GeoUtils.isPointInCircle(e, layer)) { + map.removeOverlay(drawOverlays[i]); drawOverlays.splice(i, 1); } - } else { - if (BMapLib.GeoUtils.isPointInPolygon(e, layer) || BMapLib.GeoUtils.isPointInRect(e, layer)) { - map.removeOverlay(drawOverlays[i]); - drawOverlays.splice(i, 1); - } - } } + } } ]; @@ -265,6 +260,7 @@ var overlaycomplete = function (e) { e.overlay.enableEditing(); drawOverlays.push(e.overlay); + drawingManager.close(); }; //实例化鼠标绘制工具 @@ -286,7 +282,6 @@ //添加鼠标绘制工具监听事件，用于获取绘制结果 drawingManager.addEventListener('overlaycomplete', overlaycomplete); - //加载完毕请求标识点信息 map.addEventListener("tilesloaded", function () { if (window.markerData.length == 0) { diff --git a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java index ee05fd9..43714d0 100644 --- a/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java +++ b/src/main/java/com/casic/accessControl/rs/TaskDetailInfo.java @@ -1,8 +1,10 @@ package com.casic.accessControl.rs; +import com.casic.accessControl.marker.manager.MarkerManager; import com.casic.accessControl.task.domain.Task; import com.casic.accessControl.task.domain.TaskDetail; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -16,6 +18,7 @@ private String taskCode; private String markerName;//关联点的信息 private Long markerId; + private String markerIdReal; private Double longitude;//经度 private Double latitude;//纬度 private Integer isChecked;//是否巡检完成 @@ -44,6 +47,12 @@ return taskCode; } + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } public void setTaskCode(String taskCode) { this.taskCode = taskCode; } @@ -143,6 +152,7 @@ } taskDetailDto.setMarkerName(taskDetail.getMarkerName()); taskDetailDto.setMarkerId(taskDetail.getMarkerId()); + taskDetailDto.setMarkerIdReal(taskDetail.getMarkerIdReal()); taskDetailDto.setLatitude(taskDetail.getLatitude()); taskDetailDto.setLongitude(taskDetail.getLongitude()); return taskDetailDto; diff --git a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java index cd1be3b..3cb1745 100644 --- a/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java +++ b/src/main/java/com/casic/accessControl/task/domain/TaskDetail.java @@ -20,6 +20,7 @@ private String imagePath; private String description; private Date finishTime; + private String markerIdReal;//物理上的标签ID，在移动端需要使用 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -51,6 +52,13 @@ this.markerName = markerName; } + @Column(name="markerIdReal") + public String getMarkerIdReal(){ + return markerIdReal; + } + public void setMarkerIdReal(String markerIdReal){ + this.markerIdReal = markerIdReal; + } @Column(name = "markerId") public Long getMarkerId() { return markerId; diff --git a/src/main/java/com/casic/accessControl/task/web/TaskController.java b/src/main/java/com/casic/accessControl/task/web/TaskController.java index ce1e67c..6273013 100644 --- a/src/main/java/com/casic/accessControl/task/web/TaskController.java +++ b/src/main/java/com/casic/accessControl/task/web/TaskController.java @@ -195,9 +195,11 @@ task.setIsValid(1); List taskDetails = new ArrayList(); for (Marker m : markers) { +// if(m.getMarkerId()==null) continue; TaskDetail taskDetail = new TaskDetail(); // taskDetail.setMarkerName(m.getMarkerName()); taskDetail.setMarkerId(m.getId()); + taskDetail.setMarkerIdReal(m.getMarkerId()); taskDetail.setLatitude(m.getLatitude()); taskDetail.setLongitude(m.getLongitude()); taskDetail.setTask(task); diff --git a/src/main/java/com/casic/accessControl/user/manager/UserManager.java b/src/main/java/com/casic/accessControl/user/manager/UserManager.java index 1ea91d0..1f61647 100644 --- a/src/main/java/com/casic/accessControl/user/manager/UserManager.java +++ b/src/main/java/com/casic/accessControl/user/manager/UserManager.java @@ -34,7 +34,7 @@ * @param user * @return */ - public User login(User user) { + public User login(User user) throws Exception{ Criteria criteria = this.createCriteria(User.class); criteria.add(Restrictions.eq("userName", user.getUserName())); criteria.add(Restrictions.eq("password", user.getPassword())); diff --git a/src/main/java/com/casic/accessControl/user/web/UserController.java b/src/main/java/com/casic/accessControl/user/web/UserController.java index 2760860..99a7ddd 100644 --- a/src/main/java/com/casic/accessControl/user/web/UserController.java +++ b/src/main/java/com/casic/accessControl/user/web/UserController.java @@ -45,7 +45,14 @@ @ResponseBody public Map login(@ModelAttribute User userInfo, HttpSession session) { Map result = new HashMap(); - User user = userManager.login(userInfo); + User user = null; + try{ + user = userManager.login(userInfo); + }catch(Exception e){ + result.put("success", false); + return result; + } + if (user == null) {//登录失败 logger.warn("登录失败，请检查用户名或密码是否正确,当前用户名：{},密码：{}", userInfo.getUserName(), userInfo.getPassword()); result.put("success", false); diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js index cbe6b60..17e976b 100644 --- a/src/main/webapp/s/app/ems/ems.js +++ b/src/main/webapp/s/app/ems/ems.js @@ -169,28 +169,23 @@ initMap: function () { map = new BMap.Map("container"); // 创建地图实例 + + //右键删除操作 var menu = new BMap.ContextMenu(); var txtMenuItem = [ { text: '删除', callback: function (e) { - //判断右键位置是否在覆盖物内，如果在就展示菜单，如果不在就不展示 + //判断右键位置是否在覆盖物内，如果在就删除覆盖物 for (var i = 0; i < drawOverlays.length; i++) { var layer = drawOverlays[i]; - var type = drawOverlays[i].oQ; - if (type == "Circle") { - if (BMapLib.GeoUtils.isPointInCircle(e, layer)) { - map.removeOverlay(drawOverlays[i]); + if (BMapLib.GeoUtils.isPointInPolygon(e, layer) || BMapLib.GeoUtils.isPointInRect(e, layer)||BMapLib.GeoUtils.isPointInCircle(e, layer)) { + map.removeOverlay(drawOverlays[i]); drawOverlays.splice(i, 1); } - } else { - if (BMapLib.GeoUtils.isPointInPolygon(e, layer) || BMapLib.GeoUtils.isPointInRect(e, layer)) { - map.removeOverlay(drawOverlays[i]); - drawOverlays.splice(i, 1); - } - } } + } } ]; @@ -265,6 +260,7 @@ var overlaycomplete = function (e) { e.overlay.enableEditing(); drawOverlays.push(e.overlay); + drawingManager.close(); }; //实例化鼠标绘制工具 @@ -286,7 +282,6 @@ //添加鼠标绘制工具监听事件，用于获取绘制结果 drawingManager.addEventListener('overlaycomplete', overlaycomplete); - //加载完毕请求标识点信息 map.addEventListener("tilesloaded", function () { if (window.markerData.length == 0) { diff --git a/src/main/webapp/s/app/task/task.js b/src/main/webapp/s/app/task/task.js index ec6d7d1..ebfdfd6 100644 --- a/src/main/webapp/s/app/task/task.js +++ b/src/main/webapp/s/app/task/task.js @@ -249,18 +249,22 @@ //判断右键位置是否在覆盖物内，如果在就展示菜单，如果不在就不展示 for (var i = 0; i < drawOverlays.length; i++) { var layer = drawOverlays[i]; - var type = drawOverlays[i].oQ; - if (type == "Circle") { - if (BMapLib.GeoUtils.isPointInCircle(e, layer)) { - map.removeOverlay(drawOverlays[i]); - drawOverlays.splice(i, 1); - } - } else { - if (BMapLib.GeoUtils.isPointInPolygon(e, layer) || BMapLib.GeoUtils.isPointInRect(e, layer)) { - map.removeOverlay(drawOverlays[i]); - drawOverlays.splice(i, 1); - } + if (BMapLib.GeoUtils.isPointInPolygon(e, layer) || BMapLib.GeoUtils.isPointInRect(e, layer)||BMapLib.GeoUtils.isPointInCircle(e, layer)) { + map.removeOverlay(drawOverlays[i]); + drawOverlays.splice(i, 1); } +// var type = drawOverlays[i].oQ; +// if (type == "Circle") { +// if (BMapLib.GeoUtils.isPointInCircle(e, layer)) { +// map.removeOverlay(drawOverlays[i]); +// drawOverlays.splice(i, 1); +// } +// } else { +// if (BMapLib.GeoUtils.isPointInPolygon(e, layer) || BMapLib.GeoUtils.isPointInRect(e, layer)) { +// map.removeOverlay(drawOverlays[i]); +// drawOverlays.splice(i, 1); +// } +// } } } } @@ -318,6 +322,7 @@ var overlaycomplete = function (e) { e.overlay.enableEditing(); drawOverlays.push(e.overlay); + drawingManager.close(); }; //实例化鼠标绘制工具 var drawingManager = new BMapLib.DrawingManager(map, {