开发用户白名单、用户管理service接口并优化

王言钊
1 parent 90ec071e
Showing 25 changed files with 262 additions and 140 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/EmailController.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/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/service/AudioService.java
src/main/java/com/cnlive/shenhe/service/ContentService.java
src/main/java/com/cnlive/shenhe/service/LiveApplyService.java
src/main/java/com/cnlive/shenhe/service/LiveService.java
src/main/java/com/cnlive/shenhe/service/SitesService.java
src/main/java/com/cnlive/shenhe/service/UsersService.java
src/main/java/com/cnlive/shenhe/service/UsersfreeService.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/AudioServiceImpl.java
@@ -11,7 +11,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.AudioService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -54,7 +54,7 @@ public class AudioController extends BaseController {
     AudioService audioService;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     @Value("${qn_domain}")
     String qn_domain;
@@ -427,20 +427,20 @@ public class AudioController extends BaseController {
     /**
      * 审核结果更新并通知点播音频
      *
-     * @param activityId 音频id（audioId）
+     * @param activity_id 音频id（audioId）
      * @param state      状态码
-     * @param attrTags  常用审核意见（标签）
+     * @param attr_tags  常用审核意见（标签）
      * @param msg        审核备注
      * @return
      */
     @PostMapping("/shenheAudio")
     @ResponseBody
-    public ResponseBean shenheInfo(Integer id, String activityId, Integer state, String attrTags, String msg, String callback, HttpSession session) {
+    public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
         JSONObject result;
         try {
-            result = pass.audioPass(activityId, state, attrTags, msg, callback);
+            result = pass.audioPass(activity_id, state, attr_tags, msg, callback);
         } catch (Exception e) {
             e.printStackTrace();
             System.out.println("音频审核失败");
@@ -456,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, attrTags, state, msg);
+        int i = audioService.updateAudio(id, userId, null, attr_tags, state, msg);
         if (i == 0) {
             return new ResponseBean(ErrorEnum.ERROR);
         }
@@ -11,7 +11,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.ChannelService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -45,7 +45,7 @@ public class ChannelController extends BaseController {
     ChannelService channelService;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     @Autowired
     SitesService sitesService;
@@ -13,7 +13,7 @@ import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.CommentsService;
 import com.cnlive.shenhe.service.ContentService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -46,7 +46,7 @@ public class CommentsController extends BaseController {
     CommentsService commentsService;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     @Autowired
     SitesService sitesService;
@@ -10,7 +10,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.ContentService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
@@ -45,7 +45,7 @@ public class ContentController extends BaseController {
     SitesService sitesService;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     /**
      * 图文列表
@@ -9,7 +9,7 @@ import com.cnlive.shenhe.dto.EmailDTO;
 import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.EmailService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
@@ -39,7 +39,7 @@ public class EmailController extends BaseController {
     @Autowired
     EmailService emailService;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     /**
      * 展示分页 条件查询结果
@@ -69,8 +69,7 @@ public class EmailController extends BaseController {
                     user = usersService.select(user);
                     if (CommonUtils.isNotNull(user)) {
                         String emailAdd = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                        String userName = CommonUtils.isEmpty(user.getUsername()) ? emailAdd : user.getUsername();
-                        updater = userName;
+                        updater = CommonUtils.isEmpty(user.getUsername()) ? emailAdd : user.getUsername();
                     }
                 }
                 shyEmail.setUpdater(updater);
@@ -106,7 +105,7 @@ public class EmailController extends BaseController {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         Integer n = emailService.updateState(id, isEnable, sessionUser.getUserId());
         if (n > 0) {
-            return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前用户" + (isEnable == true ? "启用" : "禁用") + "成功");
+            return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前用户" + (isEnable ? "启用" : "禁用") + "成功");
         }
         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "操作失败，请重试");
     }
@@ -148,14 +147,14 @@ public class EmailController extends BaseController {
             return "error.html";
         }
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-        String write = "";
+        StringBuilder write = new StringBuilder();
         if (CommonUtils.isNotNull(write_business) && write_business.length > 0) {
             for (String w : write_business) {
-                write = write + "," + w;
+                write.append(",").append(w);
             }
-            write = write.substring(1);
+            write = new StringBuilder(write.substring(1));
         }
-        boolean success = emailService.update(id, email, remark, write, sessionUser.getUserId());
+        boolean success = emailService.update(id, email, remark, write.toString(), sessionUser.getUserId());
         if (success) {
             return "redirect:" + redirect_url;
         } else {
@@ -12,7 +12,7 @@ import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.LiveApplyService;
 import com.cnlive.shenhe.service.LiveService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -50,7 +50,7 @@ public class LiveApplyController extends BaseController {
     @Autowired
     AuditPass pass;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     @Autowired
     SitesService sitesService;
     @Autowired
@@ -268,7 +268,7 @@ public class LiveApplyController extends BaseController {
         String showMsg = "";
         for (String shyLiveId : shyLiveIds) {
             ShyLiveapply shyLiveapply = liveApplyService.selectByPrimaryKey(Integer.parseInt(shyLiveId));
-            JSONObject result = null;
+            JSONObject result;
             try {
                 result = pass.liveApplyPass(shyLiveapply.getActivity_id(), 4, msg, msg, shyLiveapply.getCallback());
             } catch (Exception e) {
@@ -11,7 +11,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.LiveService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -53,7 +53,7 @@ public class LiveController extends BaseController {
     @Autowired
     VideosServiceImpl videosService;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     @Autowired
     SitesService sitesService;
     @Autowired
@@ -71,20 +71,20 @@ public class LiveController extends BaseController {
     /**
      * 审核信息返回接口
      *
-     * @param activityId 视频id
+     * @param activity_id 视频id
      * @param state      状态码
-     * @param attrTags  标签
+     * @param attr_tags  标签
      * @param msg        备注信息
      * @return
      */
     @PostMapping("/shenheVideo")
     @ResponseBody
-    public ResponseBean shenheInfo(Integer id, String activityId, Integer state, String attrTags, String msg, String callback, HttpSession session) {
+    public ResponseBean shenheInfo(Integer id, String activity_id, Integer state, String attr_tags, String msg, String callback, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         String userId = sessionUser.getUserId();
-        JSONObject result = null;
+        JSONObject result;
         try {
-            result = pass.auditPass(activityId, state, attrTags, msg, callback);
+            result = pass.auditPass(activity_id, state, attr_tags, 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, attrTags, state, msg);
+        int i = videosService.updateVideo(id, userId, null, attr_tags, state, msg);
         if (i == 0) {
             return new ResponseBean(ErrorEnum.ERROR);
         }
@@ -540,6 +540,4 @@ public class LiveController extends BaseController {
             }
         }
     }
-
-
 }
@@ -10,7 +10,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.NotspeakService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
@@ -37,7 +37,7 @@ public class NotSpeakController extends BaseController {
     @Autowired
     NotspeakService notSpeakService;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     @Autowired
     SitesService sitesService;
@@ -65,15 +65,15 @@ public class SitesController extends BaseController {
         if (!list.isEmpty()) {
             for (ShySites site : list) {
-                String writeBusinessName = site.getWrite_business();
-                if (CommonUtils.isNotEmpty(writeBusinessName)) {
+                String write_businessName = site.getWrite_business();
+                if (CommonUtils.isNotEmpty(write_businessName)) {
                     for (String bkey : business.keySet()) {
-                        writeBusinessName = writeBusinessName.replace(bkey, business.getString(bkey));
+                        write_businessName = write_businessName.replace(bkey, business.getString(bkey));
                     }
                 } else {
-                    writeBusinessName = "无";
+                    write_businessName = "无";
                 }
-                site.setWrite_business_name(writeBusinessName);
+                site.setWrite_business_name(write_businessName);
             }
         }
         model.addAttribute("sitePage", sitePage);
@@ -84,15 +84,15 @@ public class SitesController extends BaseController {
     @PostMapping(value = "/write")
-    public String write(Model model, Integer siteId, String[] writeBusiness, HttpSession session, String redirectUrl) {
+    public String write(Model model, Integer siteId, String[] write_business, HttpSession session, String redirect_url) {
         ShySites site = sitesService.get(siteId);
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
         StringBuilder write = new StringBuilder();
-        if (CommonUtils.isNotNull(writeBusiness) && writeBusiness.length > 0) {
-            for (String w : writeBusiness) {
+        if (CommonUtils.isNotNull(write_business) && write_business.length > 0) {
+            for (String w : write_business) {
                 write.append(",").append(w);
             }
             write = new StringBuilder(write.substring(1));
@@ -100,7 +100,7 @@ public class SitesController extends BaseController {
         site.setWrite_business(write.toString());
         boolean success = sitesService.update(site);
         if (success) {
-            return "redirect:" + redirectUrl;
+            return "redirect:" + redirect_url;
         } else {
             setmodelResult(model);
             return "error.html";
@@ -9,7 +9,7 @@ import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.service.ShyLogService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
@@ -40,7 +40,7 @@ public class UsersController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(UsersController.class);
     @Autowired
-    private UsersServiceImpl usersService;
+    private UsersService usersService;
     @Autowired
     private SitesService sitesService;
     @Autowired
@@ -62,7 +62,7 @@ public class UsersController extends BaseController {
      * 本机的名称
      */
     @Value("${spring.localhost.url}")
-    private String redirectURL;
+    private String redirect_url;
     @Value("${CAS_SERVER_LOGIN_URL}")
     private String CAS_SERVER_LOGIN_URL;
@@ -111,7 +111,7 @@ public class UsersController extends BaseController {
                 shyLog.setOperationType("登录");
                 shyLog.setRemark(user.getUsername() + "--" + "登录");
                 shyLogService.addShyLog(shyLog);
-                return "redirect:" + redirectURL + "/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
+                return "redirect:" + redirect_url + "/videos/page?video_title=&start_date=&end_date=&state=0&receive=0&video_priority=";
             }
         }
@@ -221,12 +221,12 @@ public class UsersController extends BaseController {
     @PostMapping(value = "/users/write")
-    public String write(Model model, Integer userId, String[] writeNotice, HttpSession session, String redirectUrl) {
+    public String write(Model model, Integer userId, String[] write_notice, HttpSession session, String redirect_url) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         ShyUsers user = usersService.get(userId);
         StringBuilder write = new StringBuilder();
-        if (CommonUtils.isNotNull(writeNotice) && writeNotice.length > 0) {
-            for (String w : writeNotice) {
+        if (CommonUtils.isNotNull(write_notice) && write_notice.length > 0) {
+            for (String w : write_notice) {
                 write.append(",").append(w);
             }
             write = new StringBuilder(write.substring(1));
@@ -234,7 +234,7 @@ public class UsersController extends BaseController {
         user.setNotice_show(write.toString());
         boolean success = usersService.update(user);
         if (success) {
-            return "redirect:" + redirectUrl;
+            return "redirect:" + redirect_url;
         } else {
             setmodelResult(model);
             return "error.html";
@@ -9,7 +9,7 @@ import com.cnlive.shenhe.dto.UsersFreeDTO;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsersfree;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersfreeServiceImpl;
+import com.cnlive.shenhe.service.UsersfreeService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
@@ -39,7 +39,7 @@ public class UsersFreeController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(UsersFreeController.class);
     @Autowired
-    UsersfreeServiceImpl usersfreeService;
+    UsersfreeService usersfreeService;
     @Autowired
     SitesService sitesService;
@@ -66,7 +66,7 @@ public class UsersFreeController extends BaseController {
         if (spid == 0) {
             usersFreeDTO.setSpid(null);
         }
-        PageInfo<ShyUsersfree> usersPage = usersfreeService.getpage(usersFreeDTO);
+        PageInfo<ShyUsersfree> usersPage = usersfreeService.getPage(usersFreeDTO);
         List<ShyUsersfree> list = usersPage.getList();
         JSONObject category = CommonConst.CATEGORY;
         if (!list.isEmpty()) {
@@ -115,22 +115,22 @@ public class UsersFreeController extends BaseController {
     @PostMapping(value = "/write")
-    public String write(Model model, String userId, String userMobile, Integer spId, String[] writeBusiness, HttpSession session, String redirectUrl) {
+    public String write(Model model, String userId, String userMobile, Integer spId, String[] write_business, HttpSession session, String redirect_url) {
         if (CommonUtils.isEmpty(userId) && CommonUtils.isEmpty(userMobile)) {
             setmodelParam(model, "userId,userMobile不能为空！");
             return "error.html";
         }
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
         StringBuilder write = new StringBuilder();
-        if (CommonUtils.isNotNull(writeBusiness) && writeBusiness.length > 0) {
-            for (String w : writeBusiness) {
+        if (CommonUtils.isNotNull(write_business) && write_business.length > 0) {
+            for (String w : write_business) {
                 write.append(",").append(w);
             }
             write = new StringBuilder(write.substring(1));
         }
         boolean success = usersfreeService.update(userId, userMobile, write.toString(), spId, sessionUser.getUserId());
         if (success) {
-            return "redirect:" + redirectUrl;
+            return "redirect:" + redirect_url;
         } else {
             setmodelResult(model);
             return "error.html";
@@ -10,7 +10,7 @@ import com.cnlive.shenhe.entity.*;
 import com.cnlive.shenhe.service.ShyActivityService;
 import com.cnlive.shenhe.service.ShyLogService;
 import com.cnlive.shenhe.service.SitesService;
-import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -53,7 +53,7 @@ public class VideosController extends BaseController {
     @Autowired
     private VideosServiceImpl videosService;
     @Autowired
-    private UsersServiceImpl usersService;
+    private UsersService usersService;
     @Autowired
     private SitesService sitesService;
     @Autowired
@@ -140,7 +140,7 @@ public class VideosController extends BaseController {
         logger.info("列表请求参数:{}", JSON.toJSONString(videosDTO));
         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()));
+                videosDTO.setShen_auditor_id(usersService.findSpIdByName(videosDTO.getShen_auditor_id()));
             }
         }
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
@@ -57,9 +57,8 @@ public interface AudioService {
      *
      * @param shyAudio
      * @param audioState 视频状态，1通过，2不通过
-     * @return
      */
-    int updateAudioAndShenhe(ShyAudio shyAudio, int audioState);
+    void updateAudioAndShenhe(ShyAudio shyAudio, int audioState);
     /**
      * 认领
@@ -95,14 +94,14 @@ public interface AudioService {
      * 根据id查询到音频对象进行修改
      *
      * @param id
-     * @param auditor_id
+     * @param auditorId
      * @param updater
-     * @param attr_tags
+     * @param attrTags
      * @param state
      * @param msg
      * @return
      */
-    int updateAudio(Integer id, String auditor_id, String updater, String attr_tags, Integer state, String msg);
+    int updateAudio(Integer id, String auditorId, String updater, String attrTags, Integer state, String msg);
     /**
      * 分页查询音频数据
@@ -126,10 +126,10 @@ public interface ContentService {
      * 获取审核类型
      *
      * @param spId
-     * @param ContentTag
+     * @param contentTag
      * @return
      */
-    Integer getShenheType(Integer spId, String ContentTag);
+    Integer getShenheType(Integer spId, String contentTag);
     /**
      * 易盾网站过滤
@@ -48,13 +48,13 @@ public interface LiveApplyService {
      * 修改直播申请对象 返回int类型
      *
      * @param id
-     * @param auditor_id
+     * @param auditorId
      * @param updater
      * @param status
      * @param msg
      * @return
      */
-    int updateLiveApply(Integer id, String auditor_id, String updater, Integer status, String msg);
+    int updateLiveApply(Integer id, String auditorId, String updater, Integer status, String msg);
     /**
      * 获取分页、条件查询
@@ -48,13 +48,13 @@ public interface LiveService {
      * 根据id查询，修改对象的关键信息 返回int类型
      *
      * @param id
-     * @param auditor_id
+     * @param auditorId
      * @param updater
-     * @param activity_status
+     * @param activityStatus
      * @param msg
      * @return
      */
-    int updateLive(Integer id, String auditor_id, String updater, Integer activity_status, String msg);
+    int updateLive(Integer id, String auditorId, String updater, Integer activityStatus, String msg);
     /**
      * 分页、条件查询、返回分页结果集合
@@ -46,10 +46,10 @@ public interface SitesService {
     /**
      * 根据name查询白名单对象
      *
-     * @param sp_desc
+     * @param spDesc
      * @return
      */
-    ShySites findspidBySpdesc(String sp_desc);
+    ShySites findspidBySpdesc(String spDesc);
     /**
      * 获取免审白名单列表（点播）
@@ -63,8 +63,8 @@ public interface SitesService {
      * 获取用户（操作人）
      *
      * @param updater
-     * @param auditor_id
+     * @param auditorId
      * @return
      */
-    String getUpdater(String updater, String auditor_id);
+    String getUpdater(String updater, String auditorId);
 }
+package com.cnlive.shenhe.service;
+
+import com.cnlive.shenhe.dto.UsersDTO;
+import com.cnlive.shenhe.entity.ShyUsers;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @Author: yan-zhao-wang
+ * @DateTime: 2022-11-08 9:15
+ */
+public interface UsersService {
+    /**
+     * 用户分页列表
+     *
+     * @param usersDTO
+     * @return
+     */
+    PageInfo<ShyUsers> getPage(UsersDTO usersDTO);
+
+    /**
+     * 根据spid查询名字
+     *
+     * @param shenAuditorId
+     * @return
+     */
+
+    String findSpIdByName(String shenAuditorId);
+
+    /**
+     * 根据主键id查询用户对象
+     *
+     * @param id
+     * @return
+     */
+    ShyUsers get(Integer id);
+
+    /**
+     * 根据对象查询
+     *
+     * @param shyUsers
+     * @return
+     */
+    ShyUsers select(ShyUsers shyUsers);
+
+    /**
+     * 修改用户
+     *
+     * @param shyUsers
+     * @return
+     */
+    boolean update(ShyUsers shyUsers);
+}
+package com.cnlive.shenhe.service;
+
+import com.cnlive.shenhe.dto.UsersFreeDTO;
+import com.cnlive.shenhe.entity.ShyUsersfree;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @Author: yan-zhao-wang
+ * @DateTime: 2022-11-08 9:15
+ */
+public interface UsersfreeService {
+    /**
+     * 根据主键id查询用户白名单
+     *
+     * @param id
+     * @return
+     */
+    ShyUsersfree get(Integer id);
+
+    /**
+     * 根据用户白名单对象查询
+     *
+     * @param shyUsersfree
+     * @return
+     */
+    ShyUsersfree select(ShyUsersfree shyUsersfree);
+
+    /**
+     * 修改白名单状态
+     *
+     * @param id
+     * @param isEnable
+     * @return
+     */
+    Integer updateState(Integer id, Boolean isEnable);
+
+    /**
+     * 分页、条件查询列表
+     *
+     * @param usersFreeDTO
+     * @return
+     */
+    PageInfo<ShyUsersfree> getPage(UsersFreeDTO usersFreeDTO);
+
+    /**
+     * 通过spid、栏目、用户id来查看是否是免审
+     *
+     * @param spId
+     * @param category
+     * @param userId
+     * @return
+     */
+    ShyUsersfree selectUser(Integer spId, String category, String userId);
+
+    /**
+     * 回调
+     *
+     * @param userId
+     * @param userMobile
+     * @param write
+     * @param spId
+     * @param updater
+     * @return
+     */
+    boolean update(String userId, String userMobile, String write, Integer spId, String updater);
+}
@@ -113,10 +113,9 @@ public class AudioServiceImpl implements AudioService {
      *
      * @param shyAudio
      * @param audioState 视频状态，1通过，2不通过
-     * @return
      */
     @Override
-    public int updateAudioAndShenhe(ShyAudio shyAudio, int audioState) {
+    public void updateAudioAndShenhe(ShyAudio shyAudio, int audioState) {
         //修改点播云音频状态
         JSONObject result = pass.audioPass(shyAudio.getAudioId(), audioState, shyAudio.getAttr_tags(), shyAudio.getMsg(), shyAudio.getCallback());
         Integer code = result.getInteger("code");
@@ -130,13 +129,11 @@ public class AudioServiceImpl implements AudioService {
             if (i != 1) {
                 logger.error("点播音频更改失败,AudioId:{}", shyAudio.getAudioId());
             }
-            return i;
         } else {
             shyAudio.setMsg("点播音频回调失败，" + shyAudio.getMsg());
             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;
     }
     /**
@@ -49,10 +49,7 @@ public class LiveServiceImpl implements LiveService {
     @Override
     public boolean impotVideo(ShyLive shyLive) {
         int result = shyLiveMapper.insertSelective(shyLive);
-        if (result == 0) {
-            return false;
-        }
-        return true;
+        return result != 0;
     }
     /**
@@ -63,8 +60,7 @@ public class LiveServiceImpl implements LiveService {
      */
     @Override
     public ShyLive selectByPrimaryKey(Integer id) {
-        ShyLive shyLive = shyLiveMapper.selectByPrimaryKey(id);
-        return shyLive;
+        return shyLiveMapper.selectByPrimaryKey(id);
     }
     /**
@@ -75,8 +71,7 @@ public class LiveServiceImpl implements LiveService {
      */
     @Override
     public List<ShyLive> findShyLive(ShyLive shyLive) {
-        List<ShyLive> shyLivelist = shyLiveMapper.selectByRowBounds(shyLive, new RowBounds(0, 100));
-        return shyLivelist;
+        return shyLiveMapper.selectByRowBounds(shyLive, new RowBounds(0, 100));
     }
     /**
@@ -88,28 +83,25 @@ public class LiveServiceImpl implements LiveService {
     @Override
     public boolean updateShyLive(ShyLive shyLive) {
         int i = shyLiveMapper.updateByPrimaryKey(shyLive);
-        if (i == 0) {
-            return false;
-        }
-        return true;
+        return i != 0;
     }
     /**
      * 根据id查询，修改对象的关键信息 返回int类型
      *
      * @param id
-     * @param auditor_id
+     * @param auditorId
      * @param updater
-     * @param activity_status
+     * @param activityStatus
      * @param msg
      * @return
      */
     @Override
-    public int updateLive(Integer id, String auditor_id, String updater, Integer activity_status, String msg) {
+    public int updateLive(Integer id, String auditorId, String updater, Integer activityStatus, String msg) {
         ShyLive shyLive = shyLiveMapper.selectByPrimaryKey(id);
-        shyLive.setAuditor(auditor_id);
+        shyLive.setAuditor(auditorId);
         shyLive.setShenhe_state(CommonConst.RECEIVE_AUDIT);
-        shyLive.setActivity_status(activity_status);
+        shyLive.setActivity_status(activityStatus);
         shyLive.setShenhe_msg(msg);
         shyLive.setUpdater(updater);
         shyLive.setIs_hot(CommonConstStates.SHIFOU_REDIANNO);
@@ -194,8 +186,7 @@ public class LiveServiceImpl implements LiveService {
                 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();
             }
             shyLive.setUpdater(updater);
         }
@@ -323,7 +314,6 @@ public class LiveServiceImpl implements LiveService {
             criteria.andEqualTo("activity_status", liveDTO.getActivity_status());
         }
         criteria.andEqualTo("is_show", CommonConstStates.SHIFOU_XIANSHIYES);
-        List<ShyLive> shyLiveList = shyLiveMapper.selectByExample(example);
-        return shyLiveList;
+        return shyLiveMapper.selectByExample(example);
     }
 }
@@ -6,6 +6,7 @@ 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.service.UsersService;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -32,7 +33,7 @@ public class SitesServiceImpl implements SitesService {
     @Autowired
     ShySitesMapper shySitesMapper;
     @Autowired
-    UsersServiceImpl usersService;
+    UsersService usersService;
     /**
      * 分页、条件查询 返回列表
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.dto.UsersDTO;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
+import com.cnlive.shenhe.service.UsersService;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -21,11 +22,18 @@ import java.util.List;
  * @Description:
  */
 @Service
-public class UsersServiceImpl {
+public class UsersServiceImpl implements UsersService {
     private static Logger logger = LoggerFactory.getLogger(UsersServiceImpl.class);
     @Autowired
     ShyUsersMapper shyUsersMapper;
+    /**
+     * 用户分页列表
+     *
+     * @param usersDTO
+     * @return
+     */
+    @Override
     public PageInfo<ShyUsers> getPage(UsersDTO usersDTO) {
         logger.info("接受参数列表为，UsersDTO:{}", JSON.toJSONString(usersDTO));
         Example example = new Example(ShyUsers.class);
@@ -53,15 +61,21 @@ public class UsersServiceImpl {
         return pageInfo;
     }
-    public String findspidByName(String shenAuditorId) {
+    /**
+     * 根据spid查询名字
+     *
+     * @param shenAuditorId
+     * @return
+     */
+    @Override
+    public String findSpIdByName(String shenAuditorId) {
         Example example = new Example(ShyUsers.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("username", shenAuditorId);
         List<ShyUsers> shyUsersList = shyUsersMapper.selectByExample(example);
         if (CommonUtils.isNotNull(shyUsersList) && shyUsersList.size() > 0) {
             ShyUsers shyUsers = shyUsersList.get(0);
-            String userId = shyUsers.getUser_id();
-            return userId;
+            return shyUsers.getUser_id();
         }
         return null;
     }
@@ -72,7 +86,7 @@ public class UsersServiceImpl {
      * @param id
      * @return
      */
-
+    @Override
     public ShyUsers get(Integer id) {
         return shyUsersMapper.selectByPrimaryKey(id);
     }
@@ -83,6 +97,7 @@ public class UsersServiceImpl {
      * @param shyUsers
      * @return
      */
+    @Override
     public ShyUsers select(ShyUsers shyUsers) {
         return shyUsersMapper.selectOne(shyUsers);
     }
@@ -93,6 +108,7 @@ public class UsersServiceImpl {
      * @param shyUsers
      * @return
      */
+    @Override
     public boolean update(ShyUsers shyUsers) {
         return shyUsersMapper.updateByPrimaryKeySelective(shyUsers) == 1;
     }
@@ -6,6 +6,7 @@ import com.cnlive.shenhe.dto.UsersFreeDTO;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.entity.ShyUsersfree;
 import com.cnlive.shenhe.mapper.ShyUsersfreeMapper;
+import com.cnlive.shenhe.service.UsersfreeService;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
@@ -24,7 +25,7 @@ import java.util.List;
  * @Description:
  */
 @Service
-public class UsersfreeServiceImpl {
+public class UsersfreeServiceImpl implements UsersfreeService {
     private static Logger logger = LoggerFactory.getLogger(UsersfreeServiceImpl.class);
     @Autowired
     ShyUsersfreeMapper shyUsersfreeMapper;
@@ -37,6 +38,7 @@ public class UsersfreeServiceImpl {
      * @param id
      * @return
      */
+    @Override
     public ShyUsersfree get(Integer id) {
         return shyUsersfreeMapper.selectByPrimaryKey(id);
     }
@@ -47,6 +49,7 @@ public class UsersfreeServiceImpl {
      * @param shyUsersfree
      * @return
      */
+    @Override
     public ShyUsersfree select(ShyUsersfree shyUsersfree) {
         return shyUsersfreeMapper.selectOne(shyUsersfree);
     }
@@ -58,6 +61,7 @@ public class UsersfreeServiceImpl {
      * @param isEnable
      * @return
      */
+    @Override
     public Integer updateState(Integer id, Boolean isEnable) {
         ShyUsersfree shyUsersfree = get(id);
         shyUsersfree.setIs_enable(isEnable);
@@ -70,7 +74,8 @@ public class UsersfreeServiceImpl {
      * @param usersFreeDTO
      * @return
      */
-    public PageInfo<ShyUsersfree> getpage(UsersFreeDTO usersFreeDTO) {
+    @Override
+    public PageInfo<ShyUsersfree> getPage(UsersFreeDTO usersFreeDTO) {
         logger.info("接受参数列表为，UsersFreeDTO:{}", JSON.toJSONString(usersFreeDTO));
         Example example = new Example(ShyUsers.class);
         Example.Criteria criteria = example.createCriteria();
@@ -94,15 +99,16 @@ public class UsersfreeServiceImpl {
     /**
      * 通过spid、栏目、用户id来查看是否是免审
      *
-     * @param sp_id
+     * @param spId
      * @param category
-     * @param user_id
+     * @param userId
      * @return
      */
-    public ShyUsersfree selectUser(Integer sp_id, String category, String user_id) {
+    @Override
+    public ShyUsersfree selectUser(Integer spId, String category, String userId) {
         ShyUsersfree shyUserfree = new ShyUsersfree();
-        shyUserfree.setSp_id(sp_id);
-        shyUserfree.setUser_id(user_id);
+        shyUserfree.setSp_id(spId);
+        shyUserfree.setUser_id(userId);
         shyUserfree.setIs_enable(true);
         shyUserfree.setIs_delete(false);
         ShyUsersfree shyUserfree1 = shyUsersfreeMapper.selectOne(shyUserfree);
@@ -114,6 +120,7 @@ public class UsersfreeServiceImpl {
     /**
      * 回调
+     *
      * @param userId
      * @param userMobile
      * @param write
@@ -121,8 +128,9 @@ public class UsersfreeServiceImpl {
      * @param updater
      * @return
      */
+    @Override
     public boolean update(String userId, String userMobile, String write, Integer spId, String updater) {
-        JSONObject result = new JSONObject();
+        JSONObject result;
         try {
             result = pass.queryUser(userId, userMobile);
         } catch (Exception e) {
@@ -159,9 +167,7 @@ public class UsersfreeServiceImpl {
                 shyUserfree1.setIs_delete(false);
                 shyUserfree1.setIs_enable(true);
                 int re = shyUsersfreeMapper.updateByPrimaryKeySelective(shyUserfree1);
-                if (re != 1) {
-                    return false;
-                }
+                return re == 1;
             } else {
                 shyUserfree.setMobile(mobile);
                 shyUserfree.setCategory(write);
@@ -174,11 +180,8 @@ public class UsersfreeServiceImpl {
                 shyUserfree.setIs_delete(false);
                 shyUserfree.setIs_enable(true);
                 int re = shyUsersfreeMapper.insertSelective(shyUserfree);
-                if (re != 1) {
-                    return false;
-                }
+                return re == 1;
             }
         }
-        return true;
     }
 }
@@ -14,6 +14,7 @@ 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.service.UsersfreeService;
 import com.cnlive.shenhe.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -49,7 +50,7 @@ public class VideosServiceImpl {
     @Autowired
     private SitesService sitesService;
     @Autowired
-    private UsersfreeServiceImpl usersfreeServiceImpl;
+    private UsersfreeService usersfreeService;
     @Autowired
     private YiDunServiceImpl yiDunServiceImpl;
     @Autowired
@@ -107,27 +108,27 @@ public class VideosServiceImpl {
      * 根据条件修改video 返回int类型
      *
      * @param id
-     * @param auditor_id
+     * @param auditorId
      * @param updater
-     * @param attr_tags
+     * @param attrTags
      * @param state
      * @param msg
      * @return
      */
-    public int updateVideo(Integer id, String auditor_id, String updater, String attr_tags, Integer state, String msg) {
+    public int updateVideo(Integer id, String auditorId, String updater, String attrTags, Integer state, String msg) {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
-        shyVideos.setAuditor_id(auditor_id);
+        shyVideos.setAuditor_id(auditorId);
         shyVideos.setState(state);
-        if (CommonUtils.isNotEmpty(attr_tags)) {
-            shyVideos.setAttr_tags(attr_tags);
+        if (CommonUtils.isNotEmpty(attrTags)) {
+            shyVideos.setAttr_tags(attrTags);
         }
         if (CommonUtils.isNotEmpty(msg)) {
             shyVideos.setMsg(msg);
         }
         shyVideos.setUpdater(updater);
-        if (CommonUtils.isNotEmpty(auditor_id)) {
+        if (CommonUtils.isNotEmpty(auditorId)) {
             shyVideos.setReceive(CommonConst.RECEIVE_AFTER);
-            shyVideos.setReceive_user_id(auditor_id);
+            shyVideos.setReceive_user_id(auditorId);
             shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
         }
         return shyVideosMapper.updateByPrimaryKey(shyVideos);
@@ -377,7 +378,7 @@ public class VideosServiceImpl {
         } else if (plat.equals(CommonConst.KS_PLAT)) {
             yuming = ks_domain + "/";
         }
-        String url = "";
+        StringBuilder url = new StringBuilder();
         JSONArray jsonArray = new JSONArray();
         List<String> imgList = JSONArray.parseArray(shyVideos.getAvsample_imgs(), String.class);
         for (String imgStr : imgList) {
@@ -388,7 +389,7 @@ public class VideosServiceImpl {
             image.put("type", 1);
             image.put("data", imgUrl);
             jsonArray.add(image);
-            url = url + "(" + uuid + ")";
+            url.append("(").append(uuid).append(")");
         }
         //易盾返回结果的类型
         //调用易盾智能图片审核接口
@@ -415,7 +416,7 @@ public class VideosServiceImpl {
             ShyYidun shyYidun = new ShyYidun();
             shyYidun.setId(UUID.randomUUID().toString());
             shyYidun.setContent_id(cid.toString());
-            shyYidun.setUrl(url);
+            shyYidun.setUrl(url.toString());
             shyYidun.setDesc_msg(desc);
             //校验图片类型
             shyYidun.setCheck_type(CommonConstStates.TUPIAN);
@@ -491,7 +492,7 @@ public class VideosServiceImpl {
         ShyUsersfree shyUserfree = null;
         //如果用户id存在
         if (CommonUtils.isNotEmpty(shyVideo.getVideo_user_id())) {
-            shyUserfree = usersfreeServiceImpl.selectUser(shyVideo.getSpid(), shyVideo.getCategory(), shyVideo.getVideo_user_id());
+            shyUserfree = usersfreeService.selectUser(shyVideo.getSpid(), shyVideo.getCategory(), shyVideo.getVideo_user_id());
         }
         //初始化一个审核状态
         //审核类型，1:免审，2:机审，3:人工审
@@ -537,7 +538,7 @@ public class VideosServiceImpl {
     public String repulse(String shyVideoId, String msg, String userId) {
         String showMsg = "";
         ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(shyVideoId));
-        JSONObject result = null;
+        JSONObject result;
         try {
             result = pass.auditPass(shyVideos.getVideo_id(), 4, msg, msg, shyVideos.getCallback());
         } catch (Exception e) {