优化审核云点播、话题、直播申请、频道、音频、评论等模块的条件查询并测试

王言钊
1 parent 05f0375f
Showing 6 changed files with 19 additions and 57 deletions
src/main/java/com/cnlive/shenhe/serviceImpl/AudioServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/ChannelServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/TopicServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -210,51 +210,38 @@ public class AudioServiceImpl {
     public PageInfo<ShyAudio> getListContent(AudioDTO audioDTO) {
         Example example = new Example(ShyAudio.class);
         Example.Criteria criteria = example.createCriteria();
-        Example.Criteria criteria2 = example.createCriteria();
         if (CommonUtils.isNotEmpty(audioDTO.getOrderByClause())) {
             example.setOrderByClause(audioDTO.getOrderByClause());
         }
         if (CommonUtils.isNotEmpty(audioDTO.getStart_date()) && CommonUtils.isNotEmpty(audioDTO.getEnd_date())) {
             criteria.andGreaterThanOrEqualTo("createTime", audioDTO.getStart_date());
-            criteria2.andGreaterThanOrEqualTo("createTime", audioDTO.getStart_date());
             criteria.andLessThanOrEqualTo("createTime", audioDTO.getEnd_date());
-            criteria2.andLessThanOrEqualTo("createTime", audioDTO.getEnd_date());
         }
         if (CommonUtils.isNotEmpty(audioDTO.getVideo_title())) {
             criteria.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
-            criteria2.andLike("audioTitle", "%" + audioDTO.getVideo_title() + "%");
         }
-
         if (CommonUtils.isNotEmpty(audioDTO.getVideo_priority())) {
             criteria.andEqualTo("priority", audioDTO.getVideo_priority());
-            criteria2.andEqualTo("priority", audioDTO.getVideo_priority());
         }
-
         if (CommonUtils.isNotNull(audioDTO.getSpid())) {
             criteria.andEqualTo("spId", audioDTO.getSpid());
-            criteria2.andEqualTo("spId", audioDTO.getSpid());
         } else if (CommonUtils.isNotEmpty(audioDTO.getSp_Id())) {
             criteria.andEqualTo("spId", audioDTO.getSp_Id());
-            criteria2.andEqualTo("spId", audioDTO.getSp_Id());
         }
-
         //领取状态 0-未领取 1-已领取
         if (CommonUtils.isNotNull(audioDTO.getReceive())) {
             criteria.andEqualTo("receive", audioDTO.getReceive());
-            criteria2.andEqualTo("receive", audioDTO.getReceive());
             if (audioDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
                 criteria.andEqualTo("receive_user_id", audioDTO.getUserId());
-                criteria2.andEqualTo("receive_user_id", audioDTO.getUserId());
             }
         }
-
-        //审核状态 0-未审核 1-已审核 2-拒绝
+        //审核状态 0-未审核 1-已审核 2-拒绝 3-我的已审
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(audioDTO.getState()) && audioDTO.getState() != 3) {
             criteria.andEqualTo("state", audioDTO.getState());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(audioDTO.getState()) && audioDTO.getState() == 3) {
-            criteria.andEqualTo("state", 1);
-            criteria2.andEqualTo("state", 2);
-            example.or(criteria2);
+            criteria.andBetween("state", CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         //默认按上传时间倒序排序
@@ -99,10 +99,7 @@ public class ChannelServiceImpl {
             criteria.andEqualTo("shenhe_status", channelDTO.getShenhe_status());
             //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(channelDTO.getShenhe_status()) && channelDTO.getShenhe_status() == 3) {
-            Example.Criteria criteria1 = example.createCriteria();
-            criteria1.orEqualTo("shenhe_status", CommonConst.AUDIT_SUCCESS);
-            criteria1.orEqualTo("shenhe_status", CommonConst.AUDIT_REFUSE);
-            example.and(criteria1);
+            criteria.andBetween("shenhe_status",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         PageHelper.startPage(channelDTO.getPage(), channelDTO.getPageSize(), true);
@@ -123,10 +123,7 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
             criteria.andEqualTo("state", commentsDTO.getState());
         } else if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() == 3) {
-            Example.Criteria criteria1 = example.createCriteria();
-            criteria1.orEqualTo("state", CommonConst.AUDIT_SUCCESS);
-            criteria1.orEqualTo("state", CommonConst.AUDIT_REFUSE);
-            example.and(criteria1);
+            criteria.andBetween("state",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         PageHelper.startPage(commentsDTO.getPage(), commentsDTO.getPageSize(), true);
@@ -173,14 +170,12 @@ public class CommentsServiceImpl {
                 criteria.andEqualTo("receive_user_id", commentsDTO.getUserId());
             }
         }
-
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
             criteria.andEqualTo("state", commentsDTO.getState());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() == 3) {
-            Example.Criteria criteria1 = example.createCriteria();
-            criteria1.orEqualTo("state", CommonConst.AUDIT_SUCCESS);
-            criteria1.orEqualTo("state", CommonConst.AUDIT_REFUSE);
-            example.and(criteria1);
+            criteria.andBetween("state",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         List<ShyComments> commentsList = shyCommentsMapper.selectByExample(example);
@@ -127,10 +127,12 @@ public class LiveApplyServiceImpl {
         if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
             criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
         }
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state()) && liveApplyDTO.getShenhe_state() != 3) {
             criteria.andEqualTo("shenhe_state", liveApplyDTO.getShenhe_state());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state()) && liveApplyDTO.getShenhe_state() == 3) {
-            criteria.andNotEqualTo("shenhe_state", 0);
+            criteria.andBetween("shenhe_state",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         if (CommonUtils.isNotNull(liveApplyDTO.getReceive())) {
             criteria.andEqualTo("receive", liveApplyDTO.getReceive());
@@ -262,10 +264,12 @@ public class LiveApplyServiceImpl {
         if (CommonUtils.isNotNull(liveApplyDTO.getSpid())) {
             criteria.andEqualTo("sp_id", liveApplyDTO.getSpid());
         }
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state()) && liveApplyDTO.getShenhe_state() != 3) {
             criteria.andEqualTo("shenhe_state", liveApplyDTO.getShenhe_state());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(liveApplyDTO.getShenhe_state()) && liveApplyDTO.getShenhe_state() == 3) {
-            criteria.andNotEqualTo("shenhe_state", 0);
+            criteria.andBetween("shenhe_state",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
         if (CommonUtils.isNotNull(liveApplyDTO.getReceive())) {
             criteria.andEqualTo("receive", liveApplyDTO.getReceive());
@@ -122,12 +122,8 @@ public class TopicServiceImpl {
             criteria.andEqualTo("shenhe_status", topicDTO.getShenhe_status());
             //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(topicDTO.getShenhe_status()) && topicDTO.getShenhe_status() == 3) {
-            Example.Criteria criteria1 = example.createCriteria();
-            criteria1.orEqualTo("shenhe_status", 1);
-            criteria1.orEqualTo("shenhe_status", 2);
-            example.and(criteria1);
+            criteria.andBetween("shenhe_status",CommonConst.AUDIT_SUCCESS,CommonConst.AUDIT_REFUSE);
         }
-
         PageHelper.startPage(topicDTO.getPage(), topicDTO.getPageSize(), true);
         List<ShyTopic> topicList = shyTopicMapper.selectByExample(example);
         PageInfo<ShyTopic> pageInfo = new PageInfo<>(topicList);
@@ -117,7 +117,6 @@ public class VideosServiceImpl {
         logger.info("接受点播列表为，VideosDTO:{}", JSON.toJSONString(videosDTO));
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
-        Example.Criteria criteria2 = example.createCriteria();
         if (CommonUtils.isNotEmpty(videosDTO.getOrderByClause())) {
             example.setOrderByClause(videosDTO.getOrderByClause());
         }
@@ -130,73 +129,58 @@ public class VideosServiceImpl {
                 e.printStackTrace();
             }
             criteria.andGreaterThanOrEqualTo("created_at", videosDTO.getStart_date());
-            criteria2.andGreaterThanOrEqualTo("created_at", videosDTO.getStart_date());
             criteria.andLessThanOrEqualTo("created_at", videosDTO.getEnd_date());
-            criteria2.andLessThanOrEqualTo("created_at", videosDTO.getEnd_date());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getVideo_title())) {
             criteria.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
-            criteria2.andLike("video_title", "%" + videosDTO.getVideo_title() + "%");
         }
         if (CommonUtils.isNotEmpty(videosDTO.getVideo_priority())) {
             criteria.andEqualTo("video_priority", videosDTO.getVideo_priority());
-            criteria2.andEqualTo("video_priority", videosDTO.getVideo_priority());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getVideo_id())) {
             criteria.andEqualTo("video_id", videosDTO.getVideo_id());
-            criteria2.andEqualTo("video_id", videosDTO.getVideo_id());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getShen_auditor_id())) {
             if ("白名单".equals(videosDTO.getShen_auditor_id()) || "自动审核".equals(videosDTO.getShen_auditor_id())) {
                 criteria.andEqualTo("updater", videosDTO.getShen_auditor_id());
-                criteria2.andEqualTo("updater", videosDTO.getShen_auditor_id());
             } else {
                 criteria.andEqualTo("auditor_id", videosDTO.getShen_auditor_id());
-                criteria2.andEqualTo("auditor_id", videosDTO.getShen_auditor_id());
             }
         }
         if (CommonUtils.isNotEmpty(videosDTO.getSource()) && !"22".equals(videosDTO.getSource()) && !"102".equals(videosDTO.getSource())) {
             criteria.andEqualTo("source", videosDTO.getSource());
-            criteria2.andEqualTo("source", videosDTO.getSource());
         } else if (CommonUtils.isNotEmpty(videosDTO.getSource()) && "22".equals(videosDTO.getSource())) {
             criteria.andEqualTo("category", "moment");
-            criteria2.andEqualTo("category", "moment");
         } else if (CommonUtils.isNotEmpty(videosDTO.getSource()) && "102".equals(videosDTO.getSource())) {
             criteria.andEqualTo("source", "102".equals(videosDTO.getSource()) ? "0" : videosDTO.getSource());
-            criteria2.andEqualTo("source", "102".equals(videosDTO.getSource()) ? "0" : videosDTO.getSource());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getVideo_user_id())) {
             criteria.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
-            criteria2.andEqualTo("video_user_id", videosDTO.getVideo_user_id());
         }
         if (CommonUtils.isNotNull(videosDTO.getSpid())) {
             criteria.andEqualTo("spid", videosDTO.getSpid());
-            criteria2.andEqualTo("spid", videosDTO.getSpid());
         } else if (CommonUtils.isNotEmpty(videosDTO.getSp_Id())) {
             criteria.andEqualTo("spid", videosDTO.getSp_Id());
-            criteria2.andEqualTo("spid", videosDTO.getSp_Id());
         }
         if (CommonUtils.isNotNull(videosDTO.getReceive())) {
             criteria.andEqualTo("receive", videosDTO.getReceive());
-            criteria2.andEqualTo("receive", videosDTO.getReceive());
             if (videosDTO.getReceive().equals(CommonConst.RECEIVE_AFTER)) {
                 criteria.andEqualTo("receive_user_id", videosDTO.getUserId());
-                criteria2.andEqualTo("receive_user_id", videosDTO.getUserId());
             }
         }
+        //不是   我的已审 进来的，只查一种状态
         if (CommonUtils.isNotNull(videosDTO.getState()) && videosDTO.getState() != 3) {
             criteria.andEqualTo("state", videosDTO.getState());
+            //是 我的已审，查通过和拒绝的两种状态
         } else if (CommonUtils.isNotNull(videosDTO.getState()) && videosDTO.getState() == 3) {
-            criteria.andEqualTo("state", 1);
-            criteria2.andEqualTo("state", 2);
-            example.or(criteria2);
+            criteria.andBetween("state", CommonConst.AUDIT_SUCCESS, CommonConst.AUDIT_REFUSE);
         }
         //默认按上传时间倒序排序
         example.setOrderByClause("created_at desc");
@@ -290,7 +274,6 @@ public class VideosServiceImpl {
             example.setOrderByClause(videosDTO.getOrderByClause());
         }
         if (CommonUtils.isNotEmpty(videosDTO.getStart_date()) && CommonUtils.isNotEmpty(videosDTO.getEnd_date())) {
-
             try {
                 videosDTO.setStart_date(String.valueOf(CommonUtils.parseDate(videosDTO.getStart_date(), "yyyy-MM-dd")));
                 videosDTO.setEnd_date(String.valueOf(CommonUtils.parseDate(videosDTO.getEnd_date(), "yyyy-MM-dd")));