修改网家家目击者非免审时审核方式错误的bug

增加频道审核来新的申请时右下角弹窗提示

修改网家家目击者非免审时审核方式错误的bug
增加频道审核来新的申请时右下角弹窗提示
liwei2917
1 parent 83227098
Showing 6 changed files with 325 additions and 21 deletions
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/job/ChannelJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/templates/common/head.html
src/main/resources/templates/page/content.html
@@ -11,17 +11,23 @@ import com.cnlive.shenhe.utils.CommonUtils;
 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.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 @Controller
 @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
@@ -85,5 +91,29 @@ public class ChannelControllerApi {
             return new ResponseBean(ErrorEnum.ERROR.getErrorCode(),"审核请求收到失败(新增)");
         }
     }
+    
+    /**
+     * @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;
+   }
 }
@@ -157,9 +157,9 @@ public class VideosController extends BaseController {
                 ShySites shySites = sitesService.findspidDescByspid(videos.getSpid());
                 if (CommonUtils.isNotNull(shySites)) {
                 	if(CommonUtils.isNotEmpty(videos.getCategory())&&videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
-                		videos.setSpid_desc(shySites.getName()+"目击者");
+                		videos.setSpid_desc(shySites.getName()+"(目击者)");
                 	}else if(CommonUtils.isNotEmpty(videos.getCategory())&&videos.getCategory().equals(CommonConst.CATEGORY_MOMENT)){
-                		videos.setSpid_desc(shySites.getName()+"朋友圈");
+                		videos.setSpid_desc(shySites.getName()+"(朋友圈)");
                 	}else{
                 		videos.setSpid_desc(shySites.getName());
                 	}
@@ -65,7 +65,7 @@ public class ChannelJob {
          if (channelList.size() > 0) {
         	logger.info("您有"+channelList.size()+"条新的频道审核申请，请注意查看！");
         	// 设置Headless模式,linux系统下
-//            System.setProperty("java.awt.headless", "true");
+            System.setProperty("java.awt.headless", "false");
          	infoUtil.show("新频道申请", "您有"+channelList.size()+"条新的频道审核申请，请注意查看！",localhost_url+"/channel/page?shenhe_status=0&receive=0");
          }
@@ -411,22 +411,21 @@ public class VideosServiceImpl {
         Integer shenheType=3;//审核类型，1:免审，2:机审，3:人工审
         //如果当前sp是免审sp
         if(sites.contains(shyVideo.getSpid())){
-        	//如果栏目是“目击者”
-        	if(CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
-        		//如果用户id存在
-        		if(CommonUtils.isNotEmpty(shyVideo.getVideo_user_id())){
-        			ShyUsersfree shyUserfree=usersfreeServiceImpl.selectUser(shyVideo.getSpid(), shyVideo.getCategory(), shyVideo.getVideo_user_id());
-        			//如果存在免审用户
-        			if(CommonUtils.isNotNull(shyUserfree)){
-        				shenheType=1;//免审
-        			}else{//用户不免审
-        				shenheType=2;//机审
-        			}
-        		}else{//如果用户id不存在
+        	shenheType=1;//免审
+        }
+        //如果栏目是“目击者”
+        if(CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
+        	//如果用户id存在
+        	if(CommonUtils.isNotEmpty(shyVideo.getVideo_user_id())){
+        		ShyUsersfree shyUserfree=usersfreeServiceImpl.selectUser(shyVideo.getSpid(), shyVideo.getCategory(), shyVideo.getVideo_user_id());
+        		//如果存在免审用户
+        		if(CommonUtils.isNotNull(shyUserfree)){
+        			shenheType=1;//免审
+        		}else{//用户不免审
         			shenheType=2;//机审
         		}
-        	}else{//如果栏目不存在或者不是非免审栏目
-        		shenheType=1;//免审
+        	}else{//如果用户id不存在
+        		shenheType=2;//机审
         	}
         }
         shyVideo.setShenhe_type(shenheType);
@@ -81,8 +81,283 @@
     <script src="../../static/js/app.js"></script>
     <!-- 最新的 Bootstrap 核心 JavaScript 文件 -->
-    <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" 
-    integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" 
-    crossorigin="anonymous"></script>
+<!--     <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"  -->
+<!--     integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"  -->
+<!--     crossorigin="anonymous"></script> -->
+    
+    <!--添加Dialog 的js-->
+<!--     <script type="text/javascript" src="http://resweb.cnliveimg.com/system/dialog/zDrag.js"></script> -->
+<!--     <script type="text/javascript" src="http://resweb.cnliveimg.com/system/dialog/zDialog.js"></script> -->
+<!--     <link href="../../static/css/dialog.css" rel="stylesheet"> -->
+<!--     <link href="../../static/js/JetDialog.js" rel="stylesheet"> -->
+    
+    <script language=javascript>
+    
+    var x0=0,y0=0,x1=0,y1=0;
+//     var offx=6,offy=6;
+    var moveable=false;//鼠标是否是按下状态
+//     var hover='orange',normal='slategray';//color;
+    var hover='slategray',normal='slategray';//color;
+    var index=10000;//z-index;
+    var isShow=true;//是否显示消息框 
+    
+    //创建一个对象;
+    function xWin(id,tit,msg,url)
+    {
+     index = index+2;
+     isShow=false;
+     this.id      = id;
+     this.width   = 300;//主窗体宽度
+     this.height  = 200;//主窗体高度
+     this.right   = 0;//位置距右
+     this.bottom  = 0;//位置距下
+     this.zIndex  = index;
+     this.title   = tit;//标题
+     this.message = msg;//消息体
+     this.url     = url;//url
+     this.obj     = null;
+     this.bulid   = bulid;
+     this.bulid();
+    }
+    //初始化;
+    function bulid(){
+     var str = ""
+      + "<div id=xMsg" + this.id + " "
+      + "style='"
+      + "z-index:" + this.zIndex + ";"
+      + "width:" + this.width + "px;"
+      + "height:" + this.height + "px;"
+      + "right:" + this.right + ";"
+      + "bottom:" + this.bottom + ";"
+      + "background-color:white;"
+      + "color:" + normal + ";"
+      + "font-size:18px;"
+      + "font-family:Verdana;"
+      + "position:fixed;"
+      + "cursor:default;"
+      + "-webkit-user-select:none;"
+      + "-moz-user-select:none;"
+      + "-ms-user-select:none;"
+      + "user-select:none;"
+      + "border:2px solid " + normal + ";"
+      + "' "
+      + "οnmοusedοwn='getFocus(this)'"
+      +">"
+//       标题开始
+       + "<div "
+       + "style='"
+       + "background-color:" + normal + ";"
+       + "width:" + (this.width-2*2) + "px;"
+       + "height:28px;"
+       + "color:white;"
+       + "' "
+       + "onmousedown='startDrag(this)' "
+       + "onmouseup='stopDrag(this)' " 
+       + "onmousemove='drag(this)' " 
+       + "ondblclick='min(this.childNodes[1])'" 
+       + ">"
+        + "<span style='width:" + (this.width-2*25-4) + "px;padding-left:3px; display:-moz-inline-box; display:inline-block;'>" + this.title + "</span>"
+        + "<span style='width:25px;border-width:0px;color:white;font-family:webdings;display:-moz-inline-box; display:inline-block;' onclick='min(this)'>0</span>"
+        + "<span style='width:25px;border-width:0px;color:white;font-family:webdings;display:-moz-inline-box; display:inline-block;' onclick='cls(this)'>r</span>"
+       + "</div>"
+//         主窗体开始
+    	+ "<div style='"
+        + "width:100%;"
+        + "height:" + (this.height-28-4) + "px;"
+        + "min-height:" + (this.height-28-4) + "px;"
+        + "background-color:white;"
+        + "word-break:break-all;"
+        + "padding:3px;"
+        + "'>" 
+//     主窗体的内容部分
+    	+ "<div style='"
+        + "width:100%;"
+        + "height:" + (this.height-28-4-50) + "px;"
+        + "min-height:" + (this.height-28-4-50) + "px;"
+        + "line-height:20px;"
+        + "text-align: center;"
+        + "word-break:break-all;"
+        + "padding:3px;"
+        + "padding-top: 40px;"
+    	+ "color:red;"
+        + "'>" 
+        + this.message 
+    	+ "</div>"
+//     	主窗体的按钮部分（按钮1）
+		+ "<div style='"
+      	+ "width:60px;"
+      	+ "height:30px;"
+      	+ "color: #fff;"
+      	+ "line-height: 30px;"
+      	+ "text-align: center;"
+      	+ "font-size: 15px;"
+      	+ "float:left;"
+      	+ "margin-left: 120px;"
+     	+ "background-color:" + normal + ";"
+     	+ "'"
+    	+" type='button'"
+    	+" onclick='cls(this)'"
+    	+">确定</div>"
+//     	主窗体的按钮部分（按钮2）
+		+ "<div style='"
+      	+ "width:60px;"
+      	+ "height:30px;"
+      	+ "color: #fff;"
+      	+ "line-height: 30px;"
+      	+ "text-align: center;"
+      	+ "font-size: 15px;"
+      	+ "float:right;"
+      	+ "margin-right:20px;"
+     	+ "background-color:" + normal + ";"
+     	+ "'"
+    	+" type='button'"
+    	+" onclick=\"toLink('"+this.url+"')\"" 
+    	+">查看</div>"
+    	+ "</div>"
+      
+     
+    + "</div>";
+     document.body.insertAdjacentHTML("beforeEnd",str);
+    }
+    
+  //开始拖动;
+    function startDrag(obj){
+     if(event.button==0){
+      //锁定标题栏;
+//       obj.setCapture();
+      //定义对象;
+      var win = obj.parentNode;
+//       var sha = win.nextSibling;
+      //记录鼠标和层位置;
+      x0 = event.clientX;
+      y0 = event.clientY;
+      x1 = parseInt(win.style.right.replace("px",""));
+      y1 = parseInt(win.style.bottom.replace("px",""));
+      //记录颜色;
+      normal = obj.style.backgroundColor;
+      //改变风格;
+      obj.style.backgroundColor = hover;
+      win.style.borderColor = hover;
+      obj.nextSibling.style.color = hover;
+//       sha.style.right = (x1 - offx)+"px";
+//       sha.style.bottom  = (y1 - offy)+"px";
+      moveable = true;
+     }
+    }
+    //拖动;
+    function drag(obj){
+     if(moveable){
+      var win = obj.parentNode;
+//       var sha = win.nextSibling;
+      win.style.right = ( x1+x0-event.clientX)+"px";
+      win.style.bottom  = ( y1+y0-event.clientY)+"px";
+//       sha.style.right = (parseInt(win.style.right.replace("px","")) - offx)+"px";
+//       sha.style.bottom  = (parseInt(win.style.bottom.replace("px","")) - offy)+"px";
+     }
+    }
+    //停止拖动;
+    function stopDrag(obj){
+     if(moveable){
+      var win = obj.parentNode;
+//       var sha = win.nextSibling;
+      var msg = obj.nextSibling;
+      win.style.borderColor     = normal;
+      obj.style.backgroundColor = normal;
+      msg.style.color           = normal;
+//       sha.style.right = obj.parentNode.style.right;
+//       sha.style.bottom  = obj.parentNode.style.bottom;
+//       obj.releaseCapture();
+      moveable = false;
+     }
+    }
+    //获得焦点;
+    function getFocus(obj)
+    {
+     if(obj.style.zIndex!=index)
+     {
+      index = index + 2;
+      var idx = index;
+      obj.style.zIndex=idx;
+      obj.nextSibling.style.zIndex=idx-1;
+     }
+    }
+    //最小化;
+    function min(obj){
+     var win = obj.parentNode.parentNode;
+//      var sha = win.nextSibling;
+     var tit = obj.parentNode;
+     var msg = tit.nextSibling;
+     var flg = msg.style.display=="none";
+     if(flg)
+     {
+      win.style.height  = (parseInt(msg.style.height.replace("px","")) + parseInt(tit.style.height.replace("px","")) + 2*2)+"px";
+//       sha.style.height  = win.style.height;
+      msg.style.display = "block";
+      obj.innerHTML = "0";
+     }
+     else
+     {
+      win.style.height  = (parseInt(tit.style.height.replace("px","")) + 2*2)+"px";
+//       sha.style.height  = win.style.height;
+      obj.innerHTML = "2";
+      msg.style.display = "none";
+     }
+    }
+    //关闭;
+    function cls(obj){
+     var win = obj.parentNode.parentNode;
+//      var sha = win.nextSibling;
+     win.style.visibility = "hidden";
+//      sha.style.visibility = "hidden";
+     isShow=true;
+    }
+    //点击查看跳转链接
+    function toLink(url){
+    	isShow=true;
+    	window.location.href= url;
+//     	window.location.href= window.location.protocol+"//"+window.location.host+"/channel/page?shenhe_status=0&receive=0";
+    }
+    //-->
+    </script>
+    <script language='JScript'>
+    function initialize(){
+     var a = new xWin("1","新频道审核通知","您有三条未审核的频道消息，请尽快审核，谢谢！","www.baidu.com");
+//      var b = new xWin("2",100,200,0,200,"arui2","test2");
+     //var c = new xWin("3",200,160,250,50,"arui3","test3");
+    }
+//     window.onload = initialize;
+    
+   
+    var t1;
+	$(function(){
+  		 t1 = window.setInterval(
+  				 function(){
+  			 		if(isShow){
+  			 			notice()
+  			 		}
+  			 	},10000); 
+	});
+	
+	function notice(){ 
+		$.ajax({
+			type:'get',
+			dataType:'json',
+			data:'',
+			url: "/api/channel/channelNotice",
+			success:function(data){	
+				if(data!=null && data!="" ){
+// 				alert(data.title+":"+data.content);
+ 				//去掉定时器的方法 
+// 		          window.clearInterval(t1); 
+					new xWin(data.id,data.title,data.content,data.url);
+				}
+			}
+		});
+	} 
+
+//去掉定时器的方法 
+//window.clearInterval(t1); 
+
+</script>
 </head>
 </html>
 \ No newline at end of file
@@ -13,7 +13,7 @@
             <h1>
                 图文审核
             </h1>
-            <div  th:text="${T(com.cnlive.shenhe.controller.VideosController).ceshi('')}">JAN</div>
+<!--             <div  th:text="${T(com.cnlive.shenhe.controller.VideosController).ceshi('')}">JAN</div> -->
             <ol class="breadcrumb">
                 <li>首页</li>
                 <li class="active">图文审核</li>