审核云用户管理增加提醒通知的设置

审核云管理模块增加键盘回车事件

审核云用户管理增加提醒通知的设置
审核云管理模块增加键盘回车事件
liwei2917
1 parent 9195d3f6
Showing 10 changed files with 371 additions and 252 deletions
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/entity/ShyUsers.java
src/main/java/com/cnlive/shenhe/serviceImpl/UsersServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/CommonConst.java
src/main/resources/mapper/ShyUsersMapper.xml
src/main/resources/static/js/notice.js
src/main/resources/templates/common/frame.html
src/main/resources/templates/common/head.html
src/main/resources/templates/page/users.html
src/main/resources/templates/page/usersFree.html
@@ -23,8 +23,11 @@ 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;
+import javax.print.attribute.HashAttributeSet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -97,6 +100,7 @@ public class UsersController {
         if (CommonUtils.isNull(pageSize)) pageSize = 10;
         PageInfo<ShyUsers> usersPage = usersService.getPage(page, pageSize, orderByClause, username,mobile,sp_id,company_brief);
         List<ShyUsers> list = usersPage.getList();
+        JSONObject notice = CommonConst.NOTICE;
         if (!list.isEmpty()) {
             for (ShyUsers users : list) {
             	 //显示spid简称
@@ -108,7 +112,60 @@ public class UsersController {
         }
         model.addAttribute("usersPage", usersPage);
         model.addAttribute("pageSize", pageSize);
+        model.addAttribute("notice", notice);
         return "page/users.html";
     }
+    /**
+     * 获取通知是否显示
+     * @param showType
+     * @param session
+     * @return
+     */
+    @PostMapping(value = "/getNoticeShow")
+    @ResponseBody
+    public Map<String,Object> getNoticeShow( HttpSession session) {
+        SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
+        ShyUsers shyUser = new ShyUsers();
+        shyUser.setUser_id(sessionUser.getUserId());
+        shyUser =usersService.select(shyUser);
+        boolean isShow_chinnal=false;//是否显示频道消息框
+        boolean isShow_liveApply=false;//是否显示直播申请消息框  
+        if(shyUser.getNotice_show().contains("1")){
+        	isShow_chinnal=true;
+        }
+        if(shyUser.getNotice_show().contains("2")){
+        	isShow_liveApply=true;
+        }
+        Map<String,Object> map=new HashMap<>();
+        map.put("isShow_chinnal", isShow_chinnal);
+        map.put("isShow_liveApply", isShow_liveApply);
+        return map;
+    }
+    
+    
+    @PostMapping(value = "/write")
+    public String write(Integer userId, String[] write_notice, HttpSession session, String redirect_url) {
+    	SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
+    	Integer spid = sessionUser.getSpid();
+    	if (spid != 0) {
+    		return "page/error.html";
+    	}
+    	ShyUsers user = usersService.get(userId);
+    	String write = "";
+    	if (CommonUtils.isNotNull(write_notice) && write_notice.length > 0) {
+    		for (String w : write_notice) {
+    			write = write + "," + w;
+    		}
+    		write = write.substring(1);
+    	}
+    	user.setNotice_show(write);
+    	boolean success = usersService.update(user);
+    	if (success) {
+    		return "redirect:" + redirect_url;
+    	} else {
+    		return "error.html";
+    	}
+    }
+    
 }
@@ -53,6 +53,11 @@ public class ShyUsers {
      */
     private Boolean state;
+    /**
+     * 通知显示 1：频道 2：直播申请
+     */
+    private String notice_show;
+
     private Date created_at;
     private Date updated_at;
@@ -244,6 +249,24 @@ public class ShyUsers {
     }
     /**
+     * 获取通知显示 1：频道 2：直播申请
+     *
+     * @return notice_show - 通知显示 1：频道 2：直播申请
+     */
+    public String getNotice_show() {
+        return notice_show;
+    }
+
+    /**
+     * 设置通知显示 1：频道 2：直播申请
+     *
+     * @param notice_show 通知显示 1：频道 2：直播申请
+     */
+    public void setNotice_show(String notice_show) {
+        this.notice_show = notice_show;
+    }
+
+    /**
      * @return created_at
      */
     public Date getCreated_at() {
 package com.cnlive.shenhe.serviceImpl;
+import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -56,4 +57,8 @@ public class UsersServiceImpl {
     public ShyUsers select(ShyUsers shyUsers) {
         return shyUsersMapper.selectOne(shyUsers);
     }
+    
+    public boolean update(ShyUsers shyUsers) {
+        return shyUsersMapper.updateByPrimaryKeySelective(shyUsers) == 1;
+    }
 }
@@ -83,8 +83,10 @@ public class CommonConst {
      */
     public static Integer BUSINESS_CHANNEL = 4;
-    
+    //白名单设置
     public static JSONObject BUSINESS = JSONObject.parseObject("{\"1\":\"点播业务\",\"2\":\"评论业务\",\"3\":\"图文业务\",\"4\":\"频道业务\"}");
+    //通知消息设置
+    public static JSONObject NOTICE = JSONObject.parseObject("{\"1\":\"频道通知\",\"2\":\"直播申请通知\"}");
     /**
      * 抽帧状态：未抽帧
@@ -15,6 +15,7 @@
     <result column="company_brief" jdbcType="VARCHAR" property="company_brief" />
     <result column="company_name" jdbcType="VARCHAR" property="company_name" />
     <result column="state" jdbcType="BIT" property="state" />
+    <result column="notice_show" jdbcType="VARCHAR" property="notice_show" />
     <result column="created_at" jdbcType="TIMESTAMP" property="created_at" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" />
     <result column="tm" jdbcType="BIGINT" property="tm" />
+   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;
+    
+    //创建一个对象;
+    function xWin(id,tit,msg,url){
+     index = index+2;
+     if(id==1){
+	    isShow_chinnal=false;
+	 }else if(id==2){
+	    isShow_liveApply=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," + this.id + ")'>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," + this.id + ")'"
+    	+">确定</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+"'," + this.id + ")\"" 
+    	+">查看</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,id){
+     var win = obj.parentNode.parentNode;
+//      var sha = win.nextSibling;
+     win.style.visibility = "hidden";
+//      sha.style.visibility = "hidden";
+	    if(id==1){
+	    	isShow_chinnal=true;
+	    }else if(id==2){
+	    	isShow_liveApply=true;
+	    }
+    }
+    //点击查看跳转链接
+    function toLink(url,id){
+    	if(id==1){
+	    	isShow_chinnal=true;
+	    }else if(id==2){
+	    	isShow_liveApply=true;
+	    }    	window.location.href= url;
+//     	window.location.href= window.location.protocol+"//"+window.location.host+"/channel/page?shenhe_status=0&receive=0";
+    }
 \ No newline at end of file
@@ -48,7 +48,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot; th:text=&quot;${session.sessionUser.
                             </p>
                         </li>
                         <li class="user-footer" >
-                        	<div class="pull-left" th:if="${session.sessionUser.spid==0 or session.sessionUser.master}">
+                        	<div class="pull-left" th:if="${session.sessionUser.spid==0 }">
                                 <a style="background:#3c8dbc" href="http://console.open.cnlive.com/open/console/user/info" target="black" class="btn btn-default btn-flat">账号管理</a>
                             </div>
                             <div class="pull-right">
@@ -89,256 +89,45 @@
 <!--     <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);
-    }
+
+<!-- 	右下角弹窗js -->
+    <script src="../../static/js/notice.js"></script>
-  //开始拖动;
-    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'>
+    
+    var isShow_chinnal=false;//是否显示频道消息框  
+    var isShow_liveApply=false;//是否显示直播申请消息框  
+    	
     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");
+    	$.ajax({
+			type:'post',
+			dataType:'json',
+			data:'',
+			url: "/users/getNoticeShow",
+			success:function(data){	
+				if(data.isShow_chinnal){
+					isShow_chinnal=true;
+					notice_channel();//第一次进来就弹窗
+				}
+				if(data.isShow_liveApply){
+					isShow_liveApply=true;
+				}
+			}
+		});
     }
-//     window.onload = initialize;
-    
     var t1;
 	$(function(){
+		 initialize();
   		 t1 = window.setInterval(
   				 function(){
-  			 		if(isShow){
-  			 			notice()
+  			 		if(((parseInt(new Date().getTime()/1000))%(5*60)==0) && isShow_chinnal){
+  			 			notice_channel()
   			 		}
-  			 	},10000); 
+  			 	},1000); 
 	});
-	function notice(){ 
+	function notice_channel(){ 
 		$.ajax({
 			type:'get',
 			dataType:'json',
@@ -346,9 +135,6 @@
 			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);
 				}
 			}
@@ -160,7 +160,7 @@
                                                     <td style="text-align: center; width: 12%;" th:text="${#dates.format(users.created_at, 'yyyy-MM-dd HH:mm:ss')}">2018-11-22 23:08:48</td>
                                                     <td style="text-align: center; width: 12%;" th:text="${#dates.format(users.updated_at, 'yyyy-MM-dd HH:mm:ss')}">2016-08-03 14:27:17</td>
                                                     <td style="text-align: center; width: 10%;"><span>&nbsp;</span><a
-                                                            class="edit" th:href="'javascript:edit('+${users.id}+',\''+${users.company_brief}+'\',\''+${users.state} +'\')'">
+                                                            class="edit" th:href="'javascript:edit('+${users.id}+',\''+${users.company_brief}+'\',\''+${users.notice_show} +'\')'">
                                                         <button class="btn btn-primary btn-xs">设置</button>
                                                     </a><span> </span><span>&nbsp;</span></td>
                                                 </tr>
@@ -244,14 +244,14 @@
                 </div>
                 <div class="form-group">
-                    <label class="control-label col-sm-2" style="font-size: 15px;">:</label>
+                    <label class="control-label col-sm-2" style="font-size: 15px;">提醒业务:</label>
                     <form action="/users/write" method="post" id="editWrite">
-                        <input type="text" name="siteId" value="" class="hide" id="edit_id"/>
+                        <input type="text" name="userId" value="" class="hide" id="edit_id"/>
                         <input type="text" name="redirect_url" value="" class="hide" id="redirect_url"/>
                         <div class="col-sm-10" style="float: left">
-                            <div th:each="bu:${business}" style="padding-right: 30px;" class="write_check">
+                            <div th:each="bu:${notice}" style="padding-right: 30px;" class="write_check">
                                 <span th:text="${bu.value}" style="font-size: 15px"></span>
-                                <input type="checkbox" name="write_business" th:value="${bu.key}" th:id="'write_check_'+${bu.key}">
+                                <input type="checkbox" name="write_notice" th:value="${bu.key}" th:id="'write_check_'+${bu.key}">
                             </div>
                         </div>
                     </form>
@@ -260,7 +260,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-<!--                 <button type="button" class="btn btn-primary" onclick="javascript:$('#editWrite').submit();">提交更改</button> -->
+                <button type="button" class="btn btn-primary" onclick="javascript:$('#editWrite').submit();">提交更改</button>
             </div>
         </div><!-- /.modal-content -->
     </div><!-- /.modal-dialog -->
@@ -268,13 +268,13 @@
 <!-- /.modal -->
     <script>
         //打开编辑窗口
-        function edit(id,company,write_business){
+        function edit(id,company,notice_show){
             $("#edit_company").text(company);
             $("#edit_id").val(id);
             $("#redirect_url").val(location.pathname+location.search);
             $(".write_check input").prop("checked",false);
-             if($.trim(write_business)!=''){
-                 var array =  write_business.split(",")
+             if($.trim(notice_show)!=''){
+                 var array =  notice_show.split(",")
                  for (var i=0;i<array.length;i++){
                      $("#write_check_"+array[i]).prop("checked",true);
                  }
@@ -337,6 +337,12 @@
         	var pageSize = $("#pageSize").val();
         	window.location.href = "/users/page?company_brief=" + company_brief + "&username=" + username+ "&sp_id=" + sp_id+ "&mobile=" + mobile+ "&pageSize=" + pageSize;
 		});
+        //鼠标回车事件
+        $(document).keyup(function(event){
+        	  if(event.keyCode ==13){
+        	    $("#users_query").trigger("click");
+        	  }
+        	});
     </script>
@@ -408,6 +408,12 @@ input:checked + .slider:before {
         	window.location.href = "/usersFree/page?userId=" + userId + "&mobile=" + mobile+ "&pageSize=" + pageSize;
 		});
+      //鼠标回车事件
+        $(document).keyup(function(event){
+        	  if(event.keyCode ==13){
+        	    $("#users_query").trigger("click");
+        	  }
+        	});
     </script>
     <footer th:replace="../templates/common/foot::foot" ></footer>