Merge branch 'dev'

liwei2917
2 parents c966b450 ab78fc0f
Showing 21 changed files with 1413 additions and 37 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/entity/ShyLiveapply.java
src/main/java/com/cnlive/shenhe/entity/ShyUsers.java
src/main/java/com/cnlive/shenhe/job/ChannelJob.java
src/main/java/com/cnlive/shenhe/mapper/ShyLiveapplyMapper.java
src/main/java/com/cnlive/shenhe/serviceImpl/UsersServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/CommonConst.java
src/main/java/com/cnlive/shenhe/utils/InfoUtil.java
src/main/resources/mapper/ShyContentMapper.xml
src/main/resources/mapper/ShyLiveapplyMapper.xml
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/content.html
src/main/resources/templates/page/users.html
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
@@ -259,7 +260,11 @@ public class ShenheApplication extends SpringBootServletInitializer {
 	public static void main(String[] args) {
-		SpringApplication.run(ShenheApplication.class, args);
+//		SpringApplication.run(ShenheApplication.class, args);
+		SpringApplicationBuilder builder=new SpringApplicationBuilder(ShenheApplication.class);
+		builder.headless(true).run(args);
+		// 设置Headless模式,linux系统下
+        System.setProperty("java.awt.headless", "true");
 	}
 	 /**
@@ -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;
+   }
 }
@@ -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";
+    	}
+    }
+    
 }
@@ -18,6 +18,7 @@ import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,6 +44,8 @@ public class VideosController extends BaseController {
     @Autowired
     AuditPass Pass;
     @Autowired
+    InfoUtil infoUtil;
+    @Autowired
     VideosServiceImpl videosService;
     @Autowired
     UsersServiceImpl usersService;
@@ -154,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());
                 	}
@@ -460,12 +463,13 @@ public class VideosController extends BaseController {
         return responseBean;
     }
-    @PostMapping("/ceshi")
+    @GetMapping("/ceshi")
     @ResponseBody
-    public static String ceshi(String name) {
-    	
+    public void ceshi() {
+    	System.out.println("进入测试");
+//    	InfoUtil test = new InfoUtil();
+//    	infoUtil.show("测试通知", "这是一个弹窗测试！",localhost_url+"/channel/page?shenhe_status=0&receive=0");
-    	return name;
     }
 }
+package com.cnlive.shenhe.entity;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "shy_liveapply")
+public class ShyLiveapply {
+    /**
+     * id
+     */
+    @Id
+    private Integer id;
+
+    /**
+     * 直播活动id
+     */
+    private String activity_id;
+
+    /**
+     * 直播频道id
+     */
+    private String channel_id;
+
+    /**
+     * spId
+     */
+    private Integer sp_id;
+
+    /**
+     * 直播发起人
+     */
+    private String sender;
+
+    /**
+     * 联系方式
+     */
+    private String mobile;
+
+    /**
+     * 直播发起单位
+     */
+    private String organization;
+
+    /**
+     * 直播主题
+     */
+    private String theme;
+
+    /**
+     * 预计开始时间
+     */
+    private Date preStartTime;
+
+    /**
+     * 预计结束时间
+     */
+    private Date preEndTime;
+
+    /**
+     * 商务模式：0免费  1收费
+     */
+    private Integer businessModel;
+
+    /**
+     * 内容属性：1商业类活动 0非商业活动
+     */
+    private Integer contentProperty;
+
+    /**
+     * 要点报备：0品牌植入 1广告植入 2商品推销 3网家家独家麦标
+     */
+    private String keys;
+
+    /**
+     * 直播地点
+     */
+    private String livePlace;
+
+    /**
+     * 推流地址
+     */
+    private String pushUrl;
+
+    /**
+     * 拉流地址
+     */
+    private String pullUrl;
+
+    /**
+     * 播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
+     */
+    private String platforms;
+
+    /**
+     * 回调地址
+     */
+    private String callback;
+
+    /**
+     * 审核类型，1:免审，2:机审，3:人工审
+     */
+    private Integer shenhe_type;
+
+    /**
+     * 领取状态。0：未领取；1：已领取
+     */
+    private Integer receive;
+
+    /**
+     * 审核状态:0.未审核,1:已审核,2.拒绝
+     */
+    private Integer shenhe_state;
+
+    /**
+     * 更新者
+     */
+    private String updater;
+
+    /**
+     * 审核员
+     */
+    private String auditor;
+
+    /**
+     * 审核信息
+     */
+    private String shenhe_msg;
+
+    /**
+     * 创建时间
+     */
+    private Date created_at;
+
+    /**
+     * 更新时间
+     */
+    private Date updated_at;
+
+    /**
+     * 内容简述
+     */
+    private String simpleContent;
+
+    /**
+     * 获取id
+     *
+     * @return id - id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 设置id
+     *
+     * @param id id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取直播活动id
+     *
+     * @return activity_id - 直播活动id
+     */
+    public String getActivity_id() {
+        return activity_id;
+    }
+
+    /**
+     * 设置直播活动id
+     *
+     * @param activity_id 直播活动id
+     */
+    public void setActivity_id(String activity_id) {
+        this.activity_id = activity_id;
+    }
+
+    /**
+     * 获取直播频道id
+     *
+     * @return channel_id - 直播频道id
+     */
+    public String getChannel_id() {
+        return channel_id;
+    }
+
+    /**
+     * 设置直播频道id
+     *
+     * @param channel_id 直播频道id
+     */
+    public void setChannel_id(String channel_id) {
+        this.channel_id = channel_id;
+    }
+
+    /**
+     * 获取spId
+     *
+     * @return sp_id - spId
+     */
+    public Integer getSp_id() {
+        return sp_id;
+    }
+
+    /**
+     * 设置spId
+     *
+     * @param sp_id spId
+     */
+    public void setSp_id(Integer sp_id) {
+        this.sp_id = sp_id;
+    }
+
+    /**
+     * 获取直播发起人
+     *
+     * @return sender - 直播发起人
+     */
+    public String getSender() {
+        return sender;
+    }
+
+    /**
+     * 设置直播发起人
+     *
+     * @param sender 直播发起人
+     */
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
+
+    /**
+     * 获取联系方式
+     *
+     * @return mobile - 联系方式
+     */
+    public String getMobile() {
+        return mobile;
+    }
+
+    /**
+     * 设置联系方式
+     *
+     * @param mobile 联系方式
+     */
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    /**
+     * 获取直播发起单位
+     *
+     * @return organization - 直播发起单位
+     */
+    public String getOrganization() {
+        return organization;
+    }
+
+    /**
+     * 设置直播发起单位
+     *
+     * @param organization 直播发起单位
+     */
+    public void setOrganization(String organization) {
+        this.organization = organization;
+    }
+
+    /**
+     * 获取直播主题
+     *
+     * @return theme - 直播主题
+     */
+    public String getTheme() {
+        return theme;
+    }
+
+    /**
+     * 设置直播主题
+     *
+     * @param theme 直播主题
+     */
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    /**
+     * 获取预计开始时间
+     *
+     * @return preStartTime - 预计开始时间
+     */
+    public Date getPreStartTime() {
+        return preStartTime;
+    }
+
+    /**
+     * 设置预计开始时间
+     *
+     * @param preStartTime 预计开始时间
+     */
+    public void setPreStartTime(Date preStartTime) {
+        this.preStartTime = preStartTime;
+    }
+
+    /**
+     * 获取预计结束时间
+     *
+     * @return preEndTime - 预计结束时间
+     */
+    public Date getPreEndTime() {
+        return preEndTime;
+    }
+
+    /**
+     * 设置预计结束时间
+     *
+     * @param preEndTime 预计结束时间
+     */
+    public void setPreEndTime(Date preEndTime) {
+        this.preEndTime = preEndTime;
+    }
+
+    /**
+     * 获取商务模式：0免费  1收费
+     *
+     * @return businessModel - 商务模式：0免费  1收费
+     */
+    public Integer getBusinessModel() {
+        return businessModel;
+    }
+
+    /**
+     * 设置商务模式：0免费  1收费
+     *
+     * @param businessModel 商务模式：0免费  1收费
+     */
+    public void setBusinessModel(Integer businessModel) {
+        this.businessModel = businessModel;
+    }
+
+    /**
+     * 获取内容属性：1商业类活动 0非商业活动
+     *
+     * @return contentProperty - 内容属性：1商业类活动 0非商业活动
+     */
+    public Integer getContentProperty() {
+        return contentProperty;
+    }
+
+    /**
+     * 设置内容属性：1商业类活动 0非商业活动
+     *
+     * @param contentProperty 内容属性：1商业类活动 0非商业活动
+     */
+    public void setContentProperty(Integer contentProperty) {
+        this.contentProperty = contentProperty;
+    }
+
+    /**
+     * 获取要点报备：0品牌植入 1广告植入 2商品推销 3网家家独家麦标
+     *
+     * @return keys - 要点报备：0品牌植入 1广告植入 2商品推销 3网家家独家麦标
+     */
+    public String getKeys() {
+        return keys;
+    }
+
+    /**
+     * 设置要点报备：0品牌植入 1广告植入 2商品推销 3网家家独家麦标
+     *
+     * @param keys 要点报备：0品牌植入 1广告植入 2商品推销 3网家家独家麦标
+     */
+    public void setKeys(String keys) {
+        this.keys = keys;
+    }
+
+    /**
+     * 获取直播地点
+     *
+     * @return livePlace - 直播地点
+     */
+    public String getLivePlace() {
+        return livePlace;
+    }
+
+    /**
+     * 设置直播地点
+     *
+     * @param livePlace 直播地点
+     */
+    public void setLivePlace(String livePlace) {
+        this.livePlace = livePlace;
+    }
+
+    /**
+     * 获取推流地址
+     *
+     * @return pushUrl - 推流地址
+     */
+    public String getPushUrl() {
+        return pushUrl;
+    }
+
+    /**
+     * 设置推流地址
+     *
+     * @param pushUrl 推流地址
+     */
+    public void setPushUrl(String pushUrl) {
+        this.pushUrl = pushUrl;
+    }
+
+    /**
+     * 获取拉流地址
+     *
+     * @return pullUrl - 拉流地址
+     */
+    public String getPullUrl() {
+        return pullUrl;
+    }
+
+    /**
+     * 设置拉流地址
+     *
+     * @param pullUrl 拉流地址
+     */
+    public void setPullUrl(String pullUrl) {
+        this.pullUrl = pullUrl;
+    }
+
+    /**
+     * 获取播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
+     *
+     * @return platforms - 播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
+     */
+    public String getPlatforms() {
+        return platforms;
+    }
+
+    /**
+     * 设置播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
+     *
+     * @param platforms 播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
+     */
+    public void setPlatforms(String platforms) {
+        this.platforms = platforms;
+    }
+
+    /**
+     * 获取回调地址
+     *
+     * @return callback - 回调地址
+     */
+    public String getCallback() {
+        return callback;
+    }
+
+    /**
+     * 设置回调地址
+     *
+     * @param callback 回调地址
+     */
+    public void setCallback(String callback) {
+        this.callback = callback;
+    }
+
+    /**
+     * 获取审核类型，1:免审，2:机审，3:人工审
+     *
+     * @return shenhe_type - 审核类型，1:免审，2:机审，3:人工审
+     */
+    public Integer getShenhe_type() {
+        return shenhe_type;
+    }
+
+    /**
+     * 设置审核类型，1:免审，2:机审，3:人工审
+     *
+     * @param shenhe_type 审核类型，1:免审，2:机审，3:人工审
+     */
+    public void setShenhe_type(Integer shenhe_type) {
+        this.shenhe_type = shenhe_type;
+    }
+
+    /**
+     * 获取领取状态。0：未领取；1：已领取
+     *
+     * @return receive - 领取状态。0：未领取；1：已领取
+     */
+    public Integer getReceive() {
+        return receive;
+    }
+
+    /**
+     * 设置领取状态。0：未领取；1：已领取
+     *
+     * @param receive 领取状态。0：未领取；1：已领取
+     */
+    public void setReceive(Integer receive) {
+        this.receive = receive;
+    }
+
+    /**
+     * 获取审核状态:0.未审核,1:已审核,2.拒绝
+     *
+     * @return shenhe_state - 审核状态:0.未审核,1:已审核,2.拒绝
+     */
+    public Integer getShenhe_state() {
+        return shenhe_state;
+    }
+
+    /**
+     * 设置审核状态:0.未审核,1:已审核,2.拒绝
+     *
+     * @param shenhe_state 审核状态:0.未审核,1:已审核,2.拒绝
+     */
+    public void setShenhe_state(Integer shenhe_state) {
+        this.shenhe_state = shenhe_state;
+    }
+
+    /**
+     * 获取更新者
+     *
+     * @return updater - 更新者
+     */
+    public String getUpdater() {
+        return updater;
+    }
+
+    /**
+     * 设置更新者
+     *
+     * @param updater 更新者
+     */
+    public void setUpdater(String updater) {
+        this.updater = updater;
+    }
+
+    /**
+     * 获取审核员
+     *
+     * @return auditor - 审核员
+     */
+    public String getAuditor() {
+        return auditor;
+    }
+
+    /**
+     * 设置审核员
+     *
+     * @param auditor 审核员
+     */
+    public void setAuditor(String auditor) {
+        this.auditor = auditor;
+    }
+
+    /**
+     * 获取审核信息
+     *
+     * @return shenhe_msg - 审核信息
+     */
+    public String getShenhe_msg() {
+        return shenhe_msg;
+    }
+
+    /**
+     * 设置审核信息
+     *
+     * @param shenhe_msg 审核信息
+     */
+    public void setShenhe_msg(String shenhe_msg) {
+        this.shenhe_msg = shenhe_msg;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return created_at - 创建时间
+     */
+    public Date getCreated_at() {
+        return created_at;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param created_at 创建时间
+     */
+    public void setCreated_at(Date created_at) {
+        this.created_at = created_at;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return updated_at - 更新时间
+     */
+    public Date getUpdated_at() {
+        return updated_at;
+    }
+
+    /**
+     * 设置更新时间
+     *
+     * @param updated_at 更新时间
+     */
+    public void setUpdated_at(Date updated_at) {
+        this.updated_at = updated_at;
+    }
+
+    /**
+     * 获取内容简述
+     *
+     * @return simpleContent - 内容简述
+     */
+    public String getSimpleContent() {
+        return simpleContent;
+    }
+
+    /**
+     * 设置内容简述
+     *
+     * @param simpleContent 内容简述
+     */
+    public void setSimpleContent(String simpleContent) {
+        this.simpleContent = simpleContent;
+    }
+}
 \ No newline at end of file
@@ -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() {
@@ -8,9 +8,12 @@ import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
+import com.cnlive.shenhe.utils.InfoUtil;
+
 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.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -19,11 +22,16 @@ import java.util.List;
 @Component
 public class ChannelJob {
     private static Logger logger = LoggerFactory.getLogger(ChannelJob.class);
+    @Value("${spring.localhost.url}")
+	private String localhost_url;//本机地址
+	
     @Autowired
     SitesServiceImpl sitesService;
     @Autowired
     AuditPass Pass;
     @Autowired
+    InfoUtil infoUtil;
+    @Autowired
     ChannelServiceImpl channelService;
     @Autowired
@@ -45,5 +53,23 @@ public class ChannelJob {
             }
     }
+    /**
+     * 频道审核通知
+     */
+//    @Scheduled(fixedRate = 60 * 1000)
+    public void channelNotice() {
+    	 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()+"条新的频道审核申请，请注意查看！");
+        	// 设置Headless模式,linux系统下
+            System.setProperty("java.awt.headless", "false");
+         	infoUtil.show("新频道申请", "您有"+channelList.size()+"条新的频道审核申请，请注意查看！",localhost_url+"/channel/page?shenhe_status=0&receive=0");
+         }
+    	
+    }
+    
 }
+package com.cnlive.shenhe.mapper;
+
+import com.cnlive.shenhe.entity.ShyLiveapply;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface ShyLiveapplyMapper extends Mapper<ShyLiveapply> {
+}
 \ No newline at end of file
 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;
+    }
 }
@@ -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);
@@ -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\":\"直播申请通知\"}");
     /**
      * 抽帧状态：未抽帧
+package com.cnlive.shenhe.utils;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Desktop;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Point;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.net.URI;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingConstants;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+import java.awt.Insets;
+import java.awt.Toolkit;
+import javax.swing.JDialog;
+ 
+/**
+ * @author Administrator 此工具类用法：实例化出对象，调用 void show("标题","内容") 方法. InfoUtil tool
+ *         = new InfoUtil(); tool.show("标题","内容")
+ */
+@Component
+public class InfoUtil {
+    private TipWindow tw = null; // 提示框
+    private JPanel headPan = null;
+    private JPanel feaPan = null;
+	private JPanel btnPan = null;
+    private JLabel title = null; // 栏目名称
+    private JLabel head = null; // 蓝色标题
+    private JLabel close = null; // 关闭按钮
+    private JTextArea feature = null; // 内容
+    private JScrollPane jfeaPan = null;
+    private JButton sure = null;
+    private String titleT = null;
+    private String word = null;
+    private Desktop desktop = null;
+ 
+    // private SimpleDateFormat sdf = new
+    // SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ 
+    public void init() {
+        // 新建300x180的消息提示框
+        tw = new TipWindow(300, 180);
+        headPan = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
+        feaPan = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
+        btnPan = new JPanel(new FlowLayout(FlowLayout.CENTER, 0, 0));
+        title = new JLabel("欢迎使用本系统");
+        head = new JLabel(titleT);
+        close = new JLabel(" x");
+        feature = new JTextArea(word);
+        jfeaPan = new JScrollPane(feature);
+        sure = new JButton("查看");
+        sure.setHorizontalAlignment(SwingConstants.CENTER);
+ 
+        // 设置提示框的边框,宽度和颜色
+        tw.getRootPane().setBorder(
+                BorderFactory.createMatteBorder(1, 1, 1, 1, Color.white));
+        title.setPreferredSize(new Dimension(260, 26));
+        title.setVerticalTextPosition(JLabel.CENTER);
+        title.setHorizontalTextPosition(JLabel.CENTER);
+        title.setFont(new Font("宋体", Font.PLAIN, 12));
+        title.setForeground(Color.black);
+ 
+        close.setFont(new Font("Arial", Font.BOLD, 15));
+        close.setPreferredSize(new Dimension(20, 20));
+        close.setVerticalTextPosition(JLabel.CENTER);
+        close.setHorizontalTextPosition(JLabel.CENTER);
+        close.setCursor(new Cursor(12));
+        close.setToolTipText("关闭");
+ 
+        head.setPreferredSize(new Dimension(250, 35));
+        head.setVerticalTextPosition(JLabel.CENTER);
+        head.setHorizontalTextPosition(JLabel.CENTER);
+        head.setFont(new Font("宋体", Font.PLAIN, 14));
+        head.setForeground(Color.black);
+ 
+        feature.setEditable(false);
+        feature.setForeground(Color.BLACK);
+        feature.setFont(new Font("宋体", Font.PLAIN, 13));
+        feature.setBackground(new Color(255, 255, 255));
+        // 设置文本域自动换行
+        feature.setLineWrap(true);
+ 
+        jfeaPan.setPreferredSize(new Dimension(260, 100));
+        jfeaPan.setBorder(null);
+        jfeaPan.setBackground(Color.black);
+        tw.setBackground(Color.white);
+ 
+        // 为了隐藏文本域，加个空的JLabel将他挤到下面去
+        JLabel jsp = new JLabel();
+        jsp.setPreferredSize(new Dimension(300, 15));
+ 
+        sure.setPreferredSize(new Dimension(60, 30));
+        // 设置标签鼠标手形
+        sure.setCursor(new Cursor(12));
+        // 设置button外观
+        sure.setContentAreaFilled(false);
+        sure.setBorder(BorderFactory.createRaisedBevelBorder());
+        sure.setBackground(Color.gray);
+ 
+        // headPan.add(title);
+        headPan.add(head);
+        headPan.add(close);
+ 
+        feaPan.add(jsp);
+        feaPan.add(jfeaPan);
+ 
+        // feaPan.add(releaseLabel);
+ 
+        btnPan.add(sure);
+ 
+        headPan.setBackground(new Color(104, 141, 177));
+        feaPan.setBackground(Color.white);
+        btnPan.setBackground(Color.white);
+ 
+        tw.add(headPan, BorderLayout.NORTH);
+        tw.add(feaPan, BorderLayout.CENTER);
+        tw.add(btnPan, BorderLayout.SOUTH);
+    }
+ 
+    public void handle(String url) {
+        // 为更新按钮增加相应的事件
+        desktop = Desktop.getDesktop();
+        sure.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                //注释代码为点击确认之后跳转到指定网页
+                 try {
+                 desktop.browse(new URI(url));
+                 } catch (Exception e1) {
+                 e1.printStackTrace();
+                 }
+                tw.close();
+            }
+ 
+            public void mouseEntered(MouseEvent e) {
+                sure.setBorder(BorderFactory.createLineBorder(Color.gray));
+            }
+ 
+            public void mouseExited(MouseEvent e) {
+                sure.setBorder(null);
+            }
+        });
+        // 右上角关闭按钮事件
+        close.addMouseListener(new MouseAdapter() {
+            public void mouseClicked(MouseEvent e) {
+                tw.close();
+            }
+ 
+            public void mouseEntered(MouseEvent e) {
+                close.setBorder(BorderFactory.createLineBorder(Color.gray));
+            }
+ 
+            public void mouseExited(MouseEvent e) {
+                close.setBorder(null);
+            }
+        });
+    }
+ 
+    public void show(String titleT, String word,String url) {
+        this.titleT = titleT;
+        this.word = word;
+        // time = sdf.format(new Date());
+        init();
+        handle(url);
+        tw.setAlwaysOnTop(true);
+        tw.setUndecorated(true);
+        tw.setResizable(false);
+        tw.setVisible(true);
+        tw.run();
+    }
+ 
+    public void close() {
+        tw.close();
+    }
+}
+ 
+class TipWindow extends JDialog {
+    private static final long serialVersionUID = 8541659783234673950L;
+    private static Dimension dim;
+    private int x, y;
+    private int width, height;
+    private static Insets screenInsets;
+ 
+    public TipWindow(int width, int height) {
+        this.width = width;
+        this.height = height;
+        dim = Toolkit.getDefaultToolkit().getScreenSize();
+        screenInsets = Toolkit.getDefaultToolkit().getScreenInsets(
+                this.getGraphicsConfiguration());
+        x = (int) (dim.getWidth() - width - 3);
+        y = (int) (dim.getHeight() - screenInsets.bottom - 3);
+        initComponents();
+    }
+ 
+    public void run() {
+        for (int i = 0; i <= height; i += 10) {
+            try {
+                this.setLocation(x, y - i);
+                Thread.sleep(50);
+            } catch (InterruptedException ex) {
+            }
+        }
+        // 此处代码用来实现让消息提示框10秒后自动消失
+        try {
+            Thread.sleep(10000);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        close();
+    }
+ 
+    private void initComponents() {
+        this.setSize(width, height);
+        this.setLocation(x, y);
+        this.setBackground(Color.black);
+    }
+ 
+    public void close() {
+        x = this.getX();
+        y = this.getY();
+        int ybottom = (int) dim.getHeight() - screenInsets.bottom;
+        for (int i = 0; i <= ybottom - y; i += 10) {
+            try {
+                setLocation(x, y + i);
+                Thread.sleep(50);
+            } catch (InterruptedException ex) {
+            }
+        }
+        dispose();
+    }
+ 
+}
@@ -11,7 +11,6 @@
     <result column="title_image" jdbcType="VARCHAR" property="title_image" />
     <result column="content_tag" jdbcType="VARCHAR" property="content_tag" />
     <result column="content_url" jdbcType="VARCHAR" property="content_url" />
-    <result column="content_pc_url" jdbcType="VARCHAR" property="content_pc_url" />
     <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" />
     <result column="content_status" jdbcType="INTEGER" property="content_status" />
     <result column="callback" jdbcType="VARCHAR" property="callback" />
@@ -26,6 +25,7 @@
     <result column="updater" jdbcType="VARCHAR" property="updater" />
     <result column="shenhe_msg" jdbcType="VARCHAR" property="shenhe_msg" />
     <result column="title" jdbcType="LONGVARCHAR" property="title" />
+    <result column="content_pc_url" jdbcType="LONGVARCHAR" property="content_pc_url" />
     <result column="content_text" jdbcType="LONGVARCHAR" property="content_text" />
   </resultMap>
 </mapper>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.cnlive.shenhe.mapper.ShyLiveapplyMapper">
+  <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.ShyLiveapply">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="activity_id" jdbcType="VARCHAR" property="activity_id" />
+    <result column="channel_id" jdbcType="VARCHAR" property="channel_id" />
+    <result column="sp_id" jdbcType="INTEGER" property="sp_id" />
+    <result column="sender" jdbcType="VARCHAR" property="sender" />
+    <result column="mobile" jdbcType="VARCHAR" property="mobile" />
+    <result column="organization" jdbcType="VARCHAR" property="organization" />
+    <result column="theme" jdbcType="VARCHAR" property="theme" />
+    <result column="preStartTime" jdbcType="TIMESTAMP" property="preStartTime" />
+    <result column="preEndTime" jdbcType="TIMESTAMP" property="preEndTime" />
+    <result column="businessModel" jdbcType="INTEGER" property="businessModel" />
+    <result column="contentProperty" jdbcType="INTEGER" property="contentProperty" />
+    <result column="keys" jdbcType="VARCHAR" property="keys" />
+    <result column="livePlace" jdbcType="VARCHAR" property="livePlace" />
+    <result column="pushUrl" jdbcType="VARCHAR" property="pushUrl" />
+    <result column="pullUrl" jdbcType="VARCHAR" property="pullUrl" />
+    <result column="platforms" jdbcType="VARCHAR" property="platforms" />
+    <result column="callback" jdbcType="VARCHAR" property="callback" />
+    <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" />
+    <result column="receive" jdbcType="INTEGER" property="receive" />
+    <result column="shenhe_state" jdbcType="INTEGER" property="shenhe_state" />
+    <result column="updater" jdbcType="VARCHAR" property="updater" />
+    <result column="auditor" jdbcType="VARCHAR" property="auditor" />
+    <result column="shenhe_msg" jdbcType="VARCHAR" property="shenhe_msg" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="created_at" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" />
+    <result column="simpleContent" jdbcType="LONGVARCHAR" property="simpleContent" />
+  </resultMap>
+</mapper>
 \ No newline at end of file
@@ -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">
@@ -81,8 +81,69 @@
     <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"> -->
+
+<!-- 	右下角弹窗js -->
+    <script src="../../static/js/notice.js"></script>
+    
+    <script language='JScript'>
+    
+    var isShow_chinnal=false;//是否显示频道消息框  
+    var isShow_liveApply=false;//是否显示直播申请消息框  
+    	
+    function initialize(){
+    	$.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;
+				}
+			}
+		});
+    }
+   
+    var t1;
+	$(function(){
+		 initialize();
+  		 t1 = window.setInterval(
+  				 function(){
+  			 		if(((parseInt(new Date().getTime()/1000))%(5*60)==0) && isShow_chinnal){
+  			 			notice_channel()
+  			 		}
+  			 	},1000); 
+	});
+	
+	function notice_channel(){ 
+		$.ajax({
+			type:'get',
+			dataType:'json',
+			data:'',
+			url: "/api/channel/channelNotice",
+			success:function(data){	
+				if(data!=null && data!="" ){
+					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>
@@ -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>