图文回调修改，非管理员的账号查询报错修复

liwei2917
1 parent 89b54793
Showing 8 changed files with 166 additions and 110 deletions
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/entity/ShyContent.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AuditPass.java
src/main/resources/templates/page/content.html
src/main/resources/templates/page/contentDetail.html
src/main/resources/templates/page/video.html
@@ -55,12 +55,13 @@ public class ContentControllerApi {
             shyContent1.setContent_status(json.getInteger("contentStatus"));//当前图文的审核状态
             shyContent1.setSource(json.getString("source"));//来源
             shyContent1.setAuthor(json.getString("author"));//作者
-            String contentTime = json.getString("contentTime");//创建时间
+            String contentTime = json.getString("contentTime");//图文创建时间
             if (CommonUtils.isNotEmpty(contentTime)) {
                 Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
-                shyContent1.setCreate_date(timestamp);
+                shyContent1.setContent_time(timestamp);
             }
+            shyContent1.setCreate_date(CommonUtils.getCurrentTime());
             shyContent1.setCallback(json.getString("callback"));//回调地址
             shyContent1.setContent_url(json.getString("contentUrl"));//图文发布的url
             shyContent1.setSp_id(json.getInteger("spId"));//spid
@@ -86,9 +87,10 @@ public class ContentControllerApi {
         String contentTime = json.getString("contentTime");//创建时间
         if (CommonUtils.isNotEmpty(contentTime)) {
             Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
-            shyContent.setCreate_date(timestamp);
+            shyContent.setContent_time(timestamp);
         }
+        shyContent.setCreate_date(CommonUtils.getCurrentTime());
         shyContent.setCallback(json.getString("callback"));//回调地址
         shyContent.setContent_url(json.getString("contentUrl"));//图文发布的url
         shyContent.setSp_id(json.getInteger("spId"));//spid
@@ -469,5 +469,13 @@ public class VideosController {
         }
         return responseBean;
     }
+    
+    @PostMapping("/ceshi")
+    @ResponseBody
+    public static String ceshi(String name) {
+    	
+    	
+    	return name;
+    }
 }
@@ -64,7 +64,11 @@ public class ShyContent {
     private String author;
     /**
-     * 创建时间
+     * 图文创建时间
+     */
+    private Date content_time;
+    /**
+     * 图文送审时间
      */
     private Date create_date;
@@ -426,5 +430,14 @@ public class ShyContent {
 	public void setSp_desc(String sp_desc) {
 		this.sp_desc = sp_desc;
 	}
+
+	public Date getContent_time() {
+		return content_time;
+	}
+
+	public void setContent_time(Date content_time) {
+		this.content_time = content_time;
+	}
+	
 }
 \ No newline at end of file
@@ -102,7 +102,7 @@ public class ContentServiceImpl {
             criteria.andEqualTo("updater", updater);
         }
         if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("spid", spid);
+            criteria.andEqualTo("sp_id", spid);
         }
 //        if (CommonUtils.isNotNull(is_hot)) {
 //            criteria.andEqualTo("is_hot", is_hot);
@@ -156,51 +156,54 @@ public class ContentServiceImpl {
     }
     //**********************
-    public boolean updateState(String ids,String msg, Integer state, String userId) {
-        boolean success = true;
-        String[] contentIds = ids.split(",");
-        for (String contentId : contentIds) {
-            ShyContent content = shyContentMapper.selectByPrimaryKey(Integer.parseInt(contentId));
-            JSONObject json = new JSONObject();
-            json.put("auditor_id", content.getAuditor_id());
-            json.put("state", state);
-            json.put("attr_tags", "");
-            json.put("msg", msg);
-//            JSONObject result = new JSONObject();
-//            try {
-//                result = Pass.commentPass(json, content.getCallback());
-//            } catch (Exception e) {
-//                logger.error("评论回调失败，auditor_id:{}", content.getAuditor_id());
-//                success = false;
-//                break;
-//            }
-//            if (result == null) {
-//                logger.error("评论回调错误，且无返回信息。auditor_id:{}", content.getAuditor_id());
-//                success = false;
-//                break;
-//            } else {
-//                Integer code = result.getInteger("errorCode");
-//                if (code != 0) {
-//                    logger.error("评论回调错误，auditor_id:{}，errorCode:{},errorMessage:{}", content.getAuditor_id(), code, result.getString("errorMessage"));
-//                    success = false;
-//                    break;
-//                }
-                content.setContent_status(state);//设置图文状态为审核后的状态
-                content.setReceive_status(CommonConst.RECEIVE_AUDIT);//领取状态为已审核
-                content.setShenhe_msg(msg);//设置审核消息
-                if(CommonUtils.isNotEmpty(userId)){
-                	content.setAuditor_id(userId);
-                	content.setShenhe_type(CommonConst.AUDIT_TYPE_USER);//设置审核类型为人工
-                }
-                int i = shyContentMapper.updateByPrimaryKeySelective(content);
-                if (i != 1) {
-                    success = false;
-                }
-//            }
+	public boolean updateState(String ids, String msg, Integer state, String userId) {
+		boolean success = true;
+		String[] contentIds = ids.split(",");
+		for (String contentId : contentIds) {
+			ShyContent content = shyContentMapper.selectByPrimaryKey(Integer.parseInt(contentId));
+			JSONObject result = new JSONObject();
+//			String type = "fabu";// 1、fabu，2、xiaxian，3、shanchu
+//			if (state == 2) {
+//				type = "xiaxian";
+//			} else if (state == 3) {
+//				type = "shanchu";
+//			}
+			try {
+				result = Pass.contentPass(content.getContent_id(), state+"", msg, content.getCallback());
+			} catch (Exception e) {
+				logger.error("图文审核回调失败，图文id:{}", content.getId());
+				success = false;
+				break;
+			}
+			if (result == null) {
+				logger.error("图文回调错误，且无返回信息。图文id:{}", content.getId());
+				success = false;
+				break;
+			} else {
+				Integer code = result.getInteger("errorCode");
+				msg=CommonUtils.isNotEmpty(msg)?msg+",图文回调结果："+result.getString("errorMessage"):"图文回调结果："+result.getString("errorMessage");
+				if (code != 0) {
+					logger.error("图文回调错误，图文id:{}，errorCode:{},errorMessage:{}", content.getId(), code,
+							result.getString("errorMessage"));
+					success = false;
+					break;
+				}
+				content.setContent_status(state);// 设置图文状态为审核后的状态
+				content.setReceive_status(CommonConst.RECEIVE_AUDIT);// 领取状态为已审核
+				content.setShenhe_msg(msg);// 设置审核消息
+				if (CommonUtils.isNotEmpty(userId)) {
+					content.setAuditor_id(userId);
+					content.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 设置审核类型为人工
+				}
+				int i = shyContentMapper.updateByPrimaryKeySelective(content);
+				if (i != 1) {
+					success = false;
+				}
+			}
-        }
-        return success;
-    }
+		}
+		return success;
+	}
     //**********************************
     public Integer receive(String ids, Integer num, String userId, Integer spid) {
@@ -69,4 +69,21 @@ public class AuditPass {
         String result = HttpUtil.form(callBack, map);
         return JSONObject.parseObject(result);
     }
+    
+    /**
+     * 图文审核回调
+     * @param ids
+     * @param type  1（fabu），2（xiaxian），3（shanchu）
+     * @param shenheStatus 1
+     * @param msg
+     * @param callBack
+     * @return
+     */
+    public JSONObject contentPass(String contentId, String type,String msg, String callBack) {
+        logger.info("图文回调：ids:{},type:{},msg:{}", contentId, type, msg);
+        HttpUtil httpUtil = HttpUtil.init();
+        String URL = callBack + "?contentId=" + contentId + "&type=" + type+ "&shenMsg=" + msg;
+        Map<String, String> post = httpUtil.post(URL);
+        return JSONObject.parseObject(post.get("result"));
+    }
 }
@@ -13,6 +13,7 @@
             <h1>
                 图文审核
             </h1>
+            <div  th:text="${T(com.cnlive.shenhe.controller.VideosController).ceshi('')}">JAN</div>
             <ol class="breadcrumb">
                 <li>首页</li>
                 <li class="active">图文审核</li>
@@ -360,15 +361,21 @@
             var param = location.search;
             window.location.href = "/content/excel" + param;
         }
+        
+        var title = $("#video_titleID").val();
+        var start_date = $("#start_date").val();
+        var end_date = $("#end_date").val();
+        var sp_desc = $("#sp_desc").val();
+        var count = $("#count").val();
+        var spId=[[session.sessionUser.spid]]
+        if(spId!=0){
+        	sp_desc ="";
+        	count="";
+        }
         //全部
         function quanbu() {
-//         	var video_priority = $("#video_priority").val();
-            var title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+         
 //             window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority=";
             window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date +  "&sp_desc=" + sp_desc+"&pageSize="+count;
         }
@@ -376,37 +383,31 @@
         //全部待领
         $('#daishen').click(function () {
             var receive_status = 0;
-//             var receive = 0;
-//             var video_priority = $("#video_priority").val();
-            var title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+//             var title = $("#video_titleID").val();
+//             var start_date = $("#start_date").val();
+//             var end_date = $("#end_date").val();
+//             var sp_desc = $("#sp_desc").val();
+//             var count = $("#count").val();
             window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             var receive_status = 1;
-//             var receive = 1;
-//             var video_priority = $("#video_priority").val();
-            var title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+//             var title = $("#video_titleID").val();
+//             var start_date = $("#start_date").val();
+//             var end_date = $("#end_date").val();
+//             var sp_desc = $("#sp_desc").val();
+//             var count = $("#count").val();
             window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         //我的已审核
         $('#yishen').click(function () {
             var receive_status = 2;
-//             var receive = 1;
-//             var video_priority = $("#video_priority").val();
-            var title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+//             var title = $("#video_titleID").val();
+//             var start_date = $("#start_date").val();
+//             var end_date = $("#end_date").val();
+//             var sp_desc = $("#sp_desc").val();
+//             var count = $("#count").val();
             window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status=" + receive_status + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
@@ -414,11 +415,11 @@
         //查询
         $('#videos_query').click(function () {
 //             var video_priority = $("#video_priority").val();
-            var title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+//             var title = $("#video_titleID").val();
+//             var start_date = $("#start_date").val();
+//             var end_date = $("#end_date").val();
+//             var sp_desc = $("#sp_desc").val();
+//             var count = $("#count").val();
             window.location.href = "/content/page?title=" + title + "&start_date=" + start_date + "&end_date=" + end_date + "&receive_status="  + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         /*全选的操作*/
@@ -68,15 +68,21 @@
                                     </div>
                                     <div class="col-sm-6">
                                         <div class="form-group">
-                                            <label for="program_id" class="control-label col-sm-2">图文id:</label>
+                                            <label for="program_id" class="control-label col-sm-2">图文审核id:</label>
                                             <div class="col-sm-10">
                                                 <h5 th:text="${content.id}">604</h5>
                                             </div>
                                         </div>
                                         <div class="form-group">
+                                            <label for="program_id" class="control-label col-sm-2">图文发布id:</label>
+                                            <div class="col-sm-10">
+                                                <h5 th:text="${content.content_id}">604</h5>
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
                                             <label for="comment_user_id" class="control-label col-sm-2">发布站点:</label>
                                             <div class="col-sm-10">
-                                                <h5 th:text="${content.sp_id}+':'+${content.sp_desc}">821403</h5>
+                                                <h5 th:text="${content.sp_id}+'('+${content.sp_desc}+')'">821403</h5>
                                             </div>
                                         </div>
@@ -359,15 +359,21 @@
             var param = location.search;
             window.location.href = "/videos/excel" + param;
         }
-
-        //全部
-        function quanbu() {
+        
         	var video_priority = $("#video_priority").val();
             var video_title = $("#video_titleID").val();
             var start_date = $("#start_date").val();
             var end_date = $("#end_date").val();
             var sp_desc = $("#sp_desc").val();
             var count = $("#count").val();
+            var spId=[[session.sessionUser.spid]]
+            if(spId!=0){
+            	sp_desc ="";
+            	count="";
+            }
+
+        //全部
+        function quanbu() {
 //             window.location.href = "/videos/page?video_title=&start_date=&end_date=&state=&receive=&video_priority=";
             window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date +  "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         }
@@ -376,48 +382,48 @@
         $('#daishen').click(function () {
             var state = 0;
             var receive = 0;
-            var video_priority = $("#video_priority").val();
-            var video_title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+//             var video_priority = $("#video_priority").val();
+//             var video_title = $("#video_titleID").val();
+//             var start_date = $("#start_date").val();
+//             var end_date = $("#end_date").val();
+//             var sp_desc = $("#sp_desc").val();
+//             var count = $("#count").val();
             window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         //我的待审核
         $('#Mydaishen').click(function () {
             var state = 0;
             var receive = 1;
-            var video_priority = $("#video_priority").val();
-            var video_title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+//             var video_priority = $("#video_priority").val();
+//             var video_title = $("#video_titleID").val();
+//             var start_date = $("#start_date").val();
+//             var end_date = $("#end_date").val();
+//             var sp_desc = $("#sp_desc").val();
+//             var count = $("#count").val();
             window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         //我的已审核
         $('#yishen').click(function () {
             var state = 1;
             var receive = 1;
-            var video_priority = $("#video_priority").val();
-            var video_title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+//             var video_priority = $("#video_priority").val();
+//             var video_title = $("#video_titleID").val();
+//             var start_date = $("#start_date").val();
+//             var end_date = $("#end_date").val();
+//             var sp_desc = $("#sp_desc").val();
+//             var count = $("#count").val();
             window.location.href = "page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=" + state + "&receive=" + receive + "&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         //查询
         $('#videos_query').click(function () {
-            var video_priority = $("#video_priority").val();
-            var video_title = $("#video_titleID").val();
-            var start_date = $("#start_date").val();
-            var end_date = $("#end_date").val();
-            var sp_desc = $("#sp_desc").val();
-            var count = $("#count").val();
+//             var video_priority = $("#video_priority").val();
+//             var video_title = $("#video_titleID").val();
+//             var start_date = $("#start_date").val();
+//             var end_date = $("#end_date").val();
+//             var sp_desc = $("#sp_desc").val();
+//             var count = $("#count").val();
             window.location.href = "/videos/page?video_title=" + video_title + "&start_date=" + start_date + "&end_date=" + end_date + "&state=&video_priority=" + video_priority + "&sp_desc=" + sp_desc+"&pageSize="+count;
         });
         /*全选的操作*/