From 353485ee04235b675de4dab780e55184f8af3e59 Mon Sep 17 00:00:00 2001
From: yitonglei <ytl653@163.com>
Date: Fri, 29 Jul 2022 11:30:09 +0800
Subject: [PATCH] no message

---
 .../monitor/controller/Controller.java        | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java b/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java
index 26acea28..7c1fde10 100644
--- a/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java
+++ b/renren-admin/src/main/java/io/renren/modules/monitor/controller/Controller.java
@@ -671,7 +671,7 @@ public class Controller {
      */
     @GetMapping("/saveOrgenization")
     public Result saveOrgenization() throws Exception{
-        List<JSONObject> orgenizationByPage = monitorService.getOrgenization(new ArrayList<JSONObject>());
+        List<JSONObject> orgenizationByPage = monitorService.getOrgenization(new ArrayList<JSONObject>(10000));
         List<Map> maps = JSONObject.parseArray(JSONObject.toJSONString(orgenizationByPage), Map.class);
         if(maps.size() > 0){
             List<List<Map>> lists = Lists.partition(maps,100);
@@ -693,20 +693,48 @@ public class Controller {
         return Result.success();
     }
 
+    /**
+     * 事件版的保存区域组织信息
+     */
+    @GetMapping("/saveOrgenizationEvent")
+    public Result  saveOrgenizationEvent() throws Exception{
+        monitorService.getAndSaveOrgenization();
+        return Result.success();
+    }
+
     /**
      * 保存通道信息多线程版
      * @return
      */
     @GetMapping("saveChannelInfoAsync")
     public Result saveChannelInfoAsync() throws Exception{
-        monitorService.saveChannelInfoAsync();
-        return Result.success("成功收到指令,请耐心等待");
+         monitorService.saveChannelInfoAsync();
+        return Result.success();
     }
     /******************************2022/07/13 ytl修改视频资源 end********************************************/
-
+    /**
+     * 07-25增加的判断视频资源是否在库中，
+     * 以后可以删除，直接调用cameraChannelServicecheckCameraIfExists即可
+     * @param list
+     * @return
+     */
     @GetMapping("/checkCameraIfExists")
     public Result checkCameraIfExists(@RequestParam List<String> list){
         Result result = cameraChannelService.checkCameraIfExists(list);
         return result;
     }
+
+//    //以下是7月26号的测试用的
+//    @GetMapping("/getCameraChannelByPID")
+//    public Result getCameraChannelByPID(@RequestParam String pid) throws Exception{
+//        List<Map> channelInfo = monitorService.getChannelInfo(pid);
+//        return Result.success(channelInfo);
+//    }
+//
+//    @GetMapping("/getOrganization")
+//    public Result getOrganization() throws Exception{
+//        List<JSONObject> orgenization = monitorService.getOrgenization(new ArrayList<>());
+//        return Result.success(orgenization);
+//    }
+
 }