From 9e11e94f8a92a62695657bb2b3b59a1cf47058a5 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 17 十月 2025 13:38:11 +0800
Subject: [PATCH] 大屏显示问题以及报备导出

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java |  319 +++++++++++++++++++++++++++-------------------------
 1 files changed, 167 insertions(+), 152 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index beebaa8..d7ac0b3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -563,25 +563,26 @@
      */
     @Override
     public void exportVideoOnline(HttpServletResponse response, VideoExportForm exportForm) throws IOException, NoSuchFieldException, IllegalAccessException {
-        log.error("寮�濮嬪鍑烘暟鎹�");
-        log.error("浼犲叆鐨勬湀浠�:{}",exportForm.getMonth());
-        //榛樿鏌ユ墍鏈夐儴闂�
+        log.info("寮�濮嬪鍑烘暟鎹�");
+        log.info("浼犲叆鐨勬湀浠�:{}", exportForm.getMonth());
+
+        // 榛樿鏌ユ墍鏈夐儴闂�
         if (CollectionUtils.isEmpty(exportForm.getDeptIds())) {
-            List<Integer> deptIds = new ArrayList<>();
+            List<Integer> deptIds = new ArrayList<>(AreaDeptEnum.values().length);
             for (AreaDeptEnum value : AreaDeptEnum.values()) {
                 deptIds.add(value.getDeptId());
             }
             exportForm.setDeptIds(deptIds);
         }
-        List<ExcelExp> sheet = new ArrayList<>();
-        //閫氳繃Collections闈欐�佹柟娉曪紝鎶妉ist杞负绾跨▼瀹夊叏鐨刲ist
-        List mysheet = Collections.synchronizedList(sheet);
+
+        // 浣跨敤绾跨▼瀹夊叏鐨凩ist锛岄鍏堟寚瀹氬閲�
+        List<ExcelExp> mysheet = Collections.synchronizedList(new ArrayList<>());
         VideoExportForm.convertTags(exportForm);
         Query query = getQuery(exportForm);
-        //鏈堜唤姣忔棩鍦ㄧ嚎鏁版嵁
+        // 鏈堜唤姣忔棩鍦ㄧ嚎鏁版嵁
         List<TMonitorResult> onlineResult = mongoTemplate.find(query, TMonitorResult.class);
-        log.error("鏈堜唤鍦ㄧ嚎鏁版嵁:{}鏉℃暟",onlineResult.size());
-        // 浣跨敤 Collectors.toMap 鍘婚噸锛屼繚鐣欐瘡涓� No 鐨勭涓�涓亣鍒扮殑鍏冪礌
+        log.info("鏈堜唤鍦ㄧ嚎鏁版嵁:{}鏉℃暟", onlineResult.size());
+        // 浣跨敤Collectors.toMap鍘婚噸锛屼繚鐣欐瘡涓狽o鐨勭涓�涓亣鍒扮殑鍏冪礌
         Map<String, TMonitorResult> uniqueResultsMap = onlineResult.stream()
                 .collect(Collectors.toMap(
                         TMonitorResult::getNo, // keyMapper锛岃繖閲屽亣璁� getNo() 杩斿洖 No 瀛楁
@@ -590,192 +591,206 @@
                 ));
         // 灏� Map 杞崲涓� List
         List<TMonitorResult> tMonitorResults = new ArrayList<>(uniqueResultsMap.values());
-        log.error("鍘婚噸鍚庡ぇ灏�:{}",tMonitorResults.size());
-        //鑾峰彇鍔ㄦ�佸垪鏁版嵁
-        List<Integer> pointIds = tMonitorResults.stream().map(TMonitorResult::getPointId).collect(Collectors.toList());
-        List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
-        //琛ュ厖鍔ㄦ�佸垪鏁版嵁
-        if (!CollectionUtils.isEmpty(dynamics)) {
-            Map<Integer, List<DynamicColumnVO>> map = dynamics.stream().collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
-            for (TMonitorResult tMonitorResult : tMonitorResults) {
-                Integer pointId = tMonitorResult.getPointId();
-                tMonitorResult.setDynamicColumnList(map.get(pointId));
+        log.info("鍘婚噸鍚庡ぇ灏�:{}", tMonitorResults.size());
+        // 鑾峰彇鍔ㄦ�佸垪鏁版嵁骞舵瀯寤虹紦瀛楳ap
+        Map<Integer, List<DynamicColumnVO>> dynamicColumnMap = new HashMap<>();
+        if (!tMonitorResults.isEmpty()) {
+            //鑾峰彇鐐逛綅闆嗗悎
+            List<Integer> pointIds = tMonitorResults.stream()
+                    .map(TMonitorResult::getPointId)
+                    .distinct() // 鍘婚噸锛屽噺灏戞暟鎹簱鏌ヨ
+                    .collect(Collectors.toList());
+            //鑾峰彇闆嗗悎鐐逛綅鐨勮ˉ鍏呭垪淇℃伅
+            List<DynamicColumnVO> dynamics = dynamicColumnMapper.getDynamicsByIds("t_yw_point", pointIds);
+            if (!CollectionUtils.isEmpty(dynamics)) {
+                dynamicColumnMap = dynamics.stream()
+                        .collect(Collectors.groupingBy(DynamicColumnVO::getRefId));
+            }
+
+            // 琛ュ厖鍔ㄦ�佸垪鏁版嵁
+            for (TMonitorResult result : tMonitorResults) {
+                result.setDynamicColumnList(dynamicColumnMap.getOrDefault(result.getPointId(), Collections.emptyList()));
             }
         }
-        //瀛樻斁鍖哄煙 涓� 璁惧鍒楄〃 map key涓� 鍖哄煙
-        Map<Integer, List<VideoDailyExp>> map = new HashMap<>();
-        List<CompletableFuture<List<VideoDailyExp>>> futures = new ArrayList<>();
+
+        // 鎸夐儴闂ㄥ垎缁勶紝鍑忓皯鍚庣画寰幆涓殑杩囨护鎿嶄綔
+        Map<Integer, List<TMonitorResult>> deptMonitorMap = tMonitorResults.stream()
+                .collect(Collectors.groupingBy(TMonitorResult::getDeptId));
+
+        // 鎸夎澶囩紪鍙峰垎缁刼nlineResult锛屽姞閫熷悗缁煡鎵�
+        Map<String, List<TMonitorResult>> noToOnlineMap = onlineResult.stream()
+                .collect(Collectors.groupingBy(TMonitorResult::getNo));
+
+        // 骞惰澶勭悊鍚勯儴闂ㄦ暟鎹�
+        List<CompletableFuture<ExcelExp>> futures = new ArrayList<>(exportForm.getDeptIds().size());
+        Map<Integer, List<VideoDailyExp>> deptExpMap = new ConcurrentHashMap<>();
+
         for (Integer deptId : exportForm.getDeptIds()) {
-            CompletableFuture<List<VideoDailyExp>> future = CompletableFuture.supplyAsync(() -> {
-                List<VideoDailyExp> videoDailyExps = new ArrayList<>();
-                //绛涢�夐儴闂ㄦ暟鎹�
-                List<TMonitorResult> monitors = tMonitorResults.stream()
-                        .filter(tMonitorResult -> deptId.equals(tMonitorResult.getDeptId()))
-                        .collect(Collectors.toList());
-                if (CollectionUtils.isEmpty(monitors)) return videoDailyExps;
+            // 浣跨敤閮ㄩ棬ID鐨勬渶缁堝彉閲�
+            final Integer currentDeptId = deptId;
+            CompletableFuture<ExcelExp> future = CompletableFuture.supplyAsync(() -> {
+                // 鐩存帴浠庨鍒嗙粍鐨凪ap涓幏鍙栵紝閬垮厤姣忔杩囨护
+                List<TMonitorResult> monitors = deptMonitorMap.getOrDefault(currentDeptId, Collections.emptyList());
+                if (monitors.isEmpty()) {
+                    return null;
+                }
 
-                List<String> ids = monitors.stream()
-                        .map(BaseResult::getNo)
-                        .collect(Collectors.toList());
-                //绛涢�塵ongo鍖哄幙鏁版嵁
-                List<TMonitorResult> onlines = onlineResult.stream()
-                        .filter(result -> ids.contains(result.getNo()))
-                        .collect(Collectors.toList());
+                List<VideoDailyExp> videoDailyExps = new ArrayList<>(monitors.size());
+                AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(currentDeptId);
+                String areaName = areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName();
 
-                AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(deptId);
                 for (TMonitorResult result : monitors) {
                     VideoDailyExp videoDailyExp = new VideoDailyExp();
                     videoDailyExp.setSerialNumber(result.getNo());
                     videoDailyExp.setDeviceName(result.getName());
                     videoDailyExp.setType(result.getMonitorType());
+                    videoDailyExp.setArea(areaName);
 
-                    videoDailyExp.setArea(areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName());
+                    // 鏋勫缓鏍囩瀛楃涓�
+                    StringBuilder tag = new StringBuilder();
+                    if (result.getProvinceTag()) tag.append("鐪佸巺銆�");
+                    if (result.getImportantTag()) tag.append("閲嶇偣鐐逛綅銆�");
+                    if (result.getImportantCommandImageTag()) tag.append("閲嶇偣鎸囨尌鍥惧儚銆�");
+                    if (result.getDeptTag()) tag.append("閮ㄧ骇銆�");
 
-                    StringBuilder tag = new StringBuilder("" +
-                            (result.getProvinceTag() ? "鐪佸巺銆�" : "") +
-                            (result.getImportantTag() ? "閲嶇偣鐐逛綅銆�" : "") +
-                            (result.getImportantCommandImageTag() ? "閲嶇偣鎸囨尌鍥惧儚銆�" : "") +
-                            (result.getDeptTag() ? "閮ㄧ骇銆�" : ""));
-
-                    //鍔ㄦ�佸垪澶勭悊鍔犲湪鏍囩閲�
-                    if (!CollectionUtils.isEmpty(result.getDynamicColumnList())) {
-                        for (DynamicColumnVO dynamicColumnVO : result.getDynamicColumnList()) {
+                    // 澶勭悊鍔ㄦ�佸垪
+                    List<DynamicColumnVO> dynamicColumns = result.getDynamicColumnList();
+                    if (!dynamicColumns.isEmpty()) {
+                        for (DynamicColumnVO dynamicColumnVO : dynamicColumns) {
                             tag.append(dynamicColumnVO.getColumnValue()).append("銆�");
                         }
                     }
-                    // 鍒犻櫎瀛楃涓叉湯灏剧殑"銆�"
-                    if (tag.toString().endsWith("銆�")) {
-                        tag = new StringBuilder(tag.substring(0, tag.length() - 1));
+
+                    // 绉婚櫎鏈熬鐨�"銆�"
+                    if (tag.length() > 0) {
+                        tag.setLength(tag.length() - 1);
                     }
                     videoDailyExp.setTag(tag.toString());
 
+                    // 璁剧疆鍦ㄧ嚎鏁版嵁
                     try {
+                        // 浠庨鏋勫缓鐨凪ap涓幏鍙栵紝閬垮厤姣忔杩囨护
+                        List<TMonitorResult> onlines = noToOnlineMap.getOrDefault(result.getNo(), Collections.emptyList());
                         setOnlineDaily(videoDailyExp, result, onlines);
                     } catch (Exception e) {
-                        log.error(e.getMessage());
+                        log.error("璁剧疆鍦ㄧ嚎鏁版嵁寮傚父", e);
                     }
+
                     videoDailyExps.add(videoDailyExp);
                 }
 
-                ExcelExp excelExp = new ExcelExp(
-                        areaDeptEnum == null ? "鏈煡" : areaDeptEnum.getName(),
-                        videoDailyExps,
-                        VideoDailyExp.class
-                );
-                mysheet.add(excelExp);
+                // 瀛樺偍缁撴灉鍒扮嚎绋嬪畨鍏ㄧ殑Map
+                deptExpMap.put(currentDeptId, videoDailyExps);
 
-
-                return videoDailyExps;
+                return new ExcelExp(areaName, videoDailyExps, VideoDailyExp.class);
             }, threadPoolTaskExecutor);
+
             futures.add(future);
-            map.put(deptId,future.join());
         }
-        // 鑾峰彇鍏ㄩ噺鏁版嵁
-        List<VideoDailyExp> totalExps = futures.stream()
-                .map(CompletableFuture::join)
+
+        // 绛夊緟鎵�鏈夊苟琛屼换鍔″畬鎴�
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
+        // 鏀堕泦鎵�鏈夐儴闂ㄧ殑ExcelExp缁撴灉
+        for (CompletableFuture<ExcelExp> future : futures) {
+            ExcelExp excelExp = future.join();
+            if (excelExp != null) {
+                mysheet.add(excelExp);
+            }
+        }
+
+        // 鑾峰彇鍏ㄩ噺鏁版嵁骞舵坊鍔�"鍏ㄩ噺"sheet
+        List<VideoDailyExp> totalExps = deptExpMap.values().stream()
                 .flatMap(List::stream)
                 .collect(Collectors.toList());
-        ExcelExp excelExp = new ExcelExp("鍏ㄩ噺", totalExps, VideoDailyExp.class);
-        mysheet.add(excelExp);
 
-        long face = totalExps.stream().filter(item -> item.getType().contains("1")).count();
-        long car = totalExps.stream().filter(item -> item.getType().contains("2")).count();
-        long video = totalExps.stream().filter(item -> item.getType().contains("3")).count();
-        log.error("浜鸿劯鏁�:{}",face);
-        log.error("car鏁�:{}",car);
-        log.error("video鏁�:{}",video);
-        //娣诲姞鏂扮殑sheet 绂荤嚎鏁扮粺璁¤〃
-        List<VideoTypeOffOnlineExp> videoTypeOffOnlineExps = new ArrayList<>();
+        mysheet.add(new ExcelExp("鍏ㄩ噺", totalExps, VideoDailyExp.class));
 
-        //鍦ㄧ嚎鐜囩粺璁¤〃
-        List<VideoOnlineRateExp> videoOnlineRateExps = new ArrayList<>();
-
-        for (Integer deptId : map.keySet()){
-            List<VideoDailyExp>  list = map.get(deptId);
-            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(deptId);
-            // 娣诲姞绂荤嚎琛ㄨ褰�
-            //璁惧绫诲瀷 1浜鸿劯 2杞﹁締 3瑙嗛
-            //浜鸿劯
-            log.error("浼犲叆閮ㄩ棬闆嗗悎澶у皬:{} + 閮ㄩ棬id:{}" ,list.size(),deptId);
-            VideoTypeOffOnlineExp faceVideoTypeOffOnlineExp = this.getListOfflineCountInfo(list,"1",areaDeptEnum);
-            //鍗″彛
-            VideoTypeOffOnlineExp carVideoTypeOffOnlineExp =this.getListOfflineCountInfo(list,"2",areaDeptEnum);
-            //瑙嗛
-            VideoTypeOffOnlineExp videoTypeOffOnlineExp = this.getListOfflineCountInfo(list,"3",areaDeptEnum);
-
-            VideoOnlineRateExp faceVideoOnlineRateExp = this.getListOnLineCountInfo(list,"1",areaDeptEnum);
-            //鍗″彛
-            VideoOnlineRateExp carVideoOnlineRateExp =this.getListOnLineCountInfo(list,"2",areaDeptEnum);
-            //瑙嗛
-            VideoOnlineRateExp VideoOnlineRateExp = this.getListOnLineCountInfo(list,"3",areaDeptEnum);
-
-
-            //灏嗚鍖哄煙绫讳笁绉嶈澶囩被鍨嬬殑 淇℃伅 鏀惧叆 excel瀵硅薄鍐�
-            //鏀惧叆褰撳墠鍖哄煙鐨勪汉鑴歌澶囩浉鍏宠缁�
-            videoTypeOffOnlineExps.add(faceVideoTypeOffOnlineExp);
-            //鏀惧叆褰撳墠鍖哄煙鐨勮溅杈嗚澶囩浉鍏宠缁�
-            videoTypeOffOnlineExps.add(carVideoTypeOffOnlineExp);
-            //鏀惧叆褰撳墠鍖哄煙鐨勮棰戣澶囩浉鍏宠缁�
-            videoTypeOffOnlineExps.add(videoTypeOffOnlineExp);
-
-            videoOnlineRateExps.add(faceVideoOnlineRateExp);
-            videoOnlineRateExps.add(carVideoOnlineRateExp);
-            videoOnlineRateExps.add(VideoOnlineRateExp);
+        // 缁熻鍚勭被鍨嬭澶囨暟閲�
+        long face = 0, car = 0, video = 0;
+        for (VideoDailyExp exp : totalExps) {
+            String type = exp.getType();
+            if (type.contains("1")) face++;
+            if (type.contains("2")) car++;
+            if (type.contains("3")) video++;
         }
 
-        //璁$畻鑷础甯傚悎璁�
-        //鎻掑叆excel鏃剁‘淇濇暟鎹嚭鐜板湪鏈�鍚�
-        List<VideoTypeOffOnlineExp> allVideoTypeOffOnlineExps = new ArrayList<>();
-        //鎻掑叆excel鏃剁‘淇濇暟鎹嚭鐜板湪鏈�鍚�
-        List<VideoOnlineRateExp> allVideoOnlineRateExps =  new ArrayList<>();
+        log.info("浜鸿劯鏁�:{}", face);
+        log.info("car鏁�:{}", car);
+        log.info("video鏁�:{}", video);
 
-        //鎵�鏈夌绾挎暟鎹腑锛屽悇鍖鸿澶囦负浜鸿劯鐨勫璞�  鍚堣瑁呴厤瀵硅薄
-        VideoTypeOffOnlineExp allFaceVideosOffline = new VideoTypeOffOnlineExp();
-        setAllVideoTypeOffOnlineExpCount(videoTypeOffOnlineExps,allFaceVideosOffline,"浜鸿劯");
+        // 澶勭悊绂荤嚎鏁扮粺璁″拰鍦ㄧ嚎鐜囩粺璁�
+        List<VideoTypeOffOnlineExp> videoTypeOffOnlineExps = new ArrayList<>();
+        List<VideoOnlineRateExp> videoOnlineRateExps = new ArrayList<>();
 
-        VideoTypeOffOnlineExp allCarVideosOffline = new VideoTypeOffOnlineExp();
-        setAllVideoTypeOffOnlineExpCount(videoTypeOffOnlineExps,allCarVideosOffline,"鍗″彛");
+        for (Map.Entry<Integer, List<VideoDailyExp>> entry : deptExpMap.entrySet()) {
+            Integer deptId = entry.getKey();
+            List<VideoDailyExp> list = entry.getValue();
+            AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromDept(deptId);
 
-        VideoTypeOffOnlineExp allVideosOffline = new VideoTypeOffOnlineExp();
-        setAllVideoTypeOffOnlineExpCount(videoTypeOffOnlineExps,allVideosOffline,"瑙嗛");
+            // 鎵归噺澶勭悊涓夌璁惧绫诲瀷
+            addDeviceStats(list, areaDeptEnum, "1", "浜鸿劯", videoTypeOffOnlineExps, videoOnlineRateExps);
+            addDeviceStats(list, areaDeptEnum, "2", "鍗″彛", videoTypeOffOnlineExps, videoOnlineRateExps);
+            addDeviceStats(list, areaDeptEnum, "3", "瑙嗛", videoTypeOffOnlineExps, videoOnlineRateExps);
+        }
 
-        allVideoTypeOffOnlineExps.add(allFaceVideosOffline);
-        allVideoTypeOffOnlineExps.add(allCarVideosOffline);
-        allVideoTypeOffOnlineExps.add(allVideosOffline);
+        // 璁$畻鍚堣鏁版嵁
+        addTotalStats(videoTypeOffOnlineExps, videoOnlineRateExps, face, car, video);
 
-        //鎵�鏈夊湪绾挎暟鎹� 鍚堣瑁呴厤瀵硅薄
-        VideoOnlineRateExp allFaceVideosOnline = new VideoOnlineRateExp();
-        setAllVideoTypeOnlineExpCount(face,videoOnlineRateExps,allFaceVideosOnline,"浜鸿劯");
+        // 娣诲姞缁熻sheet
+        mysheet.add(new ExcelExp("绂荤嚎鏁扮粺璁�", videoTypeOffOnlineExps, VideoTypeOffOnlineExp.class));
+        mysheet.add(new ExcelExp("鍦ㄧ嚎鐜囩粺璁�", videoOnlineRateExps, VideoOnlineRateExp.class));
 
-
-        VideoOnlineRateExp allCarVideosOnline = new VideoOnlineRateExp();
-        setAllVideoTypeOnlineExpCount(car,videoOnlineRateExps,allCarVideosOnline,"鍗″彛");
-
-        VideoOnlineRateExp allVideosOnline = new VideoOnlineRateExp();
-        setAllVideoTypeOnlineExpCount(video,videoOnlineRateExps,allVideosOnline,"瑙嗛");
-
-
-        allVideoOnlineRateExps.add(allFaceVideosOnline);
-        allVideoOnlineRateExps.add(allCarVideosOnline);
-        allVideoOnlineRateExps.add(allVideosOnline);
-
-        videoTypeOffOnlineExps.addAll(allVideoTypeOffOnlineExps);
-        videoOnlineRateExps.addAll(allVideoOnlineRateExps);
-        log.error("鎵撳嵃璁$畻绂荤嚎鐨勪俊鎭�:{}" ,videoTypeOffOnlineExps );
-        log.error("鎵撳嵃鍦ㄧ嚎鐨勪俊鎭�:{}" ,videoOnlineRateExps );
-        //娣诲姞鍚堣鏁版嵁
-
-        ExcelExp excelTypeOffLineExp = new ExcelExp("绂荤嚎鏁扮粺璁�", videoTypeOffOnlineExps, VideoTypeOffOnlineExp.class);
-        mysheet.add(excelTypeOffLineExp);
-
-        //娣诲姞鍦ㄧ嚎鐜囪〃
-        ExcelExp excelOnlineRateExp = new ExcelExp("鍦ㄧ嚎鐜囩粺璁�",videoOnlineRateExps, VideoOnlineRateExp.class);
-        mysheet.add(excelOnlineRateExp);
-
+        // 瀵煎嚭Excel
         ExcelUtilManySheet<List<ExcelExp>> util = new ExcelUtilManySheet<>(mysheet);
         util.exportExcelManySheet(response, mysheet);
-        log.error("瀵煎嚭缁撴潫");
+        log.info("瀵煎嚭缁撴潫");
     }
+
+    // 鏂板杈呭姪鏂规硶锛氭壒閲忔坊鍔犺澶囩粺璁′俊鎭�
+    private void addDeviceStats(List<VideoDailyExp> list, AreaDeptEnum areaDeptEnum,
+                                String typeCode, String typeName,
+                                List<VideoTypeOffOnlineExp> offLineList,
+                                List<VideoOnlineRateExp> onlineList) {
+        offLineList.add(getListOfflineCountInfo(list, typeCode, areaDeptEnum));
+        onlineList.add(getListOnLineCountInfo(list, typeCode, areaDeptEnum));
+    }
+
+    // 鏂板杈呭姪鏂规硶锛氭坊鍔犲悎璁$粺璁�
+    private void addTotalStats(List<VideoTypeOffOnlineExp> offLineList,
+                               List<VideoOnlineRateExp> onlineList,
+                               long face, long car, long video) throws NoSuchFieldException, IllegalAccessException {
+        // 绂荤嚎缁熻鍚堣
+        VideoTypeOffOnlineExp allFaceVideosOffline = new VideoTypeOffOnlineExp();
+        setAllVideoTypeOffOnlineExpCount(offLineList, allFaceVideosOffline, "浜鸿劯");
+
+        VideoTypeOffOnlineExp allCarVideosOffline = new VideoTypeOffOnlineExp();
+        setAllVideoTypeOffOnlineExpCount(offLineList, allCarVideosOffline, "鍗″彛");
+
+        VideoTypeOffOnlineExp allVideosOffline = new VideoTypeOffOnlineExp();
+        setAllVideoTypeOffOnlineExpCount(offLineList, allVideosOffline, "瑙嗛");
+
+        offLineList.add(allFaceVideosOffline);
+        offLineList.add(allCarVideosOffline);
+        offLineList.add(allVideosOffline);
+
+        // 鍦ㄧ嚎缁熻鍚堣
+        VideoOnlineRateExp allFaceVideosOnline = new VideoOnlineRateExp();
+        setAllVideoTypeOnlineExpCount(face, onlineList, allFaceVideosOnline, "浜鸿劯");
+
+        VideoOnlineRateExp allCarVideosOnline = new VideoOnlineRateExp();
+        setAllVideoTypeOnlineExpCount(car, onlineList, allCarVideosOnline, "鍗″彛");
+
+        VideoOnlineRateExp allVideosOnline = new VideoOnlineRateExp();
+        setAllVideoTypeOnlineExpCount(video, onlineList, allVideosOnline, "瑙嗛");
+
+        onlineList.add(allFaceVideosOnline);
+        onlineList.add(allCarVideosOnline);
+        onlineList.add(allVideosOnline);
+    }
+
+
+
     //绂荤嚎璁惧鏁版嵁锛屽悎璁″璞★紝淇℃伅瑁呴厤
     public void setAllVideoTypeOffOnlineExpCount(List<VideoTypeOffOnlineExp> videoTypeOffOnlineExps,
                                                                   VideoTypeOffOnlineExp videoTypeOffOnlineExp,

--
Gitblit v1.8.0