From ad3ac53da1c3a11a96ae62d790aa61a81b9eab91 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 20 三月 2021 18:47:23 +0800
Subject: [PATCH] 完善APP首页顶部标签栏兼容，初步处理推送

---
 src/main/java/com/yeshi/buwan/service/imp/StatisticsService.java |   21 ++++++++-------------
 1 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/StatisticsService.java b/src/main/java/com/yeshi/buwan/service/imp/StatisticsService.java
index 9078cbf..aefcf96 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/StatisticsService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/StatisticsService.java
@@ -21,7 +21,7 @@
 import com.yeshi.buwan.dao.VideoPlayStatisticsDao;
 import com.yeshi.buwan.dao.VideoTypeDao;
 import com.yeshi.buwan.domain.CategoryContry;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystem;
 import com.yeshi.buwan.domain.HotSearch;
 import com.yeshi.buwan.domain.VideoInfo;
 import com.yeshi.buwan.domain.VideoPlayStatistics;
@@ -109,7 +109,7 @@
     @Cacheable(value = "statisticCache", key = "'getDetailSystemWatchCount'+'-'+#from+'-'+#to+'-'+#detailSystem")
     @SuppressWarnings("rawtypes")
     public List<StatisticXY> getDetailSystemWatchCount(String from, String to, String detailSystem) {
-        List<StatisticXY> xylist = new ArrayList<StatisticXY>();
+        List<StatisticXY> xylist = new ArrayList<>();
         long fromS = TimeUtil.convertDateToTemp(from);
         long toS = TimeUtil.convertDateToTemp(
                 TimeUtil.getGernalTime((TimeUtil.convertDateToTemp(to) + 1000 * 60 * 60 * 24L), "yyyy-MM-dd"));
@@ -144,7 +144,7 @@
         long fromS = TimeUtil.convertDateToTemp(from);
         long toS = TimeUtil.convertDateToTemp(
                 TimeUtil.getGernalTime((TimeUtil.convertDateToTemp(to) + 1000 * 60 * 60 * 24L), "yyyy-MM-dd"));
-        List<StatisticXY> xylist = new ArrayList<StatisticXY>();
+        List<StatisticXY> xylist = new ArrayList<>();
         try {
             List list;
             if ("0".equalsIgnoreCase(detailsystem))
@@ -251,7 +251,7 @@
                 for (int i = 0; i < list.size(); i++) {
                     Object[] objs = (Object[]) list.get(i);
                     if (map.get(objs[2] + "") == null)
-                        map.put(objs[2] + "", new ArrayList<StatisticXY>());
+                        map.put(objs[2] + "", new ArrayList<>());
                     StatisticXY xy = new StatisticXY();
                     xy.setTime(objs[1] + "");
                     xy.setY(Long.parseLong(objs[0] + ""));
@@ -278,7 +278,7 @@
                         // 鍙粺璁＄數褰憋紝鐢佃鍓э紝缁艰壓锛屽姩婕殑姒滈
                         if (vt.getId() == 150 || vt.getId() == 151 || vt.getId() == 152 || vt.getId() == 153) {
                             //鐢靛奖鐢佃鍓т笉鏇存柊姒滈
-                            if(vt.getId() == 150 || vt.getId() == 151)
+                            if (vt.getId() == 150 || vt.getId() == 151)
                                 continue;
                             // if(1>0)
                             // continue;
@@ -348,7 +348,6 @@
                 } catch (Exception e) {
                     e.printStackTrace();
                     LogHelper.error(e.getMessage());
-                    if (session.getTransaction().isActive())
                         session.getTransaction().rollback();
                 }
                 LogHelper.print("缁熻瀹屾垚...");
@@ -386,7 +385,7 @@
 
         System.out.println(sql);
         final String fsql = sql;
-        final List<StatisticXY> rlist = new ArrayList<StatisticXY>();
+        final List<StatisticXY> rlist = new ArrayList<>();
         videoTypeDao.excute(new HibernateCallback() {
             public Object doInHibernate(Session session) throws HibernateException {
                 List list = session.createSQLQuery(fsql).list();
@@ -441,7 +440,6 @@
 
                 } catch (Exception e) {
                     e.printStackTrace();
-                    if (session.getTransaction().isActive())
                         session.getTransaction().rollback();
                 }
                 return null;
@@ -487,8 +485,7 @@
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
-                    if (session.getTransaction().isActive())
-                        session.getTransaction().rollback();
+                    session.getTransaction().rollback();
                 }
                 return null;
             }
@@ -549,7 +546,6 @@
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
-                    if (session.getTransaction().isActive())
                         session.getTransaction().rollback();
                 }
                 return null;
@@ -579,7 +575,6 @@
                     session.getTransaction().commit();
                 } catch (Exception e) {
                     e.printStackTrace();
-                    if (session.getTransaction().isActive())
                         session.getTransaction().rollback();
                 }
                 return null;
@@ -631,7 +626,7 @@
     // 鍒锋柊瑙嗛璇︽儏鏁伴噺
     public void refreshVideoDetailCount(final String videoid) {
         List<VideoResource> list = videoResourceService.getResourceList();
-        List<Long> resourceList = new ArrayList<Long>();
+        List<Long> resourceList = new ArrayList<>();
         for (VideoResource vr : list)
             resourceList.add(Long.parseLong(vr.getId()));
         VideoInfo info = videoDetailUtil.getVideoInfo(null, videoid, null, resourceList,

--
Gitblit v1.8.0