diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index 24d6b25..dd0fa4b 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -157,6 +157,18 @@ return Collections.emptyList(); } + public List getMarkerByMarkerId(String markerId) { + if (markerId == null || StringUtils.isBlank(markerId)) { + logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null"); + return Collections.emptyList(); + } + Criteria criteria = this.createCriteria(Marker.class); + criteria.add(Restrictions.eq("markerId", markerId)); + criteria.add(Restrictions.eq("isValid", 1)); + List markers = criteria.list(); + return MarkerDto.convert2MarkerDtoList(markers); + } + public boolean saveMarker(Marker marker) { try { if (marker == null) { diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index 24d6b25..dd0fa4b 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -157,6 +157,18 @@ return Collections.emptyList(); } + public List getMarkerByMarkerId(String markerId) { + if (markerId == null || StringUtils.isBlank(markerId)) { + logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null"); + return Collections.emptyList(); + } + Criteria criteria = this.createCriteria(Marker.class); + criteria.add(Restrictions.eq("markerId", markerId)); + criteria.add(Restrictions.eq("isValid", 1)); + List markers = criteria.list(); + return MarkerDto.convert2MarkerDtoList(markers); + } + public boolean saveMarker(Marker marker) { try { if (marker == null) { diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 8c5c84a..1026827 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -221,6 +221,12 @@ if (companyId == null) { return map; } + for(MarkerDto markerDto:markers){ + if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ + map.put("message", "标识器已存在,请勿重复安装"); + return map; + } + } boolean result = markerManager.batchSave(markers, companyId); if (!result) { return map; diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index 24d6b25..dd0fa4b 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -157,6 +157,18 @@ return Collections.emptyList(); } + public List getMarkerByMarkerId(String markerId) { + if (markerId == null || StringUtils.isBlank(markerId)) { + logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null"); + return Collections.emptyList(); + } + Criteria criteria = this.createCriteria(Marker.class); + criteria.add(Restrictions.eq("markerId", markerId)); + criteria.add(Restrictions.eq("isValid", 1)); + List markers = criteria.list(); + return MarkerDto.convert2MarkerDtoList(markers); + } + public boolean saveMarker(Marker marker) { try { if (marker == null) { diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 8c5c84a..1026827 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -221,6 +221,12 @@ if (companyId == null) { return map; } + for(MarkerDto markerDto:markers){ + if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ + map.put("message", "标识器已存在,请勿重复安装"); + return map; + } + } boolean result = markerManager.batchSave(markers, companyId); if (!result) { return map; diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp index af0f3bd..8f5d29d 100644 --- a/src/main/webapp/content/marker/marker-info-edit-new.jsp +++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@include file="/common/layout/footer.jsp" %> <%----%> \ No newline at end of file +<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@include file="/common/layout/footer.jsp" %> <%----%> \ No newline at end of file diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index 24d6b25..dd0fa4b 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -157,6 +157,18 @@ return Collections.emptyList(); } + public List getMarkerByMarkerId(String markerId) { + if (markerId == null || StringUtils.isBlank(markerId)) { + logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null"); + return Collections.emptyList(); + } + Criteria criteria = this.createCriteria(Marker.class); + criteria.add(Restrictions.eq("markerId", markerId)); + criteria.add(Restrictions.eq("isValid", 1)); + List markers = criteria.list(); + return MarkerDto.convert2MarkerDtoList(markers); + } + public boolean saveMarker(Marker marker) { try { if (marker == null) { diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 8c5c84a..1026827 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -221,6 +221,12 @@ if (companyId == null) { return map; } + for(MarkerDto markerDto:markers){ + if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ + map.put("message", "标识器已存在,请勿重复安装"); + return map; + } + } boolean result = markerManager.batchSave(markers, companyId); if (!result) { return map; diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp index af0f3bd..8f5d29d 100644 --- a/src/main/webapp/content/marker/marker-info-edit-new.jsp +++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@include file="/common/layout/footer.jsp" %> <%----%> \ No newline at end of file +<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@include file="/common/layout/footer.jsp" %> <%----%> \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js index 2ad38ae..1fa5ad6 100644 --- a/src/main/webapp/s/app/ems/ems.js +++ b/src/main/webapp/s/app/ems/ems.js @@ -10,7 +10,8 @@ var drawOverlays = new Array(); var readyToUploadMarkers = new Array(); var vectorMarkers = []; - + var markerData = []; + var hadRequest = false; var handleDatePickers = function () { if (jQuery().datepicker) { @@ -20,7 +21,8 @@ } } function requestMarkers() { - if (window.markerData.length == 0) { + if (markerData.length == 0&!hadRequest) { + hadRequest = true; $.ajax({ type: "get", url: $('#context').val() + "/marker/all-point-list.do", @@ -30,27 +32,28 @@ success: function (r) { if (r.data) {//请求成功，将获取到的数据加载到地图上 //1.解析返回的结果,.设置全局变量data的值 - window.markerData = [];//清空原来的数据 + markerData = [];//清空原来的数据 for (var t = 0; t < r.data.length; t++) { var markerDto = r.data[t]; var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle, markerDto.depth, markerDto.belowType, markerDto.belowDepth, markerDto.belowDiameter, markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType, markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, markerDto.recordType, markerDto.id,markerDto.line,markerDto.area); - window.markerData[t] = emsBean; + markerData[t] = emsBean; } //2.增加marker - Ems.addMarker(window.markerData); + Ems.addMarker(markerData); } + hadRequest = false; map.removeEventListener("tilesloaded", requestMarkers); }, error: function (d) {//请求出错 - alert(d.responseText); + hadRequest = false; map.removeEventListener("tilesloaded", requestMarkers); } }); - } else { - Ems.addMarker(window.markerData); + } else if(!hadRequest){ + Ems.addMarker(markerData); } } @@ -74,8 +77,8 @@ var layer = drawOverlays[i]; var type = drawOverlays[i].oQ; try { - for (var j = 0; j < window.markerData.length; j++) { - var emsBean = window.markerData[j]; + for (var j = 0; j < markerData.length; j++) { + var emsBean = markerData[j]; var bdPoint = gpsBdUtils.gcj2bd(emsBean.latitude, emsBean.longitude); var point = new BMap.Point(bdPoint.longitude, bdPoint.latitude); // var point = new BMap.Point(emsBean.longitude, emsBean.latitude); @@ -114,7 +117,7 @@ }, success: function (r) { if (r.success) {//请求成功 - window.markerData = []; + markerData = []; location.href = $('#context').val() + "/content/ems/ems.jsp"; } }, @@ -171,7 +174,7 @@ }, success: function (r) { if (r.success) {//请求成功 - window.markerData = []; + markerData = []; readyToUploadPoints = []; map.setViewport(pointArray); Ems.clearOverlays(); @@ -246,8 +249,8 @@ } //声明全局变量 - if (!window.markerData || window.markerData.length == 0) { - window.markerData = new Array(); + if (!markerData || markerData.length == 0) { + markerData = new Array(); } var point = new BMap.Point(116.404, 39.915); // 创建点坐标 map.centerAndZoom(point, 17); // 初始化地图，设置中心点坐标和地图级别 diff --git a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java index 24d6b25..dd0fa4b 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -157,6 +157,18 @@ return Collections.emptyList(); } + public List getMarkerByMarkerId(String markerId) { + if (markerId == null || StringUtils.isBlank(markerId)) { + logger.info("ERROR,MarkerService->getMarkerByMarkerId,markerId is null"); + return Collections.emptyList(); + } + Criteria criteria = this.createCriteria(Marker.class); + criteria.add(Restrictions.eq("markerId", markerId)); + criteria.add(Restrictions.eq("isValid", 1)); + List markers = criteria.list(); + return MarkerDto.convert2MarkerDtoList(markers); + } + public boolean saveMarker(Marker marker) { try { if (marker == null) { diff --git a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java index 8c5c84a..1026827 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -221,6 +221,12 @@ if (companyId == null) { return map; } + for(MarkerDto markerDto:markers){ + if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ + map.put("message", "标识器已存在,请勿重复安装"); + return map; + } + } boolean result = markerManager.batchSave(markers, companyId); if (!result) { return map; diff --git a/src/main/webapp/content/marker/marker-info-edit-new.jsp b/src/main/webapp/content/marker/marker-info-edit-new.jsp index af0f3bd..8f5d29d 100644 --- a/src/main/webapp/content/marker/marker-info-edit-new.jsp +++ b/src/main/webapp/content/marker/marker-info-edit-new.jsp @@ -1 +1 @@ -<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@include file="/common/layout/footer.jsp" %> <%----%> \ No newline at end of file +<%@page contentType="text/html;charset=UTF-8" %> <%@include file="/taglibs.jsp" %> <%pageContext.setAttribute("currentMenu", "marker1");%> 地下管线电子标识系统 <%@include file="/common/layout/header.jsp" %>
<%@include file="/common/layout/menu_new.jsp" %>
<%--<%@include file="/common/layout/second-menu-user.jsp"%>--%>
标识器管理信息编辑
操作失败：
添加成功
毫米
<%@include file="/common/layout/footer.jsp" %> <%----%> \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js index 2ad38ae..1fa5ad6 100644 --- a/src/main/webapp/s/app/ems/ems.js +++ b/src/main/webapp/s/app/ems/ems.js @@ -10,7 +10,8 @@ var drawOverlays = new Array(); var readyToUploadMarkers = new Array(); var vectorMarkers = []; - + var markerData = []; + var hadRequest = false; var handleDatePickers = function () { if (jQuery().datepicker) { @@ -20,7 +21,8 @@ } } function requestMarkers() { - if (window.markerData.length == 0) { + if (markerData.length == 0&!hadRequest) { + hadRequest = true; $.ajax({ type: "get", url: $('#context').val() + "/marker/all-point-list.do", @@ -30,27 +32,28 @@ success: function (r) { if (r.data) {//请求成功，将获取到的数据加载到地图上 //1.解析返回的结果,.设置全局变量data的值 - window.markerData = [];//清空原来的数据 + markerData = [];//清空原来的数据 for (var t = 0; t < r.data.length; t++) { var markerDto = r.data[t]; var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle, markerDto.depth, markerDto.belowType, markerDto.belowDepth, markerDto.belowDiameter, markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType, markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, markerDto.recordType, markerDto.id,markerDto.line,markerDto.area); - window.markerData[t] = emsBean; + markerData[t] = emsBean; } //2.增加marker - Ems.addMarker(window.markerData); + Ems.addMarker(markerData); } + hadRequest = false; map.removeEventListener("tilesloaded", requestMarkers); }, error: function (d) {//请求出错 - alert(d.responseText); + hadRequest = false; map.removeEventListener("tilesloaded", requestMarkers); } }); - } else { - Ems.addMarker(window.markerData); + } else if(!hadRequest){ + Ems.addMarker(markerData); } } @@ -74,8 +77,8 @@ var layer = drawOverlays[i]; var type = drawOverlays[i].oQ; try { - for (var j = 0; j < window.markerData.length; j++) { - var emsBean = window.markerData[j]; + for (var j = 0; j < markerData.length; j++) { + var emsBean = markerData[j]; var bdPoint = gpsBdUtils.gcj2bd(emsBean.latitude, emsBean.longitude); var point = new BMap.Point(bdPoint.longitude, bdPoint.latitude); // var point = new BMap.Point(emsBean.longitude, emsBean.latitude); @@ -114,7 +117,7 @@ }, success: function (r) { if (r.success) {//请求成功 - window.markerData = []; + markerData = []; location.href = $('#context').val() + "/content/ems/ems.jsp"; } }, @@ -171,7 +174,7 @@ }, success: function (r) { if (r.success) {//请求成功 - window.markerData = []; + markerData = []; readyToUploadPoints = []; map.setViewport(pointArray); Ems.clearOverlays(); @@ -246,8 +249,8 @@ } //声明全局变量 - if (!window.markerData || window.markerData.length == 0) { - window.markerData = new Array(); + if (!markerData || markerData.length == 0) { + markerData = new Array(); } var point = new BMap.Point(116.404, 39.915); // 创建点坐标 map.centerAndZoom(point, 17); // 初始化地图，设置中心点坐标和地图级别 diff --git a/src/main/webapp/s/app/task/task.js b/src/main/webapp/s/app/task/task.js index ec6fe12..b028453 100644 --- a/src/main/webapp/s/app/task/task.js +++ b/src/main/webapp/s/app/task/task.js @@ -14,6 +14,8 @@ var taskDetailLists = new Array(); var eventBeanList = []; var viewPoints = []; + var markerData = []; + var hadRequest = false; var options = { valueNames: [ 'id', 'patrolerName', 'status', 'deployDate', 'beginDate', 'endDate', 'description', {attr: 'src', name: 'image'} ], item: '
  • ' + @@ -155,7 +157,44 @@ // eventImgPage(images.length, 1, images); } + function requestMarkers() { + if (markerData.length == 0&&!hadRequest) { + hadRequest = true; + $.ajax({ + type: "get", + url: $('#context').val() + "/marker/all-point-list.do", + dataType: "json", + cache: false, + success: function (r) { + if (r.data) {//请求成功，将获取到的数据加载到地图上 + //1.解析返回的结果,.设置全局变量data的值 + markerData = [];//清空原来的数据 + for (var t = 0; t < r.data.length; t++) { + var markerDto = r.data[t]; + var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle, + markerDto.depth, markerDto.belowType, markerDto.belowDepth, markerDto.belowDiameter, + markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType, + markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, markerDto.recordType, markerDto.id,markerDto.line,markerDto.area); + markerData[t] = emsBean; + } + //2.增加marker + Task.addMarker(markerData); + } + hadRequest = false; + map.removeEventListener("tilesloaded", requestMarkers); + + }, + error: function (d) {//请求出错 + hadRequest = false; + map.removeEventListener("tilesloaded", requestMarkers); + } + }); + } else if(!hadRequest){ + Task.addMarker(markerData); + } + + } return { //添加工单 @@ -175,9 +214,9 @@ var layer = drawOverlays[i]; var type = drawOverlays[i].oQ; try { - for (var j = 0; j < window.markerData.length; j++) { + for (var j = 0; j < markerData.length; j++) { - var emsBean = window.markerData[j]; + var emsBean = markerData[j]; var bdPoint = gpsBdUtils.gcj2bd(emsBean.latitude, emsBean.longitude); var point = new BMap.Point(bdPoint.longitude, bdPoint.latitude); // var point = new BMap.Point(emsBean.longitude, emsBean.latitude); @@ -280,8 +319,8 @@ } //声明全局变量 - if (!window.markerData || window.markerData.length == 0) { - window.markerData = new Array(); + if (!markerData || markerData.length == 0) { + markerData = new Array(); } var point = new BMap.Point(116.404, 39.915); // 创建点坐标 map.centerAndZoom(point, 17); // 初始化地图，设置中心点坐标和地图级别 @@ -341,42 +380,8 @@ }); //添加鼠标绘制工具监听事件，用于获取绘制结果 drawingManager.addEventListener('overlaycomplete', overlaycomplete); - -//加载完毕请求标识点信息 - map.addEventListener("tilesloaded", function () { - if (window.markerData.length == 0) { - $.ajax({ - type: "get", - url: $('#context').val() + "/marker/all-point-list.do", - dataType: "json", - cache: false, - success: function (r) { - if (r.data) {//请求成功，将获取到的数据加载到地图上 - //1.解析返回的结果,.设置全局变量data的值 - window.markerData = [];//清空原来的数据 - for (var t = 0; t < r.data.length; t++) { - var markerDto = r.data[t]; - var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle, - markerDto.depth, markerDto.belowType, markerDto.belowDepth, markerDto.belowDiameter, - markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType, - markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, markerDto.recordType, markerDto.id,markerDto.line,markerDto.area); - window.markerData[t] = emsBean; - - } - //2.增加marker - Task.addMarker(window.markerData); - } - - }, - error: function (d) {//请求出错 - alert(d.responseText); - } - }); - } else { - Task.addMarker(window.markerData); - } - - }); + //加载完毕请求标识点信息 + map.addEventListener("tilesloaded", requestMarkers); }, initList: function () {