git-svn-id: https://192.168.57.71/svn/qt@35 12fe181a-e57f-b044-8676-16dc139aa63e

jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/camera/ctl/CameraCtl.java

@@ -509,12 +509,17 @@ public class CameraCtl extends BaseWebCtl {
 
     @RequestMapping(value = "/findAllCamera")
     @ResponseBody
-    public List<Resource> findAllCamera(String lonlat) {
+    public List<Resource> findAllCamera(String lonlat, String type) {
     	List<Resource> ress = new ArrayList<>();
     	if(StringUtils.isNotEmpty(lonlat)) {
     		ress = pathService.findResources2(lonlat, "camera");
     	} else {
-	    	List<CameraGisEntity> cams = cameraService.findCameraByType("road");
+	    	List<CameraGisEntity> cams = null;
+	    	if(StringUtils.isNotEmpty(type)) {
+	    		cams = cameraService.findCameraByType(type);
+	    	} else {
+	    		cams = cameraService.findAllCameraLocation();
+	    	}
 	    	for (CameraGisEntity c : cams) {
 	            Resource res = new Resource();
 	            res.setId(c.getId());