直播申请审核增加新来数据时右下角弹窗

liwei2917
1 parent ff8066ec
Showing 4 changed files with 84 additions and 33 deletions
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
src/main/resources/templates/common/head.html
@@ -26,8 +26,7 @@ import java.util.Map;
 @RequestMapping("/api/channel")
 public class ChannelControllerApi {
     private static Logger logger = LoggerFactory.getLogger(ChannelControllerApi.class);
-    @Value("${spring.localhost.url}")
-	private String localhost_url;//本机地址
+
     @Autowired
     AuditPass Pass;
     @Autowired
@@ -92,28 +91,6 @@ public class ChannelControllerApi {
         }
     }
  
-    /**
-     * @Auther: liwei
-     * @Date: 2019/08/17 11:17
-     * @Description: 频道前台通知接口
-     */
-    @GetMapping("/channelNotice")
-    @ResponseBody
-    public Map<String,Object> channelNotice() {
-    Map<String,Object> map=new HashMap<>();
-   	 ShyChannel shyChannel = new ShyChannel();
-        shyChannel.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审
-        shyChannel.setShenhe_status(CommonConst.AUDIT_INTT);
-        List<ShyChannel> channelList = channelService.findshyChannel(shyChannel);
-        if (channelList.size() > 0) {
-       	logger.info("您有"+channelList.size()+"条新的频道审核申请，请注意查看！");
-       	map.put("id", "1");//第一个提示框，避免冲突
-       	map.put("title", "新频道审核通知");
-       	map.put("content","您有"+channelList.size()+"条新的频道审核申请，请注意查看！" );
-       	map.put("url",localhost_url+"/channel/page?shenhe_status=0&receive=0" );
-       	return map;
-        }
-   	return null;
-   }
+  
  
 }
@@ -20,19 +20,24 @@ import com.github.pagehelper.PageInfo;
 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.web.bind.annotation.*;
  
 import javax.servlet.http.HttpSession;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
  
 @Controller
 @RequestMapping("/channel")
 public class ChannelController {
     private static Logger logger = LoggerFactory.getLogger(ChannelController.class);
+    @Value("${spring.localhost.url}")
+	private String localhost_url;//本机地址
     @Autowired
     AuditPass Pass;
     @Autowired
@@ -249,4 +254,29 @@ public class ChannelController {
         }
         return responseBean;
     }
+    
+    
+    /**
+     * @Auther: liwei
+     * @Date: 2019/08/17 11:17
+     * @Description: 频道前台通知接口
+     */
+    @GetMapping("/channelNotice")
+    @ResponseBody
+    public Map<String,Object> channelNotice() {
+    Map<String,Object> map=new HashMap<>();
+   	 ShyChannel shyChannel = new ShyChannel();
+        shyChannel.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审
+        shyChannel.setShenhe_status(CommonConst.AUDIT_INTT);
+        List<ShyChannel> channelList = channelService.findshyChannel(shyChannel);
+        if (channelList.size() > 0) {
+       	logger.info("您有"+channelList.size()+"条新的频道审核申请，请注意查看！");
+       	map.put("id", "1");//第一个提示框，避免冲突
+       	map.put("title", "新频道审核通知");
+       	map.put("content","您有"+channelList.size()+"条新的频道审核申请，请注意查看！" );
+       	map.put("url",localhost_url+"/channel/page?shenhe_status=0&receive=0" );
+       	return map;
+        }
+   	return null;
+   }
 }
@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
+import com.cnlive.shenhe.entity.ShyChannel;
 import com.cnlive.shenhe.entity.ShyLive;
 import com.cnlive.shenhe.entity.ShyLiveapply;
 import com.cnlive.shenhe.entity.ShySites;
@@ -38,7 +39,9 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.*;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
  
 @Controller
 @RequestMapping("/liveApply")
@@ -55,11 +58,9 @@ public class LiveApplyController {
 	@Autowired
 	LiveServiceImpl liveService;
  
-    @Value("${qn_domain}")
-    String qn_domain;
-
-    @Value("${ks_domain}")
-    String ks_domain;
+    
+    @Value("${spring.localhost.url}")
+	private String localhost_url;//本机地址
  
  
 	@Autowired
@@ -438,6 +439,30 @@ public class LiveApplyController {
            }
        }
    }
+   
+   /**
+    * @Auther: liwei
+    * @Date: 2019/11/08 11:17
+    * @Description: 直播申请前台通知接口
+    */
+   @GetMapping("/liveApplyNotice")
+   @ResponseBody
+	public Map<String, Object> channelNotice() {
+		Map<String, Object> map = new HashMap<>();
+		ShyLiveapply shyLiveapply = new ShyLiveapply();
+		shyLiveapply.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审
+		shyLiveapply.setShenhe_state(CommonConst.AUDIT_INTT);
+		List<ShyLiveapply> liveApplyList = liveApplyServiceImpl.findshyLiveApply(shyLiveapply);
+		if (liveApplyList.size() > 0) {
+			logger.info("您有" + liveApplyList.size() + "条新的直播申请，请注意查看！");
+			map.put("id", "2");// 第二个提示框，避免冲突
+			map.put("title", "新直播申请通知");
+			map.put("content", "您有" + liveApplyList.size() + "条新的直播申请，请注意查看！");
+			map.put("url", localhost_url + "/liveApply/page?shenhe_state=0&receive=0");
+			return map;
+		}
+		return null;
+  }
  
     @PostMapping("/ceshi")
     @ResponseBody
@@ -111,6 +111,7 @@
 				}
 				if(data.isShow_liveApply){
 					isShow_liveApply=true;
+					notice_liveApply();//第一次进来就弹窗
 				}
 			}
 		});
@@ -121,18 +122,36 @@
 		 initialize();
   		 t1 = window.setInterval(
   				 function(){
-  			 		if(((parseInt(new Date().getTime()/1000))%(5*60)==0) && isShow_chinnal){
-  			 			notice_channel()
+  			 		if(((parseInt(new Date().getTime()/1000))%(5*60)==0)){//弹窗设置每5分钟启用
+  			 			if(isShow_chinnal){
+  			 				notice_channel();
+  			 			}
+  			 		    if(isShow_liveApply){
+  			 		    	notice_liveApply();
+  			 		    }
   			 		}
   			 	},1000); 
 	});
  
+	function notice_liveApply(){ 
+		$.ajax({
+			type:'get',
+			dataType:'json',
+			data:'',
+			url: "/channel/channelNotice",
+			success:function(data){	
+				if(data!=null && data!="" ){
+					new xWin(data.id,data.title,data.content,data.url);
+				}
+			}
+		});
+	} 
 	function notice_channel(){ 
 		$.ajax({
 			type:'get',
 			dataType:'json',
 			data:'',
-			url: "/api/channel/channelNotice",
+			url: "/liveApply/liveApplyNotice",
 			success:function(data){	
 				if(data!=null && data!="" ){
 					new xWin(data.id,data.title,data.content,data.url);