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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js index f763843..3b8fafb 100644 --- a/src/main/webapp/s/app/ems/ems-gd.js +++ b/src/main/webapp/s/app/ems/ems-gd.js @@ -522,9 +522,10 @@ for (var a in r.data) {//遍历列表,添加marker var vectorMarker = new AMap.Marker({ position: [r.data[a].longitude,r.data[a].latitude], - size: new AMap.Size(30, 30), - offset: new AMap.Pixel(-15, -30), //相对于基点的偏移位置 - icon: $('#context').val() + '/images/point.png' + size: new AMap.Size(30, 30), // size不生效 + offset: new AMap.Pixel(-27, -38), //相对于基点的偏移位置 + icon: $('#context').val() + '/images/marker3.svg', + zIndex: -10000 }); vectorMarkers.push(vectorMarker); map.add(vectorMarker); @@ -612,7 +613,7 @@ } var mass = new AMap.MassMarks(points, { - zIndex: 5, // 海量点图层叠加的顺序 + zIndex: 5000, // 海量点图层叠加的顺序 zooms: [3, 19], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }); 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js index f763843..3b8fafb 100644 --- a/src/main/webapp/s/app/ems/ems-gd.js +++ b/src/main/webapp/s/app/ems/ems-gd.js @@ -522,9 +522,10 @@ for (var a in r.data) {//遍历列表,添加marker var vectorMarker = new AMap.Marker({ position: [r.data[a].longitude,r.data[a].latitude], - size: new AMap.Size(30, 30), - offset: new AMap.Pixel(-15, -30), //相对于基点的偏移位置 - icon: $('#context').val() + '/images/point.png' + size: new AMap.Size(30, 30), // size不生效 + offset: new AMap.Pixel(-27, -38), //相对于基点的偏移位置 + icon: $('#context').val() + '/images/marker3.svg', + zIndex: -10000 }); vectorMarkers.push(vectorMarker); map.add(vectorMarker); @@ -612,7 +613,7 @@ } var mass = new AMap.MassMarks(points, { - zIndex: 5, // 海量点图层叠加的顺序 + zIndex: 5000, // 海量点图层叠加的顺序 zooms: [3, 19], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }); diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db +++ /dev/null Binary files differ 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js index f763843..3b8fafb 100644 --- a/src/main/webapp/s/app/ems/ems-gd.js +++ b/src/main/webapp/s/app/ems/ems-gd.js @@ -522,9 +522,10 @@ for (var a in r.data) {//遍历列表,添加marker var vectorMarker = new AMap.Marker({ position: [r.data[a].longitude,r.data[a].latitude], - size: new AMap.Size(30, 30), - offset: new AMap.Pixel(-15, -30), //相对于基点的偏移位置 - icon: $('#context').val() + '/images/point.png' + size: new AMap.Size(30, 30), // size不生效 + offset: new AMap.Pixel(-27, -38), //相对于基点的偏移位置 + icon: $('#context').val() + '/images/marker3.svg', + zIndex: -10000 }); vectorMarkers.push(vectorMarker); map.add(vectorMarker); @@ -612,7 +613,7 @@ } var mass = new AMap.MassMarks(points, { - zIndex: 5, // 海量点图层叠加的顺序 + zIndex: 5000, // 海量点图层叠加的顺序 zooms: [3, 19], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }); diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db +++ /dev/null Binary files differ 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js index f763843..3b8fafb 100644 --- a/src/main/webapp/s/app/ems/ems-gd.js +++ b/src/main/webapp/s/app/ems/ems-gd.js @@ -522,9 +522,10 @@ for (var a in r.data) {//遍历列表,添加marker var vectorMarker = new AMap.Marker({ position: [r.data[a].longitude,r.data[a].latitude], - size: new AMap.Size(30, 30), - offset: new AMap.Pixel(-15, -30), //相对于基点的偏移位置 - icon: $('#context').val() + '/images/point.png' + size: new AMap.Size(30, 30), // size不生效 + offset: new AMap.Pixel(-27, -38), //相对于基点的偏移位置 + icon: $('#context').val() + '/images/marker3.svg', + zIndex: -10000 }); vectorMarkers.push(vectorMarker); map.add(vectorMarker); @@ -612,7 +613,7 @@ } var mass = new AMap.MassMarks(points, { - zIndex: 5, // 海量点图层叠加的顺序 + zIndex: 5000, // 海量点图层叠加的顺序 zooms: [3, 19], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }); diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db +++ /dev/null Binary files differ 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js index f763843..3b8fafb 100644 --- a/src/main/webapp/s/app/ems/ems-gd.js +++ b/src/main/webapp/s/app/ems/ems-gd.js @@ -522,9 +522,10 @@ for (var a in r.data) {//遍历列表,添加marker var vectorMarker = new AMap.Marker({ position: [r.data[a].longitude,r.data[a].latitude], - size: new AMap.Size(30, 30), - offset: new AMap.Pixel(-15, -30), //相对于基点的偏移位置 - icon: $('#context').val() + '/images/point.png' + size: new AMap.Size(30, 30), // size不生效 + offset: new AMap.Pixel(-27, -38), //相对于基点的偏移位置 + icon: $('#context').val() + '/images/marker3.svg', + zIndex: -10000 }); vectorMarkers.push(vectorMarker); map.add(vectorMarker); @@ -612,7 +613,7 @@ } var mass = new AMap.MassMarks(points, { - zIndex: 5, // 海量点图层叠加的顺序 + zIndex: 5000, // 海量点图层叠加的顺序 zooms: [3, 19], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }); diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db +++ /dev/null Binary files differ 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js index f763843..3b8fafb 100644 --- a/src/main/webapp/s/app/ems/ems-gd.js +++ b/src/main/webapp/s/app/ems/ems-gd.js @@ -522,9 +522,10 @@ for (var a in r.data) {//遍历列表,添加marker var vectorMarker = new AMap.Marker({ position: [r.data[a].longitude,r.data[a].latitude], - size: new AMap.Size(30, 30), - offset: new AMap.Pixel(-15, -30), //相对于基点的偏移位置 - icon: $('#context').val() + '/images/point.png' + size: new AMap.Size(30, 30), // size不生效 + offset: new AMap.Pixel(-27, -38), //相对于基点的偏移位置 + icon: $('#context').val() + '/images/marker3.svg', + zIndex: -10000 }); vectorMarkers.push(vectorMarker); map.add(vectorMarker); @@ -612,7 +613,7 @@ } var mass = new AMap.MassMarks(points, { - zIndex: 5, // 海量点图层叠加的顺序 + zIndex: 5000, // 海量点图层叠加的顺序 zooms: [3, 19], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }); diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db +++ /dev/null Binary files differ 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js index f763843..3b8fafb 100644 --- a/src/main/webapp/s/app/ems/ems-gd.js +++ b/src/main/webapp/s/app/ems/ems-gd.js @@ -522,9 +522,10 @@ for (var a in r.data) {//遍历列表,添加marker var vectorMarker = new AMap.Marker({ position: [r.data[a].longitude,r.data[a].latitude], - size: new AMap.Size(30, 30), - offset: new AMap.Pixel(-15, -30), //相对于基点的偏移位置 - icon: $('#context').val() + '/images/point.png' + size: new AMap.Size(30, 30), // size不生效 + offset: new AMap.Pixel(-27, -38), //相对于基点的偏移位置 + icon: $('#context').val() + '/images/marker3.svg', + zIndex: -10000 }); vectorMarkers.push(vectorMarker); map.add(vectorMarker); @@ -612,7 +613,7 @@ } var mass = new AMap.MassMarks(points, { - zIndex: 5, // 海量点图层叠加的顺序 + zIndex: 5000, // 海量点图层叠加的顺序 zooms: [3, 19], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }); diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/login/images/Thumbs.db b/src/main/webapp/s/login/images/Thumbs.db deleted file mode 100644 index d5a9f42..0000000 --- a/src/main/webapp/s/login/images/Thumbs.db +++ /dev/null Binary files differ 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 bfd8f8f..a8a9b93 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -377,6 +377,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); @@ -426,6 +431,11 @@ } Set newMarkerIds = new HashSet<>(); for(MarkerDto markerDto:markers){ + if(StringUtils.isBlank(markerDto.getMarkerId())){ + map.put("message", "标识器ID不能为空"); + map.put("success", "false"); + return map; + } if(markerManager.getMarkerByMarkerId(markerDto.getMarkerId()).size()>0){ map.put("message", "标识器已存在,请勿重复安装"); map.put("success", "false"); diff --git a/src/main/webapp/images/Thumbs.db b/src/main/webapp/images/Thumbs.db deleted file mode 100644 index 56b8b11..0000000 --- a/src/main/webapp/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/images/marker3.svg b/src/main/webapp/images/marker3.svg new file mode 100644 index 0000000..08396c8 --- /dev/null +++ b/src/main/webapp/images/marker3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/webapp/s/app/ems/ems-gd.js b/src/main/webapp/s/app/ems/ems-gd.js index f763843..3b8fafb 100644 --- a/src/main/webapp/s/app/ems/ems-gd.js +++ b/src/main/webapp/s/app/ems/ems-gd.js @@ -522,9 +522,10 @@ for (var a in r.data) {//遍历列表,添加marker var vectorMarker = new AMap.Marker({ position: [r.data[a].longitude,r.data[a].latitude], - size: new AMap.Size(30, 30), - offset: new AMap.Pixel(-15, -30), //相对于基点的偏移位置 - icon: $('#context').val() + '/images/point.png' + size: new AMap.Size(30, 30), // size不生效 + offset: new AMap.Pixel(-27, -38), //相对于基点的偏移位置 + icon: $('#context').val() + '/images/marker3.svg', + zIndex: -10000 }); vectorMarkers.push(vectorMarker); map.add(vectorMarker); @@ -612,7 +613,7 @@ } var mass = new AMap.MassMarks(points, { - zIndex: 5, // 海量点图层叠加的顺序 + zIndex: 5000, // 海量点图层叠加的顺序 zooms: [3, 19], // 在指定地图缩放级别范围内展示海量点图层 style: style // 设置样式对象 }); diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/black/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/bootstrap/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/default/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/gray/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db b/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db deleted file mode 100644 index 5f257a2..0000000 --- a/src/main/webapp/s/jquery-easyui-1.3.2/themes/metro/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/login/images/Thumbs.db b/src/main/webapp/s/login/images/Thumbs.db deleted file mode 100644 index d5a9f42..0000000 --- a/src/main/webapp/s/login/images/Thumbs.db +++ /dev/null Binary files differ diff --git a/src/main/webapp/s/login/images/services/Thumbs.db b/src/main/webapp/s/login/images/services/Thumbs.db deleted file mode 100644 index 85c3877..0000000 --- a/src/main/webapp/s/login/images/services/Thumbs.db +++ /dev/null Binary files differ