Commit b1b3a24e8095086c629b4a0f0a4865044f4e643f
1 parent
9187fea9
增加字段videoId
Showing
5 changed files
with
110 additions
and
58 deletions
src/main/java/com/cnlive/shenhe/entity/ShyComments.java
| @@ -54,7 +54,7 @@ public class ShyComments { | @@ -54,7 +54,7 @@ public class ShyComments { | ||
| 54 | * 原文链接url | 54 | * 原文链接url |
| 55 | */ | 55 | */ |
| 56 | private String comment_original_url; | 56 | private String comment_original_url; |
| 57 | - | 57 | + |
| 58 | /** | 58 | /** |
| 59 | * 审核类型,1:免审,2:机审,3:人工审 | 59 | * 审核类型,1:免审,2:机审,3:人工审 |
| 60 | */ | 60 | */ |
| @@ -313,6 +313,24 @@ public class ShyComments { | @@ -313,6 +313,24 @@ public class ShyComments { | ||
| 313 | private String spid_desc; | 313 | private String spid_desc; |
| 314 | 314 | ||
| 315 | /** | 315 | /** |
| 316 | + * 获取审核类型,1:免审,2:机审,3:人工审 | ||
| 317 | + * | ||
| 318 | + * @return shenhe_type - 审核类型,1:免审,2:机审,3:人工审 | ||
| 319 | + */ | ||
| 320 | + public Integer getShenhe_type() { | ||
| 321 | + return shenhe_type; | ||
| 322 | + } | ||
| 323 | + | ||
| 324 | + /** | ||
| 325 | + * 设置审核类型,1:免审,2:机审,3:人工审 | ||
| 326 | + * | ||
| 327 | + * @param shenhe_type 审核类型,1:免审,2:机审,3:人工审 | ||
| 328 | + */ | ||
| 329 | + public void setShenhe_type(Integer shenhe_type) { | ||
| 330 | + this.shenhe_type = shenhe_type; | ||
| 331 | + } | ||
| 332 | + | ||
| 333 | + /** | ||
| 316 | * 获取更新者 | 334 | * 获取更新者 |
| 317 | * | 335 | * |
| 318 | * @return updater - 更新者 | 336 | * @return updater - 更新者 |
| @@ -538,14 +556,6 @@ public class ShyComments { | @@ -538,14 +556,6 @@ public class ShyComments { | ||
| 538 | this.receive_user_id = receive_user_id; | 556 | this.receive_user_id = receive_user_id; |
| 539 | } | 557 | } |
| 540 | 558 | ||
| 541 | - public Integer getShenhe_type() { | ||
| 542 | - return shenhe_type; | ||
| 543 | - } | ||
| 544 | - | ||
| 545 | - public void setShenhe_type(Integer shenhe_type) { | ||
| 546 | - this.shenhe_type = shenhe_type; | ||
| 547 | - } | ||
| 548 | - | ||
| 549 | public String getSpid_desc() { | 559 | public String getSpid_desc() { |
| 550 | return spid_desc; | 560 | return spid_desc; |
| 551 | } | 561 | } |
| @@ -554,5 +564,4 @@ public class ShyComments { | @@ -554,5 +564,4 @@ public class ShyComments { | ||
| 554 | this.spid_desc = spid_desc; | 564 | this.spid_desc = spid_desc; |
| 555 | } | 565 | } |
| 556 | 566 | ||
| 557 | - | ||
| 558 | } | 567 | } |
| 559 | \ No newline at end of file | 568 | \ No newline at end of file |
src/main/java/com/cnlive/shenhe/entity/ShyContent.java
| @@ -24,7 +24,7 @@ public class ShyContent { | @@ -24,7 +24,7 @@ public class ShyContent { | ||
| 24 | private String title; | 24 | private String title; |
| 25 | 25 | ||
| 26 | /** | 26 | /** |
| 27 | - * 标题图片 | 27 | + * 标题图片(头像) |
| 28 | */ | 28 | */ |
| 29 | private String title_image; | 29 | private String title_image; |
| 30 | 30 | ||
| @@ -54,21 +54,27 @@ public class ShyContent { | @@ -54,21 +54,27 @@ public class ShyContent { | ||
| 54 | private String callback; | 54 | private String callback; |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | - * 来源 | 57 | + * 来源(昵称) |
| 58 | */ | 58 | */ |
| 59 | private String source; | 59 | private String source; |
| 60 | 60 | ||
| 61 | /** | 61 | /** |
| 62 | - * 作者 | 62 | + * 作者(id) |
| 63 | */ | 63 | */ |
| 64 | private String author; | 64 | private String author; |
| 65 | 65 | ||
| 66 | /** | 66 | /** |
| 67 | - * 图文创建时间 | 67 | + * 关联的点播id |
| 68 | + */ | ||
| 69 | + private String videoId; | ||
| 70 | + | ||
| 71 | + /** | ||
| 72 | + * 图文的创建时间 | ||
| 68 | */ | 73 | */ |
| 69 | private Date content_time; | 74 | private Date content_time; |
| 75 | + | ||
| 70 | /** | 76 | /** |
| 71 | - * 图文送审时间 | 77 | + * 图文审核创建时间 |
| 72 | */ | 78 | */ |
| 73 | private Date create_date; | 79 | private Date create_date; |
| 74 | 80 | ||
| @@ -172,18 +178,18 @@ public class ShyContent { | @@ -172,18 +178,18 @@ public class ShyContent { | ||
| 172 | } | 178 | } |
| 173 | 179 | ||
| 174 | /** | 180 | /** |
| 175 | - * 获取标题图片 | 181 | + * 获取标题图片(头像) |
| 176 | * | 182 | * |
| 177 | - * @return title_image - 标题图片 | 183 | + * @return title_image - 标题图片(头像) |
| 178 | */ | 184 | */ |
| 179 | public String getTitle_image() { | 185 | public String getTitle_image() { |
| 180 | return title_image; | 186 | return title_image; |
| 181 | } | 187 | } |
| 182 | 188 | ||
| 183 | /** | 189 | /** |
| 184 | - * 设置标题图片 | 190 | + * 设置标题图片(头像) |
| 185 | * | 191 | * |
| 186 | - * @param title_image 标题图片 | 192 | + * @param title_image 标题图片(头像) |
| 187 | */ | 193 | */ |
| 188 | public void setTitle_image(String title_image) { | 194 | public void setTitle_image(String title_image) { |
| 189 | this.title_image = title_image; | 195 | this.title_image = title_image; |
| @@ -226,18 +232,18 @@ public class ShyContent { | @@ -226,18 +232,18 @@ public class ShyContent { | ||
| 226 | } | 232 | } |
| 227 | 233 | ||
| 228 | /** | 234 | /** |
| 229 | - * 获取内容类型:0:免审,1:机审,2:人工审 | 235 | + * 获取审核类型,1:免审,2:机审,3:人工审 |
| 230 | * | 236 | * |
| 231 | - * @return shenhe_type - 内容类型:0:免审,1:机审,2:人工审 | 237 | + * @return shenhe_type - 审核类型,1:免审,2:机审,3:人工审 |
| 232 | */ | 238 | */ |
| 233 | public Integer getShenhe_type() { | 239 | public Integer getShenhe_type() { |
| 234 | return shenhe_type; | 240 | return shenhe_type; |
| 235 | } | 241 | } |
| 236 | 242 | ||
| 237 | /** | 243 | /** |
| 238 | - * 设置内容类型:0:免审,1:机审,2:人工审 | 244 | + * 设置审核类型,1:免审,2:机审,3:人工审 |
| 239 | * | 245 | * |
| 240 | - * @param shenhe_type 内容类型:0:免审,1:机审,2:人工审 | 246 | + * @param shenhe_type 审核类型,1:免审,2:机审,3:人工审 |
| 241 | */ | 247 | */ |
| 242 | public void setShenhe_type(Integer shenhe_type) { | 248 | public void setShenhe_type(Integer shenhe_type) { |
| 243 | this.shenhe_type = shenhe_type; | 249 | this.shenhe_type = shenhe_type; |
| @@ -280,54 +286,90 @@ public class ShyContent { | @@ -280,54 +286,90 @@ public class ShyContent { | ||
| 280 | } | 286 | } |
| 281 | 287 | ||
| 282 | /** | 288 | /** |
| 283 | - * 获取来源 | 289 | + * 获取来源(昵称) |
| 284 | * | 290 | * |
| 285 | - * @return source - 来源 | 291 | + * @return source - 来源(昵称) |
| 286 | */ | 292 | */ |
| 287 | public String getSource() { | 293 | public String getSource() { |
| 288 | return source; | 294 | return source; |
| 289 | } | 295 | } |
| 290 | 296 | ||
| 291 | /** | 297 | /** |
| 292 | - * 设置来源 | 298 | + * 设置来源(昵称) |
| 293 | * | 299 | * |
| 294 | - * @param source 来源 | 300 | + * @param source 来源(昵称) |
| 295 | */ | 301 | */ |
| 296 | public void setSource(String source) { | 302 | public void setSource(String source) { |
| 297 | this.source = source; | 303 | this.source = source; |
| 298 | } | 304 | } |
| 299 | 305 | ||
| 300 | /** | 306 | /** |
| 301 | - * 获取作者 | 307 | + * 获取作者(id) |
| 302 | * | 308 | * |
| 303 | - * @return author - 作者 | 309 | + * @return author - 作者(id) |
| 304 | */ | 310 | */ |
| 305 | public String getAuthor() { | 311 | public String getAuthor() { |
| 306 | return author; | 312 | return author; |
| 307 | } | 313 | } |
| 308 | 314 | ||
| 309 | /** | 315 | /** |
| 310 | - * 设置作者 | 316 | + * 设置作者(id) |
| 311 | * | 317 | * |
| 312 | - * @param author 作者 | 318 | + * @param author 作者(id) |
| 313 | */ | 319 | */ |
| 314 | public void setAuthor(String author) { | 320 | public void setAuthor(String author) { |
| 315 | this.author = author; | 321 | this.author = author; |
| 316 | } | 322 | } |
| 317 | 323 | ||
| 318 | /** | 324 | /** |
| 319 | - * 获取创建时间 | 325 | + * 获取关联的点播id |
| 326 | + * | ||
| 327 | + * @return videoId - 关联的点播id | ||
| 328 | + */ | ||
| 329 | + public String getVideoId() { | ||
| 330 | + return videoId; | ||
| 331 | + } | ||
| 332 | + | ||
| 333 | + /** | ||
| 334 | + * 设置关联的点播id | ||
| 335 | + * | ||
| 336 | + * @param videoId 关联的点播id | ||
| 337 | + */ | ||
| 338 | + public void setVideoId(String videoId) { | ||
| 339 | + this.videoId = videoId; | ||
| 340 | + } | ||
| 341 | + | ||
| 342 | + /** | ||
| 343 | + * 获取图文的创建时间 | ||
| 320 | * | 344 | * |
| 321 | - * @return create_date - 创建时间 | 345 | + * @return content_time - 图文的创建时间 |
| 346 | + */ | ||
| 347 | + public Date getContent_time() { | ||
| 348 | + return content_time; | ||
| 349 | + } | ||
| 350 | + | ||
| 351 | + /** | ||
| 352 | + * 设置图文的创建时间 | ||
| 353 | + * | ||
| 354 | + * @param content_time 图文的创建时间 | ||
| 355 | + */ | ||
| 356 | + public void setContent_time(Date content_time) { | ||
| 357 | + this.content_time = content_time; | ||
| 358 | + } | ||
| 359 | + | ||
| 360 | + /** | ||
| 361 | + * 获取图文审核创建时间 | ||
| 362 | + * | ||
| 363 | + * @return create_date - 图文审核创建时间 | ||
| 322 | */ | 364 | */ |
| 323 | public Date getCreate_date() { | 365 | public Date getCreate_date() { |
| 324 | return create_date; | 366 | return create_date; |
| 325 | } | 367 | } |
| 326 | 368 | ||
| 327 | /** | 369 | /** |
| 328 | - * 设置创建时间 | 370 | + * 设置图文审核创建时间 |
| 329 | * | 371 | * |
| 330 | - * @param create_date 创建时间 | 372 | + * @param create_date 图文审核创建时间 |
| 331 | */ | 373 | */ |
| 332 | public void setCreate_date(Date create_date) { | 374 | public void setCreate_date(Date create_date) { |
| 333 | this.create_date = create_date; | 375 | this.create_date = create_date; |
| @@ -431,13 +473,4 @@ public class ShyContent { | @@ -431,13 +473,4 @@ public class ShyContent { | ||
| 431 | this.sp_desc = sp_desc; | 473 | this.sp_desc = sp_desc; |
| 432 | } | 474 | } |
| 433 | 475 | ||
| 434 | - public Date getContent_time() { | ||
| 435 | - return content_time; | ||
| 436 | - } | ||
| 437 | - | ||
| 438 | - public void setContent_time(Date content_time) { | ||
| 439 | - this.content_time = content_time; | ||
| 440 | - } | ||
| 441 | - | ||
| 442 | - | ||
| 443 | } | 476 | } |
| 444 | \ No newline at end of file | 477 | \ No newline at end of file |
src/main/java/com/cnlive/shenhe/entity/ShyLive.java
| @@ -425,18 +425,18 @@ public class ShyLive { | @@ -425,18 +425,18 @@ public class ShyLive { | ||
| 425 | } | 425 | } |
| 426 | 426 | ||
| 427 | /** | 427 | /** |
| 428 | - * 获取状态 1:未认领 2.已认领,3:已审核 | 428 | + * 获取状态 0:未认领 1.已认领,2:已审核 |
| 429 | * | 429 | * |
| 430 | - * @return shenhe_state - 状态 1:未认领 2.已认领,3:已审核 | 430 | + * @return shenhe_state - 状态 0:未认领 1.已认领,2:已审核 |
| 431 | */ | 431 | */ |
| 432 | public Integer getShenhe_state() { | 432 | public Integer getShenhe_state() { |
| 433 | return shenhe_state; | 433 | return shenhe_state; |
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | /** | 436 | /** |
| 437 | - * 设置状态 1:未认领 2.已认领,3:已审核 | 437 | + * 设置状态 0:未认领 1.已认领,2:已审核 |
| 438 | * | 438 | * |
| 439 | - * @param shenhe_state 状态 1:未认领 2.已认领,3:已审核 | 439 | + * @param shenhe_state 状态 0:未认领 1.已认领,2:已审核 |
| 440 | */ | 440 | */ |
| 441 | public void setShenhe_state(Integer shenhe_state) { | 441 | public void setShenhe_state(Integer shenhe_state) { |
| 442 | this.shenhe_state = shenhe_state; | 442 | this.shenhe_state = shenhe_state; |
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
| @@ -53,6 +53,7 @@ public class ShyVideos { | @@ -53,6 +53,7 @@ public class ShyVideos { | ||
| 53 | * 常用审核意见 | 53 | * 常用审核意见 |
| 54 | */ | 54 | */ |
| 55 | private String attr_tags; | 55 | private String attr_tags; |
| 56 | + | ||
| 56 | /** | 57 | /** |
| 57 | * 拒绝理由 | 58 | * 拒绝理由 |
| 58 | */ | 59 | */ |
| @@ -332,6 +333,24 @@ public class ShyVideos { | @@ -332,6 +333,24 @@ public class ShyVideos { | ||
| 332 | } | 333 | } |
| 333 | 334 | ||
| 334 | /** | 335 | /** |
| 336 | + * 获取常用审核意见 | ||
| 337 | + * | ||
| 338 | + * @return attr_tags - 常用审核意见 | ||
| 339 | + */ | ||
| 340 | + public String getAttr_tags() { | ||
| 341 | + return attr_tags; | ||
| 342 | + } | ||
| 343 | + | ||
| 344 | + /** | ||
| 345 | + * 设置常用审核意见 | ||
| 346 | + * | ||
| 347 | + * @param attr_tags 常用审核意见 | ||
| 348 | + */ | ||
| 349 | + public void setAttr_tags(String attr_tags) { | ||
| 350 | + this.attr_tags = attr_tags; | ||
| 351 | + } | ||
| 352 | + | ||
| 353 | + /** | ||
| 335 | * 获取拒绝理由 | 354 | * 获取拒绝理由 |
| 336 | * | 355 | * |
| 337 | * @return msg - 拒绝理由 | 356 | * @return msg - 拒绝理由 |
| @@ -690,14 +709,4 @@ public class ShyVideos { | @@ -690,14 +709,4 @@ public class ShyVideos { | ||
| 690 | public void setSpid_desc(String spid_desc) { | 709 | public void setSpid_desc(String spid_desc) { |
| 691 | this.spid_desc = spid_desc; | 710 | this.spid_desc = spid_desc; |
| 692 | } | 711 | } |
| 693 | - | ||
| 694 | - public String getAttr_tags() { | ||
| 695 | - return attr_tags; | ||
| 696 | - } | ||
| 697 | - | ||
| 698 | - public void setAttr_tags(String attr_tags) { | ||
| 699 | - this.attr_tags = attr_tags; | ||
| 700 | - } | ||
| 701 | - | ||
| 702 | - | ||
| 703 | } | 712 | } |
| 704 | \ No newline at end of file | 713 | \ 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="videoId" jdbcType="VARCHAR" property="videoId" /> | ||
| 20 | <result column="content_time" jdbcType="TIMESTAMP" property="content_time" /> | 21 | <result column="content_time" jdbcType="TIMESTAMP" property="content_time" /> |
| 21 | <result column="create_date" jdbcType="TIMESTAMP" property="create_date" /> | 22 | <result column="create_date" jdbcType="TIMESTAMP" property="create_date" /> |
| 22 | <result column="last_update" jdbcType="TIMESTAMP" property="last_update" /> | 23 | <result column="last_update" jdbcType="TIMESTAMP" property="last_update" /> |