周伟鹏 / cnlive_shenhe · Commits

Commit 000a8b74881591d062688e5aeddbc2d813b55e30

Authored by liwei2917
1 parent b7d033ac

修改

Inline Side-by-side
Showing 1 changed file with 11 additions and 4 deletions
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
  View file @000a8b7
@@ -70,15 +70,22 @@ public class LiveApplyControllerApi { @@ -70,15 +70,22 @@ public class LiveApplyControllerApi {
70 String pullUrl = json.getString("pullUrl");//拉流地址 70 String pullUrl = json.getString("pullUrl");//拉流地址
71 String platforms = json.getString("platforms");//播出平台及通道：0网家家 1CNLive网站 2@TV互动电视 71 String platforms = json.getString("platforms");//播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
72 Date timestamp_start =null; 72 Date timestamp_start =null;
  73 +// if (CommonUtils.isNotEmpty(startTime)) {
  74 +// timestamp_start = new Timestamp(Long.valueOf(startTime));
  75 +// }
73 if (CommonUtils.isNotEmpty(startTime)) { 76 if (CommonUtils.isNotEmpty(startTime)) {
74 - timestamp_start = new Timestamp(Long.valueOf(startTime)); 77 + timestamp_start = CommonUtils.getTimestamp(startTime, "yyyy-MM-dd HH:mm:ss");
  78 +
75 } 79 }
76 String endTime = json.getString("preEndTime");//预计结束时间 80 String endTime = json.getString("preEndTime");//预计结束时间
77 Date timestamp_end =null; 81 Date timestamp_end =null;
  82 +// if (CommonUtils.isNotEmpty(endTime)) {
  83 +// timestamp_end = new Timestamp(Long.valueOf(endTime));
  84 +// }
78 if (CommonUtils.isNotEmpty(endTime)) { 85 if (CommonUtils.isNotEmpty(endTime)) {
79 - timestamp_end = new Timestamp(Long.valueOf(endTime));  
80 - }  
81 - 86 + timestamp_end = CommonUtils.getTimestamp(endTime, "yyyy-MM-dd HH:mm:ss");
  87 +
  88 + }
82 ShyLiveapply shyliveApply1 = new ShyLiveapply(); 89 ShyLiveapply shyliveApply1 = new ShyLiveapply();
83 //得到直播活动id去查询是否已有 90 //得到直播活动id去查询是否已有
84 shyliveApply1.setActivity_id(activityId); 91 shyliveApply1.setActivity_id(activityId);