开发邮箱、点播活动管理、日志service接口

王言钊
1 parent d0c12710
Showing 14 changed files with 251 additions and 77 deletions
src/main/java/com/cnlive/shenhe/api/ShyActivityControllerApi.java
src/main/java/com/cnlive/shenhe/controller/EmailController.java
src/main/java/com/cnlive/shenhe/controller/ShyActivityController.java
src/main/java/com/cnlive/shenhe/controller/ShyLogController.java
src/main/java/com/cnlive/shenhe/controller/UsersController.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/service/EmailService.java
src/main/java/com/cnlive/shenhe/service/ShyActivityService.java
src/main/java/com/cnlive/shenhe/service/ShyLogService.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/EmailServiceImpl.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/ShyActivityImpl.java → src/main/java/com/cnlive/shenhe/service/serviceImpl/ShyActivityServiceImpl.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/ShyLogServiceImpl.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/VideosServiceImpl.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.entity.ShyActivity;
-import com.cnlive.shenhe.service.serviceImpl.ShyActivityImpl;
+import com.cnlive.shenhe.service.ShyActivityService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +26,7 @@ public class ShyActivityControllerApi {
     private static Logger logger = LoggerFactory.getLogger(ShyActivityControllerApi.class);
     @Autowired
-    private ShyActivityImpl shyActivityImpl;
+    private ShyActivityService shyActivityService;
     @PostMapping("/import")
     @ResponseBody
@@ -42,10 +42,10 @@ public class ShyActivityControllerApi {
         shyActivity.setActivity(activity);
         logger.info("封装对象为:{}", JSON.toJSON(shyActivity));
         // 根据id查询是否存在
-        Boolean shyActivityObj = shyActivityImpl.selectById(id);
+        Boolean shyActivityObj = shyActivityService.selectById(id);
         // 如果对象不存在，就直接添加
         if (shyActivityObj) {
-            Boolean result = shyActivityImpl.insertShyActivity(shyActivity);
+            Boolean result = shyActivityService.insertShyActivity(shyActivity);
             if (result) {
                 return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前活动添加成功");
             }
@@ -8,7 +8,7 @@ import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.dto.EmailDTO;
 import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.entity.ShyUsers;
-import com.cnlive.shenhe.service.serviceImpl.EmailServiceImpl;
+import com.cnlive.shenhe.service.EmailService;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -37,7 +37,7 @@ public class EmailController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(EmailController.class);
     @Autowired
-    EmailServiceImpl emailServiceImpl;
+    EmailService emailService;
     @Autowired
     UsersServiceImpl usersService;
@@ -56,7 +56,7 @@ public class EmailController extends BaseController {
         if (CommonUtils.isNull(sessionUser)) {
             return "redirect:/users/login";
         }
-        PageInfo<ShyEmail> emailPage = emailServiceImpl.getPage(emailDTO);
+        PageInfo<ShyEmail> emailPage = emailService.getPage(emailDTO);
         List<ShyEmail> list = emailPage.getList();
         JSONObject emailMessage = CommonConst.EMAIL_MESSAGE;
         if (!list.isEmpty()) {
@@ -104,7 +104,7 @@ public class EmailController extends BaseController {
     @ResponseBody
     public ResponseBean updateState(Integer id, Boolean isEnable, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-        Integer n = emailServiceImpl.updateState(id, isEnable, sessionUser.getUserId());
+        Integer n = emailService.updateState(id, isEnable, sessionUser.getUserId());
         if (n > 0) {
             return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前用户" + (isEnable == true ? "启用" : "禁用") + "成功");
         }
@@ -122,7 +122,7 @@ public class EmailController extends BaseController {
     @ResponseBody
     public ResponseBean deleted(Integer id, HttpSession session) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-        Integer n = emailServiceImpl.deleted(id, sessionUser.getUserId());
+        Integer n = emailService.deleted(id, sessionUser.getUserId());
         if (n > 0) {
             return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "数据删除成功");
         }
@@ -155,7 +155,7 @@ public class EmailController extends BaseController {
             }
             write = write.substring(1);
         }
-        boolean success = emailServiceImpl.update(id, email, remark, write, sessionUser.getUserId());
+        boolean success = emailService.update(id, email, remark, write, sessionUser.getUserId());
         if (success) {
             return "redirect:" + redirect_url;
         } else {
@@ -5,7 +5,7 @@ import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.ShyActivityDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
-import com.cnlive.shenhe.service.serviceImpl.ShyActivityImpl;
+import com.cnlive.shenhe.service.ShyActivityService;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import java.util.List;
-
 /**
  * @author Administrator
  * @author yanzhaowang
@@ -31,7 +29,7 @@ public class ShyActivityController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(ShyActivityController.class);
     @Autowired
-    private ShyActivityImpl shyActivityImpl;
+    private ShyActivityService shyActivityService;
     /**
      * 添加活动
@@ -43,7 +41,7 @@ public class ShyActivityController extends BaseController {
     @ResponseBody
     public ResponseBean insterShyActivity(ShyActivity shyActivity) {
         try {
-            Boolean result = shyActivityImpl.insertShyActivity(shyActivity);
+            Boolean result = shyActivityService.insertShyActivity(shyActivity);
             if (result) {
                 return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前活动添加成功");
             }
@@ -63,7 +61,7 @@ public class ShyActivityController extends BaseController {
     @PostMapping("/delete")
     @ResponseBody
     public ResponseBean deleteShyActivity(Integer id) {
-        Boolean result = shyActivityImpl.deleteShyActivity(id);
+        Boolean result = shyActivityService.deleteShyActivity(id);
         if (result) {
             return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "删除当前活动成功");
         }
@@ -81,7 +79,7 @@ public class ShyActivityController extends BaseController {
     @ResponseBody
     public ResponseBean updateShyActivity(ShyActivity shyActivity) {
         try {
-            Boolean result = shyActivityImpl.updateShyActivity(shyActivity);
+            Boolean result = shyActivityService.updateShyActivity(shyActivity);
             if (result) {
                 return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "修改当前活动成功");
             }
@@ -103,12 +101,9 @@ public class ShyActivityController extends BaseController {
     @GetMapping("/page")
     public String getShyActivity(ShyActivityDTO shyActivityDTO, Model model) {
         logger.info("列表请求参数:{}", JSON.toJSONString(shyActivityDTO));
-        PageInfo<ShyActivity> shyActivityPageInfo = shyActivityImpl.selectByExample(shyActivityDTO);
-        List<ShyActivity> list = shyActivityPageInfo.getList();
+        PageInfo<ShyActivity> shyActivityPageInfo = shyActivityService.selectByExample(shyActivityDTO);
         model.addAttribute("exempt_from_trial", shyActivityDTO.getExempt_from_trial());
         model.addAttribute("ShyActivitylist", shyActivityPageInfo);
         return "page/activity.html";
     }
-
-
 }
@@ -5,7 +5,7 @@ import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.ShyLogDTO;
 import com.cnlive.shenhe.entity.ShyLog;
-import com.cnlive.shenhe.service.serviceImpl.ShyLogServiceImpl;
+import com.cnlive.shenhe.service.ShyLogService;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,7 +28,7 @@ public class ShyLogController {
     private static Logger logger = LoggerFactory.getLogger(ShyLogController.class);
     @Autowired
-    private ShyLogServiceImpl shyLogServiceImpl;
+    private ShyLogService shyLogService;
     /**
      * 获取分页列表数据
@@ -40,7 +40,7 @@ public class ShyLogController {
     @GetMapping("/page")
     public String getShyLog(ShyLogDTO shyLogDTO, Model model) {
         logger.info("进入查询日志方法，接受的对象为，ShyLogDTO：{}", JSON.toJSONString(shyLogDTO));
-        PageInfo<ShyLog> shyLogPageInfo = shyLogServiceImpl.selectByExample(shyLogDTO);
+        PageInfo<ShyLog> shyLogPageInfo = shyLogService.selectByExample(shyLogDTO);
         model.addAttribute("shyLogPageInfo", shyLogPageInfo);
         return "page/log.html";
     }
@@ -55,7 +55,7 @@ public class ShyLogController {
     @ResponseBody
     public ResponseBean insterShyLog(ShyLog shyLog) {
         logger.info("访问了日志添加方法，接受的对象为，ShyLog：{}", JSON.toJSONString(shyLog));
-        Boolean result = shyLogServiceImpl.addShyLog(shyLog);
+        Boolean result = shyLogService.addShyLog(shyLog);
         if (result) {
             return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前日志添加成功");
         }
@@ -7,7 +7,7 @@ import com.cnlive.shenhe.dto.UsersDTO;
 import com.cnlive.shenhe.entity.ShyLog;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
-import com.cnlive.shenhe.service.serviceImpl.ShyLogServiceImpl;
+import com.cnlive.shenhe.service.ShyLogService;
 import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -44,7 +44,7 @@ public class UsersController extends BaseController {
     @Autowired
     private SitesServiceImpl sitesService;
     @Autowired
-    private ShyLogServiceImpl shyLogService;
+    private ShyLogService shyLogService;
     /**
      * 登录入口
@@ -7,7 +7,11 @@ import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.bean.SessionUser;
 import com.cnlive.shenhe.dto.VideosDTO;
 import com.cnlive.shenhe.entity.*;
-import com.cnlive.shenhe.service.serviceImpl.*;
+import com.cnlive.shenhe.service.ShyActivityService;
+import com.cnlive.shenhe.service.ShyLogService;
+import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
+import com.cnlive.shenhe.service.serviceImpl.UsersServiceImpl;
+import com.cnlive.shenhe.service.serviceImpl.VideosServiceImpl;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -53,9 +57,9 @@ public class VideosController extends BaseController {
     @Autowired
     private SitesServiceImpl sitesService;
     @Autowired
-    private ShyActivityImpl shyActivityImpl;
+    private ShyActivityService shyActivityService;
     @Autowired
-    private ShyLogServiceImpl shyLogService;
+    private ShyLogService shyLogService;
     @Value("${qn_domain}")
     private String qn_domain;
@@ -179,7 +183,7 @@ public class VideosController extends BaseController {
         PageInfo<ShyVideos> videoPage = videosService.getListVideo(videosDTO);
         //查询查询条件
-        List<ShyActivity> activityList = shyActivityImpl.selectAll();
+        List<ShyActivity> activityList = shyActivityService.selectAll();
         List<ShyVideos> list = videoPage.getList();
         if (!list.isEmpty()) {
             for (ShyVideos videos : list) {
@@ -263,7 +267,7 @@ public class VideosController extends BaseController {
             yuming = ks_domain + "/";
         }
         detailsContent.setAttr_tags(CommonUtils.isEmpty(detailsContent.getAttr_tags()) ? "" : detailsContent.getAttr_tags());
-        List<ShyActivity> activityList = shyActivityImpl.selectAll();
+        List<ShyActivity> activityList = shyActivityService.selectAll();
         ShySites shySites = sitesService.findspidDescByspid(detailsContent.getSpid());
         if (CommonUtils.isNotNull(shySites)) {
             if (CommonUtils.isNotEmpty(detailsContent.getCategory()) && detailsContent.getCategory().equals(CommonConst.CATEGORY_WITNESS)) {
@@ -5,8 +5,8 @@ import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.entity.ShyLiveapply;
 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.EmailServiceImpl;
 import com.cnlive.shenhe.service.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -57,7 +57,7 @@ public class LiveApplyJob {
     ShyLiveapplyMapper shyLiveApplyMapper;
     @Autowired
-    EmailServiceImpl emailServiceImpl;
+    EmailService emailService;
     @Scheduled(fixedRate = 60 * 1000)
     public void updateLiveApply() {
@@ -93,7 +93,7 @@ public class LiveApplyJob {
             String app_key = email_app_key;
             //调用邮件发送服务器的地址
             String URL = email_send_URL;
-            List<ShyEmail> shyEmailList = emailServiceImpl.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
+            List<ShyEmail> shyEmailList = emailService.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
             logger.info("直播申请邮件通知开始，共" + shyLiveApplyList.size() + "个申请，每个申请通知" + shyEmailList.size() + "个邮箱");
             for (ShyLiveapply liveApply : shyLiveApplyList) {
                 logger.info("当前发送邮件的直播申请id为：" + liveApply.getId());
@@ -144,7 +144,7 @@ public class LiveApplyJob {
                             notice_msg = notice_msg + "\n" + dateTime + " 邮件" + emailAddr + "(" + shyEmail.getRemark() + ")发送成功";
                         }
                     } catch (Exception e) {
-                        logger.info("异常结果为：{}",e.getMessage());
+                        logger.info("异常结果为：{}", e.getMessage());
                         notice_state = CommonConst.NOTICE_FAIL;
                         notice_msg = notice_msg + "\n" + dateTime + " 邮件服务器调用失败,服务器报错了";
                         break;
+package com.cnlive.shenhe.service;
+
+import com.cnlive.shenhe.dto.EmailDTO;
+import com.cnlive.shenhe.entity.ShyEmail;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @Author: yan-zhao-wang
+ * @DateTime: 2022-11-03 15:02
+ */
+public interface EmailService {
+    /**
+     * 获取 分页 条件查询的结果集
+     *
+     * @param emailDTO
+     * @return
+     */
+    PageInfo<ShyEmail> getPage(EmailDTO emailDTO);
+
+    /**
+     * 根据主键id查询对象
+     *
+     * @param id
+     * @return
+     */
+    ShyEmail get(Integer id);
+
+    /**
+     * 根据条件查询对象
+     *
+     * @param shyEmail
+     * @return
+     */
+    ShyEmail select(ShyEmail shyEmail);
+
+    /**
+     * 修改状态
+     *
+     * @param id
+     * @param isEnable
+     * @param userId
+     * @return
+     */
+    Integer updateState(Integer id, Boolean isEnable, String userId);
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @param userId
+     * @return
+     */
+    Integer deleted(Integer id, String userId);
+
+    /**
+     * 修改
+     *
+     * @param id
+     * @param email
+     * @param remark
+     * @param write
+     * @param updater
+     * @return
+     */
+    boolean update(Integer id, String email, String remark, String write, String updater);
+
+    /**
+     * 通过邮件发送类型，获取需要发送邮件的list
+     *
+     * @param emailSendType
+     * @return
+     */
+    List<ShyEmail> getEmailSendList(Integer emailSendType);
+}
+package com.cnlive.shenhe.service;
+
+import com.cnlive.shenhe.dto.ShyActivityDTO;
+import com.cnlive.shenhe.entity.ShyActivity;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @Author: yan-zhao-wang
+ * @DateTime: 2022-11-03 15:02
+ */
+public interface ShyActivityService {
+    /**
+     * 添加活动
+     *
+     * @param shyActivity
+     * @return
+     */
+    Boolean insertShyActivity(ShyActivity shyActivity);
+
+    /**
+     * 根据主键删除活动
+     *
+     * @param id
+     * @return
+     */
+    Boolean deleteShyActivity(Integer id);
+
+    /**
+     * 修改活动
+     *
+     * @param shyActivity
+     * @return
+     */
+    Boolean updateShyActivity(ShyActivity shyActivity);
+
+    /**
+     * 查询活动
+     *
+     * @param shyActivityDTO
+     * @return
+     */
+    PageInfo<ShyActivity> selectByExample(ShyActivityDTO shyActivityDTO);
+
+    /**
+     * 根据条件查询活动
+     *
+     * @param exemptFromTrial
+     * @return
+     */
+    List<Integer> selectByExample(Integer exemptFromTrial);
+
+    /**
+     * 查询所有的数据
+     *
+     * @return
+     */
+    List<ShyActivity> selectAll();
+
+    /**
+     * 根据id查询单个对象
+     *
+     * @param id
+     * @return
+     */
+    Boolean selectById(Integer id);
+
+    /**
+     * 根据source查询审核类型
+     *
+     * @param id
+     * @return
+     */
+    Integer selectBySource(Integer id);
+}
+package com.cnlive.shenhe.service;
+
+import com.cnlive.shenhe.dto.ShyLogDTO;
+import com.cnlive.shenhe.entity.ShyLog;
+import com.github.pagehelper.PageInfo;
+
+/**
+ * @Author: yan-zhao-wang
+ * @DateTime: 2022-11-03 15:03
+ */
+public interface ShyLogService {
+    /**
+     * 查询所有的日志
+     *
+     * @param shyLogDTO
+     * @return
+     */
+    PageInfo<ShyLog> selectByExample(ShyLogDTO shyLogDTO);
+
+    /**
+     * 添加日志记录
+     *
+     * @param shyLog
+     * @return
+     */
+    Boolean addShyLog(ShyLog shyLog);
+}
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.dto.EmailDTO;
 import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.mapper.ShyEmailMapper;
+import com.cnlive.shenhe.service.EmailService;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -24,7 +25,7 @@ import java.util.List;
  * @Description:
  */
 @Service
-public class EmailServiceImpl {
+public class EmailServiceImpl implements EmailService {
     private static Logger logger = LoggerFactory.getLogger(EmailServiceImpl.class);
     @Autowired
     ShyEmailMapper shyEmailMapper;
@@ -35,6 +36,7 @@ public class EmailServiceImpl {
      * @param emailDTO
      * @return
      */
+    @Override
     public PageInfo<ShyEmail> getPage(EmailDTO emailDTO) {
         logger.info("接受参数列表为：{}", JSON.toJSONString(emailDTO));
         Example example = new Example(ShyEmail.class);
@@ -63,6 +65,7 @@ public class EmailServiceImpl {
      * @param id
      * @return
      */
+    @Override
     public ShyEmail get(Integer id) {
         return shyEmailMapper.selectByPrimaryKey(id);
     }
@@ -73,7 +76,7 @@ public class EmailServiceImpl {
      * @param shyEmail
      * @return
      */
-
+    @Override
     public ShyEmail select(ShyEmail shyEmail) {
         return shyEmailMapper.selectOne(shyEmail);
     }
@@ -86,6 +89,7 @@ public class EmailServiceImpl {
      * @param userId
      * @return
      */
+    @Override
     public Integer updateState(Integer id, Boolean isEnable, String userId) {
         ShyEmail shyEmail = get(id);
         shyEmail.setIs_enable(isEnable);
@@ -101,6 +105,7 @@ public class EmailServiceImpl {
      * @param userId
      * @return
      */
+    @Override
     public Integer deleted(Integer id, String userId) {
         ShyEmail shyEmail = get(id);
         shyEmail.setUpdater(userId);
@@ -119,6 +124,7 @@ public class EmailServiceImpl {
      * @param updater
      * @return
      */
+    @Override
     public boolean update(Integer id, String email, String remark, String write, String updater) {
         ShyEmail shyEmail = new ShyEmail();
@@ -132,9 +138,7 @@ public class EmailServiceImpl {
                 shyEmail.setUpdater(updater);
                 shyEmail.setUpdated_at(CommonUtils.getCurrentTime());
                 int re = shyEmailMapper.updateByPrimaryKeySelective(shyEmail);
-                if (re != 1) {
-                    return false;
-                }
+                return re == 1;
             }
         } else {
             shyEmail.setEmail(email);
@@ -146,9 +150,7 @@ public class EmailServiceImpl {
             shyEmail.setCreated_at(CommonUtils.getCurrentTime());
             shyEmail.setUpdated_at(CommonUtils.getCurrentTime());
             int re = shyEmailMapper.insertSelective(shyEmail);
-            if (re != 1) {
-                return false;
-            }
+            return re == 1;
         }
         return true;
     }
@@ -159,6 +161,7 @@ public class EmailServiceImpl {
      * @param emailSendType
      * @return
      */
+    @Override
     public List<ShyEmail> getEmailSendList(Integer emailSendType) {
         ShyEmail shyEmail = new ShyEmail();
         shyEmail.setIs_delete(false);
@@ -175,7 +178,5 @@ public class EmailServiceImpl {
             }
         }
         return emailList;
-
     }
-
 }
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.dto.ShyActivityDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.mapper.ShyActivityMapper;
+import com.cnlive.shenhe.service.ShyActivityService;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageHelper;
@@ -24,9 +25,9 @@ import java.util.List;
  * @create 2022-03-08 10:43
  */
 @Service
-public class ShyActivityImpl {
+public class ShyActivityServiceImpl implements ShyActivityService {
-    private static Logger logger = LoggerFactory.getLogger(ShyActivityImpl.class);
+    private static Logger logger = LoggerFactory.getLogger(ShyActivityServiceImpl.class);
     @Autowired
     private ShyActivityMapper shyActivityMapper;
@@ -37,6 +38,7 @@ public class ShyActivityImpl {
      * @param shyActivity
      * @return
      */
+    @Override
     public Boolean insertShyActivity(ShyActivity shyActivity) {
         Date date = new Date();
         shyActivity.setCreate_time(date);
@@ -44,10 +46,7 @@ public class ShyActivityImpl {
         shyActivity.setExempt_from_trial(CommonConst.AUDIT_TYPE_USER);
         logger.info("添加对象为：{}", JSON.toJSON(shyActivity));
         int result = shyActivityMapper.insertSelective(shyActivity);
-        if (result > 0) {
-            return true;
-        }
-        return false;
+        return result > 0;
     }
     /**
@@ -56,12 +55,10 @@ public class ShyActivityImpl {
      * @param id
      * @return
      */
+    @Override
     public Boolean deleteShyActivity(Integer id) {
         int result = shyActivityMapper.deleteByPrimaryKey(id);
-        if (result > 0) {
-            return true;
-        }
-        return false;
+        return result > 0;
     }
     /**
@@ -70,16 +67,14 @@ public class ShyActivityImpl {
      * @param shyActivity
      * @return
      */
+    @Override
     public Boolean updateShyActivity(ShyActivity shyActivity) {
         Date date = new Date();
         shyActivity.setCreate_time(date);
         shyActivity.setUpdate_time(date);
         logger.info("修改对象为：{}", JSON.toJSON(shyActivity));
         int result = shyActivityMapper.updateByPrimaryKeySelective(shyActivity);
-        if (result > 0) {
-            return true;
-        }
-        return false;
+        return result > 0;
     }
     /**
@@ -88,6 +83,7 @@ public class ShyActivityImpl {
      * @param shyActivityDTO
      * @return
      */
+    @Override
     public PageInfo<ShyActivity> selectByExample(ShyActivityDTO shyActivityDTO) {
         logger.info("参数接受对象为，ShyActivityDTO:{}", JSON.toJSONString(shyActivityDTO));
         Example example = new Example(ShyActivity.class);
@@ -119,9 +115,9 @@ public class ShyActivityImpl {
      * @param exemptFromTrial
      * @return
      */
+    @Override
     public List<Integer> selectByExample(Integer exemptFromTrial) {
-        List<Integer> shyActivities = shyActivityMapper.selectAllByExempt_from_trial(exemptFromTrial);
-        return shyActivities;
+        return shyActivityMapper.selectAllByExempt_from_trial(exemptFromTrial);
     }
@@ -130,9 +126,9 @@ public class ShyActivityImpl {
      *
      * @return
      */
+    @Override
     public List<ShyActivity> selectAll() {
-        List<ShyActivity> shyActivities = shyActivityMapper.selectAll();
-        return shyActivities;
+        return shyActivityMapper.selectAll();
     }
     /**
@@ -141,12 +137,10 @@ public class ShyActivityImpl {
      * @param id
      * @return
      */
+    @Override
     public Boolean selectById(Integer id) {
         ShyActivity shyActivity = shyActivityMapper.selectById(id);
-        if (shyActivity == null) {
-            return true;
-        }
-        return false;
+        return shyActivity == null;
     }
@@ -156,8 +150,8 @@ public class ShyActivityImpl {
      * @param id
      * @return
      */
+    @Override
     public Integer selectBySource(Integer id) {
-        Integer shtype = shyActivityMapper.selectBySource(id);
-        return shtype;
+        return shyActivityMapper.selectBySource(id);
     }
 }
@@ -5,6 +5,7 @@ import com.cnlive.shenhe.dto.ShyLogDTO;
 import com.cnlive.shenhe.entity.ShyActivity;
 import com.cnlive.shenhe.entity.ShyLog;
 import com.cnlive.shenhe.mapper.ShyLogMapper;
+import com.cnlive.shenhe.service.ShyLogService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
@@ -21,7 +22,7 @@ import java.util.List;
  * @create 2022-05-16 11:09
  */
 @Service
-public class ShyLogServiceImpl {
+public class ShyLogServiceImpl implements ShyLogService {
     private static Logger logger = LoggerFactory.getLogger(ShyLogServiceImpl.class);
@@ -33,6 +34,7 @@ public class ShyLogServiceImpl {
      *
      * @return
      */
+    @Override
     public PageInfo<ShyLog> selectByExample(ShyLogDTO shyLogDTO) {
         logger.info("进入日志查询方法，参数接受对象为，ShyLogDTO:{}", JSON.toJSONString(shyLogDTO));
         Example example = new Example(ShyActivity.class);
@@ -56,12 +58,10 @@ public class ShyLogServiceImpl {
      * @param shyLog
      * @return
      */
+    @Override
     public Boolean addShyLog(ShyLog shyLog) {
         logger.info("进入日志添加方法 接受日志对象为，ShyLog：{}", JSON.toJSONString(shyLog));
         int result = shyLogMapper.insertSelective(shyLog);
-        if (result > 0) {
-            return true;
-        }
-        return false;
+        return result > 0;
     }
 }
@@ -12,6 +12,7 @@ import com.cnlive.shenhe.entity.ShyVideos;
 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.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -51,7 +52,7 @@ public class VideosServiceImpl {
     @Autowired
     private YiDunServiceImpl yiDunServiceImpl;
     @Autowired
-    private ShyActivityImpl shyActivityImpl;
+    private ShyActivityService shyActivityService;
     @Value("${qn_domain}")
     private String qn_domain;
     @Value("${ks_domain}")
@@ -498,7 +499,7 @@ public class VideosServiceImpl {
         logger.info("====sites:{}", sites.toString());
         String source = shyVideo.getSource();
         // 根据source 查询审核类型    source有传空的时候 默认给0
-        Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? Integer.valueOf(0) : Integer.valueOf(source));
+        Integer shType = shyActivityService.selectBySource(StringUtils.isEmpty(source) ? Integer.valueOf(0) : Integer.valueOf(source));
         logger.info("审核类型为:{}", shType);
         ShyUsersfree shyUserfree = null;
         //如果用户id存在