Merge branch 'dev'

徐近程
2 parents 91a7cff8 4e9ed92f
Showing 4 changed files with 72 additions and 12 deletions
src/main/java/com/cnlive/shenhe/controller/TopicController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/utils/CommonConst.java
src/main/resources/templates/common/head.html
@@ -4,13 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
-import com.cnlive.shenhe.entity.ShyComments;
-import com.cnlive.shenhe.entity.ShyContent;
-import com.cnlive.shenhe.entity.ShyLive;
-import com.cnlive.shenhe.entity.ShySites;
-import com.cnlive.shenhe.entity.ShyTopic;
-import com.cnlive.shenhe.entity.ShyUsers;
-import com.cnlive.shenhe.entity.ShyVideos;
+import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
 import com.cnlive.shenhe.serviceImpl.ContentServiceImpl;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
@@ -19,6 +13,7 @@ import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
 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.apache.poi.xssf.usermodel.XSSFCell;
@@ -28,6 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +38,9 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 @Controller
@@ -61,6 +59,9 @@ public class TopicController extends BaseController {
     @Autowired
     UsersServiceImpl usersService;
+    @Value("${spring.localhost.url}")
+    private String localhost_url;
+
     /**
      * 图文列表
      * 
@@ -188,6 +189,33 @@ public class TopicController extends BaseController {
     /**
+     * 话题审核前台通知接口
+     *
+     * @return
+     */
+    @GetMapping("/topicNotice")
+    @ResponseBody
+    public Map<String, Object> channelNotice() {
+        Map<String, Object> map = new HashMap<>();
+
+        ShyTopic shyTopic = new ShyTopic();
+        shyTopic.setShenhe_status(CommonConst.AUDIT_INTT);
+        shyTopic.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
+        List<ShyTopic> shyTopicList = topicService.findshyTopic(shyTopic);
+        if(shyTopicList!=null&&shyTopicList.size()>0){
+            logger.info("您有"+shyTopicList.size()+"条新的话题审核，请注意查看！");
+            // 第三个提示框，避免冲突
+            map.put("id", "3");
+            map.put("title", "新话题审核通知");
+            map.put("content", "您有" + shyTopicList.size() + "条新的话题审核，请注意查看！");
+            map.put("url", localhost_url+"/topic/page?shenhe_status=0&receive=0");
+            return map;
+        }
+        return null;
+    }
+
+
+    /**
      * 根据条件导出excel
      */
 //    @GetMapping("excel")
@@ -127,16 +127,21 @@ public class UsersController extends BaseController {
         shyUser.setUser_id(sessionUser.getUserId());
         shyUser =usersService.select(shyUser);
         boolean isShow_chinnal=false;//是否显示频道消息框
-        boolean isShow_liveApply=false;//是否显示直播申请消息框  
+        boolean isShow_liveApply=false;//是否显示直播申请消息框
+        boolean  isShow_topic=false;//是否显示话题审核消息框
         if(CommonUtils.isNotEmpty(shyUser.getNotice_show())&&shyUser.getNotice_show().contains(CommonConst.NOTICE_CHANNAL.toString())){
         	isShow_chinnal=true;
         }
         if(CommonUtils.isNotEmpty(shyUser.getNotice_show())&&shyUser.getNotice_show().contains(CommonConst.NOTICE_LIVEAPPLY.toString())){
-        	isShow_liveApply=true;
+            isShow_liveApply=true;
+        }
+        if(CommonUtils.isNotEmpty(shyUser.getNotice_show())&&shyUser.getNotice_show().contains(CommonConst.NOTICE_TOPIC.toString())){
+            isShow_topic=true;
         }
         Map<String,Object> map=new HashMap<>();
         map.put("isShow_chinnal", isShow_chinnal);
         map.put("isShow_liveApply", isShow_liveApply);
+        map.put("isShow_topic", isShow_topic);
         return map;
     }
@@ -125,9 +125,14 @@ public class CommonConst {
      * 弹窗消息：直播申请
      */
     public static Integer NOTICE_LIVEAPPLY = 2;
+
+    /**
+     * 弹窗消息：话题审核
+     */
+    public static Integer NOTICE_TOPIC = 3;
     //通知消息设置
-    public static JSONObject NOTICE = JSONObject.parseObject("{\"1\":\"频道通知\",\"2\":\"直播申请通知\"}");
+    public static JSONObject NOTICE = JSONObject.parseObject("{\"1\":\"频道通知\",\"2\":\"直播申请通知\",\"3\":\"话题审核通知\"}");
     /**
      * 邮件消息：直播申请
@@ -97,7 +97,8 @@
     <script language='JScript'>
     var isShow_chinnal=false;//是否显示频道消息框  
-    var isShow_liveApply=false;//是否显示直播申请消息框  
+    var isShow_liveApply=false;//是否显示直播申请消息框
+    var isShow_topic=false;//是否显示话题审核消息框
     function initialize(){
     	$.ajax({
@@ -114,6 +115,10 @@
 					isShow_liveApply=true;
 					notice_liveApply();//第一次进来就弹窗
 				}
+                if(data.isShow_topic){
+                    isShow_topic=true;
+                    notice_topic();//第一次进来就弹窗
+                }
 			}
 		});
     }
@@ -130,6 +135,9 @@
   			 		    if(isShow_liveApply){
   			 		    	notice_liveApply();
   			 		    }
+                        if(isShow_topic){
+                            notice_topic();
+                        }
   			 		}
   			 	},1000); 
 	});
@@ -159,7 +167,21 @@
 				}
 			}
 		});
-	} 
+	}
+
+    function notice_topic(){
+        $.ajax({
+            type:'get',
+            dataType:'json',
+            data:'',
+            url: "/topic/topicNotice",
+            success:function(data){
+                if(data!=null && data!="" ){
+                    new xWin(data.id,data.title,data.content,data.url);
+                }
+            }
+        });
+    }
 //去掉定时器的方法 
 //window.clearInterval(t1);