Commit a29d6253179688cde76c491ce598d4af759a7a34

Authored by 王言钊
1 parent 0ec1ebad

开发音频、频道service接口

Showing 54 changed files with 345 additions and 85 deletions
src/main/java/com/cnlive/shenhe/api/AudioControllerApi.java
@@ -7,8 +7,8 @@ import com.cnlive.shenhe.bean.ResponseBean; @@ -7,8 +7,8 @@ import com.cnlive.shenhe.bean.ResponseBean;
7 import com.cnlive.shenhe.entity.ShyAudio; 7 import com.cnlive.shenhe.entity.ShyAudio;
8 import com.cnlive.shenhe.entity.ShyYidun; 8 import com.cnlive.shenhe.entity.ShyYidun;
9 import com.cnlive.shenhe.enums.TextLabels; 9 import com.cnlive.shenhe.enums.TextLabels;
10 -import com.cnlive.shenhe.serviceImpl.AudioServiceImpl;  
11 -import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl; 10 +import com.cnlive.shenhe.service.AudioService;
  11 +import com.cnlive.shenhe.service.serviceImpl.YiDunServiceImpl;
12 import com.cnlive.shenhe.utils.AuditPass; 12 import com.cnlive.shenhe.utils.AuditPass;
13 import com.cnlive.shenhe.utils.CommonConst; 13 import com.cnlive.shenhe.utils.CommonConst;
14 import com.cnlive.shenhe.utils.YiDunAntiFraudUtil; 14 import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
@@ -37,7 +37,7 @@ public class AudioControllerApi { @@ -37,7 +37,7 @@ public class AudioControllerApi {
37 private static EvictingQueue<String> queue = EvictingQueue.create(50); 37 private static EvictingQueue<String> queue = EvictingQueue.create(50);
38 38
39 @Autowired 39 @Autowired
40 - AudioServiceImpl audioService; 40 + AudioService audioService;
41 @Autowired 41 @Autowired
42 YiDunServiceImpl yiDunServiceImpl; 42 YiDunServiceImpl yiDunServiceImpl;
43 @Autowired 43 @Autowired
src/main/java/com/cnlive/shenhe/api/AvsampleCallBackControllerApi.java
@@ -2,7 +2,7 @@ package com.cnlive.shenhe.api; @@ -2,7 +2,7 @@ package com.cnlive.shenhe.api;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.entity.ShyVideos; 4 import com.cnlive.shenhe.entity.ShyVideos;
5 -import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; 5 +import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
6 import com.cnlive.shenhe.utils.CommonConst; 6 import com.cnlive.shenhe.utils.CommonConst;
7 import com.cnlive.shenhe.utils.CommonUtils; 7 import com.cnlive.shenhe.utils.CommonUtils;
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.bean.ErrorEnum; 4 import com.cnlive.shenhe.bean.ErrorEnum;
5 import com.cnlive.shenhe.bean.ResponseBean; 5 import com.cnlive.shenhe.bean.ResponseBean;
6 import com.cnlive.shenhe.entity.ShyChannel; 6 import com.cnlive.shenhe.entity.ShyChannel;
7 -import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl; 7 +import com.cnlive.shenhe.service.ChannelService;
8 import com.cnlive.shenhe.utils.CommonConst; 8 import com.cnlive.shenhe.utils.CommonConst;
9 import com.cnlive.shenhe.utils.CommonConstStates; 9 import com.cnlive.shenhe.utils.CommonConstStates;
10 import com.cnlive.shenhe.utils.CommonUtils; 10 import com.cnlive.shenhe.utils.CommonUtils;
@@ -27,7 +27,7 @@ import java.util.List; @@ -27,7 +27,7 @@ import java.util.List;
27 public class ChannelControllerApi { 27 public class ChannelControllerApi {
28 private static Logger logger = LoggerFactory.getLogger(ChannelControllerApi.class); 28 private static Logger logger = LoggerFactory.getLogger(ChannelControllerApi.class);
29 @Autowired 29 @Autowired
30 - ChannelServiceImpl channelService; 30 + ChannelService channelService;
31 31
32 /** 32 /**
33 * @Auther: liwei 33 * @Auther: liwei
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.bean.ErrorEnum; 4 import com.cnlive.shenhe.bean.ErrorEnum;
5 import com.cnlive.shenhe.bean.ResponseBean; 5 import com.cnlive.shenhe.bean.ResponseBean;
6 import com.cnlive.shenhe.entity.ShyComments; 6 import com.cnlive.shenhe.entity.ShyComments;
7 -import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; 7 +import com.cnlive.shenhe.service.serviceImpl.CommentsServiceImpl;
8 import com.cnlive.shenhe.utils.CommonConst; 8 import com.cnlive.shenhe.utils.CommonConst;
9 import com.cnlive.shenhe.utils.CommonUtils; 9 import com.cnlive.shenhe.utils.CommonUtils;
10 import org.slf4j.Logger; 10 import org.slf4j.Logger;
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
5 import com.cnlive.shenhe.bean.ErrorEnum; 5 import com.cnlive.shenhe.bean.ErrorEnum;
6 import com.cnlive.shenhe.bean.ResponseBean; 6 import com.cnlive.shenhe.bean.ResponseBean;
7 import com.cnlive.shenhe.entity.ShyContent; 7 import com.cnlive.shenhe.entity.ShyContent;
8 -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; 8 +import com.cnlive.shenhe.service.serviceImpl.ContentServiceImpl;
9 import com.cnlive.shenhe.utils.CommonConst; 9 import com.cnlive.shenhe.utils.CommonConst;
10 import com.cnlive.shenhe.utils.CommonUtils; 10 import com.cnlive.shenhe.utils.CommonUtils;
11 import org.slf4j.Logger; 11 import org.slf4j.Logger;
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
@@ -2,7 +2,7 @@ package com.cnlive.shenhe.api; @@ -2,7 +2,7 @@ package com.cnlive.shenhe.api;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.entity.ShyLiveapply; 4 import com.cnlive.shenhe.entity.ShyLiveapply;
5 -import com.cnlive.shenhe.serviceImpl.LiveApplyServiceImpl; 5 +import com.cnlive.shenhe.service.serviceImpl.LiveApplyServiceImpl;
6 import com.cnlive.shenhe.utils.CommonConst; 6 import com.cnlive.shenhe.utils.CommonConst;
7 import com.cnlive.shenhe.utils.CommonUtils; 7 import com.cnlive.shenhe.utils.CommonUtils;
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
@@ -2,7 +2,7 @@ package com.cnlive.shenhe.api; @@ -2,7 +2,7 @@ package com.cnlive.shenhe.api;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.entity.ShyLive; 4 import com.cnlive.shenhe.entity.ShyLive;
5 -import com.cnlive.shenhe.serviceImpl.LiveServiceImpl; 5 +import com.cnlive.shenhe.service.serviceImpl.LiveServiceImpl;
6 import com.cnlive.shenhe.utils.CommonConst; 6 import com.cnlive.shenhe.utils.CommonConst;
7 import com.cnlive.shenhe.utils.CommonConstStates; 7 import com.cnlive.shenhe.utils.CommonConstStates;
8 import com.cnlive.shenhe.utils.CommonUtils; 8 import com.cnlive.shenhe.utils.CommonUtils;
src/main/java/com/cnlive/shenhe/api/ShyActivityControllerApi.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
5 import com.cnlive.shenhe.bean.ErrorEnum; 5 import com.cnlive.shenhe.bean.ErrorEnum;
6 import com.cnlive.shenhe.bean.ResponseBean; 6 import com.cnlive.shenhe.bean.ResponseBean;
7 import com.cnlive.shenhe.entity.ShyActivity; 7 import com.cnlive.shenhe.entity.ShyActivity;
8 -import com.cnlive.shenhe.serviceImpl.ShyActivityImpl; 8 +import com.cnlive.shenhe.service.serviceImpl.ShyActivityImpl;
9 import org.slf4j.Logger; 9 import org.slf4j.Logger;
10 import org.slf4j.LoggerFactory; 10 import org.slf4j.LoggerFactory;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
src/main/java/com/cnlive/shenhe/api/TopicControllerApi.java
@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.bean.ErrorEnum; 4 import com.cnlive.shenhe.bean.ErrorEnum;
5 import com.cnlive.shenhe.bean.ResponseBean; 5 import com.cnlive.shenhe.bean.ResponseBean;
6 import com.cnlive.shenhe.entity.ShyTopic; 6 import com.cnlive.shenhe.entity.ShyTopic;
7 -import com.cnlive.shenhe.serviceImpl.TopicServiceImpl; 7 +import com.cnlive.shenhe.service.serviceImpl.TopicServiceImpl;
8 import com.cnlive.shenhe.utils.CommonConst; 8 import com.cnlive.shenhe.utils.CommonConst;
9 import com.cnlive.shenhe.utils.CommonUtils; 9 import com.cnlive.shenhe.utils.CommonUtils;
10 import com.cnlive.shenhe.utils.TransitServiceUtils; 10 import com.cnlive.shenhe.utils.TransitServiceUtils;
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
5 import com.cnlive.shenhe.bean.ErrorEnum; 5 import com.cnlive.shenhe.bean.ErrorEnum;
6 import com.cnlive.shenhe.bean.ResponseBean; 6 import com.cnlive.shenhe.bean.ResponseBean;
7 import com.cnlive.shenhe.entity.ShyVideos; 7 import com.cnlive.shenhe.entity.ShyVideos;
8 -import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; 8 +import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
9 import com.cnlive.shenhe.utils.CommonConst; 9 import com.cnlive.shenhe.utils.CommonConst;
10 import com.cnlive.shenhe.utils.CommonUtils; 10 import com.cnlive.shenhe.utils.CommonUtils;
11 import com.cnlive.shenhe.utils.HttpUtil; 11 import com.cnlive.shenhe.utils.HttpUtil;
src/main/java/com/cnlive/shenhe/api/YiDunControllerApi.java
@@ -2,7 +2,7 @@ package com.cnlive.shenhe.api; @@ -2,7 +2,7 @@ package com.cnlive.shenhe.api;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.entity.ShyYidun; 4 import com.cnlive.shenhe.entity.ShyYidun;
5 -import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl; 5 +import com.cnlive.shenhe.service.serviceImpl.YiDunServiceImpl;
6 import com.cnlive.shenhe.utils.CommonConstStates; 6 import com.cnlive.shenhe.utils.CommonConstStates;
7 import com.cnlive.shenhe.utils.HttpClientUtils; 7 import com.cnlive.shenhe.utils.HttpClientUtils;
8 import com.cnlive.shenhe.utils.YiDunAntiFraudUtil; 8 import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
src/main/java/com/cnlive/shenhe/controller/AudioController.java
@@ -9,9 +9,9 @@ import com.cnlive.shenhe.dto.AudioDTO; @@ -9,9 +9,9 @@ import com.cnlive.shenhe.dto.AudioDTO;
9 import com.cnlive.shenhe.entity.ShyAudio; 9 import com.cnlive.shenhe.entity.ShyAudio;
10 import com.cnlive.shenhe.entity.ShySites; 10 import com.cnlive.shenhe.entity.ShySites;
11 import com.cnlive.shenhe.entity.ShyUsers; 11 import com.cnlive.shenhe.entity.ShyUsers;
12 -import com.cnlive.shenhe.serviceImpl.AudioServiceImpl;  
13 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;  
14 -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; 12 +import com.cnlive.shenhe.service.AudioService;
  13 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
  14 +import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
15 import com.cnlive.shenhe.utils.AuditPass; 15 import com.cnlive.shenhe.utils.AuditPass;
16 import com.cnlive.shenhe.utils.CommonConst; 16 import com.cnlive.shenhe.utils.CommonConst;
17 import com.cnlive.shenhe.utils.CommonUtils; 17 import com.cnlive.shenhe.utils.CommonUtils;
@@ -51,7 +51,7 @@ public class AudioController extends BaseController { @@ -51,7 +51,7 @@ public class AudioController extends BaseController {
51 SitesServiceImpl sitesService; 51 SitesServiceImpl sitesService;
52 52
53 @Autowired 53 @Autowired
54 - AudioServiceImpl audioService; 54 + AudioService audioService;
55 55
56 @Autowired 56 @Autowired
57 UsersServiceImpl usersService; 57 UsersServiceImpl usersService;
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
@@ -9,9 +9,9 @@ import com.cnlive.shenhe.dto.ChannelDTO; @@ -9,9 +9,9 @@ import com.cnlive.shenhe.dto.ChannelDTO;
9 import com.cnlive.shenhe.entity.ShyChannel; 9 import com.cnlive.shenhe.entity.ShyChannel;
10 import com.cnlive.shenhe.entity.ShySites; 10 import com.cnlive.shenhe.entity.ShySites;
11 import com.cnlive.shenhe.entity.ShyUsers; 11 import com.cnlive.shenhe.entity.ShyUsers;
12 -import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl;  
13 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;  
14 -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; 12 +import com.cnlive.shenhe.service.ChannelService;
  13 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
  14 +import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
15 import com.cnlive.shenhe.utils.AuditPass; 15 import com.cnlive.shenhe.utils.AuditPass;
16 import com.cnlive.shenhe.utils.CommonConst; 16 import com.cnlive.shenhe.utils.CommonConst;
17 import com.cnlive.shenhe.utils.CommonUtils; 17 import com.cnlive.shenhe.utils.CommonUtils;
@@ -42,7 +42,7 @@ public class ChannelController extends BaseController { @@ -42,7 +42,7 @@ public class ChannelController extends BaseController {
42 @Autowired 42 @Autowired
43 AuditPass pass; 43 AuditPass pass;
44 @Autowired 44 @Autowired
45 - ChannelServiceImpl channelService; 45 + ChannelService channelService;
46 46
47 @Autowired 47 @Autowired
48 UsersServiceImpl usersService; 48 UsersServiceImpl usersService;
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
@@ -10,10 +10,10 @@ import com.cnlive.shenhe.entity.ShyComments; @@ -10,10 +10,10 @@ import com.cnlive.shenhe.entity.ShyComments;
10 import com.cnlive.shenhe.entity.ShyContent; 10 import com.cnlive.shenhe.entity.ShyContent;
11 import com.cnlive.shenhe.entity.ShySites; 11 import com.cnlive.shenhe.entity.ShySites;
12 import com.cnlive.shenhe.entity.ShyUsers; 12 import com.cnlive.shenhe.entity.ShyUsers;
13 -import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;  
14 -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl;  
15 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;  
16 -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; 13 +import com.cnlive.shenhe.service.serviceImpl.CommentsServiceImpl;
  14 +import com.cnlive.shenhe.service.serviceImpl.ContentServiceImpl;
  15 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
  16 +import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
17 import com.cnlive.shenhe.utils.AuditPass; 17 import com.cnlive.shenhe.utils.AuditPass;
18 import com.cnlive.shenhe.utils.CommonConst; 18 import com.cnlive.shenhe.utils.CommonConst;
19 import com.cnlive.shenhe.utils.CommonUtils; 19 import com.cnlive.shenhe.utils.CommonUtils;
src/main/java/com/cnlive/shenhe/controller/ContentController.java
@@ -8,9 +8,9 @@ import com.cnlive.shenhe.dto.ContentDTO; @@ -8,9 +8,9 @@ import com.cnlive.shenhe.dto.ContentDTO;
8 import com.cnlive.shenhe.entity.ShyContent; 8 import com.cnlive.shenhe.entity.ShyContent;
9 import com.cnlive.shenhe.entity.ShySites; 9 import com.cnlive.shenhe.entity.ShySites;
10 import com.cnlive.shenhe.entity.ShyUsers; 10 import com.cnlive.shenhe.entity.ShyUsers;
11 -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl;  
12 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;  
13 -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; 11 +import com.cnlive.shenhe.service.serviceImpl.ContentServiceImpl;
  12 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
  13 +import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
14 import com.cnlive.shenhe.utils.CommonConst; 14 import com.cnlive.shenhe.utils.CommonConst;
15 import com.cnlive.shenhe.utils.CommonUtils; 15 import com.cnlive.shenhe.utils.CommonUtils;
16 import com.github.pagehelper.PageInfo; 16 import com.github.pagehelper.PageInfo;
src/main/java/com/cnlive/shenhe/controller/EmailController.java
@@ -8,8 +8,8 @@ import com.cnlive.shenhe.bean.SessionUser; @@ -8,8 +8,8 @@ import com.cnlive.shenhe.bean.SessionUser;
8 import com.cnlive.shenhe.dto.EmailDTO; 8 import com.cnlive.shenhe.dto.EmailDTO;
9 import com.cnlive.shenhe.entity.ShyEmail; 9 import com.cnlive.shenhe.entity.ShyEmail;
10 import com.cnlive.shenhe.entity.ShyUsers; 10 import com.cnlive.shenhe.entity.ShyUsers;
11 -import com.cnlive.shenhe.serviceImpl.EmailServiceImpl;  
12 -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; 11 +import com.cnlive.shenhe.service.serviceImpl.EmailServiceImpl;
  12 +import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
13 import com.cnlive.shenhe.utils.CommonConst; 13 import com.cnlive.shenhe.utils.CommonConst;
14 import com.cnlive.shenhe.utils.CommonUtils; 14 import com.cnlive.shenhe.utils.CommonUtils;
15 import com.github.pagehelper.PageInfo; 15 import com.github.pagehelper.PageInfo;
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
@@ -9,7 +9,7 @@ import com.cnlive.shenhe.dto.LiveApplyDTO; @@ -9,7 +9,7 @@ import com.cnlive.shenhe.dto.LiveApplyDTO;
9 import com.cnlive.shenhe.entity.ShyLiveapply; 9 import com.cnlive.shenhe.entity.ShyLiveapply;
10 import com.cnlive.shenhe.entity.ShySites; 10 import com.cnlive.shenhe.entity.ShySites;
11 import com.cnlive.shenhe.entity.ShyUsers; 11 import com.cnlive.shenhe.entity.ShyUsers;
12 -import com.cnlive.shenhe.serviceImpl.*; 12 +import com.cnlive.shenhe.service.serviceImpl.*;
13 import com.cnlive.shenhe.utils.AuditPass; 13 import com.cnlive.shenhe.utils.AuditPass;
14 import com.cnlive.shenhe.utils.CommonConst; 14 import com.cnlive.shenhe.utils.CommonConst;
15 import com.cnlive.shenhe.utils.CommonUtils; 15 import com.cnlive.shenhe.utils.CommonUtils;
src/main/java/com/cnlive/shenhe/controller/LiveController.java
@@ -9,10 +9,10 @@ import com.cnlive.shenhe.dto.LiveDTO; @@ -9,10 +9,10 @@ import com.cnlive.shenhe.dto.LiveDTO;
9 import com.cnlive.shenhe.entity.ShyLive; 9 import com.cnlive.shenhe.entity.ShyLive;
10 import com.cnlive.shenhe.entity.ShySites; 10 import com.cnlive.shenhe.entity.ShySites;
11 import com.cnlive.shenhe.entity.ShyUsers; 11 import com.cnlive.shenhe.entity.ShyUsers;
12 -import com.cnlive.shenhe.serviceImpl.LiveServiceImpl;  
13 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;  
14 -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;  
15 -import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; 12 +import com.cnlive.shenhe.service.serviceImpl.LiveServiceImpl;
  13 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
  14 +import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
  15 +import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
16 import com.cnlive.shenhe.utils.AuditPass; 16 import com.cnlive.shenhe.utils.AuditPass;
17 import com.cnlive.shenhe.utils.CommonConst; 17 import com.cnlive.shenhe.utils.CommonConst;
18 import com.cnlive.shenhe.utils.CommonUtils; 18 import com.cnlive.shenhe.utils.CommonUtils;
src/main/java/com/cnlive/shenhe/controller/NotSpeakController.java
@@ -8,7 +8,7 @@ import com.cnlive.shenhe.dto.NotSpeakDTO; @@ -8,7 +8,7 @@ import com.cnlive.shenhe.dto.NotSpeakDTO;
8 import com.cnlive.shenhe.entity.ShyNotspeak; 8 import com.cnlive.shenhe.entity.ShyNotspeak;
9 import com.cnlive.shenhe.entity.ShySites; 9 import com.cnlive.shenhe.entity.ShySites;
10 import com.cnlive.shenhe.entity.ShyUsers; 10 import com.cnlive.shenhe.entity.ShyUsers;
11 -import com.cnlive.shenhe.serviceImpl.*; 11 +import com.cnlive.shenhe.service.serviceImpl.*;
12 import com.cnlive.shenhe.utils.CommonUtils; 12 import com.cnlive.shenhe.utils.CommonUtils;
13 import com.github.pagehelper.PageInfo; 13 import com.github.pagehelper.PageInfo;
14 import org.slf4j.Logger; 14 import org.slf4j.Logger;
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
@@ -5,7 +5,7 @@ import com.cnlive.shenhe.bean.ErrorEnum; @@ -5,7 +5,7 @@ import com.cnlive.shenhe.bean.ErrorEnum;
5 import com.cnlive.shenhe.bean.ResponseBean; 5 import com.cnlive.shenhe.bean.ResponseBean;
6 import com.cnlive.shenhe.dto.ShyActivityDTO; 6 import com.cnlive.shenhe.dto.ShyActivityDTO;
7 import com.cnlive.shenhe.entity.ShyActivity; 7 import com.cnlive.shenhe.entity.ShyActivity;
8 -import com.cnlive.shenhe.serviceImpl.ShyActivityImpl; 8 +import com.cnlive.shenhe.service.serviceImpl.ShyActivityImpl;
9 import com.github.pagehelper.PageInfo; 9 import com.github.pagehelper.PageInfo;
10 import org.slf4j.Logger; 10 import org.slf4j.Logger;
11 import org.slf4j.LoggerFactory; 11 import org.slf4j.LoggerFactory;
src/main/java/com/cnlive/shenhe/controller/ShyLogController.java
@@ -5,7 +5,7 @@ import com.cnlive.shenhe.bean.ErrorEnum; @@ -5,7 +5,7 @@ import com.cnlive.shenhe.bean.ErrorEnum;
5 import com.cnlive.shenhe.bean.ResponseBean; 5 import com.cnlive.shenhe.bean.ResponseBean;
6 import com.cnlive.shenhe.dto.ShyLogDTO; 6 import com.cnlive.shenhe.dto.ShyLogDTO;
7 import com.cnlive.shenhe.entity.ShyLog; 7 import com.cnlive.shenhe.entity.ShyLog;
8 -import com.cnlive.shenhe.serviceImpl.ShyLogServiceImpl; 8 +import com.cnlive.shenhe.service.serviceImpl.ShyLogServiceImpl;
9 import com.github.pagehelper.PageInfo; 9 import com.github.pagehelper.PageInfo;
10 import org.slf4j.Logger; 10 import org.slf4j.Logger;
11 import org.slf4j.LoggerFactory; 11 import org.slf4j.LoggerFactory;
src/main/java/com/cnlive/shenhe/controller/SitesController.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
5 import com.cnlive.shenhe.bean.SessionUser; 5 import com.cnlive.shenhe.bean.SessionUser;
6 import com.cnlive.shenhe.dto.SitesDTO; 6 import com.cnlive.shenhe.dto.SitesDTO;
7 import com.cnlive.shenhe.entity.ShySites; 7 import com.cnlive.shenhe.entity.ShySites;
8 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; 8 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
9 import com.cnlive.shenhe.utils.CommonConst; 9 import com.cnlive.shenhe.utils.CommonConst;
10 import com.cnlive.shenhe.utils.CommonUtils; 10 import com.cnlive.shenhe.utils.CommonUtils;
11 import com.github.pagehelper.PageInfo; 11 import com.github.pagehelper.PageInfo;
src/main/java/com/cnlive/shenhe/controller/TopicController.java
@@ -7,8 +7,8 @@ import com.cnlive.shenhe.bean.SessionUser; @@ -7,8 +7,8 @@ import com.cnlive.shenhe.bean.SessionUser;
7 import com.cnlive.shenhe.dto.TopicDTO; 7 import com.cnlive.shenhe.dto.TopicDTO;
8 import com.cnlive.shenhe.entity.ShySites; 8 import com.cnlive.shenhe.entity.ShySites;
9 import com.cnlive.shenhe.entity.ShyTopic; 9 import com.cnlive.shenhe.entity.ShyTopic;
10 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;  
11 -import com.cnlive.shenhe.serviceImpl.TopicServiceImpl; 10 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
  11 +import com.cnlive.shenhe.service.serviceImpl.TopicServiceImpl;
12 import com.cnlive.shenhe.utils.CommonConst; 12 import com.cnlive.shenhe.utils.CommonConst;
13 import com.cnlive.shenhe.utils.CommonUtils; 13 import com.cnlive.shenhe.utils.CommonUtils;
14 import com.github.pagehelper.PageInfo; 14 import com.github.pagehelper.PageInfo;
src/main/java/com/cnlive/shenhe/controller/UsersController.java
@@ -7,9 +7,9 @@ import com.cnlive.shenhe.dto.UsersDTO; @@ -7,9 +7,9 @@ import com.cnlive.shenhe.dto.UsersDTO;
7 import com.cnlive.shenhe.entity.ShyLog; 7 import com.cnlive.shenhe.entity.ShyLog;
8 import com.cnlive.shenhe.entity.ShySites; 8 import com.cnlive.shenhe.entity.ShySites;
9 import com.cnlive.shenhe.entity.ShyUsers; 9 import com.cnlive.shenhe.entity.ShyUsers;
10 -import com.cnlive.shenhe.serviceImpl.ShyLogServiceImpl;  
11 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;  
12 -import com.cnlive.shenhe.serviceImpl.UsersServiceImpl; 10 +import com.cnlive.shenhe.service.serviceImpl.ShyLogServiceImpl;
  11 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
  12 +import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
13 import com.cnlive.shenhe.utils.CommonConst; 13 import com.cnlive.shenhe.utils.CommonConst;
14 import com.cnlive.shenhe.utils.CommonUtils; 14 import com.cnlive.shenhe.utils.CommonUtils;
15 import com.github.pagehelper.PageInfo; 15 import com.github.pagehelper.PageInfo;
src/main/java/com/cnlive/shenhe/controller/UsersFreeController.java
@@ -8,8 +8,8 @@ import com.cnlive.shenhe.bean.SessionUser; @@ -8,8 +8,8 @@ import com.cnlive.shenhe.bean.SessionUser;
8 import com.cnlive.shenhe.dto.UsersFreeDTO; 8 import com.cnlive.shenhe.dto.UsersFreeDTO;
9 import com.cnlive.shenhe.entity.ShySites; 9 import com.cnlive.shenhe.entity.ShySites;
10 import com.cnlive.shenhe.entity.ShyUsersfree; 10 import com.cnlive.shenhe.entity.ShyUsersfree;
11 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;  
12 -import com.cnlive.shenhe.serviceImpl.UsersfreeServiceImpl; 11 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
  12 +import com.cnlive.shenhe.service.serviceImpl.UsersfreeServiceImpl;
13 import com.cnlive.shenhe.utils.CommonConst; 13 import com.cnlive.shenhe.utils.CommonConst;
14 import com.cnlive.shenhe.utils.CommonUtils; 14 import com.cnlive.shenhe.utils.CommonUtils;
15 import com.github.pagehelper.PageInfo; 15 import com.github.pagehelper.PageInfo;
src/main/java/com/cnlive/shenhe/controller/VideosController.java
@@ -7,7 +7,7 @@ import com.cnlive.shenhe.bean.ResponseBean; @@ -7,7 +7,7 @@ import com.cnlive.shenhe.bean.ResponseBean;
7 import com.cnlive.shenhe.bean.SessionUser; 7 import com.cnlive.shenhe.bean.SessionUser;
8 import com.cnlive.shenhe.dto.VideosDTO; 8 import com.cnlive.shenhe.dto.VideosDTO;
9 import com.cnlive.shenhe.entity.*; 9 import com.cnlive.shenhe.entity.*;
10 -import com.cnlive.shenhe.serviceImpl.*; 10 +import com.cnlive.shenhe.service.serviceImpl.*;
11 import com.cnlive.shenhe.utils.AuditPass; 11 import com.cnlive.shenhe.utils.AuditPass;
12 import com.cnlive.shenhe.utils.CommonConst; 12 import com.cnlive.shenhe.utils.CommonConst;
13 import com.cnlive.shenhe.utils.CommonUtils; 13 import com.cnlive.shenhe.utils.CommonUtils;
src/main/java/com/cnlive/shenhe/job/AudioJob.java
1 package com.cnlive.shenhe.job; 1 package com.cnlive.shenhe.job;
2 2
3 import com.cnlive.shenhe.entity.ShyAudio; 3 import com.cnlive.shenhe.entity.ShyAudio;
4 -import com.cnlive.shenhe.serviceImpl.AudioServiceImpl; 4 +import com.cnlive.shenhe.service.AudioService;
5 import com.cnlive.shenhe.utils.CommonConst; 5 import com.cnlive.shenhe.utils.CommonConst;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
7 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
@@ -21,7 +21,7 @@ public class AudioJob { @@ -21,7 +21,7 @@ public class AudioJob {
21 private static Logger logger = LoggerFactory.getLogger(AudioJob.class); 21 private static Logger logger = LoggerFactory.getLogger(AudioJob.class);
22 22
23 @Autowired 23 @Autowired
24 - AudioServiceImpl audioService; 24 + AudioService audioService;
25 25
26 /** 26 /**
27 * 白名单sp音频通过 27 * 白名单sp音频通过
src/main/java/com/cnlive/shenhe/job/ChannelJob.java
1 package com.cnlive.shenhe.job; 1 package com.cnlive.shenhe.job;
2 2
3 import com.cnlive.shenhe.entity.ShyChannel; 3 import com.cnlive.shenhe.entity.ShyChannel;
4 -import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl; 4 +import com.cnlive.shenhe.service.ChannelService;
5 import com.cnlive.shenhe.utils.CommonConst; 5 import com.cnlive.shenhe.utils.CommonConst;
6 import com.cnlive.shenhe.utils.InfoUtil; 6 import com.cnlive.shenhe.utils.InfoUtil;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
@@ -26,7 +26,7 @@ public class ChannelJob { @@ -26,7 +26,7 @@ public class ChannelJob {
26 @Autowired 26 @Autowired
27 InfoUtil infoUtil; 27 InfoUtil infoUtil;
28 @Autowired 28 @Autowired
29 - ChannelServiceImpl channelService; 29 + ChannelService channelService;
30 30
31 @Scheduled(fixedRate = 60 * 1000) 31 @Scheduled(fixedRate = 60 * 1000)
32 public void updateChannel() { 32 public void updateChannel() {
src/main/java/com/cnlive/shenhe/job/CommentsJob.java
1 package com.cnlive.shenhe.job; 1 package com.cnlive.shenhe.job;
2 2
3 import com.cnlive.shenhe.entity.ShyComments; 3 import com.cnlive.shenhe.entity.ShyComments;
4 -import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl; 4 +import com.cnlive.shenhe.service.serviceImpl.CommentsServiceImpl;
5 import com.cnlive.shenhe.utils.CommonConst; 5 import com.cnlive.shenhe.utils.CommonConst;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
7 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
src/main/java/com/cnlive/shenhe/job/ContentJob.java
1 package com.cnlive.shenhe.job; 1 package com.cnlive.shenhe.job;
2 2
3 import com.cnlive.shenhe.entity.ShyContent; 3 import com.cnlive.shenhe.entity.ShyContent;
4 -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl; 4 +import com.cnlive.shenhe.service.serviceImpl.ContentServiceImpl;
5 import com.cnlive.shenhe.utils.CommonConst; 5 import com.cnlive.shenhe.utils.CommonConst;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
7 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
@@ -5,9 +5,9 @@ import com.cnlive.shenhe.entity.ShyEmail; @@ -5,9 +5,9 @@ import com.cnlive.shenhe.entity.ShyEmail;
5 import com.cnlive.shenhe.entity.ShyLiveapply; 5 import com.cnlive.shenhe.entity.ShyLiveapply;
6 import com.cnlive.shenhe.entity.ShySites; 6 import com.cnlive.shenhe.entity.ShySites;
7 import com.cnlive.shenhe.mapper.ShyLiveapplyMapper; 7 import com.cnlive.shenhe.mapper.ShyLiveapplyMapper;
8 -import com.cnlive.shenhe.serviceImpl.EmailServiceImpl;  
9 -import com.cnlive.shenhe.serviceImpl.LiveApplyServiceImpl;  
10 -import com.cnlive.shenhe.serviceImpl.SitesServiceImpl; 8 +import com.cnlive.shenhe.service.serviceImpl.EmailServiceImpl;
  9 +import com.cnlive.shenhe.service.serviceImpl.LiveApplyServiceImpl;
  10 +import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
11 import com.cnlive.shenhe.utils.CommonConst; 11 import com.cnlive.shenhe.utils.CommonConst;
12 import com.cnlive.shenhe.utils.CommonUtils; 12 import com.cnlive.shenhe.utils.CommonUtils;
13 import com.cnlive.shenhe.utils.HttpUtil; 13 import com.cnlive.shenhe.utils.HttpUtil;
src/main/java/com/cnlive/shenhe/job/NotSpeakJob.java
1 package com.cnlive.shenhe.job; 1 package com.cnlive.shenhe.job;
2 2
3 import com.cnlive.shenhe.entity.ShyNotspeak; 3 import com.cnlive.shenhe.entity.ShyNotspeak;
4 -import com.cnlive.shenhe.serviceImpl.NotspeakServiceImpl; 4 +import com.cnlive.shenhe.service.serviceImpl.NotspeakServiceImpl;
5 import com.cnlive.shenhe.utils.CommonConst; 5 import com.cnlive.shenhe.utils.CommonConst;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
7 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
src/main/java/com/cnlive/shenhe/job/TopicJob.java
1 package com.cnlive.shenhe.job; 1 package com.cnlive.shenhe.job;
2 2
3 import com.cnlive.shenhe.entity.ShyTopic; 3 import com.cnlive.shenhe.entity.ShyTopic;
4 -import com.cnlive.shenhe.serviceImpl.TopicServiceImpl; 4 +import com.cnlive.shenhe.service.serviceImpl.TopicServiceImpl;
5 import com.cnlive.shenhe.utils.CommonConst; 5 import com.cnlive.shenhe.utils.CommonConst;
6 import com.cnlive.shenhe.utils.InfoUtil; 6 import com.cnlive.shenhe.utils.InfoUtil;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
src/main/java/com/cnlive/shenhe/job/VideosJob.java
1 package com.cnlive.shenhe.job; 1 package com.cnlive.shenhe.job;
2 2
3 import com.cnlive.shenhe.entity.ShyVideos; 3 import com.cnlive.shenhe.entity.ShyVideos;
4 -import com.cnlive.shenhe.serviceImpl.VideosServiceImpl; 4 +import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
5 import com.cnlive.shenhe.utils.CommonConst; 5 import com.cnlive.shenhe.utils.CommonConst;
6 import com.cnlive.shenhe.utils.CommonConstStates; 6 import com.cnlive.shenhe.utils.CommonConstStates;
7 import org.slf4j.Logger; 7 import org.slf4j.Logger;
src/main/java/com/cnlive/shenhe/job/YiDunUrlResultJob.java
@@ -6,8 +6,8 @@ import com.cnlive.shenhe.entity.ShyContent; @@ -6,8 +6,8 @@ import com.cnlive.shenhe.entity.ShyContent;
6 import com.cnlive.shenhe.entity.ShyYidun; 6 import com.cnlive.shenhe.entity.ShyYidun;
7 import com.cnlive.shenhe.enums.ImageLabels; 7 import com.cnlive.shenhe.enums.ImageLabels;
8 import com.cnlive.shenhe.enums.TextLabels; 8 import com.cnlive.shenhe.enums.TextLabels;
9 -import com.cnlive.shenhe.serviceImpl.ContentServiceImpl;  
10 -import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl; 9 +import com.cnlive.shenhe.service.serviceImpl.ContentServiceImpl;
  10 +import com.cnlive.shenhe.service.serviceImpl.YiDunServiceImpl;
11 import com.cnlive.shenhe.utils.CommonConst; 11 import com.cnlive.shenhe.utils.CommonConst;
12 import com.cnlive.shenhe.utils.HttpClientUtils; 12 import com.cnlive.shenhe.utils.HttpClientUtils;
13 import com.cnlive.shenhe.utils.YiDunAntiFraudUtil; 13 import com.cnlive.shenhe.utils.YiDunAntiFraudUtil;
src/main/java/com/cnlive/shenhe/service/AudioService.java 0 → 100644
  1 +package com.cnlive.shenhe.service;
  2 +
  3 +import com.cnlive.shenhe.bean.ResponseBean;
  4 +import com.cnlive.shenhe.dto.AudioDTO;
  5 +import com.cnlive.shenhe.entity.ShyAudio;
  6 +import com.github.pagehelper.PageInfo;
  7 +
  8 +import java.util.List;
  9 +
  10 +/**
  11 + * @Author: yan-zhao-wang
  12 + * @DateTime: 2022-10-31 9:29
  13 + */
  14 +public interface AudioService {
  15 + /**
  16 + * 查询音频记录是否存在
  17 + *
  18 + * @param audioId
  19 + * @return
  20 + */
  21 + ShyAudio getAudioMsg(String audioId);
  22 +
  23 + /**
  24 + * 导入音频记录
  25 + *
  26 + * @param shyAudio
  27 + * @return
  28 + */
  29 + int importAudioMsg(ShyAudio shyAudio);
  30 +
  31 + /**
  32 + * 修改音频记录
  33 + *
  34 + * @param shyAudio
  35 + * @return
  36 + */
  37 + int updateAudioMsg(ShyAudio shyAudio);
  38 +
  39 + /**
  40 + * 根据id查询音频对象
  41 + *
  42 + * @param id
  43 + * @return
  44 + */
  45 + ShyAudio selectByPrimaryKey(Integer id);
  46 +
  47 + /**
  48 + * 根据音频条件查询符合条件的音频集合
  49 + *
  50 + * @param shyAudio
  51 + * @return
  52 + */
  53 + List<ShyAudio> findshyAudio(ShyAudio shyAudio);
  54 +
  55 + /**
  56 + * 回调 更新音频和审核状态
  57 + *
  58 + * @param shyAudio
  59 + * @param audioState 视频状态,1通过,2不通过
  60 + * @return
  61 + */
  62 + int updateAudioAndShenhe(ShyAudio shyAudio, int audioState);
  63 +
  64 + /**
  65 + * 认领
  66 + *
  67 + * @param ids
  68 + * @param num
  69 + * @param userId
  70 + * @param spid
  71 + * @return
  72 + */
  73 + Integer receive(String ids, Integer num, String userId, Integer spid);
  74 +
  75 + /**
  76 + * 退领
  77 + *
  78 + * @param ids
  79 + * @param userId
  80 + * @return
  81 + */
  82 + ResponseBean retReceive(String ids, String userId);
  83 +
  84 + /**
  85 + * 回调
  86 + *
  87 + * @param shyAudioId
  88 + * @param msg
  89 + * @param userId
  90 + * @return
  91 + */
  92 + String repulse(String shyAudioId, String msg, String userId);
  93 +
  94 + /**
  95 + * 根据id查询到音频对象进行修改
  96 + *
  97 + * @param id
  98 + * @param auditor_id
  99 + * @param updater
  100 + * @param attr_tags
  101 + * @param state
  102 + * @param msg
  103 + * @return
  104 + */
  105 + int updateAudio(Integer id, String auditor_id, String updater, String attr_tags, Integer state, String msg);
  106 +
  107 + /**
  108 + * 分页查询音频数据
  109 + *
  110 + * @param audioDTO
  111 + * @return
  112 + */
  113 + PageInfo<ShyAudio> getListAudios(AudioDTO audioDTO);
  114 +
  115 + /**
  116 + * 查看音频详情
  117 + *
  118 + * @param id
  119 + * @return
  120 + */
  121 + ShyAudio getDetailsAudio(Integer id);
  122 +
  123 + /**
  124 + * 根据条件导出数据excel
  125 + *
  126 + * @param audioDTO
  127 + * @return
  128 + */
  129 +
  130 + List<ShyAudio> findByCondition(AudioDTO audioDTO);
  131 +
  132 + /**
  133 + * 根据sp、栏目、用户id来判断审核类型
  134 + *
  135 + * @param shyAudio
  136 + */
  137 + void getShenheType(ShyAudio shyAudio);
  138 +
  139 + /**
  140 + * 易盾点播音频过滤
  141 + * 音频送审时 给了回调地址
  142 + * 送审类型:1:文本 2:图片 3.网页 4:点播音频
  143 + *
  144 + * @param shyAudio
  145 + */
  146 + void audioFilter(ShyAudio shyAudio);
  147 +}
src/main/java/com/cnlive/shenhe/service/ChannelService.java 0 → 100644
  1 +package com.cnlive.shenhe.service;
  2 +
  3 +import com.cnlive.shenhe.dto.ChannelDTO;
  4 +import com.cnlive.shenhe.entity.ShyChannel;
  5 +import com.github.pagehelper.PageInfo;
  6 +
  7 +import java.util.List;
  8 +
  9 +/**
  10 + * @Author: yan-zhao-wang
  11 + * @DateTime: 2022-10-31 9:53
  12 + */
  13 +public interface ChannelService {
  14 + /**
  15 + * 根据条件查询频道集合
  16 + *
  17 + * @param shyChannel
  18 + * @return
  19 + */
  20 + List<ShyChannel> findshyChannel(ShyChannel shyChannel);
  21 +
  22 + /**
  23 + * 修改频道 返回布尔类型
  24 + *
  25 + * @param shyChannel
  26 + * @return
  27 + */
  28 + boolean updateshyChannel(ShyChannel shyChannel);
  29 +
  30 + /**
  31 + * 导入频道 返回布尔类型
  32 + *
  33 + * @param shyChannel
  34 + * @return
  35 + */
  36 + boolean impotChannel(ShyChannel shyChannel);
  37 +
  38 + /**
  39 + * 获取分页、条件查询结果集
  40 + *
  41 + * @param channelDTO
  42 + * @return
  43 + */
  44 + PageInfo<ShyChannel> getPage(ChannelDTO channelDTO);
  45 +
  46 + /**
  47 + * 获取频道详情
  48 + *
  49 + * @param id
  50 + * @return
  51 + */
  52 + ShyChannel getDetailsChannel(Integer id);
  53 +
  54 + /**
  55 + * 修改频道状态
  56 + *
  57 + * @param ids
  58 + * @param state
  59 + * @param userId
  60 + * @param updater
  61 + * @param msg
  62 + * @return
  63 + */
  64 + boolean updateState(String ids, Integer state, String userId, String updater, String msg);
  65 +
  66 + /**
  67 + * 根据主键查询频道对象
  68 + *
  69 + * @param id
  70 + * @return
  71 + */
  72 + ShyChannel selectByPrimaryKey(Integer id);
  73 +
  74 + /**
  75 + * 根据主键修改频道对象
  76 + *
  77 + * @param channel
  78 + * @return
  79 + */
  80 + int updateByPrimaryKeySelective(ShyChannel channel);
  81 +
  82 + /**
  83 + * 获得审核类型
  84 + *
  85 + * @param shyChannel
  86 + */
  87 + void getShenheType(ShyChannel shyChannel);
  88 +}
src/main/java/com/cnlive/shenhe/serviceImpl/AudioServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/AudioServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.bean.ErrorEnum; 4 import com.cnlive.shenhe.bean.ErrorEnum;
@@ -7,6 +7,7 @@ import com.cnlive.shenhe.dto.AudioDTO; @@ -7,6 +7,7 @@ import com.cnlive.shenhe.dto.AudioDTO;
7 import com.cnlive.shenhe.entity.*; 7 import com.cnlive.shenhe.entity.*;
8 import com.cnlive.shenhe.mapper.ShyAudioMapper; 8 import com.cnlive.shenhe.mapper.ShyAudioMapper;
9 import com.cnlive.shenhe.mapper.ShyUsersMapper; 9 import com.cnlive.shenhe.mapper.ShyUsersMapper;
  10 +import com.cnlive.shenhe.service.AudioService;
10 import com.cnlive.shenhe.utils.*; 11 import com.cnlive.shenhe.utils.*;
11 import com.github.pagehelper.PageHelper; 12 import com.github.pagehelper.PageHelper;
12 import com.github.pagehelper.PageInfo; 13 import com.github.pagehelper.PageInfo;
@@ -26,7 +27,7 @@ import java.util.List; @@ -26,7 +27,7 @@ import java.util.List;
26 * @Date: 2020/6/8 10:19 27 * @Date: 2020/6/8 10:19
27 */ 28 */
28 @Service 29 @Service
29 -public class AudioServiceImpl { 30 +public class AudioServiceImpl implements AudioService {
30 31
31 private static Logger logger = LoggerFactory.getLogger(AudioServiceImpl.class); 32 private static Logger logger = LoggerFactory.getLogger(AudioServiceImpl.class);
32 33
@@ -34,7 +35,7 @@ public class AudioServiceImpl { @@ -34,7 +35,7 @@ public class AudioServiceImpl {
34 ShyAudioMapper shyAudioMapper; 35 ShyAudioMapper shyAudioMapper;
35 36
36 @Autowired 37 @Autowired
37 - AudioServiceImpl audioService; 38 + AudioService audioService;
38 39
39 @Autowired 40 @Autowired
40 AuditPass pass; 41 AuditPass pass;
@@ -55,6 +56,7 @@ public class AudioServiceImpl { @@ -55,6 +56,7 @@ public class AudioServiceImpl {
55 * @param audioId 56 * @param audioId
56 * @return 57 * @return
57 */ 58 */
  59 + @Override
58 public ShyAudio getAudioMsg(String audioId) { 60 public ShyAudio getAudioMsg(String audioId) {
59 return shyAudioMapper.getAudioMsg(audioId); 61 return shyAudioMapper.getAudioMsg(audioId);
60 } 62 }
@@ -65,6 +67,7 @@ public class AudioServiceImpl { @@ -65,6 +67,7 @@ public class AudioServiceImpl {
65 * @param shyAudio 67 * @param shyAudio
66 * @return 68 * @return
67 */ 69 */
  70 + @Override
68 public int importAudioMsg(ShyAudio shyAudio) { 71 public int importAudioMsg(ShyAudio shyAudio) {
69 return shyAudioMapper.insertSelective(shyAudio); 72 return shyAudioMapper.insertSelective(shyAudio);
70 } 73 }
@@ -75,6 +78,7 @@ public class AudioServiceImpl { @@ -75,6 +78,7 @@ public class AudioServiceImpl {
75 * @param shyAudio 78 * @param shyAudio
76 * @return 79 * @return
77 */ 80 */
  81 + @Override
78 public int updateAudioMsg(ShyAudio shyAudio) { 82 public int updateAudioMsg(ShyAudio shyAudio) {
79 return shyAudioMapper.updateByPrimaryKeySelective(shyAudio); 83 return shyAudioMapper.updateByPrimaryKeySelective(shyAudio);
80 } 84 }
@@ -85,6 +89,7 @@ public class AudioServiceImpl { @@ -85,6 +89,7 @@ public class AudioServiceImpl {
85 * @param id 89 * @param id
86 * @return 90 * @return
87 */ 91 */
  92 + @Override
88 public ShyAudio selectByPrimaryKey(Integer id) { 93 public ShyAudio selectByPrimaryKey(Integer id) {
89 ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id); 94 ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id);
90 return shyAudio; 95 return shyAudio;
@@ -96,18 +101,20 @@ public class AudioServiceImpl { @@ -96,18 +101,20 @@ public class AudioServiceImpl {
96 * @param shyAudio 101 * @param shyAudio
97 * @return 102 * @return
98 */ 103 */
  104 + @Override
99 public List<ShyAudio> findshyAudio(ShyAudio shyAudio) { 105 public List<ShyAudio> findshyAudio(ShyAudio shyAudio) {
100 List<ShyAudio> shyAudiolist = shyAudioMapper.selectByRowBounds(shyAudio, new RowBounds(0, 100)); 106 List<ShyAudio> shyAudiolist = shyAudioMapper.selectByRowBounds(shyAudio, new RowBounds(0, 100));
101 return shyAudiolist; 107 return shyAudiolist;
102 } 108 }
103 109
104 /** 110 /**
105 - * 更新音频和审核状态 111 + * 回调 更新音频和审核状态
106 * 112 *
107 * @param shyAudio 113 * @param shyAudio
108 * @param audioState 视频状态,1通过,2不通过 114 * @param audioState 视频状态,1通过,2不通过
109 * @return 115 * @return
110 */ 116 */
  117 + @Override
111 public int updateAudioAndShenhe(ShyAudio shyAudio, int audioState) { 118 public int updateAudioAndShenhe(ShyAudio shyAudio, int audioState) {
112 //修改点播云音频状态 119 //修改点播云音频状态
113 JSONObject result = pass.audioPass(shyAudio.getAudioId(), audioState, shyAudio.getAttr_tags(), shyAudio.getMsg(), shyAudio.getCallback()); 120 JSONObject result = pass.audioPass(shyAudio.getAudioId(), audioState, shyAudio.getAttr_tags(), shyAudio.getMsg(), shyAudio.getCallback());
@@ -141,6 +148,7 @@ public class AudioServiceImpl { @@ -141,6 +148,7 @@ public class AudioServiceImpl {
141 * @param spid 148 * @param spid
142 * @return 149 * @return
143 */ 150 */
  151 + @Override
144 public Integer receive(String ids, Integer num, String userId, Integer spid) { 152 public Integer receive(String ids, Integer num, String userId, Integer spid) {
145 Integer n = 0; 153 Integer n = 0;
146 if (CommonUtils.isNotEmpty(ids)) { 154 if (CommonUtils.isNotEmpty(ids)) {
@@ -182,6 +190,7 @@ public class AudioServiceImpl { @@ -182,6 +190,7 @@ public class AudioServiceImpl {
182 * @param userId 190 * @param userId
183 * @return 191 * @return
184 */ 192 */
  193 + @Override
185 public ResponseBean retReceive(String ids, String userId) { 194 public ResponseBean retReceive(String ids, String userId) {
186 String[] cids = ids.split(","); 195 String[] cids = ids.split(",");
187 for (String cid : cids) { 196 for (String cid : cids) {
@@ -200,6 +209,7 @@ public class AudioServiceImpl { @@ -200,6 +209,7 @@ public class AudioServiceImpl {
200 return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "已退领"); 209 return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "已退领");
201 } 210 }
202 211
  212 + @Override
203 public String repulse(String shyAudioId, String msg, String userId) { 213 public String repulse(String shyAudioId, String msg, String userId) {
204 String showMsg = ""; 214 String showMsg = "";
205 ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(shyAudioId)); 215 ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(shyAudioId));
@@ -243,6 +253,7 @@ public class AudioServiceImpl { @@ -243,6 +253,7 @@ public class AudioServiceImpl {
243 * @param msg 253 * @param msg
244 * @return 254 * @return
245 */ 255 */
  256 + @Override
246 public int updateAudio(Integer id, String auditor_id, String updater, String attr_tags, Integer state, String msg) { 257 public int updateAudio(Integer id, String auditor_id, String updater, String attr_tags, Integer state, String msg) {
247 ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id); 258 ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id);
248 shyAudio.setAuditor_id(auditor_id); 259 shyAudio.setAuditor_id(auditor_id);
@@ -268,6 +279,7 @@ public class AudioServiceImpl { @@ -268,6 +279,7 @@ public class AudioServiceImpl {
268 * @param audioDTO 279 * @param audioDTO
269 * @return 280 * @return
270 */ 281 */
  282 + @Override
271 public PageInfo<ShyAudio> getListAudios(AudioDTO audioDTO) { 283 public PageInfo<ShyAudio> getListAudios(AudioDTO audioDTO) {
272 Example example = new Example(ShyAudio.class); 284 Example example = new Example(ShyAudio.class);
273 Example.Criteria criteria = example.createCriteria(); 285 Example.Criteria criteria = example.createCriteria();
@@ -314,7 +326,7 @@ public class AudioServiceImpl { @@ -314,7 +326,7 @@ public class AudioServiceImpl {
314 return pageInfo; 326 return pageInfo;
315 } 327 }
316 328
317 - 329 + @Override
318 public ShyAudio getDetailsAudio(Integer id) { 330 public ShyAudio getDetailsAudio(Integer id) {
319 ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id); 331 ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id);
320 if (!shyAudio.getState().equals(CommonConst.AUDIT_INTT)) { 332 if (!shyAudio.getState().equals(CommonConst.AUDIT_INTT)) {
@@ -339,6 +351,7 @@ public class AudioServiceImpl { @@ -339,6 +351,7 @@ public class AudioServiceImpl {
339 * @param audioDTO 351 * @param audioDTO
340 * @return 352 * @return
341 */ 353 */
  354 + @Override
342 public List<ShyAudio> findByCondition(AudioDTO audioDTO) { 355 public List<ShyAudio> findByCondition(AudioDTO audioDTO) {
343 Example example = new Example(ShyAudio.class); 356 Example example = new Example(ShyAudio.class);
344 Example.Criteria criteria = example.createCriteria(); 357 Example.Criteria criteria = example.createCriteria();
@@ -384,6 +397,7 @@ public class AudioServiceImpl { @@ -384,6 +397,7 @@ public class AudioServiceImpl {
384 * 397 *
385 * @param shyAudio 398 * @param shyAudio
386 */ 399 */
  400 + @Override
387 public void getShenheType(ShyAudio shyAudio) { 401 public void getShenheType(ShyAudio shyAudio) {
388 //获取点播免审sp 402 //获取点播免审sp
389 List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_AUDIO); 403 List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_AUDIO);
@@ -407,6 +421,7 @@ public class AudioServiceImpl { @@ -407,6 +421,7 @@ public class AudioServiceImpl {
407 * @param shyAudio 421 * @param shyAudio
408 * @return 422 * @return
409 */ 423 */
  424 + @Override
410 public void audioFilter(ShyAudio shyAudio) { 425 public void audioFilter(ShyAudio shyAudio) {
411 //调用易盾点播音频检测接口 426 //调用易盾点播音频检测接口
412 JSONObject jsonObject = YiDunAntiFraudUtil.submitAudioOnDemandUrl(shyAudio.getAudioUrl(), yiDun_audio_callback); 427 JSONObject jsonObject = YiDunAntiFraudUtil.submitAudioOnDemandUrl(shyAudio.getAudioUrl(), yiDun_audio_callback);
src/main/java/com/cnlive/shenhe/serviceImpl/ChannelServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/ChannelServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
@@ -7,6 +7,7 @@ import com.cnlive.shenhe.entity.ShyChannel; @@ -7,6 +7,7 @@ import com.cnlive.shenhe.entity.ShyChannel;
7 import com.cnlive.shenhe.entity.ShyUsers; 7 import com.cnlive.shenhe.entity.ShyUsers;
8 import com.cnlive.shenhe.mapper.ShyChannelMapper; 8 import com.cnlive.shenhe.mapper.ShyChannelMapper;
9 import com.cnlive.shenhe.mapper.ShyUsersMapper; 9 import com.cnlive.shenhe.mapper.ShyUsersMapper;
  10 +import com.cnlive.shenhe.service.ChannelService;
10 import com.cnlive.shenhe.utils.AuditPass; 11 import com.cnlive.shenhe.utils.AuditPass;
11 import com.cnlive.shenhe.utils.CommonConst; 12 import com.cnlive.shenhe.utils.CommonConst;
12 import com.cnlive.shenhe.utils.CommonUtils; 13 import com.cnlive.shenhe.utils.CommonUtils;
@@ -27,7 +28,7 @@ import java.util.List; @@ -27,7 +28,7 @@ import java.util.List;
27 * @Description: 28 * @Description:
28 */ 29 */
29 @Service 30 @Service
30 -public class ChannelServiceImpl { 31 +public class ChannelServiceImpl implements ChannelService {
31 32
32 private static Logger logger = LoggerFactory.getLogger(ChannelServiceImpl.class); 33 private static Logger logger = LoggerFactory.getLogger(ChannelServiceImpl.class);
33 @Autowired 34 @Autowired
@@ -46,6 +47,7 @@ public class ChannelServiceImpl { @@ -46,6 +47,7 @@ public class ChannelServiceImpl {
46 * @param shyChannel 47 * @param shyChannel
47 * @return 48 * @return
48 */ 49 */
  50 + @Override
49 public List<ShyChannel> findshyChannel(ShyChannel shyChannel) { 51 public List<ShyChannel> findshyChannel(ShyChannel shyChannel) {
50 return shyChannelMapper.selectByRowBounds(shyChannel, new RowBounds(0, 100)); 52 return shyChannelMapper.selectByRowBounds(shyChannel, new RowBounds(0, 100));
51 } 53 }
@@ -56,6 +58,7 @@ public class ChannelServiceImpl { @@ -56,6 +58,7 @@ public class ChannelServiceImpl {
56 * @param shyChannel 58 * @param shyChannel
57 * @return 59 * @return
58 */ 60 */
  61 + @Override
59 public boolean updateshyChannel(ShyChannel shyChannel) { 62 public boolean updateshyChannel(ShyChannel shyChannel) {
60 int result = shyChannelMapper.updateByPrimaryKey(shyChannel); 63 int result = shyChannelMapper.updateByPrimaryKey(shyChannel);
61 if (result == 0) { 64 if (result == 0) {
@@ -70,6 +73,7 @@ public class ChannelServiceImpl { @@ -70,6 +73,7 @@ public class ChannelServiceImpl {
70 * @param shyChannel 73 * @param shyChannel
71 * @return 74 * @return
72 */ 75 */
  76 + @Override
73 public boolean impotChannel(ShyChannel shyChannel) { 77 public boolean impotChannel(ShyChannel shyChannel) {
74 int result = shyChannelMapper.insertSelective(shyChannel); 78 int result = shyChannelMapper.insertSelective(shyChannel);
75 if (result == 0) { 79 if (result == 0) {
@@ -84,6 +88,7 @@ public class ChannelServiceImpl { @@ -84,6 +88,7 @@ public class ChannelServiceImpl {
84 * @param channelDTO 88 * @param channelDTO
85 * @return 89 * @return
86 */ 90 */
  91 + @Override
87 public PageInfo<ShyChannel> getPage(ChannelDTO channelDTO) { 92 public PageInfo<ShyChannel> getPage(ChannelDTO channelDTO) {
88 logger.info("接受参数对象为,ChannelDTO:{}", JSON.toJSONString(channelDTO)); 93 logger.info("接受参数对象为,ChannelDTO:{}", JSON.toJSONString(channelDTO));
89 Example example = new Example(ShyChannel.class); 94 Example example = new Example(ShyChannel.class);
@@ -137,6 +142,7 @@ public class ChannelServiceImpl { @@ -137,6 +142,7 @@ public class ChannelServiceImpl {
137 * @param id 142 * @param id
138 * @return 143 * @return
139 */ 144 */
  145 + @Override
140 public ShyChannel getDetailsChannel(Integer id) { 146 public ShyChannel getDetailsChannel(Integer id) {
141 ShyChannel comment = shyChannelMapper.selectByPrimaryKey(id); 147 ShyChannel comment = shyChannelMapper.selectByPrimaryKey(id);
142 if (!comment.getShenhe_status().equals(CommonConst.AUDIT_INTT)) { 148 if (!comment.getShenhe_status().equals(CommonConst.AUDIT_INTT)) {
@@ -165,6 +171,7 @@ public class ChannelServiceImpl { @@ -165,6 +171,7 @@ public class ChannelServiceImpl {
165 * @param msg 171 * @param msg
166 * @return 172 * @return
167 */ 173 */
  174 + @Override
168 public boolean updateState(String ids, Integer state, String userId, String updater, String msg) { 175 public boolean updateState(String ids, Integer state, String userId, String updater, String msg) {
169 boolean success = true; 176 boolean success = true;
170 String[] channelIds = ids.split(","); 177 String[] channelIds = ids.split(",");
@@ -219,6 +226,7 @@ public class ChannelServiceImpl { @@ -219,6 +226,7 @@ public class ChannelServiceImpl {
219 * @param id 226 * @param id
220 * @return 227 * @return
221 */ 228 */
  229 + @Override
222 public ShyChannel selectByPrimaryKey(Integer id) { 230 public ShyChannel selectByPrimaryKey(Integer id) {
223 ShyChannel shyChannel = shyChannelMapper.selectByPrimaryKey(id); 231 ShyChannel shyChannel = shyChannelMapper.selectByPrimaryKey(id);
224 return shyChannel; 232 return shyChannel;
@@ -230,6 +238,7 @@ public class ChannelServiceImpl { @@ -230,6 +238,7 @@ public class ChannelServiceImpl {
230 * @param channel 238 * @param channel
231 * @return 239 * @return
232 */ 240 */
  241 + @Override
233 public int updateByPrimaryKeySelective(ShyChannel channel) { 242 public int updateByPrimaryKeySelective(ShyChannel channel) {
234 return shyChannelMapper.updateByPrimaryKeySelective(channel); 243 return shyChannelMapper.updateByPrimaryKeySelective(channel);
235 } 244 }
@@ -239,6 +248,7 @@ public class ChannelServiceImpl { @@ -239,6 +248,7 @@ public class ChannelServiceImpl {
239 * 248 *
240 * @param shyChannel 249 * @param shyChannel
241 */ 250 */
  251 + @Override
242 public void getShenheType(ShyChannel shyChannel) { 252 public void getShenheType(ShyChannel shyChannel) {
243 253
244 //获取直播频道免审sp 254 //获取直播频道免审sp
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/CommentsServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.cnlive.shenhe.dto.CommentsDTO; 4 import com.cnlive.shenhe.dto.CommentsDTO;
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/ContentServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
src/main/java/com/cnlive/shenhe/serviceImpl/EmailServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/EmailServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 3
4 import com.alibaba.fastjson.JSON; 4 import com.alibaba.fastjson.JSON;
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/LiveApplyServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 3
4 import com.alibaba.fastjson.JSON; 4 import com.alibaba.fastjson.JSON;
src/main/java/com/cnlive/shenhe/serviceImpl/LiveServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/LiveServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.cnlive.shenhe.bean.ErrorEnum; 4 import com.cnlive.shenhe.bean.ErrorEnum;
src/main/java/com/cnlive/shenhe/serviceImpl/NotspeakServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/NotspeakServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 3
4 import com.alibaba.fastjson.JSON; 4 import com.alibaba.fastjson.JSON;
src/main/java/com/cnlive/shenhe/serviceImpl/ShyActivityImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/ShyActivityImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 3
4 import com.alibaba.fastjson.JSON; 4 import com.alibaba.fastjson.JSON;
src/main/java/com/cnlive/shenhe/serviceImpl/ShyLogServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/ShyLogServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.cnlive.shenhe.dto.ShyLogDTO; 4 import com.cnlive.shenhe.dto.ShyLogDTO;
src/main/java/com/cnlive/shenhe/serviceImpl/SitesServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/SitesServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.cnlive.shenhe.dto.SitesDTO; 4 import com.cnlive.shenhe.dto.SitesDTO;
src/main/java/com/cnlive/shenhe/serviceImpl/TopicServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/TopicServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
@@ -188,7 +188,7 @@ public class TopicServiceImpl { @@ -188,7 +188,7 @@ public class TopicServiceImpl {
188 * @return 188 * @return
189 */ 189 */
190 public boolean callback(String id, String msg, Integer state, String userId, String updater) { 190 public boolean callback(String id, String msg, Integer state, String userId, String updater) {
191 - boolean success = true; 191 + boolean success;
192 ShyTopic topic = shyTopicMapper.selectByPrimaryKey(Integer.parseInt(id)); 192 ShyTopic topic = shyTopicMapper.selectByPrimaryKey(Integer.parseInt(id));
193 JSONObject params = new JSONObject(); 193 JSONObject params = new JSONObject();
194 params.put("topic_id", topic.getTopic_id()); 194 params.put("topic_id", topic.getTopic_id());
src/main/java/com/cnlive/shenhe/serviceImpl/UsersServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/UsersServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.cnlive.shenhe.dto.UsersDTO; 4 import com.cnlive.shenhe.dto.UsersDTO;
src/main/java/com/cnlive/shenhe/serviceImpl/UsersfreeServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/UsersfreeServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
src/main/java/com/cnlive/shenhe/serviceImpl/VideofilterServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/VideofilterServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.cnlive.shenhe.entity.ShyVideofilter; 3 import com.cnlive.shenhe.entity.ShyVideofilter;
4 import com.cnlive.shenhe.mapper.ShyVideofilterMapper; 4 import com.cnlive.shenhe.mapper.ShyVideofilterMapper;
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/VideosServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONArray; 4 import com.alibaba.fastjson.JSONArray;
src/main/java/com/cnlive/shenhe/serviceImpl/YiDunServiceImpl.java renamed to src/main/java/com/cnlive/shenhe/service/serviceImpl/YiDunServiceImpl.java
1 -package com.cnlive.shenhe.serviceImpl; 1 +package com.cnlive.shenhe.service.serviceImpl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.cnlive.shenhe.entity.ShyYidun; 4 import com.cnlive.shenhe.entity.ShyYidun;