修复类型转换

王言钊
1 parent 1e8a9459
Showing 5 changed files with 48 additions and 56 deletions
src/main/java/com/cnlive/shenhe/api/AvsampleCallBackControllerApi.java
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
@@ -70,10 +70,8 @@ public class AvsampleCallBackControllerApi {
         }
         return result;
     }
-
-    @GetMapping("/getGame")
-    public String getGame() {
-        return "html/game.html";
-    }
-
+    //@GetMapping("/getGame")
+    //public String getGame() {
+    //    return "html/game.html";
+    //}
 }
@@ -12,9 +12,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.Date;
 import java.util.List;
@@ -268,15 +270,12 @@ public class ContentControllerApi {
             return new ResponseBean(ErrorEnum.ERROR);
         }
     }
-
-    @GetMapping("/detail/{id}.html")
-    public Object getContentDetail(Model model, @PathVariable Integer id) {
-        System.out.println("数美送审页面开始进入");
-        ShyContent content = contentService.selectByPrimaryKey(id);
-        model.addAttribute("contentText", content.getContent_text());
-        model.addAttribute("contentTitle", content.getTitle());
-        return "html/contentPage.html";
-    }
-
-
+    //@GetMapping("/detail/{id}.html")
+    //public Object getContentDetail(Model model, @PathVariable Integer id) {
+    //    System.out.println("数美送审页面开始进入");
+    //    ShyContent content = contentService.selectByPrimaryKey(id);
+    //    model.addAttribute("contentText", content.getContent_text());
+    //    model.addAttribute("contentTitle", content.getTitle());
+    //    return "html/contentPage.html";
+    //}
 }
@@ -61,9 +61,9 @@ public class LiveApplyControllerApi {
         //直播主题
         String theme = json.getString("theme");
         //商务模式：0免费  1收费
-        Integer businessModel = Integer.parseInt(json.getString("businessModel"));
+        Integer businessModel = json.getInteger("businessModel");
         //内容属性：1商业类活动 0非商业活动
-        Integer contentProperty = Integer.parseInt(json.getString("contentProperty"));
+        Integer contentProperty = json.getInteger("contentProperty");
         //内容简述
         String simpleContent = json.getString("simpleContent");
         //直播类型
 package com.cnlive.shenhe.api;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.entity.ShyLive;
 import com.cnlive.shenhe.serviceImpl.LiveServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonConstStates;
 import com.cnlive.shenhe.utils.CommonUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 import java.sql.Timestamp;
 import java.util.Date;
@@ -47,7 +47,7 @@ public class LiveControllerApi {
         //直播活动名称
         String activityName = json.getString("activityName");
         //直播活动状态
-        Integer activityStatus = Integer.parseInt(json.getString("activityStatus"));
+        Integer activityStatus = json.getInteger("activityStatus");
         //直播频道id
         String channelId = json.getString("channelId");
         //直播频道id
@@ -57,13 +57,11 @@ public class LiveControllerApi {
         //m3u8直播流
         String hlsUrl = json.getString("hlsUrl");
         //spid
-        Integer spId = Integer.parseInt(json.getString("spId"));
+        Integer spId = json.getInteger("spId");
         //回调地址
         String callback = json.getString("callback");
-
-
         //优先级
-        Integer isHot = Integer.parseInt(json.getString("priority"));
+        Integer isHot = json.getInteger("priority");
         //封面
         String coverImgUrl = json.getString("coverImgUrl");
         //活动描述
@@ -279,30 +277,27 @@ public class LiveControllerApi {
         }
         return map;
     }
-
-
-    @RequestMapping(value = "callbackLiveResult", method = RequestMethod.POST)
-    @ResponseBody
-    public void getFilterVideoResult(@RequestBody String json) {
-        logger.info("数美视频过滤回调,json:{}", json);
-        if (StringUtils.isNotEmpty(json)) {
-            JSONObject jsonObj = JSON.parseObject(json);
-            JSONObject resultObj = jsonObj.getJSONObject("result");
-            Integer code = resultObj.getInteger("code");
-            if (code != null && code == 1100) {
-                String riskLevel = resultObj.getString("riskLevel");
-                if ("PASS".equals(riskLevel)) {
-
-                }
-                if ("REJECT".equals(riskLevel)) {
-                    JSONObject detail = resultObj.getJSONObject("detail");
-                    logger.info("数美视频回调--REJECT,detail:{}", detail);
-                }
-                if ("REVIEW".equals(riskLevel)) {
-                }
-            } else {
-            }
-        }
-    }
-
+    //@RequestMapping(value = "callbackLiveResult", method = RequestMethod.POST)
+    //@ResponseBody
+    //public void getFilterVideoResult(@RequestBody String json) {
+    //    logger.info("数美视频过滤回调,json:{}", json);
+    //    if (StringUtils.isNotEmpty(json)) {
+    //        JSONObject jsonObj = JSON.parseObject(json);
+    //        JSONObject resultObj = jsonObj.getJSONObject("result");
+    //        Integer code = resultObj.getInteger("code");
+    //        if (code != null && code == 1100) {
+    //            String riskLevel = resultObj.getString("riskLevel");
+    //            if ("PASS".equals(riskLevel)) {
+    //
+    //            }
+    //            if ("REJECT".equals(riskLevel)) {
+    //                JSONObject detail = resultObj.getJSONObject("detail");
+    //                logger.info("数美视频回调--REJECT,detail:{}", detail);
+    //            }
+    //            if ("REVIEW".equals(riskLevel)) {
+    //            }
+    //        } else {
+    //        }
+    //    }
+    //}
 }
@@ -390,7 +390,7 @@ public class ContentServiceImpl {
                 String msg = jsonObject.getString("msg");
                 if (code != 200) {
                     // |0待发布 |1已发布 |2已下线
-                    boolean flag = callback(shyContent.getContent_id(), msg, CommonConst.AUDIT_REFUSE, shyContent.getAuditor_id(), shyContent.getUpdater());
+                    boolean flag = callback(shyContent.getContent_id(), "易盾机审未通过："+msg, CommonConst.AUDIT_REFUSE, shyContent.getAuditor_id(), shyContent.getUpdater());
                 }
                 JSONObject result = jsonObject.getJSONObject("result");
                 String dataId = result.getString("dataId");