Commit 054644562cd4b5eb21fa12c45458f0700e88403e
1 parent
000a8b74
修改
Showing
3 changed files
with
90 additions
and
90 deletions
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
| @@ -100,15 +100,15 @@ public class LiveApplyControllerApi { | @@ -100,15 +100,15 @@ public class LiveApplyControllerApi { | ||
| 100 | shyliveApply.setMobile(mobile);//设置联系方式 | 100 | shyliveApply.setMobile(mobile);//设置联系方式 |
| 101 | shyliveApply.setOrganization(organization);//设置直播发起单位 | 101 | shyliveApply.setOrganization(organization);//设置直播发起单位 |
| 102 | shyliveApply.setTheme(theme);//直播主题 | 102 | shyliveApply.setTheme(theme);//直播主题 |
| 103 | - shyliveApply.setPreStartTime(timestamp_start);//预计开始时间 | ||
| 104 | - shyliveApply.setPreEndTime(timestamp_end);//预计结束时间 | ||
| 105 | - shyliveApply.setBusinessModel(businessModel);//商务模式:0免费 1收费 | ||
| 106 | - shyliveApply.setContentProperty(contentProperty);//内容属性:1商业类活动 0非商业活动 | ||
| 107 | - shyliveApply.setSimpleContent(simpleContent);//内容简述 | ||
| 108 | - shyliveApply.setKeys(keys);//要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | ||
| 109 | - shyliveApply.setLivePlace(livePlace);//直播地点 | ||
| 110 | - shyliveApply.setPushUrl(pushUrl);//推流地址 | ||
| 111 | - shyliveApply.setPullUrl(pullUrl);//拉流地址 | 103 | + shyliveApply.setPre_start_time(timestamp_start);//预计开始时间 |
| 104 | + shyliveApply.setPre_end_time(timestamp_end);//预计结束时间 | ||
| 105 | + shyliveApply.setBusiness_model(businessModel);//商务模式:0免费 1收费 | ||
| 106 | + shyliveApply.setContent_property(contentProperty);//内容属性:1商业类活动 0非商业活动 | ||
| 107 | + shyliveApply.setSimple_content(simpleContent);//内容简述 | ||
| 108 | + shyliveApply.setPoint_key(keys);//要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | ||
| 109 | + shyliveApply.setLive_place(livePlace);//直播地点 | ||
| 110 | + shyliveApply.setPush_url(pushUrl);//推流地址 | ||
| 111 | + shyliveApply.setPull_url(pullUrl);//拉流地址 | ||
| 112 | shyliveApply.setPlatforms(platforms);//播出平台及通道:0网家家 1CNLive网站 2@TV互动电视 | 112 | shyliveApply.setPlatforms(platforms);//播出平台及通道:0网家家 1CNLive网站 2@TV互动电视 |
| 113 | shyliveApply.setCallback(callback);//设置回调地址 | 113 | shyliveApply.setCallback(callback);//设置回调地址 |
| 114 | shyliveApply.setReceive(0); | 114 | shyliveApply.setReceive(0); |
| @@ -127,15 +127,15 @@ public class LiveApplyControllerApi { | @@ -127,15 +127,15 @@ public class LiveApplyControllerApi { | ||
| 127 | shyliveApply1.setMobile(mobile);//设置联系方式 | 127 | shyliveApply1.setMobile(mobile);//设置联系方式 |
| 128 | shyliveApply1.setOrganization(organization);//设置直播发起单位 | 128 | shyliveApply1.setOrganization(organization);//设置直播发起单位 |
| 129 | shyliveApply1.setTheme(theme);//直播主题 | 129 | shyliveApply1.setTheme(theme);//直播主题 |
| 130 | - shyliveApply1.setPreStartTime(timestamp_start);//预计开始时间 | ||
| 131 | - shyliveApply1.setPreEndTime(timestamp_end);//预计结束时间 | ||
| 132 | - shyliveApply1.setBusinessModel(businessModel);//商务模式:0免费 1收费 | ||
| 133 | - shyliveApply1.setContentProperty(contentProperty);//内容属性:1商业类活动 0非商业活动 | ||
| 134 | - shyliveApply1.setSimpleContent(simpleContent);//内容简述 | ||
| 135 | - shyliveApply1.setKeys(keys);//要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | ||
| 136 | - shyliveApply1.setLivePlace(livePlace);//直播地点 | ||
| 137 | - shyliveApply1.setPushUrl(pushUrl);//推流地址 | ||
| 138 | - shyliveApply1.setPullUrl(pullUrl);//拉流地址 | 130 | + shyliveApply1.setPre_start_time(timestamp_start);//预计开始时间 |
| 131 | + shyliveApply1.setPre_end_time(timestamp_end);//预计结束时间 | ||
| 132 | + shyliveApply1.setBusiness_model(businessModel);//商务模式:0免费 1收费 | ||
| 133 | + shyliveApply1.setContent_property(contentProperty);//内容属性:1商业类活动 0非商业活动 | ||
| 134 | + shyliveApply1.setSimple_content(simpleContent);//内容简述 | ||
| 135 | + shyliveApply1.setPoint_key(keys);//要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | ||
| 136 | + shyliveApply1.setLive_place(livePlace);//直播地点 | ||
| 137 | + shyliveApply1.setPush_url(pushUrl);//推流地址 | ||
| 138 | + shyliveApply1.setPull_url(pullUrl);//拉流地址 | ||
| 139 | shyliveApply1.setPlatforms(platforms);//播出平台及通道:0网家家 1CNLive网站 2@TV互动电视 | 139 | shyliveApply1.setPlatforms(platforms);//播出平台及通道:0网家家 1CNLive网站 2@TV互动电视 |
| 140 | shyliveApply1.setCallback(callback);//设置回调地址 | 140 | shyliveApply1.setCallback(callback);//设置回调地址 |
| 141 | liveApplyServiceImpl.getShenheType(shyliveApply1);//获取审核类型 | 141 | liveApplyServiceImpl.getShenheType(shyliveApply1);//获取审核类型 |
src/main/java/com/cnlive/shenhe/entity/ShyLiveapply.java
| @@ -49,42 +49,42 @@ public class ShyLiveapply { | @@ -49,42 +49,42 @@ public class ShyLiveapply { | ||
| 49 | /** | 49 | /** |
| 50 | * 预计开始时间 | 50 | * 预计开始时间 |
| 51 | */ | 51 | */ |
| 52 | - private Date preStartTime; | 52 | + private Date pre_start_time; |
| 53 | 53 | ||
| 54 | /** | 54 | /** |
| 55 | * 预计结束时间 | 55 | * 预计结束时间 |
| 56 | */ | 56 | */ |
| 57 | - private Date preEndTime; | 57 | + private Date pre_end_time; |
| 58 | 58 | ||
| 59 | /** | 59 | /** |
| 60 | * 商务模式:0免费 1收费 | 60 | * 商务模式:0免费 1收费 |
| 61 | */ | 61 | */ |
| 62 | - private Integer businessModel; | 62 | + private Integer business_model; |
| 63 | 63 | ||
| 64 | /** | 64 | /** |
| 65 | * 内容属性:1商业类活动 0非商业活动 | 65 | * 内容属性:1商业类活动 0非商业活动 |
| 66 | */ | 66 | */ |
| 67 | - private Integer contentProperty; | 67 | + private Integer content_property; |
| 68 | 68 | ||
| 69 | /** | 69 | /** |
| 70 | * 要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | 70 | * 要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 |
| 71 | */ | 71 | */ |
| 72 | - private String keys; | 72 | + private String point_key; |
| 73 | 73 | ||
| 74 | /** | 74 | /** |
| 75 | * 直播地点 | 75 | * 直播地点 |
| 76 | */ | 76 | */ |
| 77 | - private String livePlace; | 77 | + private String live_place; |
| 78 | 78 | ||
| 79 | /** | 79 | /** |
| 80 | * 推流地址 | 80 | * 推流地址 |
| 81 | */ | 81 | */ |
| 82 | - private String pushUrl; | 82 | + private String push_url; |
| 83 | 83 | ||
| 84 | /** | 84 | /** |
| 85 | * 拉流地址 | 85 | * 拉流地址 |
| 86 | */ | 86 | */ |
| 87 | - private String pullUrl; | 87 | + private String pull_url; |
| 88 | 88 | ||
| 89 | /** | 89 | /** |
| 90 | * 播出平台及通道:0网家家 1CNLive网站 2@TV互动电视 | 90 | * 播出平台及通道:0网家家 1CNLive网站 2@TV互动电视 |
| @@ -139,7 +139,7 @@ public class ShyLiveapply { | @@ -139,7 +139,7 @@ public class ShyLiveapply { | ||
| 139 | /** | 139 | /** |
| 140 | * 内容简述 | 140 | * 内容简述 |
| 141 | */ | 141 | */ |
| 142 | - private String simpleContent; | 142 | + private String simple_content; |
| 143 | 143 | ||
| 144 | /** | 144 | /** |
| 145 | * 获取id | 145 | * 获取id |
| @@ -288,145 +288,145 @@ public class ShyLiveapply { | @@ -288,145 +288,145 @@ public class ShyLiveapply { | ||
| 288 | /** | 288 | /** |
| 289 | * 获取预计开始时间 | 289 | * 获取预计开始时间 |
| 290 | * | 290 | * |
| 291 | - * @return preStartTime - 预计开始时间 | 291 | + * @return pre_start_time - 预计开始时间 |
| 292 | */ | 292 | */ |
| 293 | - public Date getPreStartTime() { | ||
| 294 | - return preStartTime; | 293 | + public Date getPre_start_time() { |
| 294 | + return pre_start_time; | ||
| 295 | } | 295 | } |
| 296 | 296 | ||
| 297 | /** | 297 | /** |
| 298 | * 设置预计开始时间 | 298 | * 设置预计开始时间 |
| 299 | * | 299 | * |
| 300 | - * @param preStartTime 预计开始时间 | 300 | + * @param pre_start_time 预计开始时间 |
| 301 | */ | 301 | */ |
| 302 | - public void setPreStartTime(Date preStartTime) { | ||
| 303 | - this.preStartTime = preStartTime; | 302 | + public void setPre_start_time(Date pre_start_time) { |
| 303 | + this.pre_start_time = pre_start_time; | ||
| 304 | } | 304 | } |
| 305 | 305 | ||
| 306 | /** | 306 | /** |
| 307 | * 获取预计结束时间 | 307 | * 获取预计结束时间 |
| 308 | * | 308 | * |
| 309 | - * @return preEndTime - 预计结束时间 | 309 | + * @return pre_end_time - 预计结束时间 |
| 310 | */ | 310 | */ |
| 311 | - public Date getPreEndTime() { | ||
| 312 | - return preEndTime; | 311 | + public Date getPre_end_time() { |
| 312 | + return pre_end_time; | ||
| 313 | } | 313 | } |
| 314 | 314 | ||
| 315 | /** | 315 | /** |
| 316 | * 设置预计结束时间 | 316 | * 设置预计结束时间 |
| 317 | * | 317 | * |
| 318 | - * @param preEndTime 预计结束时间 | 318 | + * @param pre_end_time 预计结束时间 |
| 319 | */ | 319 | */ |
| 320 | - public void setPreEndTime(Date preEndTime) { | ||
| 321 | - this.preEndTime = preEndTime; | 320 | + public void setPre_end_time(Date pre_end_time) { |
| 321 | + this.pre_end_time = pre_end_time; | ||
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | /** | 324 | /** |
| 325 | * 获取商务模式:0免费 1收费 | 325 | * 获取商务模式:0免费 1收费 |
| 326 | * | 326 | * |
| 327 | - * @return businessModel - 商务模式:0免费 1收费 | 327 | + * @return business_model - 商务模式:0免费 1收费 |
| 328 | */ | 328 | */ |
| 329 | - public Integer getBusinessModel() { | ||
| 330 | - return businessModel; | 329 | + public Integer getBusiness_model() { |
| 330 | + return business_model; | ||
| 331 | } | 331 | } |
| 332 | 332 | ||
| 333 | /** | 333 | /** |
| 334 | * 设置商务模式:0免费 1收费 | 334 | * 设置商务模式:0免费 1收费 |
| 335 | * | 335 | * |
| 336 | - * @param businessModel 商务模式:0免费 1收费 | 336 | + * @param business_model 商务模式:0免费 1收费 |
| 337 | */ | 337 | */ |
| 338 | - public void setBusinessModel(Integer businessModel) { | ||
| 339 | - this.businessModel = businessModel; | 338 | + public void setBusiness_model(Integer business_model) { |
| 339 | + this.business_model = business_model; | ||
| 340 | } | 340 | } |
| 341 | 341 | ||
| 342 | /** | 342 | /** |
| 343 | * 获取内容属性:1商业类活动 0非商业活动 | 343 | * 获取内容属性:1商业类活动 0非商业活动 |
| 344 | * | 344 | * |
| 345 | - * @return contentProperty - 内容属性:1商业类活动 0非商业活动 | 345 | + * @return content_property - 内容属性:1商业类活动 0非商业活动 |
| 346 | */ | 346 | */ |
| 347 | - public Integer getContentProperty() { | ||
| 348 | - return contentProperty; | 347 | + public Integer getContent_property() { |
| 348 | + return content_property; | ||
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | /** | 351 | /** |
| 352 | * 设置内容属性:1商业类活动 0非商业活动 | 352 | * 设置内容属性:1商业类活动 0非商业活动 |
| 353 | * | 353 | * |
| 354 | - * @param contentProperty 内容属性:1商业类活动 0非商业活动 | 354 | + * @param content_property 内容属性:1商业类活动 0非商业活动 |
| 355 | */ | 355 | */ |
| 356 | - public void setContentProperty(Integer contentProperty) { | ||
| 357 | - this.contentProperty = contentProperty; | 356 | + public void setContent_property(Integer content_property) { |
| 357 | + this.content_property = content_property; | ||
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | /** | 360 | /** |
| 361 | * 获取要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | 361 | * 获取要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 |
| 362 | * | 362 | * |
| 363 | - * @return keys - 要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | 363 | + * @return point_key - 要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 |
| 364 | */ | 364 | */ |
| 365 | - public String getKeys() { | ||
| 366 | - return keys; | 365 | + public String getPoint_key() { |
| 366 | + return point_key; | ||
| 367 | } | 367 | } |
| 368 | 368 | ||
| 369 | /** | 369 | /** |
| 370 | * 设置要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | 370 | * 设置要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 |
| 371 | * | 371 | * |
| 372 | - * @param keys 要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | 372 | + * @param point_key 要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 |
| 373 | */ | 373 | */ |
| 374 | - public void setKeys(String keys) { | ||
| 375 | - this.keys = keys; | 374 | + public void setPoint_key(String point_key) { |
| 375 | + this.point_key = point_key; | ||
| 376 | } | 376 | } |
| 377 | 377 | ||
| 378 | /** | 378 | /** |
| 379 | * 获取直播地点 | 379 | * 获取直播地点 |
| 380 | * | 380 | * |
| 381 | - * @return livePlace - 直播地点 | 381 | + * @return live_place - 直播地点 |
| 382 | */ | 382 | */ |
| 383 | - public String getLivePlace() { | ||
| 384 | - return livePlace; | 383 | + public String getLive_place() { |
| 384 | + return live_place; | ||
| 385 | } | 385 | } |
| 386 | 386 | ||
| 387 | /** | 387 | /** |
| 388 | * 设置直播地点 | 388 | * 设置直播地点 |
| 389 | * | 389 | * |
| 390 | - * @param livePlace 直播地点 | 390 | + * @param live_place 直播地点 |
| 391 | */ | 391 | */ |
| 392 | - public void setLivePlace(String livePlace) { | ||
| 393 | - this.livePlace = livePlace; | 392 | + public void setLive_place(String live_place) { |
| 393 | + this.live_place = live_place; | ||
| 394 | } | 394 | } |
| 395 | 395 | ||
| 396 | /** | 396 | /** |
| 397 | * 获取推流地址 | 397 | * 获取推流地址 |
| 398 | * | 398 | * |
| 399 | - * @return pushUrl - 推流地址 | 399 | + * @return push_url - 推流地址 |
| 400 | */ | 400 | */ |
| 401 | - public String getPushUrl() { | ||
| 402 | - return pushUrl; | 401 | + public String getPush_url() { |
| 402 | + return push_url; | ||
| 403 | } | 403 | } |
| 404 | 404 | ||
| 405 | /** | 405 | /** |
| 406 | * 设置推流地址 | 406 | * 设置推流地址 |
| 407 | * | 407 | * |
| 408 | - * @param pushUrl 推流地址 | 408 | + * @param push_url 推流地址 |
| 409 | */ | 409 | */ |
| 410 | - public void setPushUrl(String pushUrl) { | ||
| 411 | - this.pushUrl = pushUrl; | 410 | + public void setPush_url(String push_url) { |
| 411 | + this.push_url = push_url; | ||
| 412 | } | 412 | } |
| 413 | 413 | ||
| 414 | /** | 414 | /** |
| 415 | * 获取拉流地址 | 415 | * 获取拉流地址 |
| 416 | * | 416 | * |
| 417 | - * @return pullUrl - 拉流地址 | 417 | + * @return pull_url - 拉流地址 |
| 418 | */ | 418 | */ |
| 419 | - public String getPullUrl() { | ||
| 420 | - return pullUrl; | 419 | + public String getPull_url() { |
| 420 | + return pull_url; | ||
| 421 | } | 421 | } |
| 422 | 422 | ||
| 423 | /** | 423 | /** |
| 424 | * 设置拉流地址 | 424 | * 设置拉流地址 |
| 425 | * | 425 | * |
| 426 | - * @param pullUrl 拉流地址 | 426 | + * @param pull_url 拉流地址 |
| 427 | */ | 427 | */ |
| 428 | - public void setPullUrl(String pullUrl) { | ||
| 429 | - this.pullUrl = pullUrl; | 428 | + public void setPull_url(String pull_url) { |
| 429 | + this.pull_url = pull_url; | ||
| 430 | } | 430 | } |
| 431 | 431 | ||
| 432 | /** | 432 | /** |
| @@ -612,18 +612,18 @@ public class ShyLiveapply { | @@ -612,18 +612,18 @@ public class ShyLiveapply { | ||
| 612 | /** | 612 | /** |
| 613 | * 获取内容简述 | 613 | * 获取内容简述 |
| 614 | * | 614 | * |
| 615 | - * @return simpleContent - 内容简述 | 615 | + * @return simple_content - 内容简述 |
| 616 | */ | 616 | */ |
| 617 | - public String getSimpleContent() { | ||
| 618 | - return simpleContent; | 617 | + public String getSimple_content() { |
| 618 | + return simple_content; | ||
| 619 | } | 619 | } |
| 620 | 620 | ||
| 621 | /** | 621 | /** |
| 622 | * 设置内容简述 | 622 | * 设置内容简述 |
| 623 | * | 623 | * |
| 624 | - * @param simpleContent 内容简述 | 624 | + * @param simple_content 内容简述 |
| 625 | */ | 625 | */ |
| 626 | - public void setSimpleContent(String simpleContent) { | ||
| 627 | - this.simpleContent = simpleContent; | 626 | + public void setSimple_content(String simple_content) { |
| 627 | + this.simple_content = simple_content; | ||
| 628 | } | 628 | } |
| 629 | } | 629 | } |
| 630 | \ No newline at end of file | 630 | \ No newline at end of file |
src/main/resources/mapper/ShyLiveapplyMapper.xml
| @@ -13,14 +13,14 @@ | @@ -13,14 +13,14 @@ | ||
| 13 | <result column="mobile" jdbcType="VARCHAR" property="mobile" /> | 13 | <result column="mobile" jdbcType="VARCHAR" property="mobile" /> |
| 14 | <result column="organization" jdbcType="VARCHAR" property="organization" /> | 14 | <result column="organization" jdbcType="VARCHAR" property="organization" /> |
| 15 | <result column="theme" jdbcType="VARCHAR" property="theme" /> | 15 | <result column="theme" jdbcType="VARCHAR" property="theme" /> |
| 16 | - <result column="preStartTime" jdbcType="TIMESTAMP" property="preStartTime" /> | ||
| 17 | - <result column="preEndTime" jdbcType="TIMESTAMP" property="preEndTime" /> | ||
| 18 | - <result column="businessModel" jdbcType="INTEGER" property="businessModel" /> | ||
| 19 | - <result column="contentProperty" jdbcType="INTEGER" property="contentProperty" /> | ||
| 20 | - <result column="keys" jdbcType="VARCHAR" property="keys" /> | ||
| 21 | - <result column="livePlace" jdbcType="VARCHAR" property="livePlace" /> | ||
| 22 | - <result column="pushUrl" jdbcType="VARCHAR" property="pushUrl" /> | ||
| 23 | - <result column="pullUrl" jdbcType="VARCHAR" property="pullUrl" /> | 16 | + <result column="pre_start_time" jdbcType="TIMESTAMP" property="pre_start_time" /> |
| 17 | + <result column="pre_end_time" jdbcType="TIMESTAMP" property="pre_end_time" /> | ||
| 18 | + <result column="business_model" jdbcType="INTEGER" property="business_model" /> | ||
| 19 | + <result column="content_property" jdbcType="INTEGER" property="content_property" /> | ||
| 20 | + <result column="point_key" jdbcType="VARCHAR" property="point_key" /> | ||
| 21 | + <result column="live_place" jdbcType="VARCHAR" property="live_place" /> | ||
| 22 | + <result column="push_url" jdbcType="VARCHAR" property="push_url" /> | ||
| 23 | + <result column="pull_url" jdbcType="VARCHAR" property="pull_url" /> | ||
| 24 | <result column="platforms" jdbcType="VARCHAR" property="platforms" /> | 24 | <result column="platforms" jdbcType="VARCHAR" property="platforms" /> |
| 25 | <result column="callback" jdbcType="VARCHAR" property="callback" /> | 25 | <result column="callback" jdbcType="VARCHAR" property="callback" /> |
| 26 | <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" /> | 26 | <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" /> |
| @@ -31,6 +31,6 @@ | @@ -31,6 +31,6 @@ | ||
| 31 | <result column="shenhe_msg" jdbcType="VARCHAR" property="shenhe_msg" /> | 31 | <result column="shenhe_msg" jdbcType="VARCHAR" property="shenhe_msg" /> |
| 32 | <result column="created_at" jdbcType="TIMESTAMP" property="created_at" /> | 32 | <result column="created_at" jdbcType="TIMESTAMP" property="created_at" /> |
| 33 | <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" /> | 33 | <result column="updated_at" jdbcType="TIMESTAMP" property="updated_at" /> |
| 34 | - <result column="simpleContent" jdbcType="LONGVARCHAR" property="simpleContent" /> | 34 | + <result column="simple_content" jdbcType="LONGVARCHAR" property="simple_content" /> |
| 35 | </resultMap> | 35 | </resultMap> |
| 36 | </mapper> | 36 | </mapper> |
| 37 | \ No newline at end of file | 37 | \ No newline at end of file |