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 db221fd..fa98196 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -377,6 +377,24 @@ } + public String getPathOfMarkerImages(String markerId) { + String result = ""; + Criteria criteria = this.createCriteria(Marker.class); + criteria.add(Restrictions.eq("markerId", markerId)).add(Restrictions.eq("isValid", 1)); + List list = (List) criteria.list(); + if (list==null||list.size() <= 0) return result; + String images = list.get(0).getPhotos(); + if (StringUtils.isBlank(images)) return result; + String[] imagesArr = images.split(","); + for (int i = 0; i < imagesArr.length; i++) { + if (i == 0) result += "" + imagesArr[i]; + else { + result += "," + imagesArr[i]; + } + } + return result; + } + public List getAllPoint(User user) { if (user == null) { return Collections.emptyList(); 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 db221fd..fa98196 100644 --- a/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java +++ b/src/main/java/com/casic/accessControl/marker/manager/MarkerManager.java @@ -377,6 +377,24 @@ } + public String getPathOfMarkerImages(String markerId) { + String result = ""; + Criteria criteria = this.createCriteria(Marker.class); + criteria.add(Restrictions.eq("markerId", markerId)).add(Restrictions.eq("isValid", 1)); + List list = (List) criteria.list(); + if (list==null||list.size() <= 0) return result; + String images = list.get(0).getPhotos(); + if (StringUtils.isBlank(images)) return result; + String[] imagesArr = images.split(","); + for (int i = 0; i < imagesArr.length; i++) { + if (i == 0) result += "" + imagesArr[i]; + else { + result += "," + imagesArr[i]; + } + } + return result; + } + public List getAllPoint(User user) { if (user == null) { return Collections.emptyList(); 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 940e40e..c6cd733 100644 --- a/src/main/java/com/casic/accessControl/marker/web/MarkerController.java +++ b/src/main/java/com/casic/accessControl/marker/web/MarkerController.java @@ -87,6 +87,16 @@ return result; } + @RequestMapping(value = "get-marker-images") + @ResponseBody + public Map getPathOfMarkerImages(@RequestParam(value = "markerId")String markerId){ + Map result = new HashMap(); + String data = markerManager.getPathOfMarkerImages(markerId); + result.put("data",data); + result.put("success","true"); + return result; + } + /** * 查询出要编辑的标签信息 *