Commit 3964eb4c1149604a3e762a290ba0f344fd6fcd99
1 parent
6a53942b
增加直播文件
Showing
9 changed files
with
745 additions
and
61 deletions
src/main/java/com/cnlive/shenhe/api/VideoStreamCallbackApi.java renamed to src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
| @@ -3,14 +3,19 @@ package com.cnlive.shenhe.api; | @@ -3,14 +3,19 @@ package com.cnlive.shenhe.api; | ||
| 3 | import com.alibaba.fastjson.JSON; | 3 | import com.alibaba.fastjson.JSON; |
| 4 | import com.alibaba.fastjson.JSONArray; | 4 | import com.alibaba.fastjson.JSONArray; |
| 5 | import com.alibaba.fastjson.JSONObject; | 5 | import com.alibaba.fastjson.JSONObject; |
| 6 | +import com.cnlive.shenhe.bean.ErrorEnum; | ||
| 7 | +import com.cnlive.shenhe.bean.ResponseBean; | ||
| 6 | import com.cnlive.shenhe.utils.AntiFraudUtil; | 8 | import com.cnlive.shenhe.utils.AntiFraudUtil; |
| 7 | 9 | ||
| 10 | +import java.util.HashMap; | ||
| 11 | +import java.util.Map; | ||
| 8 | import java.util.UUID; | 12 | import java.util.UUID; |
| 9 | 13 | ||
| 10 | import org.apache.commons.lang3.StringUtils; | 14 | import org.apache.commons.lang3.StringUtils; |
| 11 | import org.slf4j.Logger; | 15 | import org.slf4j.Logger; |
| 12 | import org.slf4j.LoggerFactory; | 16 | import org.slf4j.LoggerFactory; |
| 13 | import org.springframework.stereotype.Controller; | 17 | import org.springframework.stereotype.Controller; |
| 18 | +import org.springframework.web.bind.annotation.PostMapping; | ||
| 14 | import org.springframework.web.bind.annotation.RequestBody; | 19 | import org.springframework.web.bind.annotation.RequestBody; |
| 15 | import org.springframework.web.bind.annotation.RequestMapping; | 20 | import org.springframework.web.bind.annotation.RequestMapping; |
| 16 | import org.springframework.web.bind.annotation.RequestMethod; | 21 | import org.springframework.web.bind.annotation.RequestMethod; |
| @@ -20,11 +25,42 @@ import com.cnlive.shenhe.utils.AntiFraudUtil; | @@ -20,11 +25,42 @@ import com.cnlive.shenhe.utils.AntiFraudUtil; | ||
| 20 | 25 | ||
| 21 | @SuppressWarnings("unused") | 26 | @SuppressWarnings("unused") |
| 22 | @Controller | 27 | @Controller |
| 23 | -@RequestMapping("/api/videoStream") | ||
| 24 | -public class VideoStreamCallbackApi { | ||
| 25 | - private static Logger logger = LoggerFactory.getLogger(VideoStreamCallbackApi.class); | 28 | +@RequestMapping("/api/live") |
| 29 | +public class LiveControllerApi { | ||
| 30 | + private static Logger logger = LoggerFactory.getLogger(LiveControllerApi.class); | ||
| 31 | + | ||
| 32 | + | ||
| 33 | + | ||
| 34 | + @RequestMapping("/import") | ||
| 35 | + @ResponseBody | ||
| 36 | + public JSONObject impotVideo(String param) { | ||
| 37 | + JSONObject map = new JSONObject(); | ||
| 38 | + JSONObject result = new JSONObject(); | ||
| 39 | + | ||
| 40 | + | ||
| 41 | + | ||
| 42 | + | ||
| 43 | + | ||
| 44 | + | ||
| 45 | + result.put("errorCode", "0"); | ||
| 46 | + result.put("errorMessage", "直播审核请求收到成功"); | ||
| 47 | + map.put("statusCode", "200"); | ||
| 48 | + map.put("result", result); | ||
| 26 | 49 | ||
| 27 | - @RequestMapping(value = "callbackVideoStreamResult", method = RequestMethod.POST) | 50 | + return map; |
| 51 | + } | ||
| 52 | + | ||
| 53 | + | ||
| 54 | + | ||
| 55 | + | ||
| 56 | + | ||
| 57 | + | ||
| 58 | + | ||
| 59 | + | ||
| 60 | + | ||
| 61 | + | ||
| 62 | + | ||
| 63 | + @RequestMapping(value = "callbackLiveResult", method = RequestMethod.POST) | ||
| 28 | @ResponseBody | 64 | @ResponseBody |
| 29 | public void getFilterVideoResult(@RequestBody String json) { | 65 | public void getFilterVideoResult(@RequestBody String json) { |
| 30 | logger.info("数美视频过滤回调,json:{}", json); | 66 | logger.info("数美视频过滤回调,json:{}", json); |
src/main/java/com/cnlive/shenhe/entity/ShyLive.java
0 → 100644
| 1 | +package com.cnlive.shenhe.entity; | ||
| 2 | + | ||
| 3 | +import java.util.Date; | ||
| 4 | +import javax.persistence.*; | ||
| 5 | + | ||
| 6 | +@Table(name = "shy_live") | ||
| 7 | +public class ShyLive { | ||
| 8 | + @Id | ||
| 9 | + private Integer id; | ||
| 10 | + | ||
| 11 | + /** | ||
| 12 | + * spId | ||
| 13 | + */ | ||
| 14 | + private Integer sp_id; | ||
| 15 | + | ||
| 16 | + /** | ||
| 17 | + * 主播资质标识 | ||
| 18 | + */ | ||
| 19 | + private String channel_id; | ||
| 20 | + | ||
| 21 | + /** | ||
| 22 | + * 直播活动id | ||
| 23 | + */ | ||
| 24 | + private String activity_id; | ||
| 25 | + | ||
| 26 | + /** | ||
| 27 | + * 直播活动名称 | ||
| 28 | + */ | ||
| 29 | + private String activity_name; | ||
| 30 | + | ||
| 31 | + /** | ||
| 32 | + * 直播活动状态,1:直播中,2:直播完成,3:待直播,4:直播撤销 | ||
| 33 | + */ | ||
| 34 | + private Boolean activity_status; | ||
| 35 | + | ||
| 36 | + /** | ||
| 37 | + * 直播活动开始时间 | ||
| 38 | + */ | ||
| 39 | + private String activity_start_time; | ||
| 40 | + | ||
| 41 | + /** | ||
| 42 | + * 直播活动结束时间 | ||
| 43 | + */ | ||
| 44 | + private String activity_end_time; | ||
| 45 | + | ||
| 46 | + /** | ||
| 47 | + * 直播活动简介 | ||
| 48 | + */ | ||
| 49 | + private String activity_intro; | ||
| 50 | + | ||
| 51 | + /** | ||
| 52 | + * m3u8直播流 | ||
| 53 | + */ | ||
| 54 | + private String m3u8_url; | ||
| 55 | + | ||
| 56 | + /** | ||
| 57 | + * rtmp直播流 | ||
| 58 | + */ | ||
| 59 | + private String rtmp_url; | ||
| 60 | + | ||
| 61 | + /** | ||
| 62 | + * 回调函数 | ||
| 63 | + */ | ||
| 64 | + private String callback; | ||
| 65 | + | ||
| 66 | + /** | ||
| 67 | + * 直播封面图 | ||
| 68 | + */ | ||
| 69 | + private String cover_img_url; | ||
| 70 | + | ||
| 71 | + /** | ||
| 72 | + * 直播回放的url | ||
| 73 | + */ | ||
| 74 | + private String playback_url; | ||
| 75 | + | ||
| 76 | + /** | ||
| 77 | + * 是否是热点: 0:全部 ,1:不是 ,2: 是 | ||
| 78 | + */ | ||
| 79 | + private Boolean is_hot; | ||
| 80 | + | ||
| 81 | + /** | ||
| 82 | + * 审核类型,1:免审,2:机审,3:人工审 | ||
| 83 | + */ | ||
| 84 | + private Boolean shenhe_type; | ||
| 85 | + | ||
| 86 | + /** | ||
| 87 | + * 状态 1:未认领 2.已领未审,3:已审通过,4:已审拒绝 | ||
| 88 | + */ | ||
| 89 | + private Boolean shenhe_state; | ||
| 90 | + | ||
| 91 | + /** | ||
| 92 | + * 更新者 | ||
| 93 | + */ | ||
| 94 | + private String updater; | ||
| 95 | + | ||
| 96 | + /** | ||
| 97 | + * 审核员 | ||
| 98 | + */ | ||
| 99 | + private String auditor; | ||
| 100 | + | ||
| 101 | + /** | ||
| 102 | + * 审核信息 | ||
| 103 | + */ | ||
| 104 | + private String shenhe_msg; | ||
| 105 | + | ||
| 106 | + /** | ||
| 107 | + * 抽帧开始时间 | ||
| 108 | + */ | ||
| 109 | + private Date avsample_start_time; | ||
| 110 | + | ||
| 111 | + /** | ||
| 112 | + * 抽帧结束时间 | ||
| 113 | + */ | ||
| 114 | + private Date avsample_end_time; | ||
| 115 | + | ||
| 116 | + /** | ||
| 117 | + * 是否显示 0:不显示 1:显示 | ||
| 118 | + */ | ||
| 119 | + private Boolean is_show; | ||
| 120 | + | ||
| 121 | + private Date created_at; | ||
| 122 | + | ||
| 123 | + private Date updated_at; | ||
| 124 | + | ||
| 125 | + /** | ||
| 126 | + * 抽帧图片地址 | ||
| 127 | + */ | ||
| 128 | + private String avsample_imgs; | ||
| 129 | + | ||
| 130 | + /** | ||
| 131 | + * 抽帧返回信息(主要找问题时使用) | ||
| 132 | + */ | ||
| 133 | + private String avsample_msg; | ||
| 134 | + | ||
| 135 | + /** | ||
| 136 | + * @return id | ||
| 137 | + */ | ||
| 138 | + public Integer getId() { | ||
| 139 | + return id; | ||
| 140 | + } | ||
| 141 | + | ||
| 142 | + /** | ||
| 143 | + * @param id | ||
| 144 | + */ | ||
| 145 | + public void setId(Integer id) { | ||
| 146 | + this.id = id; | ||
| 147 | + } | ||
| 148 | + | ||
| 149 | + /** | ||
| 150 | + * 获取spId | ||
| 151 | + * | ||
| 152 | + * @return sp_id - spId | ||
| 153 | + */ | ||
| 154 | + public Integer getSp_id() { | ||
| 155 | + return sp_id; | ||
| 156 | + } | ||
| 157 | + | ||
| 158 | + /** | ||
| 159 | + * 设置spId | ||
| 160 | + * | ||
| 161 | + * @param sp_id spId | ||
| 162 | + */ | ||
| 163 | + public void setSp_id(Integer sp_id) { | ||
| 164 | + this.sp_id = sp_id; | ||
| 165 | + } | ||
| 166 | + | ||
| 167 | + /** | ||
| 168 | + * 获取主播资质标识 | ||
| 169 | + * | ||
| 170 | + * @return channel_id - 主播资质标识 | ||
| 171 | + */ | ||
| 172 | + public String getChannel_id() { | ||
| 173 | + return channel_id; | ||
| 174 | + } | ||
| 175 | + | ||
| 176 | + /** | ||
| 177 | + * 设置主播资质标识 | ||
| 178 | + * | ||
| 179 | + * @param channel_id 主播资质标识 | ||
| 180 | + */ | ||
| 181 | + public void setChannel_id(String channel_id) { | ||
| 182 | + this.channel_id = channel_id; | ||
| 183 | + } | ||
| 184 | + | ||
| 185 | + /** | ||
| 186 | + * 获取直播活动id | ||
| 187 | + * | ||
| 188 | + * @return activity_id - 直播活动id | ||
| 189 | + */ | ||
| 190 | + public String getActivity_id() { | ||
| 191 | + return activity_id; | ||
| 192 | + } | ||
| 193 | + | ||
| 194 | + /** | ||
| 195 | + * 设置直播活动id | ||
| 196 | + * | ||
| 197 | + * @param activity_id 直播活动id | ||
| 198 | + */ | ||
| 199 | + public void setActivity_id(String activity_id) { | ||
| 200 | + this.activity_id = activity_id; | ||
| 201 | + } | ||
| 202 | + | ||
| 203 | + /** | ||
| 204 | + * 获取直播活动名称 | ||
| 205 | + * | ||
| 206 | + * @return activity_name - 直播活动名称 | ||
| 207 | + */ | ||
| 208 | + public String getActivity_name() { | ||
| 209 | + return activity_name; | ||
| 210 | + } | ||
| 211 | + | ||
| 212 | + /** | ||
| 213 | + * 设置直播活动名称 | ||
| 214 | + * | ||
| 215 | + * @param activity_name 直播活动名称 | ||
| 216 | + */ | ||
| 217 | + public void setActivity_name(String activity_name) { | ||
| 218 | + this.activity_name = activity_name; | ||
| 219 | + } | ||
| 220 | + | ||
| 221 | + /** | ||
| 222 | + * 获取直播活动状态,1:直播中,2:直播完成,3:待直播,4:直播撤销 | ||
| 223 | + * | ||
| 224 | + * @return activity_status - 直播活动状态,1:直播中,2:直播完成,3:待直播,4:直播撤销 | ||
| 225 | + */ | ||
| 226 | + public Boolean getActivity_status() { | ||
| 227 | + return activity_status; | ||
| 228 | + } | ||
| 229 | + | ||
| 230 | + /** | ||
| 231 | + * 设置直播活动状态,1:直播中,2:直播完成,3:待直播,4:直播撤销 | ||
| 232 | + * | ||
| 233 | + * @param activity_status 直播活动状态,1:直播中,2:直播完成,3:待直播,4:直播撤销 | ||
| 234 | + */ | ||
| 235 | + public void setActivity_status(Boolean activity_status) { | ||
| 236 | + this.activity_status = activity_status; | ||
| 237 | + } | ||
| 238 | + | ||
| 239 | + /** | ||
| 240 | + * 获取直播活动开始时间 | ||
| 241 | + * | ||
| 242 | + * @return activity_start_time - 直播活动开始时间 | ||
| 243 | + */ | ||
| 244 | + public String getActivity_start_time() { | ||
| 245 | + return activity_start_time; | ||
| 246 | + } | ||
| 247 | + | ||
| 248 | + /** | ||
| 249 | + * 设置直播活动开始时间 | ||
| 250 | + * | ||
| 251 | + * @param activity_start_time 直播活动开始时间 | ||
| 252 | + */ | ||
| 253 | + public void setActivity_start_time(String activity_start_time) { | ||
| 254 | + this.activity_start_time = activity_start_time; | ||
| 255 | + } | ||
| 256 | + | ||
| 257 | + /** | ||
| 258 | + * 获取直播活动结束时间 | ||
| 259 | + * | ||
| 260 | + * @return activity_end_time - 直播活动结束时间 | ||
| 261 | + */ | ||
| 262 | + public String getActivity_end_time() { | ||
| 263 | + return activity_end_time; | ||
| 264 | + } | ||
| 265 | + | ||
| 266 | + /** | ||
| 267 | + * 设置直播活动结束时间 | ||
| 268 | + * | ||
| 269 | + * @param activity_end_time 直播活动结束时间 | ||
| 270 | + */ | ||
| 271 | + public void setActivity_end_time(String activity_end_time) { | ||
| 272 | + this.activity_end_time = activity_end_time; | ||
| 273 | + } | ||
| 274 | + | ||
| 275 | + /** | ||
| 276 | + * 获取直播活动简介 | ||
| 277 | + * | ||
| 278 | + * @return activity_intro - 直播活动简介 | ||
| 279 | + */ | ||
| 280 | + public String getActivity_intro() { | ||
| 281 | + return activity_intro; | ||
| 282 | + } | ||
| 283 | + | ||
| 284 | + /** | ||
| 285 | + * 设置直播活动简介 | ||
| 286 | + * | ||
| 287 | + * @param activity_intro 直播活动简介 | ||
| 288 | + */ | ||
| 289 | + public void setActivity_intro(String activity_intro) { | ||
| 290 | + this.activity_intro = activity_intro; | ||
| 291 | + } | ||
| 292 | + | ||
| 293 | + /** | ||
| 294 | + * 获取m3u8直播流 | ||
| 295 | + * | ||
| 296 | + * @return m3u8_url - m3u8直播流 | ||
| 297 | + */ | ||
| 298 | + public String getM3u8_url() { | ||
| 299 | + return m3u8_url; | ||
| 300 | + } | ||
| 301 | + | ||
| 302 | + /** | ||
| 303 | + * 设置m3u8直播流 | ||
| 304 | + * | ||
| 305 | + * @param m3u8_url m3u8直播流 | ||
| 306 | + */ | ||
| 307 | + public void setM3u8_url(String m3u8_url) { | ||
| 308 | + this.m3u8_url = m3u8_url; | ||
| 309 | + } | ||
| 310 | + | ||
| 311 | + /** | ||
| 312 | + * 获取rtmp直播流 | ||
| 313 | + * | ||
| 314 | + * @return rtmp_url - rtmp直播流 | ||
| 315 | + */ | ||
| 316 | + public String getRtmp_url() { | ||
| 317 | + return rtmp_url; | ||
| 318 | + } | ||
| 319 | + | ||
| 320 | + /** | ||
| 321 | + * 设置rtmp直播流 | ||
| 322 | + * | ||
| 323 | + * @param rtmp_url rtmp直播流 | ||
| 324 | + */ | ||
| 325 | + public void setRtmp_url(String rtmp_url) { | ||
| 326 | + this.rtmp_url = rtmp_url; | ||
| 327 | + } | ||
| 328 | + | ||
| 329 | + /** | ||
| 330 | + * 获取回调函数 | ||
| 331 | + * | ||
| 332 | + * @return callback - 回调函数 | ||
| 333 | + */ | ||
| 334 | + public String getCallback() { | ||
| 335 | + return callback; | ||
| 336 | + } | ||
| 337 | + | ||
| 338 | + /** | ||
| 339 | + * 设置回调函数 | ||
| 340 | + * | ||
| 341 | + * @param callback 回调函数 | ||
| 342 | + */ | ||
| 343 | + public void setCallback(String callback) { | ||
| 344 | + this.callback = callback; | ||
| 345 | + } | ||
| 346 | + | ||
| 347 | + /** | ||
| 348 | + * 获取直播封面图 | ||
| 349 | + * | ||
| 350 | + * @return cover_img_url - 直播封面图 | ||
| 351 | + */ | ||
| 352 | + public String getCover_img_url() { | ||
| 353 | + return cover_img_url; | ||
| 354 | + } | ||
| 355 | + | ||
| 356 | + /** | ||
| 357 | + * 设置直播封面图 | ||
| 358 | + * | ||
| 359 | + * @param cover_img_url 直播封面图 | ||
| 360 | + */ | ||
| 361 | + public void setCover_img_url(String cover_img_url) { | ||
| 362 | + this.cover_img_url = cover_img_url; | ||
| 363 | + } | ||
| 364 | + | ||
| 365 | + /** | ||
| 366 | + * 获取直播回放的url | ||
| 367 | + * | ||
| 368 | + * @return playback_url - 直播回放的url | ||
| 369 | + */ | ||
| 370 | + public String getPlayback_url() { | ||
| 371 | + return playback_url; | ||
| 372 | + } | ||
| 373 | + | ||
| 374 | + /** | ||
| 375 | + * 设置直播回放的url | ||
| 376 | + * | ||
| 377 | + * @param playback_url 直播回放的url | ||
| 378 | + */ | ||
| 379 | + public void setPlayback_url(String playback_url) { | ||
| 380 | + this.playback_url = playback_url; | ||
| 381 | + } | ||
| 382 | + | ||
| 383 | + /** | ||
| 384 | + * 获取是否是热点: 0:全部 ,1:不是 ,2: 是 | ||
| 385 | + * | ||
| 386 | + * @return is_hot - 是否是热点: 0:全部 ,1:不是 ,2: 是 | ||
| 387 | + */ | ||
| 388 | + public Boolean getIs_hot() { | ||
| 389 | + return is_hot; | ||
| 390 | + } | ||
| 391 | + | ||
| 392 | + /** | ||
| 393 | + * 设置是否是热点: 0:全部 ,1:不是 ,2: 是 | ||
| 394 | + * | ||
| 395 | + * @param is_hot 是否是热点: 0:全部 ,1:不是 ,2: 是 | ||
| 396 | + */ | ||
| 397 | + public void setIs_hot(Boolean is_hot) { | ||
| 398 | + this.is_hot = is_hot; | ||
| 399 | + } | ||
| 400 | + | ||
| 401 | + /** | ||
| 402 | + * 获取审核类型,1:免审,2:机审,3:人工审 | ||
| 403 | + * | ||
| 404 | + * @return shenhe_type - 审核类型,1:免审,2:机审,3:人工审 | ||
| 405 | + */ | ||
| 406 | + public Boolean getShenhe_type() { | ||
| 407 | + return shenhe_type; | ||
| 408 | + } | ||
| 409 | + | ||
| 410 | + /** | ||
| 411 | + * 设置审核类型,1:免审,2:机审,3:人工审 | ||
| 412 | + * | ||
| 413 | + * @param shenhe_type 审核类型,1:免审,2:机审,3:人工审 | ||
| 414 | + */ | ||
| 415 | + public void setShenhe_type(Boolean shenhe_type) { | ||
| 416 | + this.shenhe_type = shenhe_type; | ||
| 417 | + } | ||
| 418 | + | ||
| 419 | + /** | ||
| 420 | + * 获取状态 1:未认领 2.已领未审,3:已审通过,4:已审拒绝 | ||
| 421 | + * | ||
| 422 | + * @return shenhe_state - 状态 1:未认领 2.已领未审,3:已审通过,4:已审拒绝 | ||
| 423 | + */ | ||
| 424 | + public Boolean getShenhe_state() { | ||
| 425 | + return shenhe_state; | ||
| 426 | + } | ||
| 427 | + | ||
| 428 | + /** | ||
| 429 | + * 设置状态 1:未认领 2.已领未审,3:已审通过,4:已审拒绝 | ||
| 430 | + * | ||
| 431 | + * @param shenhe_state 状态 1:未认领 2.已领未审,3:已审通过,4:已审拒绝 | ||
| 432 | + */ | ||
| 433 | + public void setShenhe_state(Boolean shenhe_state) { | ||
| 434 | + this.shenhe_state = shenhe_state; | ||
| 435 | + } | ||
| 436 | + | ||
| 437 | + /** | ||
| 438 | + * 获取更新者 | ||
| 439 | + * | ||
| 440 | + * @return updater - 更新者 | ||
| 441 | + */ | ||
| 442 | + public String getUpdater() { | ||
| 443 | + return updater; | ||
| 444 | + } | ||
| 445 | + | ||
| 446 | + /** | ||
| 447 | + * 设置更新者 | ||
| 448 | + * | ||
| 449 | + * @param updater 更新者 | ||
| 450 | + */ | ||
| 451 | + public void setUpdater(String updater) { | ||
| 452 | + this.updater = updater; | ||
| 453 | + } | ||
| 454 | + | ||
| 455 | + /** | ||
| 456 | + * 获取审核员 | ||
| 457 | + * | ||
| 458 | + * @return auditor - 审核员 | ||
| 459 | + */ | ||
| 460 | + public String getAuditor() { | ||
| 461 | + return auditor; | ||
| 462 | + } | ||
| 463 | + | ||
| 464 | + /** | ||
| 465 | + * 设置审核员 | ||
| 466 | + * | ||
| 467 | + * @param auditor 审核员 | ||
| 468 | + */ | ||
| 469 | + public void setAuditor(String auditor) { | ||
| 470 | + this.auditor = auditor; | ||
| 471 | + } | ||
| 472 | + | ||
| 473 | + /** | ||
| 474 | + * 获取审核信息 | ||
| 475 | + * | ||
| 476 | + * @return shenhe_msg - 审核信息 | ||
| 477 | + */ | ||
| 478 | + public String getShenhe_msg() { | ||
| 479 | + return shenhe_msg; | ||
| 480 | + } | ||
| 481 | + | ||
| 482 | + /** | ||
| 483 | + * 设置审核信息 | ||
| 484 | + * | ||
| 485 | + * @param shenhe_msg 审核信息 | ||
| 486 | + */ | ||
| 487 | + public void setShenhe_msg(String shenhe_msg) { | ||
| 488 | + this.shenhe_msg = shenhe_msg; | ||
| 489 | + } | ||
| 490 | + | ||
| 491 | + /** | ||
| 492 | + * 获取抽帧开始时间 | ||
| 493 | + * | ||
| 494 | + * @return avsample_start_time - 抽帧开始时间 | ||
| 495 | + */ | ||
| 496 | + public Date getAvsample_start_time() { | ||
| 497 | + return avsample_start_time; | ||
| 498 | + } | ||
| 499 | + | ||
| 500 | + /** | ||
| 501 | + * 设置抽帧开始时间 | ||
| 502 | + * | ||
| 503 | + * @param avsample_start_time 抽帧开始时间 | ||
| 504 | + */ | ||
| 505 | + public void setAvsample_start_time(Date avsample_start_time) { | ||
| 506 | + this.avsample_start_time = avsample_start_time; | ||
| 507 | + } | ||
| 508 | + | ||
| 509 | + /** | ||
| 510 | + * 获取抽帧结束时间 | ||
| 511 | + * | ||
| 512 | + * @return avsample_end_time - 抽帧结束时间 | ||
| 513 | + */ | ||
| 514 | + public Date getAvsample_end_time() { | ||
| 515 | + return avsample_end_time; | ||
| 516 | + } | ||
| 517 | + | ||
| 518 | + /** | ||
| 519 | + * 设置抽帧结束时间 | ||
| 520 | + * | ||
| 521 | + * @param avsample_end_time 抽帧结束时间 | ||
| 522 | + */ | ||
| 523 | + public void setAvsample_end_time(Date avsample_end_time) { | ||
| 524 | + this.avsample_end_time = avsample_end_time; | ||
| 525 | + } | ||
| 526 | + | ||
| 527 | + /** | ||
| 528 | + * 获取是否显示 0:不显示 1:显示 | ||
| 529 | + * | ||
| 530 | + * @return is_show - 是否显示 0:不显示 1:显示 | ||
| 531 | + */ | ||
| 532 | + public Boolean getIs_show() { | ||
| 533 | + return is_show; | ||
| 534 | + } | ||
| 535 | + | ||
| 536 | + /** | ||
| 537 | + * 设置是否显示 0:不显示 1:显示 | ||
| 538 | + * | ||
| 539 | + * @param is_show 是否显示 0:不显示 1:显示 | ||
| 540 | + */ | ||
| 541 | + public void setIs_show(Boolean is_show) { | ||
| 542 | + this.is_show = is_show; | ||
| 543 | + } | ||
| 544 | + | ||
| 545 | + /** | ||
| 546 | + * @return created_at | ||
| 547 | + */ | ||
| 548 | + public Date getCreated_at() { | ||
| 549 | + return created_at; | ||
| 550 | + } | ||
| 551 | + | ||
| 552 | + /** | ||
| 553 | + * @param created_at | ||
| 554 | + */ | ||
| 555 | + public void setCreated_at(Date created_at) { | ||
| 556 | + this.created_at = created_at; | ||
| 557 | + } | ||
| 558 | + | ||
| 559 | + /** | ||
| 560 | + * @return updated_at | ||
| 561 | + */ | ||
| 562 | + public Date getUpdated_at() { | ||
| 563 | + return updated_at; | ||
| 564 | + } | ||
| 565 | + | ||
| 566 | + /** | ||
| 567 | + * @param updated_at | ||
| 568 | + */ | ||
| 569 | + public void setUpdated_at(Date updated_at) { | ||
| 570 | + this.updated_at = updated_at; | ||
| 571 | + } | ||
| 572 | + | ||
| 573 | + /** | ||
| 574 | + * 获取抽帧图片地址 | ||
| 575 | + * | ||
| 576 | + * @return avsample_imgs - 抽帧图片地址 | ||
| 577 | + */ | ||
| 578 | + public String getAvsample_imgs() { | ||
| 579 | + return avsample_imgs; | ||
| 580 | + } | ||
| 581 | + | ||
| 582 | + /** | ||
| 583 | + * 设置抽帧图片地址 | ||
| 584 | + * | ||
| 585 | + * @param avsample_imgs 抽帧图片地址 | ||
| 586 | + */ | ||
| 587 | + public void setAvsample_imgs(String avsample_imgs) { | ||
| 588 | + this.avsample_imgs = avsample_imgs; | ||
| 589 | + } | ||
| 590 | + | ||
| 591 | + /** | ||
| 592 | + * 获取抽帧返回信息(主要找问题时使用) | ||
| 593 | + * | ||
| 594 | + * @return avsample_msg - 抽帧返回信息(主要找问题时使用) | ||
| 595 | + */ | ||
| 596 | + public String getAvsample_msg() { | ||
| 597 | + return avsample_msg; | ||
| 598 | + } | ||
| 599 | + | ||
| 600 | + /** | ||
| 601 | + * 设置抽帧返回信息(主要找问题时使用) | ||
| 602 | + * | ||
| 603 | + * @param avsample_msg 抽帧返回信息(主要找问题时使用) | ||
| 604 | + */ | ||
| 605 | + public void setAvsample_msg(String avsample_msg) { | ||
| 606 | + this.avsample_msg = avsample_msg; | ||
| 607 | + } | ||
| 608 | +} | ||
| 0 | \ No newline at end of file | 609 | \ No newline at end of file |
src/main/java/com/cnlive/shenhe/mapper/ShyLiveMapper.java
0 → 100644
src/main/resources/mapper/ShyCommentsMapper.xml
| @@ -16,6 +16,7 @@ | @@ -16,6 +16,7 @@ | ||
| 16 | <result column="spid" jdbcType="INTEGER" property="spid" /> | 16 | <result column="spid" jdbcType="INTEGER" property="spid" /> |
| 17 | <result column="app_id" jdbcType="VARCHAR" property="app_id" /> | 17 | <result column="app_id" jdbcType="VARCHAR" property="app_id" /> |
| 18 | <result column="comment_original_url" jdbcType="VARCHAR" property="comment_original_url" /> | 18 | <result column="comment_original_url" jdbcType="VARCHAR" property="comment_original_url" /> |
| 19 | + <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" /> | ||
| 19 | <result column="updater" jdbcType="VARCHAR" property="updater" /> | 20 | <result column="updater" jdbcType="VARCHAR" property="updater" /> |
| 20 | <result column="auditor_id" jdbcType="VARCHAR" property="auditor_id" /> | 21 | <result column="auditor_id" jdbcType="VARCHAR" property="auditor_id" /> |
| 21 | <result column="callback" jdbcType="VARCHAR" property="callback" /> | 22 | <result column="callback" jdbcType="VARCHAR" property="callback" /> |
| @@ -27,7 +28,7 @@ | @@ -27,7 +28,7 @@ | ||
| 27 | <result column="comment_user_ip" jdbcType="CHAR" property="comment_user_ip" /> | 28 | <result column="comment_user_ip" jdbcType="CHAR" property="comment_user_ip" /> |
| 28 | <result column="created_at" jdbcType="TIMESTAMP" property="created_at" /> | 29 | <result column="created_at" jdbcType="TIMESTAMP" property="created_at" /> |
| 29 | <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" /> | 30 | <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" /> |
| 30 | - <result column="receive" jdbcType="BIT" property="receive" /> | 31 | + <result column="receive" jdbcType="INTEGER" property="receive" /> |
| 31 | <result column="receive_user_id" jdbcType="VARCHAR" property="receive_user_id" /> | 32 | <result column="receive_user_id" jdbcType="VARCHAR" property="receive_user_id" /> |
| 32 | </resultMap> | 33 | </resultMap> |
| 33 | </mapper> | 34 | </mapper> |
| 34 | \ No newline at end of file | 35 | \ No newline at end of file |
src/main/resources/mapper/ShyContentMapper.xml
| @@ -17,6 +17,7 @@ | @@ -17,6 +17,7 @@ | ||
| 17 | <result column="callback" jdbcType="VARCHAR" property="callback" /> | 17 | <result column="callback" jdbcType="VARCHAR" property="callback" /> |
| 18 | <result column="source" jdbcType="VARCHAR" property="source" /> | 18 | <result column="source" jdbcType="VARCHAR" property="source" /> |
| 19 | <result column="author" jdbcType="VARCHAR" property="author" /> | 19 | <result column="author" jdbcType="VARCHAR" property="author" /> |
| 20 | + <result column="content_time" jdbcType="TIMESTAMP" property="content_time" /> | ||
| 20 | <result column="create_date" jdbcType="TIMESTAMP" property="create_date" /> | 21 | <result column="create_date" jdbcType="TIMESTAMP" property="create_date" /> |
| 21 | <result column="last_update" jdbcType="TIMESTAMP" property="last_update" /> | 22 | <result column="last_update" jdbcType="TIMESTAMP" property="last_update" /> |
| 22 | <result column="receive_status" jdbcType="INTEGER" property="receive_status" /> | 23 | <result column="receive_status" jdbcType="INTEGER" property="receive_status" /> |
src/main/resources/mapper/ShyLiveMapper.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||
| 3 | +<mapper namespace="com.cnlive.shenhe.mapper.ShyLiveMapper"> | ||
| 4 | + <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.ShyLive"> | ||
| 5 | + <!-- | ||
| 6 | + WARNING - @mbg.generated | ||
| 7 | + --> | ||
| 8 | + <id column="id" jdbcType="INTEGER" property="id" /> | ||
| 9 | + <result column="sp_id" jdbcType="INTEGER" property="sp_id" /> | ||
| 10 | + <result column="channel_id" jdbcType="VARCHAR" property="channel_id" /> | ||
| 11 | + <result column="activity_id" jdbcType="VARCHAR" property="activity_id" /> | ||
| 12 | + <result column="activity_name" jdbcType="VARCHAR" property="activity_name" /> | ||
| 13 | + <result column="activity_status" jdbcType="BIT" property="activity_status" /> | ||
| 14 | + <result column="activity_start_time" jdbcType="VARCHAR" property="activity_start_time" /> | ||
| 15 | + <result column="activity_end_time" jdbcType="VARCHAR" property="activity_end_time" /> | ||
| 16 | + <result column="activity_intro" jdbcType="VARCHAR" property="activity_intro" /> | ||
| 17 | + <result column="m3u8_url" jdbcType="VARCHAR" property="m3u8_url" /> | ||
| 18 | + <result column="rtmp_url" jdbcType="VARCHAR" property="rtmp_url" /> | ||
| 19 | + <result column="callback" jdbcType="VARCHAR" property="callback" /> | ||
| 20 | + <result column="cover_img_url" jdbcType="VARCHAR" property="cover_img_url" /> | ||
| 21 | + <result column="playback_url" jdbcType="VARCHAR" property="playback_url" /> | ||
| 22 | + <result column="is_hot" jdbcType="BIT" property="is_hot" /> | ||
| 23 | + <result column="shenhe_type" jdbcType="BIT" property="shenhe_type" /> | ||
| 24 | + <result column="shenhe_state" jdbcType="BIT" property="shenhe_state" /> | ||
| 25 | + <result column="updater" jdbcType="VARCHAR" property="updater" /> | ||
| 26 | + <result column="auditor" jdbcType="VARCHAR" property="auditor" /> | ||
| 27 | + <result column="shenhe_msg" jdbcType="VARCHAR" property="shenhe_msg" /> | ||
| 28 | + <result column="avsample_start_time" jdbcType="TIMESTAMP" property="avsample_start_time" /> | ||
| 29 | + <result column="avsample_end_time" jdbcType="TIMESTAMP" property="avsample_end_time" /> | ||
| 30 | + <result column="is_show" jdbcType="BIT" property="is_show" /> | ||
| 31 | + <result column="created_at" jdbcType="TIMESTAMP" property="created_at" /> | ||
| 32 | + <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" /> | ||
| 33 | + <result column="avsample_imgs" jdbcType="LONGVARCHAR" property="avsample_imgs" /> | ||
| 34 | + <result column="avsample_msg" jdbcType="LONGVARCHAR" property="avsample_msg" /> | ||
| 35 | + </resultMap> | ||
| 36 | +</mapper> | ||
| 0 | \ No newline at end of file | 37 | \ No newline at end of file |
src/main/resources/mapper/ShyVideosMapper.xml
| @@ -16,6 +16,7 @@ | @@ -16,6 +16,7 @@ | ||
| 16 | <result column="auditor_id" jdbcType="VARCHAR" property="auditor_id" /> | 16 | <result column="auditor_id" jdbcType="VARCHAR" property="auditor_id" /> |
| 17 | <result column="callback" jdbcType="VARCHAR" property="callback" /> | 17 | <result column="callback" jdbcType="VARCHAR" property="callback" /> |
| 18 | <result column="video_priority" jdbcType="VARCHAR" property="video_priority" /> | 18 | <result column="video_priority" jdbcType="VARCHAR" property="video_priority" /> |
| 19 | + <result column="attr_tags" jdbcType="VARCHAR" property="attr_tags" /> | ||
| 19 | <result column="msg" jdbcType="VARCHAR" property="msg" /> | 20 | <result column="msg" jdbcType="VARCHAR" property="msg" /> |
| 20 | <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" /> | 21 | <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" /> |
| 21 | <result column="state" jdbcType="INTEGER" property="state" /> | 22 | <result column="state" jdbcType="INTEGER" property="state" /> |
| @@ -25,7 +26,7 @@ | @@ -25,7 +26,7 @@ | ||
| 25 | <result column="video_id" jdbcType="VARCHAR" property="video_id" /> | 26 | <result column="video_id" jdbcType="VARCHAR" property="video_id" /> |
| 26 | <result column="created_at" jdbcType="TIMESTAMP" property="created_at" /> | 27 | <result column="created_at" jdbcType="TIMESTAMP" property="created_at" /> |
| 27 | <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" /> | 28 | <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" /> |
| 28 | - <result column="receive" jdbcType="BIT" property="receive" /> | 29 | + <result column="receive" jdbcType="INTEGER" property="receive" /> |
| 29 | <result column="receive_user_id" jdbcType="VARCHAR" property="receive_user_id" /> | 30 | <result column="receive_user_id" jdbcType="VARCHAR" property="receive_user_id" /> |
| 30 | <result column="avsample" jdbcType="INTEGER" property="avsample" /> | 31 | <result column="avsample" jdbcType="INTEGER" property="avsample" /> |
| 31 | <result column="task_id" jdbcType="VARCHAR" property="task_id" /> | 32 | <result column="task_id" jdbcType="VARCHAR" property="task_id" /> |
src/main/resources/templates/common/frame.html
| @@ -61,7 +61,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser. | @@ -61,7 +61,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em" th:text="${session.sessionUser. | ||
| 61 | </a> | 61 | </a> |
| 62 | <ul class="treeview-menu"> | 62 | <ul class="treeview-menu"> |
| 63 | <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page"></i> 点播审核</a></li> | 63 | <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page"></i> 点播审核</a></li> |
| 64 | -<!-- <li><a href="/live/page?receive_status=0" id="/live/page"> 直播审核</a></li> --> | 64 | + <li><a href="/live/page?receive_status=0" id="/live/page"> 直播审核</a></li> |
| 65 | <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li> | 65 | <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li> |
| 66 | <!-- <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li> --> | 66 | <!-- <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li> --> |
| 67 | </ul> | 67 | </ul> |
src/main/resources/templates/page/videoStream.html
| @@ -173,61 +173,55 @@ | @@ -173,61 +173,55 @@ | ||
| 173 | </div> | 173 | </div> |
| 174 | <script> | 174 | <script> |
| 175 | 175 | ||
| 176 | - //定义serializeObject方法,序列化表单 | ||
| 177 | - $.fn.serializeObject = function() { | ||
| 178 | - var o = {}; | ||
| 179 | - var a = this.serializeArray(); | ||
| 180 | - $.each(a, function() { | ||
| 181 | - if (o[this.name]) { | ||
| 182 | - if (!o[this.name].push) { | ||
| 183 | - o[this.name] = [ o[this.name] ]; | ||
| 184 | - } | ||
| 185 | - o[this.name].push(this.value || ''); | ||
| 186 | - } else { | ||
| 187 | - o[this.name] = this.value || ''; | ||
| 188 | - } | ||
| 189 | - }); | ||
| 190 | - return o; | ||
| 191 | - }; | ||
| 192 | - //定义serializeObject方法结束 | ||
| 193 | - | ||
| 194 | - var global_state = 1; //全局状态 默认为全部 | ||
| 195 | - | ||
| 196 | - /* 筛选 */ | ||
| 197 | - $('#live_query').click( | ||
| 198 | - function() { | ||
| 199 | - var object = $('#forms input').serializeObject(); | ||
| 200 | - object['is_hot'] = $('#is_hot').val(); | ||
| 201 | - object['activity_status'] = $('#activity_status').val(); | ||
| 202 | - | ||
| 203 | - var arrK = []; | ||
| 204 | - for ( var item in object) { | ||
| 205 | - arrK.push(item); | ||
| 206 | - } | ||
| 207 | - var arrV = []; | ||
| 208 | - for ( var item in object) { | ||
| 209 | - arrV.push(object[item]); | ||
| 210 | - } | ||
| 211 | - //全局状态传过去 | ||
| 212 | - arrK.push('gstate'); | ||
| 213 | - arrV.push(global_state); | ||
| 214 | -// window.location.href = '/live/filter_list/'+ arrK+ '='+ arrV; | ||
| 215 | - }); | 176 | + var activity_id ="";//直播id |
| 177 | + var activity_name = "";//直播名称 | ||
| 178 | + var is_hot ="";//是否热点 | ||
| 179 | + var activity_status ="";//直播状态 | ||
| 180 | + var start_date ="";//开始时间 | ||
| 181 | + var end_date = "";//结束时间 | ||
| 182 | + var count = ""; | ||
| 183 | + | ||
| 184 | + function updateValue(){ | ||
| 185 | + video_priority = $("#video_priority").val(); | ||
| 186 | + video_title = $("#video_titleID").val(); | ||
| 187 | + start_date = $("#start_date").val(); | ||
| 188 | + end_date = $("#end_date").val(); | ||
| 189 | + var spId=[[${session.sessionUser.spid}]]; | ||
| 190 | + if(spId==0){ | ||
| 191 | + sp_desc = $("#sp_desc").val(); | ||
| 192 | + count = $("#count").val(); | ||
| 193 | + } | ||
| 194 | + } | ||
| 195 | + | ||
| 196 | + | ||
| 197 | + //全部 | ||
| 198 | + function quanbu() { | ||
| 199 | + updateValue(); | ||
| 200 | + 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; | ||
| 201 | + } | ||
| 202 | + | ||
| 203 | + //全部待领 | ||
| 204 | + $('#daishen').click(function () { | ||
| 205 | + updateValue(); | ||
| 206 | + var state = 0; | ||
| 207 | + var receive = 0; | ||
| 208 | + 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; | ||
| 209 | + }); | ||
| 210 | + //我的待审核 | ||
| 211 | + $('#Mydaishen').click(function () { | ||
| 212 | + updateValue(); | ||
| 213 | + var state = 0; | ||
| 214 | + var receive = 1; | ||
| 215 | + 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; | ||
| 216 | + }); | ||
| 217 | + //我的已审核 | ||
| 218 | + $('#yishen').click(function () { | ||
| 219 | + updateValue(); | ||
| 220 | + var state = 1; | ||
| 221 | + var receive = 1; | ||
| 222 | + 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; | ||
| 223 | + }); | ||
| 216 | 224 | ||
| 217 | - $('#a_down').hide(); | ||
| 218 | - /*查询*/ | ||
| 219 | - function openOrClose(id_name_str) { | ||
| 220 | - var id_name = '#' + id_name_str; | ||
| 221 | - if ($(id_name).css('display') == 'block') { | ||
| 222 | - $(id_name).slideUp(350); | ||
| 223 | - $('#a_up').show(); | ||
| 224 | - $('#a_down').hide(); | ||
| 225 | - } else { | ||
| 226 | - $(id_name).slideDown(350); | ||
| 227 | - $('#a_up').hide(); | ||
| 228 | - $('#a_down').show(); | ||
| 229 | - } | ||
| 230 | - } | ||
| 231 | 225 | ||
| 232 | /*时间插件*/ | 226 | /*时间插件*/ |
| 233 | $('.date').datetimepicker({ | 227 | $('.date').datetimepicker({ |