修改

liwei2917
1 parent b7d033ac
Showing 1 changed file with 11 additions and 4 deletions
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
@@ -70,15 +70,22 @@ public class LiveApplyControllerApi {
         String pullUrl = json.getString("pullUrl");//拉流地址
         String platforms = json.getString("platforms");//播出平台及通道：0网家家 1CNLive网站 2@TV互动电视
         Date timestamp_start =null;
+//        if (CommonUtils.isNotEmpty(startTime)) {
+//             timestamp_start = new Timestamp(Long.valueOf(startTime));
+//        }
         if (CommonUtils.isNotEmpty(startTime)) {
-             timestamp_start = new Timestamp(Long.valueOf(startTime));
+             timestamp_start = CommonUtils.getTimestamp(startTime, "yyyy-MM-dd HH:mm:ss");
+
         }
         String endTime = json.getString("preEndTime");//预计结束时间
         Date timestamp_end =null;
+//        if (CommonUtils.isNotEmpty(endTime)) {
+//        	 timestamp_end = new Timestamp(Long.valueOf(endTime));
+//        }
         if (CommonUtils.isNotEmpty(endTime)) {
-        	 timestamp_end = new Timestamp(Long.valueOf(endTime));
-        }
-        
+        	timestamp_end = CommonUtils.getTimestamp(endTime, "yyyy-MM-dd HH:mm:ss");
+
+       }
         ShyLiveapply shyliveApply1 = new ShyLiveapply();
         //得到直播活动id去查询是否已有
         shyliveApply1.setActivity_id(activityId);