diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index a7a1c064..1226a031 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -405,7 +405,7 @@ public class MapController extends BaseController {
      */
     @RequestMapping("/getPersonPositioningCount")
     @ResponseBody
-    public Object getPersonPositioningCount() {
+    public Object getPersonPositioningCount() throws Exception{
         Map<String, Object> map = new HashMap<String, Object>();
         PageData pageData = this.getPageData();
         if ("00004".equals(pageData.getString("GANGKOU"))) {
@@ -427,8 +427,6 @@ public class MapController extends BaseController {
 
             return result;
         }
-        // bus_riskunit
-        // bus_identificationparts
         PageData data = biMapService.getPersonPositioningCount(pageData);
         map.put("result", "success");
         map.put("personPositioningCount", data);
@@ -841,10 +839,15 @@ public class MapController extends BaseController {
      */
     @RequestMapping(value = "/getCurrentLocationOnline")
     @ResponseBody
-    public Object getCurrentLocationOnline() {
+    public Object getCurrentLocationOnline() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         String errInfo = "success";
         PageData pd = this.getPageData();
+        // created by liu jun 一公司人员定位新增摄像头功能
+        if ("platcamera".equals(pd.getString("TYPE")) && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("CORPINFO_ID"))){
+            GetCameraListDto dto = new GetCameraListDto();
+            return  dwService.getCameraList(dto);
+        }
         if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("peoplePosition")) {
             MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
             Map<String, Object> result =
@@ -964,6 +967,39 @@ public class MapController extends BaseController {
         }
     }
 
+    @RequestMapping(value = "/getCameraList")
+    @ResponseBody
+    public Object getCameraList() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        // TODO 判断是否是公司人员定位
+        if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) {
+            GetCameraListDto dto = new GetCameraListDto();
+            return dwService.getCameraList(dto);
+        }else {
+            // TODO 其他系统有待开发
+            return null;
+        }
+    }
+
+
+    @RequestMapping(value = "/getCameraInfo")
+    @ResponseBody
+    public Object getCameraInfo() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        // TODO 判断是否是公司人员定位
+        if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) {
+            GetCameraInfoDto dto = new GetCameraInfoDto();
+            dto.setId(pd.getString("id"));
+            return dwService.getCameraInfo(dto);
+        }else {
+            // TODO 其他系统有待开发
+            return null;
+        }
+    }
+
+