开发禁言、白名单接口并优化代码

王言钊
1 parent 64638111
Showing 25 changed files with 417 additions and 357 deletions
src/main/java/com/cnlive/shenhe/controller/AudioController.java
src/main/java/com/cnlive/shenhe/controller/ChannelController.java
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/ContentController.java
src/main/java/com/cnlive/shenhe/controller/LiveApplyController.java
src/main/java/com/cnlive/shenhe/controller/LiveController.java
src/main/java/com/cnlive/shenhe/controller/NotSpeakController.java
src/main/java/com/cnlive/shenhe/controller/SitesController.java
src/main/java/com/cnlive/shenhe/controller/TopicController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.java
src/main/java/com/cnlive/shenhe/controller/UsersFreeController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
src/main/java/com/cnlive/shenhe/job/NotSpeakJob.java
src/main/java/com/cnlive/shenhe/service/NotspeakService.java
src/main/java/com/cnlive/shenhe/service/SitesService.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/AudioServiceImpl.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/ChannelServiceImpl.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/ContentServiceImpl.java
@@ -10,7 +10,7 @@ import com.cnlive.shenhe.entity.ShyAudio;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.AudioService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -48,7 +48,7 @@ public class AudioController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(AudioController.class);
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Autowired
     AudioService audioService;
@@ -113,8 +113,7 @@ public class AudioController extends BaseController {
                             user = usersService.select(user);
                             if (CommonUtils.isNotNull(user)) {
                                 String email = CommonUtils.isEmpty(user.getEmail()) ? "" : user.getEmail();
-                                String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                                updater = userName;
+                                updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                             }
                         }
                         shyAudio.setUploader(updater);
@@ -345,8 +344,7 @@ public class AudioController extends BaseController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                 }
@@ -385,7 +383,6 @@ public class AudioController extends BaseController {
                 ShySites shySites = sitesService.findspidDescByspid(shyAudioList.get(i).getSpId());
                 cell.setCellValue(shySites.getName());
             }
-
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             wb.write(os);
             byte[] content = os.toByteArray();
@@ -430,20 +427,20 @@ public class AudioController extends BaseController {
     /**
      * 审核结果更新并通知点播音频
      *
-     * @param activity_id 音频id（audioId）
-     * @param state       状态码
-     * @param attr_tags   常用审核意见（标签）
-     * @param msg         审核备注
+     * @param activityId 音频id（audioId）
+     * @param state      状态码
+     * @param attrTags  常用审核意见（标签）
+     * @param msg        审核备注
      * @return
      */
     @PostMapping("/shenheAudio")
     @ResponseBody
-    public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, HttpSession session) {
+    public ResponseBean shenheInfo(Integer id, String activityId, Integer state, String attrTags, String msg, String callback, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
         JSONObject result;
         try {
-            result = pass.audioPass(activity_id, state, attr_tags, msg, callback);
+            result = pass.audioPass(activityId, state, attrTags, msg, callback);
         } catch (Exception e) {
             e.printStackTrace();
             System.out.println("音频审核失败");
@@ -459,7 +456,7 @@ public class AudioController extends BaseController {
             return new ResponseBean(code, result.getString("msg"));
         }
         state = state == 4 ? 2 : 1;
-        int i = audioService.updateAudio(id, userId, null, attr_tags, state, msg);
+        int i = audioService.updateAudio(id, userId, null, attrTags, state, msg);
         if (i == 0) {
             return new ResponseBean(ErrorEnum.ERROR);
         }
@@ -10,7 +10,7 @@ import com.cnlive.shenhe.entity.ShyChannel;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.ChannelService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -48,7 +48,7 @@ public class ChannelController extends BaseController {
     UsersServiceImpl usersService;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     /**
      * 频道列表页
@@ -106,8 +106,7 @@ public class ChannelController extends BaseController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                     channel.setUpdater(updater);
@@ -12,7 +12,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.CommentsService;
 import com.cnlive.shenhe.service.ContentService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -49,7 +49,7 @@ public class CommentsController extends BaseController {
     UsersServiceImpl usersService;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Autowired
     ContentService contentService;
@@ -99,8 +99,7 @@ public class CommentsController extends BaseController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                     comment.setUpdater(updater);
@@ -128,14 +127,12 @@ public class CommentsController extends BaseController {
                         comment.setComment_original_url(shyContent.getContent_url());
                     }
                 }
-
                 //评论的类型
                 if (CommonConst.CATEGORY_TOPIC.equals(comment.getType())) {
                     comment.setType("话题");
                 } else {
                     comment.setType("其他");
                 }
-
             }
         }
         /* 获取参数值给前台 用来判断是否需要把查看显示出来 state recive*/
@@ -435,8 +432,7 @@ public class CommentsController extends BaseController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                 }
@@ -9,7 +9,7 @@ import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.ContentService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -42,7 +42,7 @@ public class ContentController extends BaseController {
     @Autowired
     ContentService contentService;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Autowired
     UsersServiceImpl usersService;
@@ -382,14 +382,12 @@ public class ContentController extends BaseController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                 }
                 cell = row.createCell(10);
                 cell.setCellValue(updater);
-
                 cell = row.createCell(11);
                 cell.setCellValue(contentList.get(i).getShenhe_msg());
                 cell = row.createCell(12);
@@ -399,7 +397,6 @@ public class ContentController extends BaseController {
                 cell = row.createCell(14);
                 cell.setCellValue(contentList.get(i).getContent_url());
             }
-
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             wb.write(os);
             byte[] content = os.toByteArray();
@@ -11,7 +11,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.LiveApplyService;
 import com.cnlive.shenhe.service.LiveService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -52,7 +52,7 @@ public class LiveApplyController extends BaseController {
     @Autowired
     UsersServiceImpl usersService;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Autowired
     LiveService liveService;
     @Value("${spring.localhost.url}")
@@ -80,7 +80,7 @@ public class LiveApplyController extends BaseController {
         String showMsg = "";
         for (String shyLiveApplyId : shyLiveApplyIds) {
             ShyLiveapply shyLiveapply = liveApplyService.selectByPrimaryKey(Integer.parseInt(shyLiveApplyId));
-            JSONObject result = null;
+            JSONObject result;
             try {
                 result = pass.liveApplyPass(shyLiveapply.getActivity_id(), state + 2, msg, msg, shyLiveapply.getCallback());
             } catch (Exception e) {
@@ -154,8 +154,7 @@ public class LiveApplyController extends BaseController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                     liveApply.setUpdater(updater);
@@ -186,15 +185,12 @@ public class LiveApplyController extends BaseController {
     @GetMapping("/details")
     public Object getDetailsLiveApply(Model model, Integer id) {
         ShyLiveapply shyLiveapply = liveApplyService.getDetailsLiveApply(id);
-
         //显示spid简称
         ShySites shySites = sitesService.findspidDescByspid(shyLiveapply.getSp_id());
         if (CommonUtils.isNotNull(shySites)) {
             shyLiveapply.setSpid_desc(shySites.getName());
         }
-
         model.addAttribute("shyLiveapply", shyLiveapply);
-
         return "page/liveApplyDetail.html";
     }
@@ -223,7 +219,6 @@ public class LiveApplyController extends BaseController {
                     }
                 } else {
                     return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "您领取的内容不存在，请检查并重试");
-
                 }
             }
         }
@@ -10,7 +10,7 @@ import com.cnlive.shenhe.entity.ShyLive;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.LiveService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
@@ -55,7 +55,7 @@ public class LiveController extends BaseController {
     @Autowired
     UsersServiceImpl usersService;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Autowired
     LiveService liveService;
@@ -71,20 +71,20 @@ public class LiveController extends BaseController {
     /**
      * 审核信息返回接口
      *
-     * @param activity_id 视频id
-     * @param state       状态码
-     * @param attr_tags   标签
-     * @param msg         备注信息
+     * @param activityId 视频id
+     * @param state      状态码
+     * @param attrTags  标签
+     * @param msg        备注信息
      * @return
      */
     @PostMapping("/shenheVideo")
     @ResponseBody
-    public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, HttpSession session) {
+    public ResponseBean shenheInfo(Integer id, String activityId, Integer state, String attrTags, String msg, String callback, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
         JSONObject result = null;
         try {
-            result = pass.auditPass(activity_id, state, attr_tags, msg, callback);
+            result = pass.auditPass(activityId, state, attrTags, msg, callback);
         } catch (Exception e) {
             e.printStackTrace();
             System.out.println("视频审核失败");
@@ -100,7 +100,7 @@ public class LiveController extends BaseController {
             return new ResponseBean(code, result.getString("msg"));
         }
         state = state == 4 ? 2 : 1;
-        int i = videosService.updateVideo(id, userId, null, attr_tags, state, msg);
+        int i = videosService.updateVideo(id, userId, null, attrTags, state, msg);
         if (i == 0) {
             return new ResponseBean(ErrorEnum.ERROR);
         }
@@ -148,7 +148,6 @@ public class LiveController extends BaseController {
                 orderByClause = "is_hot desc, pre_start_time desc";
             }
         }
-
         if (CommonUtils.isNotNull(liveDTO.getContentId())) {
             Map<String, String> map = new HashMap<>(1);
             map.put("id", liveDTO.getContentId().toString());
@@ -162,7 +161,6 @@ public class LiveController extends BaseController {
                 liveDTO.setActivity_id(String.valueOf(liveDTO.getContentId()));
             }
         }
-
         PageInfo<ShyLive> livePage = liveService.getListLive(liveDTO);
         List<ShyLive> list = livePage.getList();
         if (!list.isEmpty()) {
@@ -195,15 +193,12 @@ public class LiveController extends BaseController {
     @GetMapping("/details")
     public Object getDetailsLive(Model model, Integer id) {
         ShyLive live = liveService.getDetailsLive(id);
-
         //显示spid简称
         ShySites shySites = sitesService.findspidDescByspid(live.getSp_id());
         if (CommonUtils.isNotNull(shySites)) {
             live.setSpid_desc(shySites.getName());
         }
-
         model.addAttribute("live", live);
-
         return "page/liveDetail.html";
     }
@@ -320,12 +315,11 @@ public class LiveController extends BaseController {
      *
      * @param ids
      * @param
-     * @param session
      * @return
      */
     @PostMapping("/syncLive")
     @ResponseBody
-    public ResponseBean syncLive(String ids, HttpSession session) {
+    public ResponseBean syncLive(String ids) {
         logger.info("同步直播云信息接口进入");
         ResponseBean responseBean = new ResponseBean();
         String[] shyLiveIds = ids.split(",");
@@ -470,8 +464,7 @@ public class LiveController extends BaseController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                 }
@@ -496,21 +489,18 @@ public class LiveController extends BaseController {
                     } else if (activityCount > 0) {
                         activityEndTime = "跨" + activityCount + "天 " + CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm");
                     }
-
                     cell = row.createCell(10);//列
                     cell.setCellValue(activityEndTime);
                     cell = row.createCell(11);//时长
                     /*时长需要处理成用户可读,单位：分钟*/
                     long timeLength = (activityEnd - activityStart) / (60 * 1000);
                     cell.setCellValue(timeLength);
-
                     cell = row.createCell(12);//列
                     cell.setCellValue("");
                     cell = row.createCell(13);//列
                     cell.setCellValue("");
                 }
             }
-
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             wb.write(os);
             byte[] content = os.toByteArray();
@@ -8,7 +8,9 @@ import com.cnlive.shenhe.dto.NotSpeakDTO;
 import com.cnlive.shenhe.entity.ShyNotspeak;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
-import com.cnlive.shenhe.service.serviceImpl.*;
+import com.cnlive.shenhe.service.NotspeakService;
+import com.cnlive.shenhe.service.SitesService;
+import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
@@ -33,11 +35,11 @@ import java.util.List;
 public class NotSpeakController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(NotSpeakController.class);
     @Autowired
-    NotspeakServiceImpl notSpeakService;
+    NotspeakService notSpeakService;
     @Autowired
     UsersServiceImpl usersService;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     /**
      * 禁言列表页
@@ -67,8 +69,7 @@ public class NotSpeakController extends BaseController {
                     user = usersService.select(user);
                     if (CommonUtils.isNotNull(user)) {
                         String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                        String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                        updater = userName;
+                        updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                     }
                 }
                 notspeak.setUpdater(updater);
@@ -105,8 +106,7 @@ public class NotSpeakController extends BaseController {
     public ResponseBean notSpeakByComment(Integer commentId, Integer time, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        ResponseBean success = notSpeakService.notSpeakByComment(commentId, time, userId);
-        return success;
+        return notSpeakService.notSpeakByComment(commentId, time, userId);
     }
     /**
@@ -123,8 +123,7 @@ public class NotSpeakController extends BaseController {
     public ResponseBean querySpeakState(Integer commentId, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        ResponseBean success = notSpeakService.querySpeakState(commentId, userId);
-        return success;
+        return notSpeakService.querySpeakState(commentId, userId);
     }
     /**
@@ -141,7 +140,6 @@ public class NotSpeakController extends BaseController {
     public ResponseBean speak(Integer notSpeakId, Integer type, Integer time, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        ResponseBean success = notSpeakService.speak(notSpeakId, type, time, userId);
-        return success;
+        return notSpeakService.speak(notSpeakId, type, time, userId);
     }
 }
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.dto.SitesDTO;
 import com.cnlive.shenhe.entity.ShySites;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
@@ -34,7 +34,7 @@ public class SitesController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(SitesController.class);
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     /**
      * 站点白名单分页列表
@@ -84,27 +84,26 @@ public class SitesController extends BaseController {
     @PostMapping(value = "/write")
-    public String write(Model model, Integer siteId, String[] write_business, HttpSession session, String redirect_url) {
+    public String write(Model model, Integer siteId, String[] writeBusiness, HttpSession session, String redirectUrl) {
         ShySites site = sitesService.get(siteId);
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
-        String write = "";
-        if (CommonUtils.isNotNull(write_business) && write_business.length > 0) {
-            for (String w : write_business) {
-                write = write + "," + w;
+        StringBuilder write = new StringBuilder();
+        if (CommonUtils.isNotNull(writeBusiness) && writeBusiness.length > 0) {
+            for (String w : writeBusiness) {
+                write.append(",").append(w);
             }
-            write = write.substring(1);
+            write = new StringBuilder(write.substring(1));
         }
-        site.setWrite_business(write);
+        site.setWrite_business(write.toString());
         boolean success = sitesService.update(site);
         if (success) {
-            return "redirect:" + redirect_url;
+            return "redirect:" + redirectUrl;
         } else {
             setmodelResult(model);
             return "error.html";
         }
     }
-
 }
@@ -7,7 +7,7 @@ import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.dto.TopicDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyTopic;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.TopicServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -40,7 +40,7 @@ public class TopicController extends BaseController {
     @Autowired
     TopicServiceImpl topicService;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Value("${spring.localhost.url}")
     private String localhost_url;
@@ -131,7 +131,7 @@ public class TopicController extends BaseController {
     public ResponseBean pass(String ids, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        boolean success = false;
+        boolean success;
         String[] topicIds = ids.split(",");
         for (String id : topicIds) {
             success = topicService.callback(id, "审核通过", CommonConst.AUDIT_SUCCESS, userId, "");
@@ -153,7 +153,7 @@ public class TopicController extends BaseController {
     public ResponseBean refuse(String ids, String msg, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        boolean success = false;
+        boolean success;
         String[] contentIds = ids.split(",");
         for (String id : contentIds) {
             success = topicService.callback(id, msg, CommonConst.AUDIT_REFUSE, userId, "");
@@ -8,7 +8,7 @@ import com.cnlive.shenhe.entity.ShyLog;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.ShyLogService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -42,7 +42,7 @@ public class UsersController extends BaseController {
     @Autowired
     private UsersServiceImpl usersService;
     @Autowired
-    private SitesServiceImpl sitesService;
+    private SitesService sitesService;
     @Autowired
     private ShyLogService shyLogService;
@@ -221,24 +221,23 @@ public class UsersController extends BaseController {
     @PostMapping(value = "/users/write")
-    public String write(Model model, Integer userId, String[] write_notice, HttpSession session, String redirect_url) {
+    public String write(Model model, Integer userId, String[] writeNotice, HttpSession session, String redirectUrl) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         ShyUsers user = usersService.get(userId);
-        String write = "";
-        if (CommonUtils.isNotNull(write_notice) && write_notice.length > 0) {
-            for (String w : write_notice) {
-                write = write + "," + w;
+        StringBuilder write = new StringBuilder();
+        if (CommonUtils.isNotNull(writeNotice) && writeNotice.length > 0) {
+            for (String w : writeNotice) {
+                write.append(",").append(w);
             }
-            write = write.substring(1);
+            write = new StringBuilder(write.substring(1));
         }
-        user.setNotice_show(write);
+        user.setNotice_show(write.toString());
         boolean success = usersService.update(user);
         if (success) {
-            return "redirect:" + redirect_url;
+            return "redirect:" + redirectUrl;
         } else {
             setmodelResult(model);
             return "error.html";
         }
     }
-
 }
@@ -8,7 +8,7 @@ import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.dto.UsersFreeDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsersfree;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersfreeServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -41,7 +41,7 @@ public class UsersFreeController extends BaseController {
     @Autowired
     UsersfreeServiceImpl usersfreeService;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     /**
      * 返回分页列表
@@ -101,41 +101,39 @@ public class UsersFreeController extends BaseController {
      *
      * @param id
      * @param isEnable
-     * @param session
      * @return
      */
     @PostMapping("/updateState")
     @ResponseBody
-    public ResponseBean updateState(Integer id, Boolean isEnable, HttpSession session) {
+    public ResponseBean updateState(Integer id, Boolean isEnable) {
         Integer n = usersfreeService.updateState(id, isEnable);
         if (n > 0) {
-            return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前用户" + (isEnable == true ? "启用" : "禁用") + "成功");
+            return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前用户" + (isEnable ? "启用" : "禁用") + "成功");
         }
         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "操作失败，请重试");
     }
     @PostMapping(value = "/write")
-    public String write(Model model, String userId, String userMobile, Integer spId, String[] write_business, HttpSession session, String redirect_url) {
+    public String write(Model model, String userId, String userMobile, Integer spId, String[] writeBusiness, HttpSession session, String redirectUrl) {
         if (CommonUtils.isEmpty(userId) && CommonUtils.isEmpty(userMobile)) {
             setmodelParam(model, "userId,userMobile不能为空！");
             return "error.html";
         }
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-        String write = "";
-        if (CommonUtils.isNotNull(write_business) && write_business.length > 0) {
-            for (String w : write_business) {
-                write = write + "," + w;
+        StringBuilder write = new StringBuilder();
+        if (CommonUtils.isNotNull(writeBusiness) && writeBusiness.length > 0) {
+            for (String w : writeBusiness) {
+                write.append(",").append(w);
             }
-            write = write.substring(1);
+            write = new StringBuilder(write.substring(1));
         }
-        boolean success = usersfreeService.update(userId, userMobile, write, spId, sessionUser.getUserId());
+        boolean success = usersfreeService.update(userId, userMobile, write.toString(), spId, sessionUser.getUserId());
         if (success) {
-            return "redirect:" + redirect_url;
+            return "redirect:" + redirectUrl;
         } else {
             setmodelResult(model);
             return "error.html";
         }
     }
-
 }
@@ -9,7 +9,7 @@ import com.cnlive.shenhe.dto.VideosDTO;
 import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.service.ShyActivityService;
 import com.cnlive.shenhe.service.ShyLogService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
@@ -55,7 +55,7 @@ public class VideosController extends BaseController {
     @Autowired
     private UsersServiceImpl usersService;
     @Autowired
-    private SitesServiceImpl sitesService;
+    private SitesService sitesService;
     @Autowired
     private ShyActivityService shyActivityService;
     @Autowired
@@ -82,7 +82,7 @@ public class VideosController extends BaseController {
      */
     @PostMapping("/shenheVideo")
     @ResponseBody
-    public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, String video_title,
+    public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback,
                                    HttpSession session, HttpServletRequest request) {
         logger.info("id:{},activity_id:{},state:{},attr_tags:{},msg:{},callback:{}", id, activity_id, state, attr_tags, msg, callback);
         AttributePrincipal principal = (AttributePrincipal) request.getUserPrincipal();
@@ -94,7 +94,6 @@ public class VideosController extends BaseController {
         JSONObject result;
         try {
             result = pass.auditPass(activity_id, state, attr_tags, msg, callback);
-
             ShyLog shyLog = new ShyLog();
             shyLog.setVideoId(activity_id);
             shyLog.setVideoName(shyVideos.getVideo_title());
@@ -103,7 +102,6 @@ public class VideosController extends BaseController {
             shyLog.setOperationType("人工审核");
             shyLog.setRemark(msg);
             shyLogService.addShyLog(shyLog);
-
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("视频审核失败", e);
@@ -143,7 +141,6 @@ public class VideosController extends BaseController {
         if (!StringUtils.isEmpty(videosDTO.getShen_auditor_id())) {
             if ((!"自动审核".equals(videosDTO.getShen_auditor_id())) && (!"白名单".equals(videosDTO.getShen_auditor_id()))) {
                 videosDTO.setShen_auditor_id(usersService.findspidByName(videosDTO.getShen_auditor_id()));
-
             }
         }
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
@@ -166,7 +163,6 @@ public class VideosController extends BaseController {
         } else if (CommonUtils.isEmpty(videosDTO.getSp_desc()) && videosDTO.getSpid() == 0) {
             videosDTO.setSpid(null);
         }
-
         if (CommonUtils.isNotNull(videosDTO.getContentId())) {
             Map<String, String> map = new HashMap<>(1);
             map.put("id", videosDTO.getContentId().toString());
@@ -180,7 +176,6 @@ public class VideosController extends BaseController {
                 videosDTO.setVideo_id(String.valueOf(videosDTO.getContentId()));
             }
         }
-
         PageInfo<ShyVideos> videoPage = videosService.getListVideo(videosDTO);
         //查询查询条件
         List<ShyActivity> activityList = shyActivityService.selectAll();
@@ -454,8 +449,7 @@ public class VideosController extends BaseController {
                         user = usersService.select(user);
                         if (CommonUtils.isNotNull(user)) {
                             String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                            String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                            updater = userName;
+                            updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
                         }
                     }
                 }
@@ -489,7 +483,6 @@ public class VideosController extends BaseController {
                 cell = row.createCell(15);//列
                 cell.setCellValue(shyVideosList.get(i).getSpid());
                 cell = row.createCell(16);//列
-
                 //显示spid简称
                 ShySites shySites = sitesService.findspidDescByspid(shyVideosList.get(i).getSpid());
                 if (CommonUtils.isNotNull(shySites)) {
@@ -504,7 +497,6 @@ public class VideosController extends BaseController {
                 cell = row.createCell(17);//列
                 cell.setCellValue(shyVideosList.get(i).getVideo_user_id());
             }
-
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             wb.write(os);
             byte[] content = os.toByteArray();
@@ -7,7 +7,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.mapper.ShyLiveapplyMapper;
 import com.cnlive.shenhe.service.EmailService;
 import com.cnlive.shenhe.service.LiveApplyService;
-import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.cnlive.shenhe.utils.HttpUtil;
@@ -50,7 +50,7 @@ public class LiveApplyJob {
     private String email_send_URL;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Autowired
     LiveApplyService liveApplyService;
     @Autowired
@@ -88,19 +88,19 @@ public class LiveApplyJob {
         List<ShyLiveapply> shyLiveApplyList = shyLiveApplyMapper.selectByExample(example);
         if (shyLiveApplyList.size() > 0) {
             //开发者对应的id，与app_key相对应
-            String app_id = email_app_id;
+            String appId = email_app_id;
             //开发者帐号对应的key. 请开发者谨慎保管此值。
-            String app_key = email_app_key;
+            String appKey = email_app_key;
             //调用邮件发送服务器的地址
-            String URL = email_send_URL;
+            String url = email_send_URL;
             List<ShyEmail> shyEmailList = emailService.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
             logger.info("直播申请邮件通知开始，共" + shyLiveApplyList.size() + "个申请，每个申请通知" + shyEmailList.size() + "个邮箱");
             for (ShyLiveapply liveApply : shyLiveApplyList) {
                 logger.info("当前发送邮件的直播申请id为：" + liveApply.getId());
                 //初始化通知状态
-                Integer notice_state = liveApply.getEmail_notice_state();
+                Integer noticeState = liveApply.getEmail_notice_state();
                 //初始化通知消息
-                String notice_msg = liveApply.getEmail_notice_msg();
+                String noticeMsg = liveApply.getEmail_notice_msg();
                 //显示spid简称
                 ShySites shySites = sitesService.findspidDescByspid(liveApply.getSp_id());
                 if (CommonUtils.isNotNull(shySites)) {
@@ -117,46 +117,44 @@ public class LiveApplyJob {
                     String title = liveApply.getSpid_desc() + "新直播开播申请";
                     String templateId = "4017";
                     Map<String, String> params = new HashMap<>();
-                    params.put("appId", app_id);
+                    params.put("appId", appId);
                     params.put("emailAddr", emailAddr);
                     params.put("title", title);
                     params.put("content", content);
                     params.put("templateId", templateId);
-                    params.put("sign", OpenUtil.sign(params, app_key));
+                    params.put("sign", OpenUtil.sign(params, appKey));
                     HttpUtil httpUtil = HttpUtil.init();
                     httpUtil.setParamMap(params);
                     try {
-                        Map<String, String> post = httpUtil.post(URL);
+                        Map<String, String> post = httpUtil.post(url);
                         logger.info("当前发送邮件用户为：" + emailAddr + ",发送邮件的直播申请审核云id为：" + liveApply.getId() + "结果为：" + post.get("result"));
                         JSONObject result = JSONObject.parseObject(post.get("result"));
                         if (result == null) {
-                            notice_state = CommonConst.NOTICE_FAIL;
-                            notice_msg = notice_msg + "\n" + dateTime + " 邮件服务器调用失败,result为空";
+                            noticeState = CommonConst.NOTICE_FAIL;
+                            noticeMsg = noticeMsg + "\n" + dateTime + " 邮件服务器调用失败,result为空";
                             break;
                         }
                         Integer code = result.getInteger("errorCode");
                         if (code != 0) {
-                            notice_state = CommonConst.NOTICE_FAIL;
-                            notice_msg = notice_msg + "\n" + dateTime + " 邮件服务器调用失败,result返回消息为：" + result.getString("errorMessage");
+                            noticeState = CommonConst.NOTICE_FAIL;
+                            noticeMsg = noticeMsg + "\n" + dateTime + " 邮件服务器调用失败,result返回消息为：" + result.getString("errorMessage");
                             break;
                         } else {
-                            notice_state = CommonConst.NOTICE_SUCCESS;
-                            notice_msg = notice_msg + "\n" + dateTime + " 邮件" + emailAddr + "(" + shyEmail.getRemark() + ")发送成功";
+                            noticeState = CommonConst.NOTICE_SUCCESS;
+                            noticeMsg = noticeMsg + "\n" + dateTime + " 邮件" + emailAddr + "(" + shyEmail.getRemark() + ")发送成功";
                         }
                     } catch (Exception e) {
                         logger.info("异常结果为：{}", e.getMessage());
-                        notice_state = CommonConst.NOTICE_FAIL;
-                        notice_msg = notice_msg + "\n" + dateTime + " 邮件服务器调用失败,服务器报错了";
+                        noticeState = CommonConst.NOTICE_FAIL;
+                        noticeMsg = noticeMsg + "\n" + dateTime + " 邮件服务器调用失败,服务器报错了";
                         break;
                     }
                 }
-
-                liveApply.setEmail_notice_state(notice_state);
-                liveApply.setEmail_notice_msg(notice_msg);
+                liveApply.setEmail_notice_state(noticeState);
+                liveApply.setEmail_notice_msg(noticeMsg);
                 liveApplyService.updateShyLiveApply(liveApply);
             }
         }
-
     }
     /**
@@ -182,5 +180,4 @@ public class LiveApplyJob {
             }
         }
     }
-
 }
 package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyNotspeak;
-import com.cnlive.shenhe.service.serviceImpl.NotspeakServiceImpl;
+import com.cnlive.shenhe.service.NotspeakService;
 import com.cnlive.shenhe.utils.CommonConst;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,7 +19,7 @@ public class NotSpeakJob {
     private static Logger logger = LoggerFactory.getLogger(NotSpeakJob.class);
     @Autowired
-    NotspeakServiceImpl notSpeakService;
+    NotspeakService notSpeakService;
     /**
      * 自动解除禁言
@@ -35,6 +35,4 @@ public class NotSpeakJob {
             }
         }
     }
-
-
 }
+package com.cnlive.shenhe.service;
+
+import com.cnlive.shenhe.bean.ResponseBean;
+import com.cnlive.shenhe.dto.NotSpeakDTO;
+import com.cnlive.shenhe.entity.ShyNotspeak;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @Author: yan-zhao-wang
+ * @DateTime: 2022-11-07 9:09
+ */
+public interface NotspeakService {
+    /**
+     * 根据条件获取禁言集合列表
+     *
+     * @param shyNotspeak
+     * @return
+     */
+    List<ShyNotspeak> findShyNotSpeak(ShyNotspeak shyNotspeak);
+
+    /**
+     * 根据主键修改禁言 返回布尔类型
+     *
+     * @param shyNotspeak
+     * @return
+     */
+    boolean updateShyNotSpeak(ShyNotspeak shyNotspeak);
+
+    /**
+     * 入禁言对象 返货布尔类型
+     *
+     * @param shyNotspeak
+     * @return
+     */
+    boolean impotShyNotSpeak(ShyNotspeak shyNotspeak);
+
+    /**
+     * 根据评论禁言
+     *
+     * @param commentId
+     * @param time
+     * @param userId
+     * @return
+     */
+    ResponseBean notSpeakByComment(Integer commentId, Integer time, String userId);
+
+    /**
+     * 查询禁言状态
+     *
+     * @param commentId
+     * @param userId
+     * @return
+     */
+    ResponseBean querySpeakState(Integer commentId, String userId);
+
+    /**
+     * 禁言回调
+     *
+     * @param notSpeakId
+     * @param type
+     * @param time
+     * @param userId
+     * @return
+     */
+    ResponseBean speak(Integer notSpeakId, Integer type, Integer time, String userId);
+
+    /**
+     * 根据评论进行禁言
+     *
+     * @param commentId
+     * @param time
+     * @param userId
+     * @return
+     */
+    boolean writeNotSpeakByComment(Integer commentId, Integer time, String userId);
+
+    /**
+     * 获取禁言分页、条件查询列表
+     *
+     * @param notSpeakDTO
+     * @return
+     */
+    PageInfo<ShyNotspeak> getPage(NotSpeakDTO notSpeakDTO);
+
+    /**
+     * 根据主键id查询禁言对象
+     *
+     * @param id
+     * @return
+     */
+    ShyNotspeak selectByPrimaryKey(Integer id);
+
+    /**
+     * 根据主键修改禁言对象
+     *
+     * @param shyNotspeak
+     * @return
+     */
+    int updateByPrimaryKeySelective(ShyNotspeak shyNotspeak);
+
+    /**
+     * 获取禁言时间
+     *
+     * @return
+     */
+    List<ShyNotspeak> getNotSpeakByTime();
+}
+package com.cnlive.shenhe.service;
+
+import com.cnlive.shenhe.dto.SitesDTO;
+import com.cnlive.shenhe.entity.ShySites;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @Author: yan-zhao-wang
+ * @DateTime: 2022-11-07 9:09
+ */
+public interface SitesService {
+    /**
+     * 分页、条件查询 返回列表
+     *
+     * @param sitesDTO
+     * @return
+     */
+    PageInfo<ShySites> getPage(SitesDTO sitesDTO);
+
+    /**
+     * 根据主键id查询白名单对象
+     *
+     * @param siteId
+     * @return
+     */
+    ShySites get(Integer siteId);
+
+    /**
+     * 根据主键修改白名单对象
+     *
+     * @param site
+     * @return
+     */
+    boolean update(ShySites site);
+
+    /**
+     * 根据spid查询白名单对象
+     *
+     * @param spId
+     * @return
+     */
+    ShySites findspidDescByspid(int spId);
+
+    /**
+     * 根据name查询白名单对象
+     *
+     * @param sp_desc
+     * @return
+     */
+    ShySites findspidBySpdesc(String sp_desc);
+
+    /**
+     * 获取免审白名单列表（点播）
+     *
+     * @param business_
+     * @return
+     */
+    List<Integer> getBusinessList(Integer business_);
+
+    /**
+     * 获取用户（操作人）
+     *
+     * @param updater
+     * @param auditor_id
+     * @return
+     */
+    String getUpdater(String updater, String auditor_id);
+}
@@ -4,10 +4,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.AudioDTO;
-import com.cnlive.shenhe.entity.*;
+import com.cnlive.shenhe.entity.ShyAudio;
+import com.cnlive.shenhe.entity.ShyUsers;
+import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.mapper.ShyAudioMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.service.AudioService;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -44,7 +47,7 @@ public class AudioServiceImpl implements AudioService {
     ShyUsersMapper shyUsersMapper;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Autowired
     YiDunServiceImpl yiDunServiceImpl;
     @Value("${yiDun_audio_callback}")
@@ -91,8 +94,7 @@ public class AudioServiceImpl implements AudioService {
      */
     @Override
     public ShyAudio selectByPrimaryKey(Integer id) {
-        ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id);
-        return shyAudio;
+        return shyAudioMapper.selectByPrimaryKey(id);
     }
     /**
@@ -103,8 +105,7 @@ public class AudioServiceImpl implements AudioService {
      */
     @Override
     public List<ShyAudio> findshyAudio(ShyAudio shyAudio) {
-        List<ShyAudio> shyAudiolist = shyAudioMapper.selectByRowBounds(shyAudio, new RowBounds(0, 100));
-        return shyAudiolist;
+        return shyAudioMapper.selectByRowBounds(shyAudio, new RowBounds(0, 100));
     }
     /**
@@ -135,7 +136,6 @@ public class AudioServiceImpl implements AudioService {
             audioService.updateAudio(shyAudio.getId(), null, shyAudio.getUploader(), "", CommonConst.AUDIT_CALLBACK_FAIL, shyAudio.getMsg());
             logger.error("点播音频回调失败，activity_id:{},code:{},msg:{}", shyAudio.getAudioId(), code, result.getString("msg"));
         }
-
         return 0;
     }
@@ -238,7 +238,6 @@ public class AudioServiceImpl implements AudioService {
             showMsg = showMsg + "," + shyAudio.getAudioTitle() + " 更新失败";
             return showMsg;
         }
-
         return showMsg;
     }
@@ -246,28 +245,28 @@ public class AudioServiceImpl implements AudioService {
      * 根据id查询到音频对象进行修改
      *
      * @param id
-     * @param auditor_id
+     * @param auditorId
      * @param updater
-     * @param attr_tags
+     * @param attrTags
      * @param state
      * @param msg
      * @return
      */
     @Override
-    public int updateAudio(Integer id, String auditor_id, String updater, String attr_tags, Integer state, String msg) {
+    public int updateAudio(Integer id, String auditorId, String updater, String attrTags, Integer state, String msg) {
         ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id);
-        shyAudio.setAuditor_id(auditor_id);
+        shyAudio.setAuditor_id(auditorId);
         shyAudio.setState(state);
-        if (CommonUtils.isNotEmpty(attr_tags)) {
-            shyAudio.setAttr_tags(attr_tags);
+        if (CommonUtils.isNotEmpty(attrTags)) {
+            shyAudio.setAttr_tags(attrTags);
         }
         if (CommonUtils.isNotEmpty(msg)) {
             shyAudio.setMsg(msg);
         }
         shyAudio.setUploader(updater);
-        if (CommonUtils.isNotEmpty(auditor_id)) {
+        if (CommonUtils.isNotEmpty(auditorId)) {
             shyAudio.setReceive(CommonConst.RECEIVE_AFTER);
-            shyAudio.setReceive_user_id(auditor_id);
+            shyAudio.setReceive_user_id(auditorId);
             shyAudio.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
         }
         return shyAudioMapper.updateByPrimaryKey(shyAudio);
@@ -337,8 +336,7 @@ public class AudioServiceImpl implements AudioService {
                 user.setUser_id(auditorId);
                 user = shyUsersMapper.selectOne(user);
                 String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                updater = userName;
+                updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
             }
             shyAudio.setUploader(updater);
         }
@@ -387,8 +385,7 @@ public class AudioServiceImpl implements AudioService {
         }
         //默认按上传时间倒序排序
         example.setOrderByClause("createTime desc");
-        List<ShyAudio> shyAudioList = shyAudioMapper.selectByExample(example);
-        return shyAudioList;
+        return shyAudioMapper.selectByExample(example);
     }
@@ -8,6 +8,7 @@ import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyChannelMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.service.ChannelService;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -39,7 +40,7 @@ public class ChannelServiceImpl implements ChannelService {
     AuditPass pass;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     /**
      * 根据条件查询频道集合
@@ -61,10 +62,7 @@ public class ChannelServiceImpl implements ChannelService {
     @Override
     public boolean updateshyChannel(ShyChannel shyChannel) {
         int result = shyChannelMapper.updateByPrimaryKey(shyChannel);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -76,10 +74,7 @@ public class ChannelServiceImpl implements ChannelService {
     @Override
     public boolean impotChannel(ShyChannel shyChannel) {
         int result = shyChannelMapper.insertSelective(shyChannel);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -153,8 +148,7 @@ public class ChannelServiceImpl implements ChannelService {
                 user.setUser_id(auditorId);
                 user = shyUsersMapper.selectOne(user);
                 String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                updater = userName;
+                updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
             }
             comment.setUpdater(updater);
         }
@@ -228,8 +222,7 @@ public class ChannelServiceImpl implements ChannelService {
      */
     @Override
     public ShyChannel selectByPrimaryKey(Integer id) {
-        ShyChannel shyChannel = shyChannelMapper.selectByPrimaryKey(id);
-        return shyChannel;
+        return shyChannelMapper.selectByPrimaryKey(id);
     }
     /**
@@ -7,6 +7,7 @@ import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.service.CommentsService;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -37,7 +38,7 @@ public class CommentsServiceImpl implements CommentsService {
     @Autowired
     AuditPass pass;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     /**
@@ -48,8 +49,7 @@ public class CommentsServiceImpl implements CommentsService {
      */
     @Override
     public List<ShyComments> findShyComments(ShyComments shyComments) {
-        List<ShyComments> commentsList = shyCommentsMapper.selectByRowBounds(shyComments, new RowBounds(0, 100));
-        return commentsList;
+        return shyCommentsMapper.selectByRowBounds(shyComments, new RowBounds(0, 100));
     }
     /**
@@ -61,10 +61,7 @@ public class CommentsServiceImpl implements CommentsService {
     @Override
     public boolean updateShyComments1(ShyComments shyComments) {
         int result = shyCommentsMapper.updateByPrimaryKey(shyComments);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -76,10 +73,7 @@ public class CommentsServiceImpl implements CommentsService {
     @Override
     public boolean impotComments(ShyComments shyComments) {
         int result = shyCommentsMapper.insertSelective(shyComments);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -219,8 +213,7 @@ public class CommentsServiceImpl implements CommentsService {
                 user.setUser_id(auditorId);
                 user = shyUsersMapper.selectOne(user);
                 String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                updater = userName;
+                updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
             }
             comment.setUpdater(updater);
         }
@@ -283,7 +276,6 @@ public class CommentsServiceImpl implements CommentsService {
                     success = false;
                 }
             }
-
         }
         return success;
     }
@@ -365,8 +357,7 @@ public class CommentsServiceImpl implements CommentsService {
      */
     @Override
     public ShyComments selectByPrimaryKey(Integer id) {
-        ShyComments shyComments = shyCommentsMapper.selectByPrimaryKey(id);
-        return shyComments;
+        return shyCommentsMapper.selectByPrimaryKey(id);
     }
     /**
@@ -7,6 +7,7 @@ import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.mapper.ShyContentMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.service.ContentService;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -37,7 +38,7 @@ public class ContentServiceImpl implements ContentService {
     @Autowired
     AuditPass pass;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     @Autowired
     VideosServiceImpl videosService;
     @Autowired
@@ -86,8 +87,7 @@ public class ContentServiceImpl implements ContentService {
         criteria.andEqualTo("content_tag", checkParamList);
         criteria.andEqualTo("shenhe_type", CommonConst.AUDIT_TYPE_MACHANE);
         criteria.andEqualTo("receive_status", CommonConst.RECEIVE_BEFORE);
-        List<ShyContent> ShyContent = shyContentMapper.selectByExampleAndRowBounds(example, new RowBounds(0, 100));
-        return ShyContent;
+        return shyContentMapper.selectByExampleAndRowBounds(example, new RowBounds(0, 100));
     }
     /**
@@ -99,10 +99,7 @@ public class ContentServiceImpl implements ContentService {
     @Override
     public boolean updateShyContent(ShyContent shyContent) {
         int result = shyContentMapper.updateByPrimaryKeySelective(shyContent);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -114,10 +111,7 @@ public class ContentServiceImpl implements ContentService {
     @Override
     public boolean impotContent(ShyContent shyContent) {
         int result = shyContentMapper.insertSelective(shyContent);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -181,7 +175,6 @@ public class ContentServiceImpl implements ContentService {
      */
     @Override
     public List<ShyContent> findByCondition(ContentDTO contentDTO) {
-
         Example example = new Example(ShyContent.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(contentDTO.getOrderByClause())) {
@@ -210,8 +203,7 @@ public class ContentServiceImpl implements ContentService {
         if (CommonUtils.isNotNull(contentDTO.getReceive_status())) {
             criteria.andEqualTo("receive_status", contentDTO.getReceive_status());
         }
-        List<ShyContent> shyContentList = shyContentMapper.selectByExample(example);
-        return shyContentList;
+        return shyContentMapper.selectByExample(example);
     }
@@ -232,8 +224,7 @@ public class ContentServiceImpl implements ContentService {
                 user.setUser_id(auditorId);
                 user = shyUsersMapper.selectOne(user);
                 String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                updater = userName;
+                updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
             }
             content.setUpdater(updater);
         }
@@ -407,8 +398,7 @@ public class ContentServiceImpl implements ContentService {
      */
     @Override
     public ShyContent selectByPrimaryKey(Integer id) {
-        ShyContent shyContent = shyContentMapper.selectByPrimaryKey(id);
-        return shyContent;
+        return shyContentMapper.selectByPrimaryKey(id);
     }
     /**
@@ -428,18 +418,18 @@ public class ContentServiceImpl implements ContentService {
      * @param spId
      */
     @Override
-    public Integer getShenheType(Integer spId, String ContentTag) {
+    public Integer getShenheType(Integer spId, String contentTag) {
         //获取图文免审sp
         List<Integer> sites = sitesService.getBusinessList(CommonConst.BUSINESS_CONTENT);
         //初始化一个审核状态
         //审核类型，1:免审，2:机审，3:人工审  默认人工审
         Integer shenheType = CommonConst.AUDIT_TYPE_USER;
         //如果当前sp是免审sp
-        if (sites.contains(spId) || ContentTag.startsWith("cms_") || ContentTag.startsWith("edu_")) {
+        if (sites.contains(spId) || contentTag.startsWith("cms_") || contentTag.startsWith("edu_")) {
             //免审
             shenheType = CommonConst.AUDIT_TYPE_FREE;
         } else {
-            if ("content".equals(ContentTag)) {
+            if ("content".equals(contentTag)) {
                 //机审
                 shenheType = CommonConst.AUDIT_TYPE_MACHANE;
             }
@@ -481,7 +471,6 @@ public class ContentServiceImpl implements ContentService {
             e.printStackTrace();
         }
     }
-
 }
@@ -10,6 +10,7 @@ import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyLiveapplyMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.service.LiveApplyService;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
@@ -39,7 +40,7 @@ public class LiveApplyServiceImpl implements LiveApplyService {
     @Autowired
     ShyUsersMapper shyUsersMapper;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     /**
      * 导入直播申请
@@ -50,10 +51,7 @@ public class LiveApplyServiceImpl implements LiveApplyService {
     @Override
     public boolean impotLiveApply(ShyLiveapply shyLiveApply) {
         int result = shyLiveApplyMapper.insertSelective(shyLiveApply);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -64,8 +62,7 @@ public class LiveApplyServiceImpl implements LiveApplyService {
      */
     @Override
     public ShyLiveapply selectByPrimaryKey(Integer id) {
-        ShyLiveapply shyLiveApply = shyLiveApplyMapper.selectByPrimaryKey(id);
-        return shyLiveApply;
+        return shyLiveApplyMapper.selectByPrimaryKey(id);
     }
     /**
@@ -76,8 +73,7 @@ public class LiveApplyServiceImpl implements LiveApplyService {
      */
     @Override
     public List<ShyLiveapply> findShyLiveApply(ShyLiveapply shyLiveApply) {
-        List<ShyLiveapply> shyLiveApplylist = shyLiveApplyMapper.selectByRowBounds(shyLiveApply, new RowBounds(0, 100));
-        return shyLiveApplylist;
+        return shyLiveApplyMapper.selectByRowBounds(shyLiveApply, new RowBounds(0, 100));
     }
     /**
@@ -89,26 +85,23 @@ public class LiveApplyServiceImpl implements LiveApplyService {
     @Override
     public boolean updateShyLiveApply(ShyLiveapply shyLiveApply) {
         int i = shyLiveApplyMapper.updateByPrimaryKey(shyLiveApply);
-        if (i == 0) {
-            return false;
-        }
-        return true;
+        return i != 0;
     }
     /**
      * 修改直播申请对象 返回int类型
      *
      * @param id
-     * @param auditor_id
+     * @param auditorId
      * @param updater
      * @param status
      * @param msg
      * @return
      */
     @Override
-    public int updateLiveApply(Integer id, String auditor_id, String updater, Integer status, String msg) {
+    public int updateLiveApply(Integer id, String auditorId, String updater, Integer status, String msg) {
         ShyLiveapply shyLiveapply = shyLiveApplyMapper.selectByPrimaryKey(id);
-        shyLiveapply.setAuditor(auditor_id);
+        shyLiveapply.setAuditor(auditorId);
         shyLiveapply.setShenhe_state(status);
         shyLiveapply.setReceive(CommonConst.RECEIVE_AFTER);
         shyLiveapply.setShenhe_msg(msg);
@@ -197,8 +190,7 @@ public class LiveApplyServiceImpl implements LiveApplyService {
                 user.setUser_id(auditorId);
                 user = shyUsersMapper.selectOne(user);
                 String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                updater = userName;
+                updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
             }
             shyLiveapply.setUpdater(updater);
         }
@@ -334,8 +326,7 @@ public class LiveApplyServiceImpl implements LiveApplyService {
                 criteria.andEqualTo("auditor", liveApplyDTO.getUserId());
             }
         }
-        List<ShyLiveapply> shyLiveApplyList = shyLiveApplyMapper.selectByExample(example);
-        return shyLiveApplyList;
+        return shyLiveApplyMapper.selectByExample(example);
     }
     /**
@@ -358,6 +349,4 @@ public class LiveApplyServiceImpl implements LiveApplyService {
         }
         shyLiveApply.setShenhe_type(shenheType);
     }
-
-
 }
@@ -9,6 +9,7 @@ import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyNotspeak;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
 import com.cnlive.shenhe.mapper.ShyNotspeakMapper;
+import com.cnlive.shenhe.service.NotspeakService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -30,7 +31,7 @@ import java.util.List;
  * @Description:
  */
 @Service
-public class NotspeakServiceImpl {
+public class NotspeakServiceImpl implements NotspeakService {
     private static Logger logger = LoggerFactory.getLogger(NotspeakServiceImpl.class);
     @Autowired
@@ -44,46 +45,48 @@ public class NotspeakServiceImpl {
     /**
      * 根据条件获取禁言集合列表
+     *
      * @param shyNotspeak
      * @return
      */
-    public List<ShyNotspeak> findshyNotspeak(ShyNotspeak shyNotspeak) {
+    @Override
+    public List<ShyNotspeak> findShyNotSpeak(ShyNotspeak shyNotspeak) {
         return shyNotspeakMapper.selectByRowBounds(shyNotspeak, new RowBounds(0, 100));
     }
     /**
      * 根据主键修改禁言 返回布尔类型
+     *
      * @param shyNotspeak
      * @return
      */
-    public boolean updateshyNotspeak(ShyNotspeak shyNotspeak) {
+    @Override
+    public boolean updateShyNotSpeak(ShyNotspeak shyNotspeak) {
         int result = shyNotspeakMapper.updateByPrimaryKey(shyNotspeak);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
      * 导入禁言对象 返货布尔类型
+     *
      * @param shyNotspeak
      * @return
      */
-    public boolean impotshyNotspeak(ShyNotspeak shyNotspeak) {
+    @Override
+    public boolean impotShyNotSpeak(ShyNotspeak shyNotspeak) {
         int result = shyNotspeakMapper.insertSelective(shyNotspeak);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
      * 根据评论禁言
+     *
      * @param commentId
      * @param time
      * @param userId
      * @return
      */
+    @Override
     public ResponseBean notSpeakByComment(Integer commentId, Integer time, String userId) {
         ResponseBean success;
         ShyComments comment = shyCommentsMapper.selectByPrimaryKey(commentId);
@@ -133,16 +136,18 @@ public class NotspeakServiceImpl {
     /**
      * 查询禁言状态
+     *
      * @param commentId
      * @param userId
      * @return
      */
+    @Override
     public ResponseBean querySpeakState(Integer commentId, String userId) {
         ShyComments comment = shyCommentsMapper.selectByPrimaryKey(commentId);
         ShyNotspeak shyNotspeak = new ShyNotspeak();
         shyNotspeak.setUser_id(comment.getComment_user_id());
         shyNotspeak.setState(CommonConst.SPEAK_NOT);
-        List<ShyNotspeak> shyNotspeakList = findshyNotspeak(shyNotspeak);
+        List<ShyNotspeak> shyNotspeakList = findShyNotSpeak(shyNotspeak);
         if (shyNotspeakList.size() > 0) {
             shyNotspeak = shyNotspeakList.get(0);
             return new ResponseBean(500, "当前用户已被禁言，禁言剩余时长：" + (shyNotspeak.getEnd_time().getTime() - System.currentTimeMillis()) / (1000 * 60) + "分钟，解禁时间：" + CommonUtils.formatDate(shyNotspeak.getEnd_time(), "yyyy-MM-dd HH:mm:ss"));
@@ -152,12 +157,14 @@ public class NotspeakServiceImpl {
     /**
      * 禁言回调
+     *
      * @param notSpeakId
      * @param type
      * @param time
      * @param userId
      * @return
      */
+    @Override
     public ResponseBean speak(Integer notSpeakId, Integer type, Integer time, String userId) {
         ResponseBean success;
         ShyNotspeak shyNotspeak = selectByPrimaryKey(notSpeakId);
@@ -203,7 +210,7 @@ public class NotspeakServiceImpl {
             }
             shyNotspeak.setUpdated_at(CommonUtils.getCurrentTime());
             shyNotspeak.setMsg(shyNotspeak.getMsg() + "\n" + msg);
-            boolean res = updateshyNotspeak(shyNotspeak);
+            boolean res = updateShyNotSpeak(shyNotspeak);
             if (!res) {
                 success = new ResponseBean(500, "评论禁言修改禁言表失败!");
                 return success;
@@ -213,7 +220,16 @@ public class NotspeakServiceImpl {
         return new ResponseBean();
     }
+    /**
+     * 根据评论进行禁言
+     *
+     * @param commentId
+     * @param time
+     * @param userId
+     * @return
+     */
+    @Override
     public boolean writeNotSpeakByComment(Integer commentId, Integer time, String userId) {
         boolean result = false;
         ShyComments comment = shyCommentsMapper.selectByPrimaryKey(commentId);
@@ -236,7 +252,7 @@ public class NotspeakServiceImpl {
             notspeak.setCount(notspeak.getCount() + 1);
             notspeak.setUpdater("");
             notspeak.setAuditor(userId);
-            result = updateshyNotspeak(notspeak);
+            result = updateShyNotSpeak(notspeak);
         } else {
             shyNotspeak.setUser_name(comment.getComment_user_name());
             shyNotspeak.setUser_id(comment.getComment_user_id());
@@ -252,16 +268,18 @@ public class NotspeakServiceImpl {
             shyNotspeak.setCount(1);
             shyNotspeak.setUpdater("");
             shyNotspeak.setAuditor(userId);
-            result = impotshyNotspeak(shyNotspeak);
+            result = impotShyNotSpeak(shyNotspeak);
         }
         return result;
     }
     /**
      * 获取禁言分页、条件查询列表
+     *
      * @param notSpeakDTO
      * @return
      */
+    @Override
     public PageInfo<ShyNotspeak> getPage(NotSpeakDTO notSpeakDTO) {
         logger.info("接受参数对象为，NotSpeakDTO:{}", JSON.toJSONString(notSpeakDTO));
         Example example = new Example(ShyNotspeak.class);
@@ -289,30 +307,38 @@ public class NotspeakServiceImpl {
     /**
      * 根据主键id查询禁言对象
+     *
      * @param id
      * @return
      */
+    @Override
     public ShyNotspeak selectByPrimaryKey(Integer id) {
-        ShyNotspeak shyNotspeak = shyNotspeakMapper.selectByPrimaryKey(id);
-        return shyNotspeak;
+        return shyNotspeakMapper.selectByPrimaryKey(id);
     }
     /**
      * 根据主键修改禁言对象
+     *
      * @param shyNotspeak
      * @return
      */
+    @Override
     public int updateByPrimaryKeySelective(ShyNotspeak shyNotspeak) {
         return shyNotspeakMapper.updateByPrimaryKeySelective(shyNotspeak);
     }
+    /**
+     * 获取禁言时间
+     *
+     * @return
+     */
+    @Override
     public List<ShyNotspeak> getNotSpeakByTime() {
         Example example = new Example(ShyNotspeak.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("state", CommonConst.SPEAK_NOT);
         criteria.andLessThan("end_time", CommonUtils.getCurrentTime());
-        List<ShyNotspeak> shyNotspeakList = shyNotspeakMapper.selectByExample(example);
-        return shyNotspeakList;
+        return shyNotspeakMapper.selectByExample(example);
     }
 }
@@ -5,6 +5,7 @@ import com.cnlive.shenhe.dto.SitesDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShySitesMapper;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -25,7 +26,7 @@ import java.util.List;
  * @Description:
  */
 @Service
-public class SitesServiceImpl {
+public class SitesServiceImpl implements SitesService {
     private static Logger logger = LoggerFactory.getLogger(SitesServiceImpl.class);
     @Autowired
@@ -39,6 +40,7 @@ public class SitesServiceImpl {
      * @param sitesDTO
      * @return
      */
+    @Override
     public PageInfo<ShySites> getPage(SitesDTO sitesDTO) {
         logger.info("接受参数列表为，SitesDTO:{}", JSON.toJSONString(sitesDTO));
         Example example = new Example(ShySites.class);
@@ -68,6 +70,7 @@ public class SitesServiceImpl {
      * @param siteId
      * @return
      */
+    @Override
     public ShySites get(Integer siteId) {
         return shySitesMapper.selectByPrimaryKey(siteId);
     }
@@ -78,6 +81,7 @@ public class SitesServiceImpl {
      * @param site
      * @return
      */
+    @Override
     public boolean update(ShySites site) {
         return shySitesMapper.updateByPrimaryKeySelective(site) == 1;
     }
@@ -88,12 +92,11 @@ public class SitesServiceImpl {
      * @param spId
      * @return
      */
+    @Override
     public ShySites findspidDescByspid(int spId) {
         Example example = new Example(ShySites.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotNull(spId)) {
-            criteria.andEqualTo("spid", spId);
-        }
+        criteria.andEqualTo("spid", spId);
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
         if (CommonUtils.isNotNull(shySites) && shySites.size() > 0) {
             return shySites.get(0);
@@ -104,14 +107,15 @@ public class SitesServiceImpl {
     /**
      * 根据name查询白名单对象
      *
-     * @param sp_desc
+     * @param spDesc
      * @return
      */
-    public ShySites findspidBySpdesc(String sp_desc) {
+    @Override
+    public ShySites findspidBySpdesc(String spDesc) {
         Example example = new Example(ShySites.class);
         Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(sp_desc)) {
-            criteria.andEqualTo("name", sp_desc);
+        if (CommonUtils.isNotEmpty(spDesc)) {
+            criteria.andEqualTo("name", spDesc);
         }
         List<ShySites> shySites = shySitesMapper.selectByExample(example);
         if (CommonUtils.isNotNull(shySites) && shySites.size() > 0) {
@@ -125,6 +129,7 @@ public class SitesServiceImpl {
      *
      * @return
      */
+    @Override
     public List<Integer> getBusinessList(Integer business_) {
         List<ShySites> sitesList = shySitesMapper.selectAll();
         List<Integer> sites = new ArrayList<Integer>();
@@ -144,19 +149,18 @@ public class SitesServiceImpl {
      * 获取用户（操作人）
      *
      * @param updater
-     * @param auditor_id
+     * @param auditorId
      * @return
      */
-    public String getUpdater(String updater, String auditor_id) {
-
-        if (CommonUtils.isNotEmpty(auditor_id)) {
+    @Override
+    public String getUpdater(String updater, String auditorId) {
+        if (CommonUtils.isNotEmpty(auditorId)) {
             ShyUsers user = new ShyUsers();
-            user.setUser_id(auditor_id);
+            user.setUser_id(auditorId);
             user = usersService.select(user);
             if (CommonUtils.isNotNull(user)) {
                 String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                updater = userName;
+                updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
             }
         }
         return updater;
@@ -3,9 +3,9 @@ package com.cnlive.shenhe.service.serviceImpl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.dto.TopicDTO;
-import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShyTopic;
 import com.cnlive.shenhe.mapper.ShyTopicMapper;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.cnlive.shenhe.utils.TransitServiceUtils;
@@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
-import java.util.Date;
 import java.util.List;
 /**
@@ -35,7 +34,7 @@ public class TopicServiceImpl {
     @Autowired
     TransitServiceUtils transitServiceUtils;
     @Autowired
-    SitesServiceImpl sitesService;
+    SitesService sitesService;
     public ShyTopic getShyTopic(ShyTopic shyTopic) {
         List<ShyTopic> shyTopicList = shyTopicMapper.select(shyTopic);
@@ -63,10 +62,7 @@ public class TopicServiceImpl {
      */
     public boolean updateshyTopic(ShyTopic shyTopic) {
         int result = shyTopicMapper.updateByPrimaryKey(shyTopic);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -77,10 +73,7 @@ public class TopicServiceImpl {
      */
     public boolean impotshyTopic(ShyTopic shyTopic) {
         int result = shyTopicMapper.insertSelective(shyTopic);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -135,47 +128,6 @@ public class TopicServiceImpl {
         return pageInfo;
     }
-    /**
-     * 根据条件导出数据excel
-     *
-     * @return
-     */
-    public List<ShyTopic> findByCondition(String title, String content_tag, String contentId, Date start_date,
-                                          Date end_date, Integer receive_status, Integer page,
-                                          Integer pageSize, String orderByClause, Integer spid) {
-
-        Example example = new Example(ShyContent.class);
-        Example.Criteria criteria = example.createCriteria();
-        if (CommonUtils.isNotEmpty(orderByClause)) {
-            example.setOrderByClause(orderByClause);
-        } else {
-            example.setOrderByClause("create_date desc");
-        }
-        if (CommonUtils.isNotNull(start_date)) {
-            criteria.andGreaterThanOrEqualTo("create_date", start_date);
-        }
-        if (CommonUtils.isNotNull(end_date)) {
-            criteria.andLessThanOrEqualTo("create_date", end_date);
-        }
-        if (CommonUtils.isNotEmpty(title)) {
-            criteria.andLike("title", "%" + title + "%");
-        }
-        if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("sp_id", spid);
-        }
-        if (CommonUtils.isNotEmpty(contentId)) {
-            criteria.andEqualTo("content_id", contentId);
-        }
-        if (CommonUtils.isNotEmpty(content_tag)) {
-            criteria.andEqualTo("content_tag", content_tag);
-        }
-        if (CommonUtils.isNotNull(receive_status)) {
-            criteria.andEqualTo("receive_status", receive_status);
-        }
-        List<ShyTopic> shyContentList = shyTopicMapper.selectByExample(example);
-        return shyContentList;
-    }
-
     /**
      * 话题回调
@@ -216,7 +168,6 @@ public class TopicServiceImpl {
         if (i != 1) {
             success = false;
         }
-
         return success;
     }
@@ -228,8 +179,7 @@ public class TopicServiceImpl {
      * @return
      */
     public ShyTopic selectByPrimaryKey(Integer id) {
-        ShyTopic shyTopic = shyTopicMapper.selectByPrimaryKey(id);
-        return shyTopic;
+        return shyTopicMapper.selectByPrimaryKey(id);
     }
     /**
@@ -13,6 +13,7 @@ import com.cnlive.shenhe.entity.ShyYidun;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.mapper.ShyVideosMapper;
 import com.cnlive.shenhe.service.ShyActivityService;
+import com.cnlive.shenhe.service.SitesService;
 import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -46,7 +47,7 @@ public class VideosServiceImpl {
     @Autowired
     private VideosServiceImpl videosService;
     @Autowired
-    private SitesServiceImpl sitesService;
+    private SitesService sitesService;
     @Autowired
     private UsersfreeServiceImpl usersfreeServiceImpl;
     @Autowired
@@ -68,10 +69,7 @@ public class VideosServiceImpl {
      */
     public boolean impotVideo(ShyVideos shyVideos) {
         int result = shyVideosMapper.insertSelective(shyVideos);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -81,8 +79,7 @@ public class VideosServiceImpl {
      * @return
      */
     public ShyVideos selectByPrimaryKey(Integer id) {
-        ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
-        return shyVideos;
+        return shyVideosMapper.selectByPrimaryKey(id);
     }
     /**
@@ -92,8 +89,7 @@ public class VideosServiceImpl {
      * @return
      */
     public List<ShyVideos> findshyVideo(ShyVideos shyVideos) {
-        List<ShyVideos> shyVideoslist = shyVideosMapper.selectByRowBounds(shyVideos, new RowBounds(0, 100));
-        return shyVideoslist;
+        return shyVideosMapper.selectByRowBounds(shyVideos, new RowBounds(0, 100));
     }
     /**
@@ -104,10 +100,7 @@ public class VideosServiceImpl {
      */
     public boolean updateshyVideos(ShyVideos shyVideos) {
         int i = shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
-        if (i == 0) {
-            return false;
-        }
-        return true;
+        return i != 0;
     }
     /**
@@ -240,8 +233,7 @@ public class VideosServiceImpl {
                 user.setUser_id(auditorId);
                 user = shyUsersMapper.selectOne(user);
                 String email = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                String userName = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
-                updater = userName;
+                updater = CommonUtils.isEmpty(user.getUsername()) ? email : user.getUsername();
             }
             shyVideos.setUpdater(updater);
         }
@@ -366,8 +358,7 @@ public class VideosServiceImpl {
             }
         }
         //默认按上传时间倒序排序
-        List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example);
-        return shyVideosList;
+        return shyVideosMapper.selectByExample(example);
     }
     /**
@@ -375,9 +366,8 @@ public class VideosServiceImpl {
      * type:1:文本 2:图片 3.网页 4:点播音频
      *
      * @param cid 审核云中视频的id
-     * @return
      */
-    public int videoFilter(Integer cid) {
+    public void videoFilter(Integer cid) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(cid);
         shyVideos.setUpdater("自动审核");
         Integer plat = shyVideos.getPlat();
@@ -431,13 +421,10 @@ public class VideosServiceImpl {
             shyYidun.setCheck_type(CommonConstStates.TUPIAN);
             shyYidun.setDuration(shyVideos.getDuration());
             shyYidun.setCreate_time(new Date());
-
             yiDunServiceImpl.addYiDunMsg(shyYidun);
-
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return 0;
     }
     /**