点播审核增加审核员查询

徐近程
1 parent 3857f059
Showing 4 changed files with 51 additions and 8 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/UsersServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/templates/page/video.html
@@ -20,12 +20,14 @@ import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.cnlive.shenhe.utils.InfoUtil;
 import com.github.pagehelper.PageInfo;
+import org.jsoup.helper.DataUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -115,7 +117,16 @@ public class VideosController extends BaseController {
      * @return
      */
     @GetMapping("/page")
-    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id,Integer source,String video_user_id, HttpSession session) {
+    public Object getListVideos(Model model, String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, String sp_desc, String sp_Id,Integer source,String video_user_id,String shen_auditor_id, HttpSession session) {
+        if (!StringUtils.isEmpty(shen_auditor_id)) {
+            if((!"自动审核".equals(shen_auditor_id))&&(!"白名单".equals(shen_auditor_id))){
+                shen_auditor_id = usersService.findspidByName(shen_auditor_id);
+            }
+        }
+
+
+
+
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
@@ -136,7 +147,7 @@ public class VideosController extends BaseController {
         } else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
             spid = null;
         }
-        PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId,sp_Id,source,video_user_id);
+        PageInfo<ShyVideos> videoPage = videosService.getListContent(video_title, start_date, end_date, state, receive, page, pageSize, video_priority, orderByClause, spid, userId,sp_Id,source,video_user_id,shen_auditor_id);
         List<ShyVideos> list = videoPage.getList();
         if (!list.isEmpty()) {
             for (ShyVideos videos : list) {
@@ -50,6 +50,19 @@ public class UsersServiceImpl {
         return pageInfo;
     }
+    public String findspidByName(String shen_auditor_id) {
+        Example example = new Example(ShyUsers.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("username", shen_auditor_id);
+        List<ShyUsers> shyUsersList = shyUsersMapper.selectByExample(example);
+        if (CommonUtils.isNotNull(shyUsersList) && shyUsersList.size() > 0) {
+            ShyUsers shyUsers = shyUsersList.get(0);
+            String user_id = shyUsers.getUser_id();
+            return user_id;
+        }
+        return null;
+    }
+
     public ShyUsers get(Integer id) {
         return shyUsersMapper.selectByPrimaryKey(id);
     }
@@ -109,7 +109,7 @@ public class VideosServiceImpl {
         return shyVideosMapper.updateByPrimaryKey(shyVideos);
     }
-    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,Integer source,String video_user_id) {
+    public PageInfo<ShyVideos> getListContent(String video_title, String start_date, String end_date, Integer state, Integer receive, Integer page, Integer pageSize, String video_priority, String orderByClause, Integer spid, String userId, String sp_Id,Integer source,String video_user_id,String shen_auditor_id) {
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
@@ -142,6 +142,16 @@ public class VideosServiceImpl {
             criteria2.andEqualTo("video_priority", video_priority);
         }
+        if(CommonUtils.isNotEmpty(shen_auditor_id)){
+            if("白名单".equals(shen_auditor_id)||"自动审核".equals(shen_auditor_id)){
+                criteria.andEqualTo("updater", shen_auditor_id);
+                criteria2.andEqualTo("updater", shen_auditor_id);
+            }else{
+                criteria.andEqualTo("auditor_id", shen_auditor_id);
+                criteria2.andEqualTo("auditor_id", shen_auditor_id);
+            }
+        }
+
         if (source!=null) {
             criteria.andEqualTo("source", source);
             criteria2.andEqualTo("source", source);
@@ -174,6 +174,13 @@
                                             </div>
                                         </div>
+                                        <div class="col-md-6" style="padding: 0;width: 25%;" th:if="${session.sessionUser.spid==0}">
+                                            <label for="shen_auditor_id" class="control-label cb-toolbar">审核员</label>
+                                            <div class="col-sm-9" style="padding: 0;">
+                                                <input class="form-control" type="text" value="" id="shen_auditor_id">
+                                            </div>
+                                        </div>
+
                                         <!--                                           <div class="col-md-6" style="padding: 0;width: 15%;" th:if="${session.sessionUser.spid==0}"> -->
                                         <!--                                             <label for="count" class="control-label cb-toolbar">每页条数:</label> -->
                                         <!--                                             <div class="col-sm-5" style="padding: 0;"> -->
@@ -455,6 +462,7 @@
         var sp_Id = "";
         var source = "";
         var video_user_id = "";
+        var shen_auditor_id = "";
         function updateValue(){
@@ -470,6 +478,7 @@
                 sp_desc = $("#sp_desc").val();
                 count = $("#pageSize").val();
                 video_user_id = $("#video_user_id").val();
+                shen_auditor_id = $("#shen_auditor_id").val();
             }
         }
@@ -477,7 +486,7 @@
         //全部
         function quanbu() {
             updateValue();
-            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date +  "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id;
+            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date +  "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id;
         }
         //全部待领
@@ -485,27 +494,27 @@
             updateValue();
             if($.trim(state) == '') state=0;
             var receive = 0;
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id;
+            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             updateValue();
             var receive = 1;
             if($.trim(state) == '') state=0;
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id;
+            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id;
         });
         //我的已审核
         $('#yishen').click(function () {
             updateValue();
             var receive = 1;
             if($.trim(state) == '') state=3;//审核状态，3代表通过和拒绝都查询
-            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id;
+            window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id;
         });
         //查询
         $('#videos_query').click(function () {
-            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id;
+            window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count+"&sp_Id="+sp_Id+"&source="+source+"&video_user_id="+video_user_id+"&shen_auditor_id="+shen_auditor_id;
         });
         /*全选的操作*/
         $('#select_all').click(function () {