周伟鹏 / cnlive_shenhe · Commits

Commit 49b472d1726ea342c322830fd5a232a6d2b5c478

Authored by 王言钊
1 parent d75edb8e

规范编码格式

Inline Side-by-side
Showing 43 changed files with 648 additions and 336 deletions
src/main/java/com/cnlive/shenhe/controller/BootTestController.java deleted 100644 → 0
  View file @d75edb8
1   -package com.cnlive.shenhe.controller;
2   -import com.google.common.collect.Lists;
3   -
4   -import com.cnlive.shenhe.entity.BootTest;
5   -import com.cnlive.shenhe.serviceImpl.BootTestServiceImpl;
6   -import com.cnlive.shenhe.utils.CommonUtils;
7   -import org.springframework.beans.factory.annotation.Autowired;
8   -import org.springframework.web.bind.annotation.*;
9   -
10   -import java.util.List;
11   -
12   -/**
13   - * @Author: yanzhaowang
14   - * @Date: 2022/3/4 14:10
15   - */
16   -@RestController
17   -@RequestMapping("/boottest")
18   -public class BootTestController {
19   -
20   - @Autowired
21   - BootTestServiceImpl bootTestService;
22   -
23   - @GetMapping("/testselect/{pagesiaz}/{pageNum}")
24   - public List<BootTest> selectAll(@RequestParam(defaultValue = "10") @PathVariable(name = "pagesiaz") int pagesiaz, @RequestParam(defaultValue = "1") @PathVariable(name = "pageNum") int pageNum){
25   - List<BootTest> bootTests = bootTestService.selectAll(pagesiaz, pageNum);
26   - return bootTests;
27   - }
28   - @GetMapping("/testselectid/{BootId}")
29   - public BootTest selectById(@PathVariable(value = "BootId") String BootId){
30   - if (BootId != null) {
31   - BootTest bootTest = bootTestService.selectByid(BootId);
32   - return bootTest;
33   - }
34   - return null;
35   - }
36   -
37   - @RequestMapping("/testaddBoottest")
38   - public int addBootTest(@RequestBody BootTest bootTest){
39   - int i = bootTestService.addBootTest(bootTest);
40   - return i;
41   - }
42   -
43   - @DeleteMapping("/testdeleteBoottest/{bootTestid}")
44   - public int deleteBootTest(@PathVariable(name = "bootTestid") String bootTestid){
45   - if (CommonUtils.isNotEmpty(bootTestid)) {
46   - int i = bootTestService.deleteBootTest(bootTestid);
47   - return i;
48   - }
49   - return 0;
50   - }
51   -
52   - @RequestMapping("/testupdateBoottest")
53   - public int testupdateBoottest(@RequestBody BootTest bootTest){
54   - if (bootTest.getId() != null&&bootTest.getAge()!=null&&bootTest.getName()!=null) {
55   - int i = bootTestService.updateBootTest(bootTest);
56   - return i;
57   - }
58   - return 0;
59   - }
60   -}
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
  View file @49b472d
... ... @@ -244,7 +244,7 @@ public class LiveApplyController extends BaseController {
244 244 String[] cids = ids.split(",");
245 245 for (String cid : cids) {
246 246 ShyLiveapply shyLiveapply = liveApplyServiceImpl.selectByPrimaryKey(Integer.parseInt(cid));
247   - if (shyLiveapply.getReceive() != CommonConst.RECEIVE_AFTER || !shyLiveapply.getAuditor().equals(userId)||shyLiveapply.getShenhe_state()!=CommonConst.AUDIT_INTT) {
  247 + if (!shyLiveapply.getReceive().equals(CommonConst.RECEIVE_AFTER) || !shyLiveapply.getAuditor().equals(userId)|| !shyLiveapply.getShenhe_state().equals(CommonConst.AUDIT_INTT)) {
248 248 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的");
249 249 }
250 250 }
... ...
src/main/java/com/cnlive/shenhe/controller/LiveController.java
  View file @49b472d
... ... @@ -226,7 +226,7 @@ public class LiveController extends BaseController {
226 226 for (String cid : cids) {
227 227 ShyLive shyLive = liveService.selectByPrimaryKey(Integer.parseInt(cid));
228 228 if (CommonUtils.isNotNull(shyLive)) {
229   - if (shyLive.getShenhe_state() != CommonConst.RECEIVE_BEFORE ) {
  229 + if (!shyLive.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
230 230 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容中有已被领取或者已经被审核，请检查并重试");
231 231 }
232 232 } else {
... ... @@ -255,7 +255,7 @@ public class LiveController extends BaseController {
255 255 String[] cids = ids.split(",");
256 256 for (String cid : cids) {
257 257 ShyLive shyLive = liveService.selectByPrimaryKey(Integer.parseInt(cid));
258   - if (shyLive.getShenhe_state() != CommonConst.RECEIVE_AFTER || !shyLive.getAuditor().equals(userId)) {
  258 + if (!shyLive.getShenhe_state().equals(CommonConst.RECEIVE_AFTER) || !shyLive.getAuditor().equals(userId)) {
259 259 return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "退领失败，您选中的内容包含已退领的或已经审核的");
260 260 }
261 261 }
... ...
src/main/java/com/cnlive/shenhe/dto/AudioDTO.java
  View file @49b472d
... ... @@ -14,8 +14,8 @@ public class AudioDTO extends ShyAudio implements Serializable {
14 14 private String video_title;
15 15 private String start_date;
16 16 private String end_date;
17   - private Integer page = 1;
18   - private Integer pageSize = 10;
  17 + private Integer page;
  18 + private Integer pageSize;
19 19 private String video_priority;
20 20 private String orderByClause;
21 21 private String sp_desc;
... ... @@ -128,6 +128,23 @@ public class AudioDTO extends ShyAudio implements Serializable {
128 128 public void setUserId(String userId) {
129 129 this.userId = userId;
130 130 }
  131 +
  132 + @Override
  133 + public String toString() {
  134 + return "AudioDTO{" +
  135 + "video_title='" + video_title + '\'' +
  136 + ", start_date='" + start_date + '\'' +
  137 + ", end_date='" + end_date + '\'' +
  138 + ", page=" + page +
  139 + ", pageSize=" + pageSize +
  140 + ", video_priority='" + video_priority + '\'' +
  141 + ", orderByClause='" + orderByClause + '\'' +
  142 + ", sp_desc='" + sp_desc + '\'' +
  143 + ", sp_Id='" + sp_Id + '\'' +
  144 + ", spid=" + spid +
  145 + ", userId='" + userId + '\'' +
  146 + "} " + super.toString();
  147 + }
131 148 }
132 149  
133 150  
... ...
src/main/java/com/cnlive/shenhe/dto/ChannelDTO.java
  View file @49b472d
... ... @@ -11,8 +11,8 @@ import java.io.Serializable;
11 11 */
12 12 public class ChannelDTO extends ShyChannel implements Serializable {
13 13  
14   - private Integer page = 1;
15   - private Integer pageSize = 10;
  14 + private Integer page;
  15 + private Integer pageSize;
16 16 private String orderByClause;
17 17 private Integer spid;
18 18 private String userId;
... ... @@ -97,4 +97,18 @@ public class ChannelDTO extends ShyChannel implements Serializable {
97 97 public void setReceive(Integer receive) {
98 98 this.receive = receive;
99 99 }
  100 +
  101 + @Override
  102 + public String toString() {
  103 + return "ChannelDTO{" +
  104 + "page=" + page +
  105 + ", pageSize=" + pageSize +
  106 + ", orderByClause='" + orderByClause + '\'' +
  107 + ", spid=" + spid +
  108 + ", userId='" + userId + '\'' +
  109 + ", start_date='" + start_date + '\'' +
  110 + ", end_date='" + end_date + '\'' +
  111 + ", receive=" + receive +
  112 + "} " + super.toString();
  113 + }
100 114 }
... ...
src/main/java/com/cnlive/shenhe/dto/CommentsDTO.java
  View file @49b472d
... ... @@ -12,8 +12,8 @@ import java.io.Serializable;
12 12 public class CommentsDTO extends ShyComments implements Serializable {
13 13  
14 14 private String content;
15   - private Integer page = 1;
16   - private Integer pageSize = 10;
  15 + private Integer page;
  16 + private Integer pageSize;
17 17 private String orderByClause;
18 18 private String start_date;
19 19 private String end_date;
... ... @@ -88,4 +88,17 @@ public class CommentsDTO extends ShyComments implements Serializable {
88 88 public void setEnd_date(String end_date) {
89 89 this.end_date = end_date;
90 90 }
  91 +
  92 + @Override
  93 + public String toString() {
  94 + return "CommentsDTO{" +
  95 + "content='" + content + '\'' +
  96 + ", page=" + page +
  97 + ", pageSize=" + pageSize +
  98 + ", orderByClause='" + orderByClause + '\'' +
  99 + ", start_date='" + start_date + '\'' +
  100 + ", end_date='" + end_date + '\'' +
  101 + ", userId='" + userId + '\'' +
  102 + "} " + super.toString();
  103 + }
91 104 }
... ...
src/main/java/com/cnlive/shenhe/dto/ContentDTO.java
  View file @49b472d
... ... @@ -12,8 +12,8 @@ import java.io.Serializable;
12 12 public class ContentDTO extends ShyContent implements Serializable {
13 13  
14 14 private String contentId;
15   - private Integer page = 1;
16   - private Integer pageSize = 10;
  15 + private Integer page;
  16 + private Integer pageSize;
17 17 private String orderByClause;
18 18 private String start_date;
19 19 private String end_date;
... ... @@ -100,4 +100,18 @@ public class ContentDTO extends ShyContent implements Serializable {
100 100 this.spid = spid;
101 101 this.userId = userId;
102 102 }
  103 +
  104 + @Override
  105 + public String toString() {
  106 + return "ContentDTO{" +
  107 + "contentId='" + contentId + '\'' +
  108 + ", page=" + page +
  109 + ", pageSize=" + pageSize +
  110 + ", orderByClause='" + orderByClause + '\'' +
  111 + ", start_date='" + start_date + '\'' +
  112 + ", end_date='" + end_date + '\'' +
  113 + ", spid=" + spid +
  114 + ", userId='" + userId + '\'' +
  115 + "} " + super.toString();
  116 + }
103 117 }
... ...
src/main/java/com/cnlive/shenhe/dto/EmailDTO.java
  View file @49b472d
... ... @@ -10,8 +10,9 @@ import java.io.Serializable;
10 10 * @create 2022-03-17 15:15
11 11 */
12 12 public class EmailDTO extends ShyEmail implements Serializable {
13   - private Integer page = 1;
14   - private Integer pageSize = 10;
  13 +
  14 + private Integer page;
  15 + private Integer pageSize;
15 16 private String orderByClause;
16 17  
17 18 public EmailDTO() {
... ... @@ -47,4 +48,12 @@ public class EmailDTO extends ShyEmail implements Serializable {
47 48 this.orderByClause = orderByClause;
48 49 }
49 50  
  51 + @Override
  52 + public String toString() {
  53 + return "EmailDTO{" +
  54 + "page=" + page +
  55 + ", pageSize=" + pageSize +
  56 + ", orderByClause='" + orderByClause + '\'' +
  57 + "} " + super.toString();
  58 + }
50 59 }
... ...
src/main/java/com/cnlive/shenhe/dto/LiveApplyDTO.java
  View file @49b472d
... ... @@ -11,10 +11,8 @@ import java.io.Serializable;
11 11 */
12 12 public class LiveApplyDTO extends ShyLiveapply implements Serializable {
13 13  
14   -
15   -
16   - private Integer page = 1;
17   - private Integer pageSize = 10;
  14 + private Integer page;
  15 + private Integer pageSize;
18 16 private String sp_desc;
19 17 private String orderByClause;
20 18 private Integer spid;
... ... @@ -100,5 +98,17 @@ public class LiveApplyDTO extends ShyLiveapply implements Serializable {
100 98 this.orderByClause = orderByClause;
101 99 }
102 100  
103   -
  101 + @Override
  102 + public String toString() {
  103 + return "LiveApplyDTO{" +
  104 + "page=" + page +
  105 + ", pageSize=" + pageSize +
  106 + ", sp_desc='" + sp_desc + '\'' +
  107 + ", orderByClause='" + orderByClause + '\'' +
  108 + ", spid=" + spid +
  109 + ", userId='" + userId + '\'' +
  110 + ", start_date='" + start_date + '\'' +
  111 + ", end_date='" + end_date + '\'' +
  112 + "} " + super.toString();
  113 + }
104 114 }
... ...
src/main/java/com/cnlive/shenhe/dto/LiveDTO.java
  View file @49b472d
... ... @@ -11,8 +11,8 @@ import java.io.Serializable;
11 11 */
12 12 public class LiveDTO extends ShyLive implements Serializable {
13 13  
14   - private Integer page = 1;
15   - private Integer pageSize = 10;
  14 + private Integer page;
  15 + private Integer pageSize;
16 16 private String sp_desc;
17 17 private Integer contentId;
18 18 private String orderByClause;
... ... @@ -107,4 +107,19 @@ public class LiveDTO extends ShyLive implements Serializable {
107 107 public void setEnd_date(String end_date) {
108 108 this.end_date = end_date;
109 109 }
  110 +
  111 + @Override
  112 + public String toString() {
  113 + return "LiveDTO{" +
  114 + "page=" + page +
  115 + ", pageSize=" + pageSize +
  116 + ", sp_desc='" + sp_desc + '\'' +
  117 + ", contentId=" + contentId +
  118 + ", orderByClause='" + orderByClause + '\'' +
  119 + ", spid=" + spid +
  120 + ", userId='" + userId + '\'' +
  121 + ", start_date='" + start_date + '\'' +
  122 + ", end_date='" + end_date + '\'' +
  123 + "} " + super.toString();
  124 + }
110 125 }
... ...
src/main/java/com/cnlive/shenhe/dto/NotSpeakDTO.java
  View file @49b472d
... ... @@ -11,9 +11,8 @@ import java.io.Serializable;
11 11 */
12 12 public class NotSpeakDTO extends ShyNotspeak implements Serializable {
13 13  
14   -
15   - private Integer page = 1;
16   - private Integer pageSize = 10;
  14 + private Integer page;
  15 + private Integer pageSize;
17 16 private String orderByClause;
18 17 private String userId;
19 18  
... ... @@ -58,4 +57,14 @@ public class NotSpeakDTO extends ShyNotspeak implements Serializable {
58 57 public void setOrderByClause(String orderByClause) {
59 58 this.orderByClause = orderByClause;
60 59 }
  60 +
  61 + @Override
  62 + public String toString() {
  63 + return "NotSpeakDTO{" +
  64 + "page=" + page +
  65 + ", pageSize=" + pageSize +
  66 + ", orderByClause='" + orderByClause + '\'' +
  67 + ", userId='" + userId + '\'' +
  68 + "} " + super.toString();
  69 + }
61 70 }
... ...
src/main/java/com/cnlive/shenhe/dto/ShyActivityDTO.java
  View file @49b472d
... ... @@ -12,10 +12,9 @@ import java.io.Serializable;
12 12  
13 13 public class ShyActivityDTO extends ShyActivity implements Serializable {
14 14  
  15 + private Integer pageNum;
15 16  
16   - private Integer pageNum = 1;
17   -
18   - private Integer pageSize = 10;
  17 + private Integer pageSize ;
19 18  
20 19  
21 20 public ShyActivityDTO(Integer pageNum, Integer pageSize) {
... ... @@ -27,7 +26,7 @@ public class ShyActivityDTO extends ShyActivity implements Serializable {
27 26 }
28 27  
29 28 public Integer getPageNum() {
30   - return pageNum;
  29 + return pageNum == null ? 1 : pageNum;
31 30 }
32 31  
33 32 public void setPageNum(Integer pageNum) {
... ... @@ -35,10 +34,12 @@ public class ShyActivityDTO extends ShyActivity implements Serializable {
35 34 }
36 35  
37 36 public Integer getPageSize() {
38   - return pageSize;
  37 + return pageSize == null ? 10 : pageSize;
39 38 }
40 39  
41 40 public void setPageSize(Integer pageSize) {
42 41 this.pageSize = pageSize;
43 42 }
  43 +
  44 +
44 45 }
... ...
src/main/java/com/cnlive/shenhe/dto/SitesDTO.java
  View file @49b472d
... ... @@ -10,8 +10,9 @@ import java.io.Serializable;
10 10 * @create 2022-03-17 16:19
11 11 */
12 12 public class SitesDTO extends ShySites implements Serializable {
13   - private Integer page = 1;
14   - private Integer pageSize = 10;
  13 +
  14 + private Integer page;
  15 + private Integer pageSize;
15 16 private String orderByClause;
16 17 private String keyword;
17 18 private Integer spId;
... ... @@ -73,4 +74,15 @@ public class SitesDTO extends ShySites implements Serializable {
73 74 public void setKeyword(String keyword) {
74 75 this.keyword = keyword;
75 76 }
  77 +
  78 + @Override
  79 + public String toString() {
  80 + return "SitesDTO{" +
  81 + "page=" + page +
  82 + ", pageSize=" + pageSize +
  83 + ", orderByClause='" + orderByClause + '\'' +
  84 + ", keyword='" + keyword + '\'' +
  85 + ", spId=" + spId +
  86 + "} " + super.toString();
  87 + }
76 88 }
... ...
src/main/java/com/cnlive/shenhe/dto/TopicDTO.java
  View file @49b472d
... ... @@ -12,8 +12,8 @@ import java.io.Serializable;
12 12 public class TopicDTO extends ShyTopic implements Serializable {
13 13  
14 14 private String topic_name;
15   - private Integer page = 1;
16   - private Integer pageSize = 10;
  15 + private Integer page;
  16 + private Integer pageSize;
17 17 private Integer receive;
18 18 private String orderByClause;
19 19 private String start_date;
... ... @@ -109,4 +109,19 @@ public class TopicDTO extends ShyTopic implements Serializable {
109 109 public void setOrderByClause(String orderByClause) {
110 110 this.orderByClause = orderByClause;
111 111 }
  112 +
  113 + @Override
  114 + public String toString() {
  115 + return "TopicDTO{" +
  116 + "topic_name='" + topic_name + '\'' +
  117 + ", page=" + page +
  118 + ", pageSize=" + pageSize +
  119 + ", receive=" + receive +
  120 + ", orderByClause='" + orderByClause + '\'' +
  121 + ", start_date='" + start_date + '\'' +
  122 + ", end_date='" + end_date + '\'' +
  123 + ", spid=" + spid +
  124 + ", userId='" + userId + '\'' +
  125 + "} " + super.toString();
  126 + }
112 127 }
... ...
src/main/java/com/cnlive/shenhe/dto/UsersDTO.java
  View file @49b472d
... ... @@ -10,8 +10,9 @@ import java.io.Serializable;
10 10 * @create 2022-03-17 16:27
11 11 */
12 12 public class UsersDTO extends ShyUsers implements Serializable {
13   - private Integer page = 1;
14   - private Integer pageSize = 10;
  13 +
  14 + private Integer page;
  15 + private Integer pageSize;
15 16 private String orderByClause;
16 17  
17 18 public UsersDTO() {
... ... @@ -47,4 +48,12 @@ public class UsersDTO extends ShyUsers implements Serializable {
47 48 this.orderByClause = orderByClause;
48 49 }
49 50  
  51 + @Override
  52 + public String toString() {
  53 + return "UsersDTO{" +
  54 + "page=" + page +
  55 + ", pageSize=" + pageSize +
  56 + ", orderByClause='" + orderByClause + '\'' +
  57 + "} " + super.toString();
  58 + }
50 59 }
... ...
src/main/java/com/cnlive/shenhe/dto/UsersFreeDTO.java
  View file @49b472d
... ... @@ -11,8 +11,8 @@ import java.io.Serializable;
11 11 */
12 12 public class UsersFreeDTO extends ShyUsersfree implements Serializable {
13 13  
14   - private Integer page = 1;
15   - private Integer pageSize = 10;
  14 + private Integer page;
  15 + private Integer pageSize;
16 16 private String orderByClause;
17 17 private String userId;
18 18 private Integer spid;
... ... @@ -67,4 +67,15 @@ public class UsersFreeDTO extends ShyUsersfree implements Serializable {
67 67 public void setUserId(String userId) {
68 68 this.userId = userId;
69 69 }
  70 +
  71 + @Override
  72 + public String toString() {
  73 + return "UsersFreeDTO{" +
  74 + "page=" + page +
  75 + ", pageSize=" + pageSize +
  76 + ", orderByClause='" + orderByClause + '\'' +
  77 + ", userId='" + userId + '\'' +
  78 + ", spid=" + spid +
  79 + "} " + super.toString();
  80 + }
70 81 }
... ...
src/main/java/com/cnlive/shenhe/dto/VideosDTO.java
  View file @49b472d
... ... @@ -11,9 +11,8 @@ import java.io.Serializable;
11 11 */
12 12 public class VideosDTO extends ShyVideos implements Serializable {
13 13  
14   -
15   - private Integer page = 1;
16   - private Integer pageSize = 10;
  14 + private Integer page;
  15 + private Integer pageSize;
17 16 private String orderByClause;
18 17 private String sp_desc;
19 18 private String sp_Id;
... ... @@ -119,4 +118,20 @@ public class VideosDTO extends ShyVideos implements Serializable {
119 118 public void setUserId(String userId) {
120 119 this.userId = userId;
121 120 }
  121 +
  122 + @Override
  123 + public String toString() {
  124 + return "VideosDTO{" +
  125 + "page=" + page +
  126 + ", pageSize=" + pageSize +
  127 + ", orderByClause='" + orderByClause + '\'' +
  128 + ", sp_desc='" + sp_desc + '\'' +
  129 + ", sp_Id='" + sp_Id + '\'' +
  130 + ", shen_auditor_id='" + shen_auditor_id + '\'' +
  131 + ", contentId=" + contentId +
  132 + ", start_date='" + start_date + '\'' +
  133 + ", end_date='" + end_date + '\'' +
  134 + ", userId='" + userId + '\'' +
  135 + "} " + super.toString();
  136 + }
122 137 }
... ...
src/main/java/com/cnlive/shenhe/entity/BootTest.java deleted 100644 → 0
  View file @d75edb8
1   -package com.cnlive.shenhe.entity;
2   -
3   -import javax.persistence.*;
4   -
5   -@Table(name = "boot_test")
6   -public class BootTest {
7   - @Id
8   - private Integer id;
9   -
10   - private String name;
11   -
12   - private Integer age;
13   -
14   - private String address;
15   -
16   - private String hobby;
17   -
18   - /**
19   - * @return id
20   - */
21   - public Integer getId() {
22   - return id;
23   - }
24   -
25   - /**
26   - * @param id
27   - */
28   - public void setId(Integer id) {
29   - this.id = id;
30   - }
31   -
32   - /**
33   - * @return name
34   - */
35   - public String getName() {
36   - return name;
37   - }
38   -
39   - /**
40   - * @param name
41   - */
42   - public void setName(String name) {
43   - this.name = name;
44   - }
45   -
46   - /**
47   - * @return age
48   - */
49   - public Integer getAge() {
50   - return age;
51   - }
52   -
53   - /**
54   - * @param age
55   - */
56   - public void setAge(Integer age) {
57   - this.age = age;
58   - }
59   -
60   - /**
61   - * @return address
62   - */
63   - public String getAddress() {
64   - return address;
65   - }
66   -
67   - /**
68   - * @param address
69   - */
70   - public void setAddress(String address) {
71   - this.address = address;
72   - }
73   -
74   - /**
75   - * @return hobby
76   - */
77   - public String getHobby() {
78   - return hobby;
79   - }
80   -
81   - /**
82   - * @param hobby
83   - */
84   - public void setHobby(String hobby) {
85   - this.hobby = hobby;
86   - }
87   -}
88 0 \ No newline at end of file
src/main/java/com/cnlive/shenhe/entity/ShyActivity.java
  View file @49b472d
1 1 package com.cnlive.shenhe.entity;
2 2  
  3 +import javax.persistence.Id;
  4 +import javax.persistence.Table;
3 5 import java.util.Date;
4   -import javax.persistence.*;
5 6  
6 7 @Table(name = "shy_activity")
7 8 public class ShyActivity {
... ... @@ -110,4 +111,14 @@ public class ShyActivity {
110 111 this.exempt_from_trial = exempt_from_trial;
111 112 }
112 113  
  114 + @Override
  115 + public String toString() {
  116 + return "ShyActivity{" +
  117 + "id=" + id +
  118 + ", activity='" + activity + '\'' +
  119 + ", create_time=" + create_time +
  120 + ", update_time=" + update_time +
  121 + ", exempt_from_trial=" + exempt_from_trial +
  122 + '}';
  123 + }
113 124 }
114 125 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyAudio.java
  View file @49b472d
1 1 package com.cnlive.shenhe.entity;
2 2  
  3 +import javax.persistence.Column;
  4 +import javax.persistence.Id;
  5 +import javax.persistence.Table;
  6 +import javax.persistence.Transient;
3 7 import java.util.Date;
4   -import javax.persistence.*;
5 8  
6 9 @Table(name = "shy_audio")
7 10 public class ShyAudio {
... ... @@ -708,4 +711,41 @@ public class ShyAudio {
708 711 public void setSpid_desc(String spid_desc) {
709 712 this.spid_desc = spid_desc;
710 713 }
  714 +
  715 + @Override
  716 + public String toString() {
  717 + return "ShyAudio{" +
  718 + "id=" + id +
  719 + ", multiplecategory='" + multiplecategory + '\'' +
  720 + ", audioClipsName='" + audioClipsName + '\'' +
  721 + ", soure=" + soure +
  722 + ", audioId='" + audioId + '\'' +
  723 + ", audioTitle='" + audioTitle + '\'' +
  724 + ", audioUrl='" + audioUrl + '\'' +
  725 + ", audioCoverUrl='" + audioCoverUrl + '\'' +
  726 + ", audioIntro='" + audioIntro + '\'' +
  727 + ", audioTag='" + audioTag + '\'' +
  728 + ", audioKeyword='" + audioKeyword + '\'' +
  729 + ", uploadTime=" + uploadTime +
  730 + ", priority=" + priority +
  731 + ", callback='" + callback + '\'' +
  732 + ", spId=" + spId +
  733 + ", bucketName='" + bucketName + '\'' +
  734 + ", bucketType=" + bucketType +
  735 + ", duration=" + duration +
  736 + ", uploader='" + uploader + '\'' +
  737 + ", contactInfo='" + contactInfo + '\'' +
  738 + ", extendField='" + extendField + '\'' +
  739 + ", auditor_id='" + auditor_id + '\'' +
  740 + ", attr_tags='" + attr_tags + '\'' +
  741 + ", msg='" + msg + '\'' +
  742 + ", shenhe_type=" + shenhe_type +
  743 + ", state=" + state +
  744 + ", createTime=" + createTime +
  745 + ", updateTime=" + updateTime +
  746 + ", receive=" + receive +
  747 + ", receive_user_id='" + receive_user_id + '\'' +
  748 + ", spid_desc='" + spid_desc + '\'' +
  749 + '}';
  750 + }
711 751 }
712 752 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyChannel.java
  View file @49b472d
... ... @@ -334,5 +334,25 @@ public class ShyChannel {
334 334 public void setSp_desc(String sp_desc) {
335 335 this.sp_desc = sp_desc;
336 336 }
337   -
  337 +
  338 + @Override
  339 + public String toString() {
  340 + return "ShyChannel{" +
  341 + "id=" + id +
  342 + ", sp_id=" + sp_id +
  343 + ", channel_id='" + channel_id + '\'' +
  344 + ", channel_name='" + channel_name + '\'' +
  345 + ", channel_img='" + channel_img + '\'' +
  346 + ", callback='" + callback + '\'' +
  347 + ", updater='" + updater + '\'' +
  348 + ", auditor='" + auditor + '\'' +
  349 + ", shenhe_type=" + shenhe_type +
  350 + ", shenhe_status=" + shenhe_status +
  351 + ", shenhe_msg='" + shenhe_msg + '\'' +
  352 + ", offline=" + offline +
  353 + ", created_at=" + created_at +
  354 + ", updated_at=" + updated_at +
  355 + ", sp_desc='" + sp_desc + '\'' +
  356 + '}';
  357 + }
338 358 }
339 359 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyComments.java
  View file @49b472d
... ... @@ -609,5 +609,38 @@ public class ShyComments {
609 609 public void setSpid_desc(String spid_desc) {
610 610 this.spid_desc = spid_desc;
611 611 }
612   -
  612 +
  613 + @Override
  614 + public String toString() {
  615 + return "ShyComments{" +
  616 + "id=" + id +
  617 + ", comment_content='" + comment_content + '\'' +
  618 + ", comment_user_id=" + comment_user_id +
  619 + ", program_id='" + program_id + '\'' +
  620 + ", activity_id='" + activity_id + '\'' +
  621 + ", platform='" + platform + '\'' +
  622 + ", comment_title='" + comment_title + '\'' +
  623 + ", comment_time=" + comment_time +
  624 + ", type='" + type + '\'' +
  625 + ", level=" + level +
  626 + ", spid=" + spid +
  627 + ", app_id='" + app_id + '\'' +
  628 + ", comment_original_url='" + comment_original_url + '\'' +
  629 + ", shenhe_type=" + shenhe_type +
  630 + ", updater='" + updater + '\'' +
  631 + ", auditor_id='" + auditor_id + '\'' +
  632 + ", callback='" + callback + '\'' +
  633 + ", is_hot=" + is_hot +
  634 + ", msg='" + msg + '\'' +
  635 + ", state=" + state +
  636 + ", comment_user_name='" + comment_user_name + '\'' +
  637 + ", comment_user_avatar='" + comment_user_avatar + '\'' +
  638 + ", comment_user_ip='" + comment_user_ip + '\'' +
  639 + ", created_at=" + created_at +
  640 + ", updated_at=" + updated_at +
  641 + ", receive=" + receive +
  642 + ", receive_user_id='" + receive_user_id + '\'' +
  643 + ", spid_desc='" + spid_desc + '\'' +
  644 + '}';
  645 + }
613 646 }
614 647 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyContent.java
  View file @49b472d
... ... @@ -517,4 +517,33 @@ public class ShyContent {
517 517 public void setContent_text(String content_text) {
518 518 this.content_text = content_text;
519 519 }
  520 +
  521 + @Override
  522 + public String toString() {
  523 + return "ShyContent{" +
  524 + "id=" + id +
  525 + ", content_id='" + content_id + '\'' +
  526 + ", sp_id=" + sp_id +
  527 + ", title_image='" + title_image + '\'' +
  528 + ", content_tag='" + content_tag + '\'' +
  529 + ", content_url='" + content_url + '\'' +
  530 + ", content_pc_url='" + content_pc_url + '\'' +
  531 + ", shenhe_type=" + shenhe_type +
  532 + ", content_status=" + content_status +
  533 + ", callback='" + callback + '\'' +
  534 + ", source='" + source + '\'' +
  535 + ", author='" + author + '\'' +
  536 + ", video_id='" + video_id + '\'' +
  537 + ", content_time=" + content_time +
  538 + ", create_date=" + create_date +
  539 + ", last_update=" + last_update +
  540 + ", receive_status=" + receive_status +
  541 + ", auditor_id='" + auditor_id + '\'' +
  542 + ", updater='" + updater + '\'' +
  543 + ", shenhe_msg='" + shenhe_msg + '\'' +
  544 + ", title='" + title + '\'' +
  545 + ", sp_desc='" + sp_desc + '\'' +
  546 + ", content_text='" + content_text + '\'' +
  547 + '}';
  548 + }
520 549 }
521 550 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyEmail.java
  View file @49b472d
... ... @@ -223,6 +223,20 @@ public class ShyEmail {
223 223 public void setEmail_type_name(String email_type_name) {
224 224 this.email_type_name = email_type_name;
225 225 }
226   -
227   -
  226 +
  227 + @Override
  228 + public String toString() {
  229 + return "ShyEmail{" +
  230 + "id=" + id +
  231 + ", email='" + email + '\'' +
  232 + ", remark='" + remark + '\'' +
  233 + ", notice_type='" + notice_type + '\'' +
  234 + ", is_enable=" + is_enable +
  235 + ", is_delete=" + is_delete +
  236 + ", updater='" + updater + '\'' +
  237 + ", created_at=" + created_at +
  238 + ", updated_at=" + updated_at +
  239 + ", email_type_name='" + email_type_name + '\'' +
  240 + '}';
  241 + }
228 242 }
229 243 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyLive.java
  View file @49b472d
... ... @@ -708,5 +708,42 @@ public class ShyLive {
708 708 public void setSpid_desc(String spid_desc) {
709 709 this.spid_desc = spid_desc;
710 710 }
711   -
  711 +
  712 + @Override
  713 + public String toString() {
  714 + return "ShyLive{" +
  715 + "id=" + id +
  716 + ", sp_id=" + sp_id +
  717 + ", channel_id='" + channel_id + '\'' +
  718 + ", activity_id='" + activity_id + '\'' +
  719 + ", activity_name='" + activity_name + '\'' +
  720 + ", activity_status=" + activity_status +
  721 + ", pre_start_time=" + pre_start_time +
  722 + ", pre_end_time=" + pre_end_time +
  723 + ", activity_start_time=" + activity_start_time +
  724 + ", activity_end_time=" + activity_end_time +
  725 + ", live_type='" + live_type + '\'' +
  726 + ", activity_intro='" + activity_intro + '\'' +
  727 + ", m3u8_url='" + m3u8_url + '\'' +
  728 + ", rtmp_url='" + rtmp_url + '\'' +
  729 + ", callback='" + callback + '\'' +
  730 + ", cover_img_url='" + cover_img_url + '\'' +
  731 + ", playback_url='" + playback_url + '\'' +
  732 + ", is_hot=" + is_hot +
  733 + ", shenhe_type=" + shenhe_type +
  734 + ", shenhe_state=" + shenhe_state +
  735 + ", updater='" + updater + '\'' +
  736 + ", auditor='" + auditor + '\'' +
  737 + ", shenhe_msg='" + shenhe_msg + '\'' +
  738 + ", avsample_state=" + avsample_state +
  739 + ", avsample_start_time=" + avsample_start_time +
  740 + ", avsample_end_time=" + avsample_end_time +
  741 + ", is_show=" + is_show +
  742 + ", created_at=" + created_at +
  743 + ", updated_at=" + updated_at +
  744 + ", avsample_imgs='" + avsample_imgs + '\'' +
  745 + ", avsample_msg='" + avsample_msg + '\'' +
  746 + ", spid_desc='" + spid_desc + '\'' +
  747 + '}';
  748 + }
712 749 }
713 750 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyLiveapply.java
  View file @49b472d
... ... @@ -729,5 +729,42 @@ public class ShyLiveapply {
729 729 public void setSpid_desc(String spid_desc) {
730 730 this.spid_desc = spid_desc;
731 731 }
732   -
  732 +
  733 + @Override
  734 + public String toString() {
  735 + return "ShyLiveapply{" +
  736 + "id=" + id +
  737 + ", activity_id='" + activity_id + '\'' +
  738 + ", channel_id='" + channel_id + '\'' +
  739 + ", sp_id=" + sp_id +
  740 + ", sender='" + sender + '\'' +
  741 + ", mobile='" + mobile + '\'' +
  742 + ", organization='" + organization + '\'' +
  743 + ", theme='" + theme + '\'' +
  744 + ", live_type='" + live_type + '\'' +
  745 + ", pre_start_time=" + pre_start_time +
  746 + ", pre_end_time=" + pre_end_time +
  747 + ", business_model=" + business_model +
  748 + ", content_property=" + content_property +
  749 + ", point_key='" + point_key + '\'' +
  750 + ", live_place='" + live_place + '\'' +
  751 + ", push_url='" + push_url + '\'' +
  752 + ", pull_url='" + pull_url + '\'' +
  753 + ", pull_source='" + pull_source + '\'' +
  754 + ", platforms='" + platforms + '\'' +
  755 + ", callback='" + callback + '\'' +
  756 + ", shenhe_type=" + shenhe_type +
  757 + ", receive=" + receive +
  758 + ", shenhe_state=" + shenhe_state +
  759 + ", updater='" + updater + '\'' +
  760 + ", auditor='" + auditor + '\'' +
  761 + ", shenhe_msg='" + shenhe_msg + '\'' +
  762 + ", email_notice_state=" + email_notice_state +
  763 + ", email_notice_msg='" + email_notice_msg + '\'' +
  764 + ", created_at=" + created_at +
  765 + ", updated_at=" + updated_at +
  766 + ", simple_content='" + simple_content + '\'' +
  767 + ", spid_desc='" + spid_desc + '\'' +
  768 + '}';
  769 + }
733 770 }
734 771 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyNotspeak.java
  View file @49b472d
... ... @@ -354,5 +354,26 @@ public class ShyNotspeak {
354 354 public void setSpid_desc(String spid_desc) {
355 355 this.spid_desc = spid_desc;
356 356 }
357   -
  357 +
  358 + @Override
  359 + public String toString() {
  360 + return "ShyNotspeak{" +
  361 + "id=" + id +
  362 + ", user_name='" + user_name + '\'' +
  363 + ", user_id=" + user_id +
  364 + ", user_avatar='" + user_avatar + '\'' +
  365 + ", sp_id=" + sp_id +
  366 + ", state=" + state +
  367 + ", start_time=" + start_time +
  368 + ", time=" + time +
  369 + ", end_time=" + end_time +
  370 + ", count=" + count +
  371 + ", created_at=" + created_at +
  372 + ", updated_at=" + updated_at +
  373 + ", updater='" + updater + '\'' +
  374 + ", auditor='" + auditor + '\'' +
  375 + ", msg='" + msg + '\'' +
  376 + ", spid_desc='" + spid_desc + '\'' +
  377 + '}';
  378 + }
358 379 }
359 380 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShySites.java
  View file @49b472d
... ... @@ -165,5 +165,19 @@ public class ShySites {
165 165 public void setWrite_business_name(String write_business_name) {
166 166 this.write_business_name = write_business_name;
167 167 }
168   -
  168 +
  169 + @Override
  170 + public String toString() {
  171 + return "ShySites{" +
  172 + "id=" + id +
  173 + ", name='" + name + '\'' +
  174 + ", company='" + company + '\'' +
  175 + ", created_at=" + created_at +
  176 + ", updated_at=" + updated_at +
  177 + ", spid=" + spid +
  178 + ", appid='" + appid + '\'' +
  179 + ", write_business='" + write_business + '\'' +
  180 + ", write_business_name='" + write_business_name + '\'' +
  181 + '}';
  182 + }
169 183 }
170 184 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyTopic.java
  View file @49b472d
... ... @@ -387,5 +387,27 @@ public class ShyTopic {
387 387 public void setSp_desc(String sp_desc) {
388 388 this.sp_desc = sp_desc;
389 389 }
390   -
  390 +
  391 + @Override
  392 + public String toString() {
  393 + return "ShyTopic{" +
  394 + "id=" + id +
  395 + ", topic_id='" + topic_id + '\'' +
  396 + ", sp_id=" + sp_id +
  397 + ", topic_image='" + topic_image + '\'' +
  398 + ", topic_tag='" + topic_tag + '\'' +
  399 + ", topic_url='" + topic_url + '\'' +
  400 + ", topic_time='" + topic_time + '\'' +
  401 + ", shenhe_type=" + shenhe_type +
  402 + ", shenhe_status=" + shenhe_status +
  403 + ", create_date=" + create_date +
  404 + ", update_date=" + update_date +
  405 + ", auditor_id='" + auditor_id + '\'' +
  406 + ", updater='" + updater + '\'' +
  407 + ", shenhe_msg='" + shenhe_msg + '\'' +
  408 + ", title='" + title + '\'' +
  409 + ", topic_text='" + topic_text + '\'' +
  410 + ", sp_desc='" + sp_desc + '\'' +
  411 + '}';
  412 + }
391 413 }
392 414 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyUsers.java
  View file @49b472d
1 1 package com.cnlive.shenhe.entity;
2 2  
  3 +import javax.persistence.Id;
  4 +import javax.persistence.Table;
  5 +import javax.persistence.Transient;
3 6 import java.util.Date;
4   -import javax.persistence.*;
5 7  
6 8 @Table(name = "shy_users")
7 9 public class ShyUsers {
... ... @@ -333,5 +335,26 @@ public class ShyUsers {
333 335 public void setSp_desc(String sp_desc) {
334 336 this.sp_desc = sp_desc;
335 337 }
336   -
  338 +
  339 + @Override
  340 + public String toString() {
  341 + return "ShyUsers{" +
  342 + "id=" + id +
  343 + ", user_id='" + user_id + '\'' +
  344 + ", username='" + username + '\'' +
  345 + ", email='" + email + '\'' +
  346 + ", master=" + master +
  347 + ", mobile='" + mobile + '\'' +
  348 + ", sp_id=" + sp_id +
  349 + ", company_brief='" + company_brief + '\'' +
  350 + ", company_name='" + company_name + '\'' +
  351 + ", state=" + state +
  352 + ", notice_show='" + notice_show + '\'' +
  353 + ", created_at=" + created_at +
  354 + ", updated_at=" + updated_at +
  355 + ", tm=" + tm +
  356 + ", user_logo='" + user_logo + '\'' +
  357 + ", sp_desc='" + sp_desc + '\'' +
  358 + '}';
  359 + }
337 360 }
338 361 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyUsersfree.java
  View file @49b472d
1 1 package com.cnlive.shenhe.entity;
2 2  
  3 +import javax.persistence.Id;
  4 +import javax.persistence.Table;
  5 +import javax.persistence.Transient;
3 6 import java.util.Date;
4   -import javax.persistence.*;
5 7  
6 8 @Table(name = "shy_usersfree")
7 9 public class ShyUsersfree {
... ... @@ -295,6 +297,24 @@ public class ShyUsersfree {
295 297 public void setCategory_name(String category_name) {
296 298 this.category_name = category_name;
297 299 }
298   -
299   -
  300 +
  301 + @Override
  302 + public String toString() {
  303 + return "ShyUsersfree{" +
  304 + "id=" + id +
  305 + ", user_id='" + user_id + '\'' +
  306 + ", user_name='" + user_name + '\'' +
  307 + ", mobile='" + mobile + '\'' +
  308 + ", email='" + email + '\'' +
  309 + ", sp_id=" + sp_id +
  310 + ", category='" + category + '\'' +
  311 + ", is_enable=" + is_enable +
  312 + ", sp_desc='" + sp_desc + '\'' +
  313 + ", category_name='" + category_name + '\'' +
  314 + ", is_delete=" + is_delete +
  315 + ", updater='" + updater + '\'' +
  316 + ", created_at=" + created_at +
  317 + ", updated_at=" + updated_at +
  318 + '}';
  319 + }
300 320 }
301 321 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyVideofilter.java
  View file @49b472d
1 1 package com.cnlive.shenhe.entity;
2 2  
  3 +import javax.persistence.Id;
  4 +import javax.persistence.Table;
3 5 import java.util.Date;
4   -import javax.persistence.*;
5 6  
6 7 @Table(name = "shy_videofilter")
7 8 public class ShyVideofilter {
... ... @@ -182,4 +183,18 @@ public class ShyVideofilter {
182 183 public void setCreated_at(Date created_at) {
183 184 this.created_at = created_at;
184 185 }
  186 +
  187 + @Override
  188 + public String toString() {
  189 + return "ShyVideofilter{" +
  190 + "id=" + id +
  191 + ", videos_id=" + videos_id +
  192 + ", token_id='" + token_id + '\'' +
  193 + ", channel='" + channel + '\'' +
  194 + ", result_type='" + result_type + '\'' +
  195 + ", desc_msg='" + desc_msg + '\'' +
  196 + ", duration=" + duration +
  197 + ", created_at=" + created_at +
  198 + '}';
  199 + }
185 200 }
186 201 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
  View file @49b472d
1 1 package com.cnlive.shenhe.entity;
2 2  
  3 +import javax.persistence.Id;
  4 +import javax.persistence.Table;
  5 +import javax.persistence.Transient;
3 6 import java.util.Date;
4   -import javax.persistence.*;
5 7  
6 8 @Table(name = "shy_videos")
7 9 public class ShyVideos {
... ... @@ -756,4 +758,45 @@ public class ShyVideos {
756 758 public void setSpid_desc(String spid_desc) {
757 759 this.spid_desc = spid_desc;
758 760 }
  761 +
  762 + @Override
  763 + public String toString() {
  764 + return "ShyVideos{" +
  765 + "id=" + id +
  766 + ", video_title='" + video_title + '\'' +
  767 + ", spid=" + spid +
  768 + ", spid_desc='" + spid_desc + '\'' +
  769 + ", video_url='" + video_url + '\'' +
  770 + ", video_poster='" + video_poster + '\'' +
  771 + ", video_imgs='" + video_imgs + '\'' +
  772 + ", video_tags='" + video_tags + '\'' +
  773 + ", updater='" + updater + '\'' +
  774 + ", auditor_id='" + auditor_id + '\'' +
  775 + ", callback='" + callback + '\'' +
  776 + ", video_priority='" + video_priority + '\'' +
  777 + ", attr_tags='" + attr_tags + '\'' +
  778 + ", msg='" + msg + '\'' +
  779 + ", shenhe_type=" + shenhe_type +
  780 + ", state=" + state +
  781 + ", video_upload_time=" + video_upload_time +
  782 + ", video_keyword='" + video_keyword + '\'' +
  783 + ", video_desc='" + video_desc + '\'' +
  784 + ", video_id='" + video_id + '\'' +
  785 + ", created_at=" + created_at +
  786 + ", updated_at=" + updated_at +
  787 + ", receive=" + receive +
  788 + ", receive_user_id='" + receive_user_id + '\'' +
  789 + ", avsample=" + avsample +
  790 + ", task_id='" + task_id + '\'' +
  791 + ", bucket='" + bucket + '\'' +
  792 + ", plat=" + plat +
  793 + ", duration=" + duration +
  794 + ", category='" + category + '\'' +
  795 + ", video_user_id='" + video_user_id + '\'' +
  796 + ", source='" + source + '\'' +
  797 + ", video_md5='" + video_md5 + '\'' +
  798 + ", avsample_imgs='" + avsample_imgs + '\'' +
  799 + ", avsample_msg='" + avsample_msg + '\'' +
  800 + '}';
  801 + }
759 802 }
760 803 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/entity/ShyYidun.java
  View file @49b472d
... ... @@ -233,18 +233,21 @@ public class ShyYidun {
233 233 public ShyYidun() {
234 234 }
235 235  
236   -// public ShyYidun(String id, String content_id, String url, String result_type, String desc_msg, Integer duration, Date create_time, Date update_time
237   -// , Integer check_type, String task_id) {
238   -// this.id = id;
239   -// this.content_id = content_id;
240   -// this.url = url;
241   -// this.result_type = result_type;
242   -// this.desc_msg = desc_msg;
243   -// this.duration = duration;
244   -// this.create_time = create_time;
245   -// this.update_time = update_time;
246   -// this.check_type = check_type;
247   -// this.task_id = task_id;
248   -// }
249   -
  236 + @Override
  237 + public String toString() {
  238 + return "ShyYidun{" +
  239 + "id='" + id + '\'' +
  240 + ", content_id='" + content_id + '\'' +
  241 + ", url='" + url + '\'' +
  242 + ", result_type='" + result_type + '\'' +
  243 + ", desc_msg='" + desc_msg + '\'' +
  244 + ", duration=" + duration +
  245 + ", create_time=" + create_time +
  246 + ", update_time=" + update_time +
  247 + ", task_id='" + task_id + '\'' +
  248 + ", data_id='" + data_id + '\'' +
  249 + ", check_type=" + check_type +
  250 + ", check_status=" + check_status +
  251 + '}';
  252 + }
250 253 }
251 254 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/mapper/BootTestMapper.java deleted 100644 → 0
  View file @d75edb8
1   -package com.cnlive.shenhe.mapper;
2   -
3   -import com.cnlive.shenhe.entity.BootTest;
4   -import tk.mybatis.mapper.common.Mapper;
5   -
6   -public interface BootTestMapper extends Mapper<BootTest> {
7   -}
8 0 \ No newline at end of file
src/main/java/com/cnlive/shenhe/serviceImpl/BootTestServiceImpl.java deleted 100644 → 0
  View file @d75edb8
1   -package com.cnlive.shenhe.serviceImpl;
2   -import com.google.common.collect.Lists;
3   -
4   -import com.cnlive.shenhe.entity.BootTest;
5   -import com.cnlive.shenhe.mapper.BootTestMapper;
6   -import com.cnlive.shenhe.utils.CommonUtils;
7   -import com.github.pagehelper.Page;
8   -import com.github.pagehelper.PageHelper;
9   -import com.github.pagehelper.PageInfo;
10   -import org.springframework.beans.factory.annotation.Autowired;
11   -import org.springframework.stereotype.Service;
12   -
13   -import java.util.List;
14   -
15   -/**
16   - * @Author: yanzhaowang
17   - * @Date: 2022/3/4 13:38
18   - */
19   -@Service
20   -public class BootTestServiceImpl {
21   -
22   - @Autowired
23   - BootTestMapper bootTestMapper;
24   -
25   - /**
26   - *根据主键查询对象
27   - * @param boottestid
28   - * @return
29   - */
30   - public BootTest selectByid(String boottestid) {
31   -
32   - if (CommonUtils.isEmpty(boottestid)) {
33   - return null;
34   - }
35   - BootTest bootTest = bootTestMapper.selectByPrimaryKey(boottestid);
36   -
37   - return bootTest;
38   - }
39   -
40   - /**
41   - * 查询所有的数据
42   - * @return
43   - */
44   - public List<BootTest> selectAll(int pagesaiz, int pagenum){
45   -// PageInfo pageInfo = new PageInfo();
46   -// pageInfo.setSize(pagesaiz);
47   -// pageInfo.setPageNum(pagenum);
48   -// PageHelper pageHelper = new PageHelper();
49   - List<BootTest> bootTestList = bootTestMapper.selectAll();
50   -// pageInfo.setList(bootTestList);
51   - return bootTestList;
52   - }
53   -
54   - /**
55   - * 添加一个对象
56   - * @param bootTest
57   - * @return
58   - */
59   - public int addBootTest(BootTest bootTest) {
60   - Integer age = bootTest.getAge();
61   - if (age >= 18 && age <= 60) {
62   - int i = bootTestMapper.insertSelective(bootTest);
63   - return i;
64   - }
65   - return 0;
66   - }
67   -
68   - /**
69   - * 根据主键删除一个对象
70   - * @param boottestid
71   - * @return
72   - */
73   - public int deleteBootTest(String boottestid){
74   - if (boottestid == null) {
75   - return 0;
76   - }
77   - int i = bootTestMapper.deleteByPrimaryKey(boottestid);
78   - return i;
79   - }
80   -
81   - /**
82   - * 根据条件修改对象
83   - * @return
84   - */
85   - public int updateBootTest(BootTest bootTest){
86   - if (bootTest != null) {
87   - int i = bootTestMapper.updateByPrimaryKeySelective(bootTest);
88   - return i;
89   - }
90   - return 0;
91   -
92   - }
93   -}
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
  View file @49b472d
... ... @@ -290,7 +290,7 @@ public class ContentServiceImpl {
290 290 String[] cids = ids.split(",");
291 291 for (String cid : cids) {
292 292 ShyContent shyContent = shyContentMapper.selectByPrimaryKey(Integer.parseInt(cid));
293   - if (CommonUtils.isNotNull(shyContent) && shyContent.getReceive_status() == CommonConst.RECEIVE_BEFORE) {
  293 + if (CommonUtils.isNotNull(shyContent) && shyContent.getReceive_status().equals(CommonConst.RECEIVE_BEFORE)) {
294 294 shyContent.setAuditor_id(userId);
295 295 shyContent.setReceive_status(CommonConst.RECEIVE_AFTER);
296 296 shyContent.setLast_update(CommonUtils.getCurrentTime());
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
  View file @49b472d
... ... @@ -173,7 +173,7 @@ public class LiveApplyServiceImpl {
173 173 String[] cids = ids.split(",");
174 174 for (String cid : cids) {
175 175 ShyLiveapply shyLiveapply = shyLiveApplyMapper.selectByPrimaryKey(Integer.parseInt(cid));
176   - if (CommonUtils.isNotNull(shyLiveapply) && shyLiveapply.getShenhe_state() == CommonConst.RECEIVE_BEFORE ) {
  176 + if (CommonUtils.isNotNull(shyLiveapply) && shyLiveapply.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
177 177 shyLiveapply.setAuditor(userId);;
178 178 shyLiveapply.setShenhe_state(CommonConst.AUDIT_INTT);
179 179 shyLiveapply.setReceive(CommonConst.RECEIVE_AFTER);
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/LiveServiceImpl.java
  View file @49b472d
... ... @@ -157,7 +157,7 @@ public class LiveServiceImpl {
157 157 String[] cids = ids.split(",");
158 158 for (String cid : cids) {
159 159 ShyLive shyLive = shyLiveMapper.selectByPrimaryKey(Integer.parseInt(cid));
160   - if (CommonUtils.isNotNull(shyLive) && shyLive.getShenhe_state() == CommonConst.RECEIVE_BEFORE ) {
  160 + if (CommonUtils.isNotNull(shyLive) && shyLive.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
161 161 shyLive.setAuditor(userId);;
162 162 shyLive.setShenhe_state(CommonConst.RECEIVE_AFTER);
163 163 shyLiveMapper.updateByPrimaryKeySelective(shyLive);
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @49b472d
... ... @@ -231,7 +231,7 @@ public class VideosServiceImpl {
231 231 String[] cids = ids.split(",");
232 232 for (String cid : cids) {
233 233 ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(Integer.parseInt(cid));
234   - if (CommonUtils.isNotNull(shyVideos) && shyVideos.getState() == CommonConst.AUDIT_INTT && shyVideos.getReceive() == CommonConst.RECEIVE_BEFORE) {
  234 + if (CommonUtils.isNotNull(shyVideos) && shyVideos.getState().equals(CommonConst.AUDIT_INTT) && shyVideos.getReceive().equals(CommonConst.RECEIVE_BEFORE)) {
235 235 shyVideos.setReceive_user_id(userId);
236 236 shyVideos.setReceive(CommonConst.RECEIVE_AFTER);
237 237 shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
... ...
src/main/java/com/cnlive/shenhe/utils/InfoUtil.java
  View file @49b472d
... ... @@ -136,6 +136,7 @@ public class InfoUtil {
136 136 // 为更新按钮增加相应的事件
137 137 desktop = Desktop.getDesktop();
138 138 sure.addMouseListener(new MouseAdapter() {
  139 + @Override
139 140 public void mouseClicked(MouseEvent e) {
140 141 //注释代码为点击确认之后跳转到指定网页
141 142 try {
... ... @@ -146,24 +147,29 @@ public class InfoUtil {
146 147 tw.close();
147 148 }
148 149  
  150 + @Override
149 151 public void mouseEntered(MouseEvent e) {
150 152 sure.setBorder(BorderFactory.createLineBorder(Color.gray));
151 153 }
152 154  
  155 + @Override
153 156 public void mouseExited(MouseEvent e) {
154 157 sure.setBorder(null);
155 158 }
156 159 });
157 160 // 右上角关闭按钮事件
158 161 close.addMouseListener(new MouseAdapter() {
  162 + @Override
159 163 public void mouseClicked(MouseEvent e) {
160 164 tw.close();
161 165 }
162 166  
  167 + @Override
163 168 public void mouseEntered(MouseEvent e) {
164 169 close.setBorder(BorderFactory.createLineBorder(Color.gray));
165 170 }
166 171  
  172 + @Override
167 173 public void mouseExited(MouseEvent e) {
168 174 close.setBorder(null);
169 175 }
... ...
src/main/resources/mapper/BootTestMapper.xml deleted 100644 → 0
  View file @d75edb8
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.BootTestMapper">
4   - <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.BootTest">
5   - <!--
6   - WARNING - @mbg.generated
7   - -->
8   - <id column="id" jdbcType="INTEGER" property="id" />
9   - <result column="name" jdbcType="VARCHAR" property="name" />
10   - <result column="age" jdbcType="INTEGER" property="age" />
11   - <result column="address" jdbcType="VARCHAR" property="address" />
12   - <result column="hobby" jdbcType="VARCHAR" property="hobby" />
13   - </resultMap>
14   -</mapper>
15 0 \ No newline at end of file
src/main/resources/mapper/ShyYidunMapper.xml 0 → 100644
  View file @49b472d
  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.ShyYidunMapper">
  4 + <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.ShyYidun">
  5 + <!--
  6 + WARNING - @mbg.generated
  7 + -->
  8 + <id column="id" jdbcType="VARCHAR" property="id" />
  9 + <result column="content_id" jdbcType="VARCHAR" property="content_id" />
  10 + <result column="url" jdbcType="VARCHAR" property="url" />
  11 + <result column="result_type" jdbcType="VARCHAR" property="result_type" />
  12 + <result column="desc_msg" jdbcType="VARCHAR" property="desc_msg" />
  13 + <result column="duration" jdbcType="INTEGER" property="duration" />
  14 + <result column="create_time" jdbcType="TIMESTAMP" property="create_time" />
  15 + <result column="update_time" jdbcType="TIMESTAMP" property="update_time" />
  16 + <result column="task_id" jdbcType="VARCHAR" property="task_id" />
  17 + <result column="data_id" jdbcType="VARCHAR" property="data_id" />
  18 + <result column="check_type" jdbcType="INTEGER" property="check_type" />
  19 + <result column="check_status" jdbcType="INTEGER" property="check_status" />
  20 + </resultMap>
  21 +</mapper>
0 22 \ No newline at end of file
... ...