优化直播、朋友圈、直播申请api

王言钊
1 parent ea9898ed
Showing 4 changed files with 27 additions and 35 deletions
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/utils/CommonUtils.java
@@ -148,29 +148,29 @@ public class ContentControllerApi {
         //获取生活圈内容的类型 1：图片 2：视频 3：分享
         Integer contentType = json.getInteger("contentType");
         //内容图片地址
-        String contentImageUrl = "";
+        StringBuilder contentImageUrl = new StringBuilder();
         if (contentType != null && contentType == 1) {
             //朋友圈分享的内容的url
             JSONArray contentImageUrlList = JSONObject.parseArray(json.getString("contentImageUrl"));
             for (int i = 0; i < contentImageUrlList.size(); i++) {
                 JSONObject contentImageUrlMap = contentImageUrlList.getJSONObject(i);
-                contentImageUrl += contentImageUrlMap.getString("imageUrl") + ",";
+                contentImageUrl.append(contentImageUrlMap.getString("imageUrl")).append(",");
             }
             //去掉最后一个逗号
-            contentImageUrl = contentImageUrl.substring(0, contentImageUrl.length() - 1);
+            contentImageUrl = new StringBuilder(contentImageUrl.substring(0, contentImageUrl.length() - 1));
         } else {
-            contentImageUrl = json.getString("contentImageUrl");
+            contentImageUrl = new StringBuilder(json.getString("contentImageUrl"));
         }
         if (contentList.size() > 0) {
             //朋友圈存在则更新
             ShyContent shyContent1 = contentList.get(0);
-            yorN = saveOrUpdateMoment(json, shyContent1, shenheType, contentImageUrl);
+            yorN = saveOrUpdateMoment(json, shyContent1, shenheType, contentImageUrl.toString());
             logger.info("朋友圈接口更新操作:{}", momentId);
         } else {
             //当前朋友圈内容的审核状态，先发后审
             shyContent.setContent_status(1);
             //朋友圈不存在直接保存
-            yorN = saveOrUpdateMoment(json, shyContent, shenheType, contentImageUrl);
+            yorN = saveOrUpdateMoment(json, shyContent, shenheType, contentImageUrl.toString());
             logger.info("朋友圈接口保存操作:{}", momentId);
         }
         if (yorN) {
@@ -13,7 +13,6 @@ 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;
 import java.util.List;
@@ -50,16 +49,10 @@ public class LiveApplyControllerApi {
         }
         //预计开始时间
         String startTime = json.getString("preStartTime");
-        Date timestampStart = null;
-        if (CommonUtils.isNotEmpty(startTime)) {
-            timestampStart = new Timestamp(Long.parseLong(startTime));
-        }
+        Date timestampStart = CommonUtils.getStartAndEndTime(startTime);
         //预计结束时间
         String endTime = json.getString("preEndTime");
-        Date timestampEnd = null;
-        if (CommonUtils.isNotEmpty(endTime)) {
-            timestampEnd = new Timestamp(Long.parseLong(endTime));
-        }
+        Date timestampEnd =CommonUtils.getStartAndEndTime(endTime);
         ShyLiveapply shyliveApply = new ShyLiveapply();
         //得到直播活动id去查询是否已有
         shyliveApply.setActivity_id(activityId);
@@ -127,15 +120,15 @@ public class LiveApplyControllerApi {
         //内容简述
         shyliveApply.setSimple_content(json.getString("simpleContent"));
         //要点报备：0品牌植入 1广告植入 2商品推销 3网家家独家麦标
-        shyliveApply.setPoint_key(json.getString("keys").equals("") ? "无" : json.getString("keys"));
+        shyliveApply.setPoint_key("".equals(json.getString("keys")) ? "无" : json.getString("keys"));
         //直播地点
         shyliveApply.setLive_place(json.getString("livePlace"));
         //推流地址
         shyliveApply.setPush_url(json.getString("pushUrl"));
         //拉流地址
-        shyliveApply.setPull_url(json.getString("pullUrl").equals("") ? "无拉流地址" : json.getString("pullUrl"));
+        shyliveApply.setPull_url("".equals(json.getString("pullUrl")) ? "无拉流地址" : json.getString("pullUrl"));
         //拉流来源
-        shyliveApply.setPull_source(json.getString("pullSource").equals("") ? "无来源" : json.getString("pullSource"));
+        shyliveApply.setPull_source("".equals(json.getString("pullSource")) ? "无来源" : json.getString("pullSource"));
         //播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
         shyliveApply.setPlatforms(json.getString("platforms"));
         //设置回调地址
@@ -14,7 +14,6 @@ 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;
 import java.util.List;
@@ -49,28 +48,16 @@ public class LiveControllerApi {
         String channelId = json.getString("channelId");
         //开始时间
         String startTime = json.getString("startTime");
-        Date timestampStart = null;
-        if (CommonUtils.isNotEmpty(startTime)) {
-            timestampStart = new Timestamp(Long.parseLong(startTime));
-        }
+        Date timestampStart = CommonUtils.getStartAndEndTime(startTime);
         //结束时间
         String endTime = json.getString("endTime");
-        Date timestampEnd = null;
-        if (CommonUtils.isNotEmpty(endTime)) {
-            timestampEnd = new Timestamp(Long.parseLong(endTime));
-        }
+        Date timestampEnd = CommonUtils.getStartAndEndTime(endTime);
         //预计开始时间
         String preStartTime = json.getString("preStartTime");
-        Date preTimestampStart = null;
-        if (CommonUtils.isNotEmpty(preStartTime)) {
-            preTimestampStart = new Timestamp(Long.parseLong(preStartTime));
-        }
+        Date preTimestampStart = CommonUtils.getStartAndEndTime(preStartTime);
         //预计结束时间
         String preEndTime = json.getString("preEndTime");
-        Date preTimestampEnd = null;
-        if (CommonUtils.isNotEmpty(preEndTime)) {
-            preTimestampEnd = new Timestamp(Long.parseLong(preEndTime));
-        }
+        Date preTimestampEnd = CommonUtils.getStartAndEndTime(preEndTime);
         ShyLive shyLive = new ShyLive();
         //得到直播活动id去查询是否已有
         shyLive.setActivity_id(activityId);
@@ -576,4 +576,16 @@ public class CommonUtils {
         }
         return dateTime;
     }
+
+    /**
+     * 获取直播、直播申请中的预计开始、结束时间
+     *
+     * @return
+     */
+    public static Date getStartAndEndTime(String preStartAndEndTime) {
+        if (CommonUtils.isNotEmpty(preStartAndEndTime)) {
+            return new Timestamp(Long.parseLong(preStartAndEndTime));
+        }
+        return null;
+    }
 }