优化代码、删去无引用的注入、删去注释的代码、将下划线统一换成驼峰命名

王言钊
1 parent 32a5b6f9
Showing 47 changed files with 367 additions and 654 deletions
src/main/java/com/cnlive/shenhe/api/AudioControllerApi.java
src/main/java/com/cnlive/shenhe/api/ChannelControllerApi.java
src/main/java/com/cnlive/shenhe/api/CommentsControllerApi.java
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
src/main/java/com/cnlive/shenhe/api/TopicControllerApi.java
src/main/java/com/cnlive/shenhe/api/YiDunControllerApi.java
src/main/java/com/cnlive/shenhe/config/SessionFilter.java
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/ShyActivityController.java
src/main/java/com/cnlive/shenhe/controller/SitesController.java
src/main/java/com/cnlive/shenhe/controller/TopicController.java
@@ -41,7 +41,7 @@ public class AudioControllerApi {
     @Autowired
     YiDunServiceImpl yiDunServiceImpl;
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     /**
      * 音频入库
@@ -143,7 +143,7 @@ public class AudioControllerApi {
                                 newshyAudio.setState(1);
                                 newshyAudio.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);
                                 newshyAudio.setReceive(CommonConst.RECEIVE_AUDIT);
-                                Pass.audioPass(shyAudio.getAudioId(), 3, shyAudio.getAttr_tags(), "易盾点播音频审核通过了", shyAudio.getCallback());
+                                pass.audioPass(shyAudio.getAudioId(), 3, shyAudio.getAttr_tags(), "易盾点播音频审核通过了", shyAudio.getCallback());
                             } else {
                                 String labelMsg = "";
                                 if (action != 0 && asrStatus == 3) {
@@ -34,6 +34,7 @@ public class ChannelControllerApi {
      * @Date: 2019/08/17 11:17
      * @Description: 频道送审接口
      */
+    @SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
     @PostMapping("/import")
     @ResponseBody
     public ResponseBean impotChannel(String param) {
@@ -62,8 +63,8 @@ public class ChannelControllerApi {
             shyChannel1.setOffline(CommonConstStates.ZHENGCHANG);
             shyChannel1.setUpdated_at(CommonUtils.getCurrentTime());
             channelService.getShenheType(shyChannel1);
-            boolean YorN = channelService.updateshyChannel(shyChannel1);
-            if (YorN) {
+            boolean yorN = channelService.updateshyChannel(shyChannel1);
+            if (yorN) {
                 return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "审核请求收到成功");
             }
             return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "审核请求收到失败(更新)");
@@ -79,8 +80,8 @@ public class ChannelControllerApi {
         shyChannel.setCreated_at(CommonUtils.getCurrentTime());
         shyChannel.setUpdated_at(CommonUtils.getCurrentTime());
         channelService.getShenheType(shyChannel);
-        boolean YorN = channelService.impotChannel(shyChannel);
-        if (YorN) {
+        boolean yorN = channelService.impotChannel(shyChannel);
+        if (yorN) {
             return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "审核请求收到成功");
         }
         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "审核请求收到失败(新增)");
@@ -5,8 +5,6 @@ import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
-import com.cnlive.shenhe.serviceImpl.TopicServiceImpl;
-import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import org.slf4j.Logger;
@@ -28,11 +26,7 @@ import java.util.List;
 public class CommentsControllerApi {
     private static Logger logger = LoggerFactory.getLogger(CommentsControllerApi.class);
     @Autowired
-    AuditPass Pass;
-    @Autowired
     CommentsServiceImpl commentsService;
-    @Autowired
-    TopicServiceImpl topicService;
     /**
      * @Auther: chenhao
@@ -54,7 +48,7 @@ public class CommentsControllerApi {
         Integer commentUserId = json.getInteger("commentUserId");
         String commentUserName = json.getString("commentUserName");
         String commentUserAvatar = json.getString("commentUserAvatar");
-        String commentUserIP = json.getString("commentUserIP");
+        String commentUserIp = json.getString("commentUserIP");
         String commentContent = json.getString("commentContent");
         String appId = json.getString("appId");
         String platform = json.getString("platform");
@@ -72,11 +66,11 @@ public class CommentsControllerApi {
         shyComments.setActivity_id(json.getString("activityId"));
         List<ShyComments> commentsList = commentsService.findshyComments(shyComments);
-        Integer sp_id = null;
+        Integer spId = null;
         try {
-            sp_id = json.getInteger("spId");
+            spId = json.getInteger("spId");
         } catch (Exception e) {
-            sp_id = null;
+            spId = null;
         }
         //存在则更新
         if (commentsList.size() > 0) {
@@ -88,20 +82,19 @@ public class CommentsControllerApi {
             shyComments1.setComment_user_id(commentUserId);
             shyComments1.setComment_user_name(commentUserName);
             shyComments1.setComment_user_avatar(commentUserAvatar);
-            shyComments1.setComment_user_ip(commentUserIP);
+            shyComments1.setComment_user_ip(commentUserIp);
             shyComments1.setComment_content(commentContent);
             shyComments1.setType(type);
             shyComments1.setLevel(level);
-
             shyComments1.setComment_time(timestamp);
-            shyComments1.setSpid(sp_id);
+            shyComments1.setSpid(spId);
             shyComments1.setApp_id(appId);
             shyComments1.setPlatform(platform);
             shyComments1.setActivity_id(activityId);
             shyComments1.setIs_hot(priority);
             shyComments1.setCallback(callback);
-            boolean YorN = commentsService.updateshyComments1(shyComments1);
-            if (YorN == true) {
+            boolean yorN = commentsService.updateshyComments1(shyComments1);
+            if (yorN) {
                 return new ResponseBean(ErrorEnum.SUCCESS);
             } else {
                 return new ResponseBean(ErrorEnum.ERROR);
@@ -115,19 +108,19 @@ public class CommentsControllerApi {
         shyComments.setComment_user_id(commentUserId);
         shyComments.setComment_user_name(commentUserName);
         shyComments.setComment_user_avatar(commentUserAvatar);
-        shyComments.setComment_user_ip(commentUserIP);
+        shyComments.setComment_user_ip(commentUserIp);
         shyComments.setComment_content(commentContent);
         shyComments.setComment_time(timestamp);
         shyComments.setType(type);
         shyComments.setLevel(level);
-        shyComments.setSpid(sp_id);
+        shyComments.setSpid(spId);
         shyComments.setApp_id(appId);
         shyComments.setPlatform(platform);
         shyComments.setIs_hot(priority);
         shyComments.setCallback(callback);
         commentsService.getShenheType(shyComments);
-        boolean YorN = commentsService.impotComments(shyComments);
-        if (YorN == true) {
+        boolean yorN = commentsService.impotComments(shyComments);
+        if (yorN) {
             return new ResponseBean(ErrorEnum.SUCCESS);
         } else {
             return new ResponseBean(ErrorEnum.ERROR);
@@ -76,7 +76,6 @@ public class ContentControllerApi {
             if (CommonUtils.isNotEmpty(contentTime)) {
                 Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
                 shyContent1.setContent_time(timestamp);
-
             }
             shyContent1.setCreate_date(CommonUtils.getCurrentTime());
             //回调地址
@@ -93,8 +92,8 @@ public class ContentControllerApi {
             shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);
             //最后一次更新时间
             shyContent1.setLast_update(CommonUtils.getCurrentTime());
-            boolean YorN = contentService.updateshyContent(shyContent1);
-            if (YorN == true) {
+            boolean yorN = contentService.updateshyContent(shyContent1);
+            if (yorN) {
                 logger.info("图文同步接口更新成功:{}", contentId);
                 return new ResponseBean(ErrorEnum.SUCCESS);
             } else {
@@ -130,15 +129,8 @@ public class ContentControllerApi {
         shyContent.setContent_text(json.getString("content_text"));
         //创建时间
         shyContent.setContent_time(new Date());
-        //String contentTime = json.getString("contentTime");
-        //if (CommonUtils.isNotEmpty(contentTime)) {
-        //    Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
-        //    shyContent.setContent_time(timestamp);
-        //
-        //}
         String contentTag = json.getString("content_tag");
         shyContent.setContent_tag(StringUtils.isEmpty(contentTag) ? "content" : contentTag);
-
         shyContent.setCreate_date(CommonUtils.getCurrentTime());
         //回调地址
         shyContent.setCallback(json.getString("callback"));
@@ -152,8 +144,8 @@ public class ContentControllerApi {
         shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);
         //最后一次更新时间
         shyContent.setLast_update(CommonUtils.getCurrentTime());
-        boolean YorN = contentService.impotContent(shyContent);
-        if (YorN == true) {
+        boolean yorN = contentService.impotContent(shyContent);
+        if (yorN) {
             logger.info("图文同步接口保存操作成功:{}", json.getString("contentId"));
             return new ResponseBean(ErrorEnum.SUCCESS);
         } else {
@@ -181,7 +173,6 @@ public class ContentControllerApi {
         List<ShyContent> contentList = contentService.findshyContent(shyContent);
         //获取审核类型
         Integer shenheType = contentService.getShenheType(json.getInteger("spId"), "moment");
-
         //获取生活圈内容的类型 1：图片 2：视频 3：分享
         Integer contentType = json.getInteger("contentType");
         //内容图片地址
@@ -211,10 +202,6 @@ public class ContentControllerApi {
             //朋友圈内容创建时间
             String contentTime = json.getString("createTime");
             shyContent1.setContent_time(new Date(Long.valueOf(contentTime)));
-            //if (CommonUtils.isNotEmpty(contentTime)) {
-            //    //Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
-            //
-            //}
             shyContent1.setCreate_date(CommonUtils.getCurrentTime());
             //回调地址
             shyContent1.setCallback(json.getString("callbackUrl"));
@@ -236,10 +223,8 @@ public class ContentControllerApi {
             shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);
             //最后一次更新时间
             shyContent1.setLast_update(CommonUtils.getCurrentTime());
-
-
-            boolean YorN = contentService.updateshyContent(shyContent1);
-            if (YorN == true) {
+            boolean yorN = contentService.updateshyContent(shyContent1);
+            if (yorN) {
                 return new ResponseBean(ErrorEnum.SUCCESS);
             } else {
                 return new ResponseBean(ErrorEnum.ERROR);
@@ -257,10 +242,6 @@ public class ContentControllerApi {
         //创建时间
         String contentTime = json.getString("createTime");
         shyContent.setContent_time(new Date(Long.valueOf(contentTime)));
-//        if (CommonUtils.isNotEmpty(contentTime)) {
-//    		Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
-//
-//        }
         shyContent.setCreate_date(CommonUtils.getCurrentTime());
         //回调地址
         shyContent.setCallback(json.getString("callbackUrl"));
@@ -280,8 +261,8 @@ public class ContentControllerApi {
         shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);
         //最后一次更新时间
         shyContent.setLast_update(CommonUtils.getCurrentTime());
-        boolean YorN = contentService.impotContent(shyContent);
-        if (YorN == true) {
+        boolean yorN = contentService.impotContent(shyContent);
+        if (yorN) {
             return new ResponseBean(ErrorEnum.SUCCESS);
         } else {
             return new ResponseBean(ErrorEnum.ERROR);
@@ -35,7 +35,7 @@ public class LiveApplyControllerApi {
         JSONObject map = new JSONObject();
         JSONObject result = new JSONObject();
         //初始化一个请求数据库返回结果
-        boolean YorN = true;
+        boolean yorN = true;
         logger.info("直播申请入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
@@ -67,7 +67,7 @@ public class LiveApplyControllerApi {
         //内容简述
         String simpleContent = json.getString("simpleContent");
         //直播类型
-        String live_type = json.getString("liveType");
+        String liveType = json.getString("liveType");
         //要点报备：0品牌植入 1广告植入 2商品推销 3网家家独家麦标
         String keys = json.getString("keys").equals("") ? "无" : json.getString("keys");
         //直播地点
@@ -82,15 +82,15 @@ public class LiveApplyControllerApi {
         String platforms = json.getString("platforms");
         //预计开始时间
         String startTime = json.getString("preStartTime");
-        Date timestamp_start = null;
+        Date timestampStart = null;
         if (CommonUtils.isNotEmpty(startTime)) {
-            timestamp_start = new Timestamp(Long.valueOf(startTime));
+            timestampStart = new Timestamp(Long.valueOf(startTime));
         }
         //预计结束时间
         String endTime = json.getString("preEndTime");
-        Date timestamp_end = null;
+        Date timestampEnd = null;
         if (CommonUtils.isNotEmpty(endTime)) {
-            timestamp_end = new Timestamp(Long.valueOf(endTime));
+            timestampEnd = new Timestamp(Long.valueOf(endTime));
         }
         ShyLiveapply shyliveApply1 = new ShyLiveapply();
         //得到直播活动id去查询是否已有
@@ -112,11 +112,11 @@ public class LiveApplyControllerApi {
             //直播主题
             shyliveApply.setTheme(theme);
             //直播类型
-            shyliveApply.setLive_type(live_type);
+            shyliveApply.setLive_type(liveType);
             //预计开始时间
-            shyliveApply.setPre_start_time(timestamp_start);
+            shyliveApply.setPre_start_time(timestampStart);
             //预计结束时间
-            shyliveApply.setPre_end_time(timestamp_end);
+            shyliveApply.setPre_end_time(timestampEnd);
             //商务模式：0免费  1收费
             shyliveApply.setBusiness_model(businessModel);
             //内容属性：1商业类活动 0非商业活动
@@ -147,7 +147,7 @@ public class LiveApplyControllerApi {
             //获取审核类型
             liveApplyServiceImpl.getShenheType(shyliveApply);
-            YorN = liveApplyServiceImpl.updateshyLiveApply(shyliveApply);
+            yorN = liveApplyServiceImpl.updateshyLiveApply(shyliveApply);
         } else {
             //查了，没有，直接插入数据库
             //设置频道id
@@ -163,11 +163,11 @@ public class LiveApplyControllerApi {
             //直播主题
             shyliveApply1.setTheme(theme);
             //直播类型
-            shyliveApply1.setLive_type(live_type);
+            shyliveApply1.setLive_type(liveType);
             //预计开始时间
-            shyliveApply1.setPre_start_time(timestamp_start);
+            shyliveApply1.setPre_start_time(timestampStart);
             //预计结束时间
-            shyliveApply1.setPre_end_time(timestamp_end);
+            shyliveApply1.setPre_end_time(timestampEnd);
             //商务模式：0免费  1收费
             shyliveApply1.setBusiness_model(businessModel);
             //内容属性：1商业类活动 0非商业活动
@@ -202,10 +202,10 @@ public class LiveApplyControllerApi {
             //更新时间
             shyliveApply1.setUpdated_at(CommonUtils.getCurrentTime());
-            YorN = liveApplyServiceImpl.impotLiveApply(shyliveApply1);
+            yorN = liveApplyServiceImpl.impotLiveApply(shyliveApply1);
         }
-        if (YorN == true) {
+        if (yorN) {
             result.put("errorCode", "0");
             result.put("errorMessage", "直播申请审核请求收到成功");
             map.put("statusCode", "200");
@@ -37,7 +37,7 @@ public class LiveControllerApi {
         JSONObject map = new JSONObject();
         JSONObject result = new JSONObject();
         //初始化一个请求数据库返回结果
-        boolean YorN = true;
+        boolean yorN = true;
         logger.info("直播入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
@@ -51,7 +51,7 @@ public class LiveControllerApi {
         //直播频道id
         String channelId = json.getString("channelId");
         //直播频道id
-        String live_type = json.getString("liveType");
+        String liveType = json.getString("liveType");
         //rtmp直播流
         String mp4Url = json.getString("mp4Url");
         //m3u8直播流
@@ -60,8 +60,10 @@ public class LiveControllerApi {
         Integer spId = Integer.parseInt(json.getString("spId"));
         //回调地址
         String callback = json.getString("callback");
+
+
         //优先级
-        Integer is_hot = Integer.parseInt(json.getString("priority"));
+        Integer isHot = Integer.parseInt(json.getString("priority"));
         //封面
         String coverImgUrl = json.getString("coverImgUrl");
         //活动描述
@@ -70,28 +72,30 @@ public class LiveControllerApi {
         String playbackUrl = json.getString("playbackUrl");
         //开始时间
         String startTime = json.getString("startTime");
-        Date timestamp_start = null;
+
+        Date timestampStart = null;
         if (CommonUtils.isNotEmpty(startTime)) {
-            timestamp_start = new Timestamp(Long.valueOf(startTime));
+            timestampStart = new Timestamp(Long.valueOf(startTime));
         }
         //结束时间
         String endTime = json.getString("endTime");
-        Date timestamp_end = null;
+        Date timestampEnd = null;
         if (CommonUtils.isNotEmpty(endTime)) {
-            timestamp_end = new Timestamp(Long.valueOf(endTime));
+            timestampEnd = new Timestamp(Long.valueOf(endTime));
         }
         //预计开始时间
-        String pre_startTime = json.getString("preStartTime");
-        Date pre_timestamp_start = null;
-        if (CommonUtils.isNotEmpty(pre_startTime)) {
-            pre_timestamp_start = new Timestamp(Long.valueOf(pre_startTime));
+        String preStartTime = json.getString("preStartTime");
+
+        Date preTimestampStart = null;
+        if (CommonUtils.isNotEmpty(preStartTime)) {
+            preTimestampStart = new Timestamp(Long.valueOf(preStartTime));
         }
         //预计结束时间
-        String pre_endTime = json.getString("preEndTime");
-        Date pre_timestamp_end = null;
-        if (CommonUtils.isNotEmpty(pre_endTime)) {
-            pre_timestamp_end = new Timestamp(Long.valueOf(pre_endTime));
+        String preEndTime = json.getString("preEndTime");
+        Date preTimestampEnd = null;
+        if (CommonUtils.isNotEmpty(preEndTime)) {
+            preTimestampEnd = new Timestamp(Long.valueOf(preEndTime));
         }
         ShyLive shylive1 = new ShyLive();
@@ -109,8 +113,8 @@ public class LiveControllerApi {
             shyLive.setActivity_name(activityName);
             //设置直播活动状态
             shyLive.setActivity_status(activityStatus);
-            shyLive.setPre_start_time(pre_timestamp_start);
-            shyLive.setPre_end_time(pre_timestamp_end);
+            shyLive.setPre_start_time(preTimestampStart);
+            shyLive.setPre_end_time(preTimestampEnd);
             //直播活动状态，1:直播中，2:直播完成，3:待直播，0:直播撤销(手动),4:直播下线(强制)
             //发布直播
@@ -121,14 +125,14 @@ public class LiveControllerApi {
                 shyLive.setIs_hot(CommonConstStates.SHIFOU_REDIANYES);
                 //启动直播
             } else if (activityStatus.equals(CommonConstStates.ZHIBO_ZHENGZAI)) {
-                shyLive.setActivity_start_time(timestamp_start);
+                shyLive.setActivity_start_time(timestampStart);
                 shyLive.setActivity_end_time(null);
                 //是否是热点: 1:不是 ,2: 是
                 shyLive.setIs_hot(CommonConstStates.SHIFOU_REDIANYES);
                 //停止直播
             } else if (activityStatus.equals(CommonConstStates.ZHIBO_JIESHU)) {
-                shyLive.setActivity_start_time(timestamp_start);
-                shyLive.setActivity_end_time(timestamp_end);
+                shyLive.setActivity_start_time(timestampStart);
+                shyLive.setActivity_end_time(timestampEnd);
                 //回放地址
                 shyLive.setPlayback_url(playbackUrl);
                 //状态 0:未认领 1.已领未审,2:已审
@@ -139,8 +143,8 @@ public class LiveControllerApi {
                 shyLive.setIs_hot(CommonConstStates.SHIFOU_REDIANNO);
                 //审核强制下线
             } else if (activityStatus.equals(CommonConstStates.ZHIBO_XIAXIAN)) {
-                shyLive.setActivity_start_time(timestamp_start);
-                shyLive.setActivity_end_time(timestamp_end);
+                shyLive.setActivity_start_time(timestampStart);
+                shyLive.setActivity_end_time(timestampEnd);
                 //回放地址
                 shyLive.setPlayback_url(playbackUrl);
                 //是否是热点: 1:不是 ,2: 是
@@ -148,7 +152,7 @@ public class LiveControllerApi {
             }
             //直播活动简介
             shyLive.setActivity_intro(activityIntro);
-            shyLive.setLive_type(live_type);
+            shyLive.setLive_type(liveType);
             //m3u8直播流
             shyLive.setM3u8_url(hlsUrl);
             //rtmp直播流
@@ -173,7 +177,7 @@ public class LiveControllerApi {
             //更新时间
             shyLive.setUpdated_at(CommonUtils.getCurrentTime());
-            YorN = liveService.updateshyLive(shyLive);
+            yorN = liveService.updateshyLive(shyLive);
         } else {
             //查了，没有，直接插入数据库
             //设置直播活动id
@@ -190,20 +194,20 @@ public class LiveControllerApi {
             shylive1.setShenhe_state(CommonConst.RECEIVE_BEFORE);
             //是否是热点: 1:不是 ,2: 是
             shylive1.setIs_hot(CommonConstStates.SHIFOU_REDIANYES);
-            shylive1.setPre_start_time(pre_timestamp_start);
-            shylive1.setPre_end_time(pre_timestamp_end);
+            shylive1.setPre_start_time(preTimestampStart);
+            shylive1.setPre_end_time(preTimestampEnd);
             //发布直播
             if (activityStatus.equals(CommonConstStates.ZHIBO_DENGDAI)) {
                 shylive1.setActivity_start_time(null);
                 shylive1.setActivity_end_time(null);
             } else if (activityStatus.equals(CommonConstStates.ZHIBO_ZHENGZAI)) {
                 //启动直播
-                shylive1.setActivity_start_time(timestamp_start);
+                shylive1.setActivity_start_time(timestampStart);
                 shylive1.setActivity_end_time(null);
                 //停止直播
             } else if (activityStatus.equals(CommonConstStates.ZHIBO_JIESHU)) {
-                shylive1.setActivity_start_time(timestamp_start);
-                shylive1.setActivity_end_time(timestamp_end);
+                shylive1.setActivity_start_time(timestampStart);
+                shylive1.setActivity_end_time(timestampEnd);
                 //回放地址
                 shylive1.setPlayback_url(playbackUrl);
                 //状态 0:未认领 1.已领未审,2:已审
@@ -214,8 +218,8 @@ public class LiveControllerApi {
                 shylive1.setIs_hot(CommonConstStates.SHIFOU_REDIANNO);
                 //审核强制下线
             } else if (activityStatus.equals(CommonConstStates.ZHIBO_XIAXIAN)) {
-                shylive1.setActivity_start_time(timestamp_start);
-                shylive1.setActivity_end_time(timestamp_end);
+                shylive1.setActivity_start_time(timestampStart);
+                shylive1.setActivity_end_time(timestampEnd);
                 //回放地址
                 shylive1.setPlayback_url(playbackUrl);
                 //状态 0:未认领 1.已领未审,2:已审
@@ -225,7 +229,7 @@ public class LiveControllerApi {
             }
             //直播活动简介
             shylive1.setActivity_intro(activityIntro);
-            shylive1.setLive_type(live_type);
+            shylive1.setLive_type(liveType);
             //m3u8直播流
             shylive1.setM3u8_url(hlsUrl);
             //rtmp直播流
@@ -252,10 +256,10 @@ public class LiveControllerApi {
             shylive1.setCreated_at(CommonUtils.getCurrentTime());
             //更新时间
             shylive1.setUpdated_at(CommonUtils.getCurrentTime());
-            YorN = liveService.impotVideo(shylive1);
+            yorN = liveService.impotVideo(shylive1);
         }
-        if (YorN == true) {
+        if (yorN) {
             result.put("errorCode", "0");
             result.put("errorMessage", "直播审核请求收到成功");
             map.put("statusCode", "200");
@@ -4,22 +4,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.entity.ShyTopic;
-import com.cnlive.shenhe.serviceImpl.CommentsServiceImpl;
 import com.cnlive.shenhe.serviceImpl.TopicServiceImpl;
-import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.cnlive.shenhe.utils.TransitServiceUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import java.util.HashMap;
 import java.util.List;
@@ -31,16 +24,12 @@ import java.util.Map;
 @Controller
 @RequestMapping("/api/topic")
 public class TopicControllerApi {
+
     private static Logger logger = LoggerFactory.getLogger(TopicControllerApi.class);
     @Autowired
-    AuditPass Pass;
-    @Autowired
-    CommentsServiceImpl commentsService;
-    @Autowired
     TopicServiceImpl topicService;
-
     @Autowired
-    TransitServiceUtils t;
+    TransitServiceUtils transitServiceUtils;
     /**
      * @author liwei
@@ -52,11 +41,9 @@ public class TopicControllerApi {
     public ResponseBean impotTopic(@RequestBody String param) {
         logger.info("话题入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
-        JSONObject result = new JSONObject();
-
         //获取所有参数
         //话题id
-        String topic_id = json.getString("topicId");
+        String topicId = json.getString("topicId");
         Integer spId = null;
         try {
             spId = json.getInteger("spId");
@@ -68,18 +55,18 @@ public class TopicControllerApi {
         //话题图片
         String topicPic = json.getString("topicPic");
         //话题内容
-        String topic_text = json.getString("topicMsg");
+        String topicText = json.getString("topicMsg");
         //话题创建时间
-        String topic_time = json.getString("createTime");
+        String topicTime = json.getString("createTime");
         //话题标签
-        String topic_tag = json.getString("topicTag");
+        String topicTag = json.getString("topicTag");
         //话题url
-        String topic_url = json.getString("topicUrl");
+        String topicUrl = json.getString("topicUrl");
         //判断是否存在
         ShyTopic shyTopic = new ShyTopic();
-        shyTopic.setTopic_id(topic_id);
+        shyTopic.setTopic_id(topicId);
         List<ShyTopic> topicList = topicService.findshyTopic(shyTopic);
         //获取审核类型
@@ -94,13 +81,13 @@ public class TopicControllerApi {
             //审核类型
             shyTopic1.setShenhe_type(shenheType);
             //话题内容
-            shyTopic1.setTopic_text(topic_text);
+            shyTopic1.setTopic_text(topicText);
             //话题标签
-            shyTopic1.setTopic_tag(topic_tag);
+            shyTopic1.setTopic_tag(topicTag);
             //话题url
-            shyTopic1.setTopic_url(topic_url);
+            shyTopic1.setTopic_url(topicUrl);
             //话题创建时间
-            shyTopic1.setTopic_time(topic_time);
+            shyTopic1.setTopic_time(topicTime);
             //spid
             shyTopic1.setSp_id(spId);
             //当前话题的审核状态
@@ -108,11 +95,11 @@ public class TopicControllerApi {
             //最后一次更新时间
             shyTopic1.setUpdate_date(CommonUtils.getCurrentTime());
-            boolean YorN = topicService.updateshyTopic(shyTopic1);
-            if (YorN == true) {
-                return new ResponseBean(ErrorEnum.SUCCESS, new JSONObject().put("topic_id", topic_id));
+            boolean yorN = topicService.updateshyTopic(shyTopic1);
+            if (yorN) {
+                return new ResponseBean(ErrorEnum.SUCCESS, new JSONObject().put("topic_id", topicId));
             } else {
-                return new ResponseBean(ErrorEnum.ERROR, new JSONObject().put("topic_id", topic_id));
+                return new ResponseBean(ErrorEnum.ERROR, new JSONObject().put("topic_id", topicId));
             }
         }
         //如果不存在直接插入
@@ -123,13 +110,13 @@ public class TopicControllerApi {
         //审核类型
         shyTopic.setShenhe_type(shenheType);
         //话题内容
-        shyTopic.setTopic_text(topic_text);
+        shyTopic.setTopic_text(topicText);
         //话题标签
-        shyTopic.setTopic_tag(topic_tag);
+        shyTopic.setTopic_tag(topicTag);
         //话题url
-        shyTopic.setTopic_url(topic_url);
+        shyTopic.setTopic_url(topicUrl);
         //话题创建时间
-        shyTopic.setTopic_time(topic_time);
+        shyTopic.setTopic_time(topicTime);
         //spid
         shyTopic.setSp_id(spId);
         //当前话题的审核状态
@@ -138,24 +125,24 @@ public class TopicControllerApi {
         shyTopic.setUpdate_date(CommonUtils.getCurrentTime());
         //送审时间
         shyTopic.setCreate_date(CommonUtils.getCurrentTime());
-        boolean YorN = topicService.impotshyTopic(shyTopic);
-        if (YorN == true) {
-            return new ResponseBean(ErrorEnum.SUCCESS, new JSONObject().put("topic_id", topic_id));
+        boolean yorN = topicService.impotshyTopic(shyTopic);
+        if (yorN) {
+            return new ResponseBean(ErrorEnum.SUCCESS, new JSONObject().put("topic_id", topicId));
         } else {
-            return new ResponseBean(ErrorEnum.ERROR, new JSONObject().put("topic_id", topic_id));
+            return new ResponseBean(ErrorEnum.ERROR, new JSONObject().put("topic_id", topicId));
         }
     }
     @GetMapping("/send")
     @ResponseBody
     public String send() {
-        System.out.println("1111");
+        logger.info("1111");
         JSONObject params = new JSONObject();
         params.put("video_id", "11111");
         params.put("state", "22222");
         params.put("attr_tags", "33333");
         params.put("msg", "4444");
-        t.send("cms", "/api/callback", false, params);
+        transitServiceUtils.send("cms", "/api/callback", false, params);
         return "1111";
     }
@@ -169,27 +156,28 @@ public class TopicControllerApi {
         String errorMessage = json.getString("errorMessage");
         //获取接收方消息 
         JSONObject dataObject = json.getJSONObject("data");
-        String topic_id = dataObject.getString("topic_id");
+        String topicId = dataObject.getString("topic_id");
         //获取当前话题实体
         ShyTopic topic = new ShyTopic();
-        topic.setTopic_id(topic_id);
+        topic.setTopic_id(topicId);
         topic = topicService.getShyTopic(topic);
-        if (errorCode.equals("0")) {
-            logger.info("话题id为:" + topic_id + ",cms系统已通知");
+        String numcode = "0";
+        if (numcode.equals(errorCode)) {
+            logger.info("话题id为:" + topicId + ",cms系统已通知");
             if (topic != null) {
                 topic.setShenhe_msg(topic.getShenhe_msg() + ",cms系统已通知");
             }
         } else {//中转服务器失败
-            logger.info("话题id为:" + topic_id + ",中转服务器调用cms失败,失败消息：" + errorMessage);
+            logger.info("话题id为:" + topicId + ",中转服务器调用cms失败,失败消息：" + errorMessage);
             topic.setShenhe_msg(topic.getShenhe_msg() + ",中转服务器调用cms失败,失败消息：" + errorMessage);
             topic.setShenhe_status(CommonConst.AUDIT_INTT);
             topic.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
             topic.setAuditor_id(null);
         }
         boolean rs = topicService.updateshyTopic(topic);
-        Map<String, Object> ee = new HashMap<>();
-        ee.put("topic_id", topic_id);
+        Map<String, Object> ee = new HashMap<>(16);
+        ee.put("topic_id", topicId);
         if (rs) {
             return new ResponseBean(ErrorEnum.SUCCESS, ee);
         }
@@ -49,7 +49,7 @@ public class YiDunControllerApi {
     @PostMapping("/submitYiDunUrl")
     @ResponseBody
     public void submitYiDunUrl(String url) {
-        Map<String, String> params = new HashMap<String, String>();
+        Map<String, String> params = new HashMap<String, String>(16);
         // 1.设置公共参数
         params.put("secretId", SECRETID);
 package com.cnlive.shenhe.config;
+import com.cnlive.shenhe.bean.SessionUser;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import com.cnlive.shenhe.bean.SessionUser;
-
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
  * 过滤器
  */
 public class SessionFilter implements Filter {
-    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(SessionFilter.class);
+    private static final Logger logger = LoggerFactory.getLogger(SessionFilter.class);
     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
     HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();
     /**
@@ -59,7 +59,7 @@ public class SessionFilter implements Filter {
                 // session不存在 准备跳转失败
                 RequestDispatcher dispatcher = request.getRequestDispatcher("/users/login");
                 dispatcher.forward(request, response);
-//                chain.doFilter(httpRequest, httpResponse);
+                //chain.doFilter(httpRequest, httpResponse);
                 return;
             }
         }
@@ -63,7 +63,7 @@ public class AudioController extends BaseController {
     String ks_domain;
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     /**
      * 音频数据分页获取
@@ -105,10 +105,11 @@ public class AudioController extends BaseController {
                     //已审+已拒绝
                     if (!CommonConst.AUDIT_INTT.equals(shyAudio.getState())) {
                         String updater = CommonUtils.isEmpty(shyAudio.getUploader()) ? "白名单" : shyAudio.getUploader();
-                        String auditor_id = shyAudio.getAuditor_id();
-                        if (CommonUtils.isNotEmpty(auditor_id)) {
+
+                        String auditorId = shyAudio.getAuditor_id();
+                        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()) ? "" : user.getEmail();
@@ -332,10 +333,10 @@ public class AudioController extends BaseController {
                 //审核员需要做处理
                 if (!shyAudioList.get(i).getState().equals(CommonConst.AUDIT_INTT)) {
                     updater = CommonUtils.isEmpty(shyAudioList.get(i).getUploader()) || "null".equals(shyAudioList.get(i).getUploader()) ? "白名单" : shyAudioList.get(i).getUploader();
-                    String auditor_id = shyAudioList.get(i).getAuditor_id();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+                    String auditorId = shyAudioList.get(i).getAuditor_id();
+                    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();
@@ -437,7 +438,7 @@ public class AudioController extends BaseController {
         String userId = sessionUser.getUserId();
         JSONObject result;
         try {
-            result = Pass.audioPass(activity_id, state, attr_tags, msg, callback);
+            result = pass.audioPass(activity_id, state, attr_tags, msg, callback);
         } catch (Exception e) {
             e.printStackTrace();
             System.out.println("音频审核失败");
@@ -40,7 +40,7 @@ public class ChannelController extends BaseController {
     @Value("${spring.localhost.url}")
     private String localhost_url;//本机地址
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Autowired
     ChannelServiceImpl channelService;
@@ -99,10 +99,10 @@ public class ChannelController extends BaseController {
             for (ShyChannel channel : list) {
                 if (!channel.getShenhe_status().equals(CommonConst.AUDIT_INTT)) {
                     String updater = CommonUtils.isEmpty(channel.getUpdater()) || "null".equals(channel.getUpdater()) ? "白名单" : channel.getUpdater();
-                    String auditor_id = channel.getAuditor();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+                    String auditorId = channel.getAuditor();
+                    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();
@@ -211,7 +211,7 @@ public class ChannelController extends BaseController {
             json.put("attr_tags", "");
             json.put("msg", msg);
             try {
-                result = Pass.commentPass(json, channel.getCallback());
+                result = pass.commentPass(json, channel.getCallback());
             } catch (Exception e) {
                 logger.error("评论回调失败，activity_id:{}", channel.getChannel_id());
                 showMsg = showMsg + "," + channel.getChannel_name() + "的评论拒绝请求失败";
@@ -254,7 +254,7 @@ public class ChannelController extends BaseController {
     @GetMapping("/channelNotice")
     @ResponseBody
     public Map<String, Object> channelNotice() {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(16);
         ShyChannel shyChannel = new ShyChannel();
         shyChannel.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审
         shyChannel.setShenhe_status(CommonConst.AUDIT_INTT);
@@ -41,7 +41,7 @@ import java.util.List;
 public class CommentsController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(CommentsController.class);
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Autowired
     CommentsServiceImpl commentsService;
@@ -92,10 +92,10 @@ public class CommentsController extends BaseController {
             for (ShyComments comment : list) {
                 if (!comment.getState().equals(CommonConst.AUDIT_INTT)) {
                     String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater()) ? "白名单" : comment.getUpdater();
-                    String auditor_id = comment.getAuditor_id();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+                    String auditorId = comment.getAuditor_id();
+                    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();
@@ -253,7 +253,7 @@ public class CommentsController extends BaseController {
             json.put("attr_tags", "");
             json.put("msg", msg);
             try {
-                result = Pass.commentPass(json, comments.getCallback());
+                result = pass.commentPass(json, comments.getCallback());
             } catch (Exception e) {
                 logger.error("评论回调失败，activity_id:{}", comments.getActivity_id());
                 showMsg = showMsg + "," + comments.getComment_user_name() + "的评论拒绝请求失败";
@@ -373,17 +373,17 @@ public class CommentsController extends BaseController {
                 /*状态需要处理成用户可读*/
-                String common_type = "";//评论类型，topic:话题
+                String commonType = "";//评论类型，topic:话题
                 String type = list.get(i).getType();
                 if (type != null) {
                     if (type.equals(CommonConst.CATEGORY_TOPIC)) {
-                        common_type = "话题";
+                        commonType = "话题";
                     }
                 } else {
-                    common_type = "其他";
+                    commonType = "其他";
                 }
                 cell = row.createCell(6);//列
-                cell.setCellValue(common_type);
+                cell.setCellValue(commonType);
                 cell = row.createCell(7);//列
                 Integer level = list.get(i).getLevel();
                 if (level != null) {
@@ -391,9 +391,9 @@ public class CommentsController extends BaseController {
                 }
                 /*状态需要处理成用户可读*/
                 String platform = "";//评论所属的平台
-                if (list.get(i).getPlatform().equals("a")) {
+                if ("a".equals(list.get(i).getPlatform())) {
                     platform = "安卓";
-                } else if (list.get(i).getPlatform().equals("i")) {
+                } else if ("i".equals(list.get(i).getPlatform())) {
                     platform = "ios";
                 } else {
                     platform = "未知";
@@ -406,25 +406,26 @@ public class CommentsController extends BaseController {
                 cell.setCellValue(list.get(i).getCreated_at() == null ? "" : CommonUtils.formatDate(list.get(i).getCreated_at(), "yyyy-MM-dd HH:mm:ss"));
                 /*状态需要处理成用户可读*/
-                String shenhe_Status = "";//状态 0.未审核,1:已审核,2审核失败
+                //状态 0.未审核,1:已审核,2审核失败
+                String shenheStatus = "";
                 if (list.get(i).getState() == 1) {
-                    shenhe_Status = "已审核";
+                    shenheStatus = "已审核";
                 } else if (list.get(i).getState() == 2) {
-                    shenhe_Status = "已拒绝";
+                    shenheStatus = "已拒绝";
                 } else {
-                    shenhe_Status = "未审核";
+                    shenheStatus = "未审核";
                 }
                 cell = row.createCell(10);//列
-                cell.setCellValue(shenhe_Status);
+                cell.setCellValue(shenheStatus);
                 /* 审核员需要做处理*/
                 String updater = "";//审核员名字
                 if (!list.get(i).getState().equals(CommonConst.AUDIT_INTT)) {
                     updater = CommonUtils.isEmpty(list.get(i).getUpdater()) || "null".equals(list.get(i).getUpdater()) ? "自动通过" : list.get(i).getUpdater();
-                    String auditor_id = list.get(i).getAuditor_id();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+                    String auditorId = list.get(i).getAuditor_id();
+                    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();
@@ -95,9 +95,9 @@ public class ContentController extends BaseController {
         if (!list.isEmpty()) {
             for (ShyContent content : list) {
                 if (content.getReceive_status().equals(CommonConst.RECEIVE_AUDIT)) {
-                    String auditor_id = content.getAuditor_id();
+                    String auditorId = content.getAuditor_id();
                     String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater();
-                    updater = sitesService.getUpdater(updater, auditor_id);
+                    updater = sitesService.getUpdater(updater, auditorId);
                     content.setUpdater(updater);
                 }
                 //显示spid简称
@@ -122,13 +122,13 @@ public class ContentController extends BaseController {
     public String getDetailsComments(@PathVariable Integer id, Model model) {
         ShyContent content = contentService.getDetailsContent(id);
         if (!content.getReceive_status().equals(CommonConst.RECEIVE_BEFORE)) {
-            String auditor_id = content.getAuditor_id();
+            String auditorId = content.getAuditor_id();
             String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater();
-            updater = sitesService.getUpdater(updater, auditor_id);
+            updater = sitesService.getUpdater(updater, auditorId);
             content.setUpdater(updater);
         }
         //朋友圈内容切割内容图片或者视频地址
-        if (content.getContent_tag().equals("moment")) {
+        if ("moment".equals(content.getContent_tag())) {
             String[] contentImageUrlList = null;
             if (content.getContent_pc_url() != null) {
                 contentImageUrlList = content.getContent_pc_url().split(",");
@@ -304,9 +304,9 @@ public class ContentController extends BaseController {
                 /*状态需要处理成用户可读*/
                 //图文标签 content：图文发布，moment：朋友圈
                 String contentTag = "";
-                if (contentList.get(i).getContent_tag().equals("content")) {
+                if ("content".equals(contentList.get(i).getContent_tag())) {
                     contentTag = "图文发布";
-                } else if (contentList.get(i).getContent_tag().equals("moment")) {
+                } else if ("moment".equals(contentList.get(i).getContent_tag())) {
                     contentTag = "朋友圈";
                 }
                 cell = row.createCell(4);
@@ -365,10 +365,12 @@ public class ContentController extends BaseController {
                 String updater = "";
                 if (!contentList.get(i).getReceive_status().equals(CommonConst.RECEIVE_BEFORE)) {
                     updater = CommonUtils.isEmpty(contentList.get(i).getUpdater()) || "null".equals(contentList.get(i).getUpdater()) ? "自动通过" : contentList.get(i).getUpdater();
-                    String auditor_id = contentList.get(i).getAuditor_id();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+
+
+                    String auditorId = contentList.get(i).getAuditor_id();
+                    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();
@@ -9,7 +9,6 @@ import com.cnlive.shenhe.dto.EmailDTO;
 import com.cnlive.shenhe.entity.ShyEmail;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.serviceImpl.EmailServiceImpl;
-import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
@@ -40,9 +39,6 @@ public class EmailController extends BaseController {
     @Autowired
     EmailServiceImpl emailServiceImpl;
     @Autowired
-    SitesServiceImpl sitesService;
-
-    @Autowired
     UsersServiceImpl usersService;
@@ -55,7 +51,11 @@ public class EmailController extends BaseController {
         }
         PageInfo<ShyEmail> emailPage = emailServiceImpl.getPage(emailDTO);
         List<ShyEmail> list = emailPage.getList();
-        JSONObject email_message = CommonConst.EMAIL_MESSAGE;
+
+
+
+
+        JSONObject emailMessage = CommonConst.EMAIL_MESSAGE;
         if (!list.isEmpty()) {
             for (ShyEmail shyEmail : list) {
                 //获取更新人的名称
@@ -65,28 +65,30 @@ public class EmailController extends BaseController {
                     user.setUser_id(shyEmail.getUpdater());
                     user = usersService.select(user);
                     if (CommonUtils.isNotNull(user)) {
-                        String email_add = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
-                        String userName = CommonUtils.isEmpty(user.getUsername()) ? email_add : user.getUsername();
+                        String emailAdd = CommonUtils.isEmpty(user.getEmail()) || "null".equals(user.getEmail()) ? "" : user.getEmail();
+                        String userName = CommonUtils.isEmpty(user.getUsername()) ? emailAdd : user.getUsername();
                         updater = userName;
                     }
                 }
                 shyEmail.setUpdater(updater);
                 //获取邮件消息类型名称
-                String email_type_name = shyEmail.getNotice_type();
-                if (CommonUtils.isNotEmpty(email_type_name)) {
-                    for (String bkey : email_message.keySet()) {
-                        email_type_name = email_type_name.replace(bkey, email_message.getString(bkey));
+
+
+                String emailTypeName = shyEmail.getNotice_type();
+                if (CommonUtils.isNotEmpty(emailTypeName)) {
+                    for (String bkey : emailMessage.keySet()) {
+                        emailTypeName = emailTypeName.replace(bkey, emailMessage.getString(bkey));
                     }
                 } else {
-                    email_type_name = "无";
+                    emailTypeName = "无";
                 }
-                shyEmail.setEmail_type_name(email_type_name);
+                shyEmail.setEmail_type_name(emailTypeName);
             }
         }
         model.addAttribute("emailPage", emailPage);
         model.addAttribute("pageSize", emailDTO.getPageSize());
-        model.addAttribute("email_message", email_message);
+        model.addAttribute("email_message", emailMessage);
         return "page/email.html";
     }
@@ -45,9 +45,7 @@ import java.util.Map;
 public class LiveApplyController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(LiveApplyController.class);
     @Autowired
-    AuditPass Pass;
-    @Autowired
-    VideosServiceImpl videosService;
+    AuditPass pass;
     @Autowired
     UsersServiceImpl usersService;
     @Autowired
@@ -84,7 +82,7 @@ public class LiveApplyController extends BaseController {
             ShyLiveapply shyLiveapply = liveApplyServiceImpl.selectByPrimaryKey(Integer.parseInt(shyLiveApplyId));
             JSONObject result = null;
             try {
-                result = Pass.liveApplyPass(shyLiveapply.getActivity_id(), state + 2, msg, msg, shyLiveapply.getCallback());
+                result = pass.liveApplyPass(shyLiveapply.getActivity_id(), state + 2, msg, msg, shyLiveapply.getCallback());
             } catch (Exception e) {
                 logger.error("直播视频审核失败,id==" + shyLiveApplyId, e);
                 showMsg = showMsg + "," + shyLiveapply.getActivity_id() + " 拒绝请求失败";
@@ -149,10 +147,13 @@ public class LiveApplyController extends BaseController {
             for (ShyLiveapply liveApply : list) {
                 if (!liveApply.getShenhe_state().equals(CommonConst.AUDIT_INTT)) {
                     String updater = CommonUtils.isEmpty(liveApply.getUpdater()) || "null".equals(liveApply.getUpdater()) ? "白名单" : liveApply.getUpdater();
-                    String auditor_id = liveApply.getAuditor();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+
+
+
+                    String auditorId = liveApply.getAuditor();
+                    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();
@@ -272,7 +273,7 @@ public class LiveApplyController extends BaseController {
             ShyLiveapply shyLiveapply = liveApplyServiceImpl.selectByPrimaryKey(Integer.parseInt(shyLiveId));
             JSONObject result = null;
             try {
-                result = Pass.liveApplyPass(shyLiveapply.getActivity_id(), 4, msg, msg, shyLiveapply.getCallback());
+                result = pass.liveApplyPass(shyLiveapply.getActivity_id(), 4, msg, msg, shyLiveapply.getCallback());
             } catch (Exception e) {
                 logger.error("直播视频审核失败,id==" + shyLiveId, e);
                 showMsg = showMsg + "," + shyLiveapply.getActivity_id() + " 拒绝请求失败";
@@ -446,7 +447,7 @@ public class LiveApplyController extends BaseController {
     @GetMapping("/liveApplyNotice")
     @ResponseBody
     public Map<String, Object> channelNotice() {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(16);
         ShyLiveapply shyLiveapply = new ShyLiveapply();
         shyLiveapply.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审
         shyLiveapply.setShenhe_state(CommonConst.AUDIT_INTT);
@@ -49,7 +49,7 @@ import java.util.Map;
 public class LiveController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(LiveController.class);
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Autowired
     VideosServiceImpl videosService;
     @Autowired
@@ -82,11 +82,9 @@ public class LiveController extends BaseController {
     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();
-//        ShyVideos shyVideos = videosService.selectByPrimaryKey(id);
-//        if (shyVideos.getReceive() && CommonUtils.isNotEmpty(shyVideos.getReceive_user_id()) && userId.equals(shyVideos.getReceive_user_id())) {
         JSONObject result = null;
         try {
-            result = Pass.auditPass(activity_id, state, attr_tags, msg, callback);
+            result = pass.auditPass(activity_id, state, attr_tags, msg, callback);
         } catch (Exception e) {
             e.printStackTrace();
             System.out.println("视频审核失败");
@@ -107,9 +105,6 @@ public class LiveController extends BaseController {
             return new ResponseBean(ErrorEnum.ERROR);
         }
         return new ResponseBean(ErrorEnum.SUCCESS);
-//        }
-//        logger.error("领取逻辑不符，不能审核，Video_id:{}", shyVideos.getVideo_id());
-//        return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "领取逻辑不符，不能审核");
     }
     /**
@@ -283,7 +278,7 @@ public class LiveController extends BaseController {
             ShyLive shyLive = liveService.selectByPrimaryKey(Integer.parseInt(shyLiveId));
             JSONObject result = null;
             try {
-                result = Pass.livePass(shyLive.getActivity_id(), 6, msg, msg, shyLive.getCallback());
+                result = pass.livePass(shyLive.getActivity_id(), 6, msg, msg, shyLive.getCallback());
             } catch (Exception e) {
                 logger.error("直播视频审核失败,id==" + shyLiveId, e);
                 showMsg = showMsg + "," + shyLive.getActivity_id() + " 拒绝请求失败";
@@ -332,7 +327,7 @@ public class LiveController extends BaseController {
             ShyLive shyLive = liveService.selectByPrimaryKey(Integer.parseInt(shyLiveId));
             JSONObject result = null;
             try {
-                result = Pass.syncLive(shyLive.getActivity_id());
+                result = pass.syncLive(shyLive.getActivity_id());
             } catch (Exception e) {
                 logger.error("直播云信息同步失败,id==" + shyLiveId, e);
                 showMsg = showMsg + "," + shyLive.getActivity_id() + " 拒绝请求失败";
@@ -433,23 +428,23 @@ public class LiveController extends BaseController {
                     cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getPre_start_time(), "HH:mm"));
                 }
                 /*预计结束时间需要处理成用户可读*/
-                String pre_endTime = "";
-
-                if (CommonUtils.isNull(liveList.get(i).getPre_end_time())) {//结束时间为空
-                    pre_endTime = "待定";
+                String preEndTime = "";
+                //结束时间为空
+                if (CommonUtils.isNull(liveList.get(i).getPre_end_time())) {
+                    preEndTime = "待定";
                 } else {
                     long start = liveList.get(i).getPre_start_time().getTime() + 8 * 60 * 60 * 1000;
                     long end = liveList.get(i).getPre_end_time().getTime() + 8 * 60 * 60 * 1000;
                     long count = end / (24 * 3600 * 1000) - start / (24 * 3600 * 1000);
                     logger.info(String.valueOf(count));
                     if (count == 0) {
-                        pre_endTime = CommonUtils.formatDate(liveList.get(i).getPre_end_time(), "HH:mm");
+                        preEndTime = CommonUtils.formatDate(liveList.get(i).getPre_end_time(), "HH:mm");
                     } else if (count > 0) {
-                        pre_endTime = "跨" + count + "天 " + CommonUtils.formatDate(liveList.get(i).getPre_end_time(), "HH:mm");
+                        preEndTime = "跨" + count + "天 " + CommonUtils.formatDate(liveList.get(i).getPre_end_time(), "HH:mm");
                     }
                 }
                 cell = row.createCell(3);//列
-                cell.setCellValue(pre_endTime);
+                cell.setCellValue(preEndTime);
                 cell = row.createCell(4);//列
                 cell.setCellValue(liveList.get(i).getActivity_name());
                 cell = row.createCell(5);//列
@@ -461,10 +456,10 @@ public class LiveController extends BaseController {
                 String updater = "";//审核员名字
                 if (!liveList.get(i).getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
                     updater = CommonUtils.isEmpty(liveList.get(i).getUpdater()) || "null".equals(liveList.get(i).getUpdater()) ? "自动通过" : liveList.get(i).getUpdater();
-                    String auditor_id = liveList.get(i).getAuditor();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+                    String auditorId = liveList.get(i).getAuditor();
+                    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();
@@ -483,24 +478,24 @@ public class LiveController extends BaseController {
                     cell.setCellValue(CommonUtils.formatDate(liveList.get(i).getActivity_start_time(), "HH:mm"));
                 }
                 /*实际结束时间需要处理成用户可读*/
-                String Activity_endTime = "";
+                String activityEndTime = "";
                 if (liveList.get(i).getActivity_start_time() != null && liveList.get(i).getActivity_end_time() != null) {
-                    long Activity_start = liveList.get(i).getActivity_start_time().getTime() + 8 * 60 * 60 * 1000;
-                    long Activity_end = liveList.get(i).getActivity_end_time().getTime() + 8 * 60 * 60 * 1000;
-                    long Activity_count = Activity_end / (24 * 3600 * 1000) - Activity_start / (24 * 3600 * 1000);
-                    logger.info(String.valueOf(Activity_count));
-                    if (Activity_count == 0) {
-                        Activity_endTime = CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm");
-                    } else if (Activity_count > 0) {
-                        Activity_endTime = "跨" + Activity_count + "天 " + CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm");
+                    long activityStart = liveList.get(i).getActivity_start_time().getTime() + 8 * 60 * 60 * 1000;
+                    long activityEnd = liveList.get(i).getActivity_end_time().getTime() + 8 * 60 * 60 * 1000;
+                    long activityCount = activityEnd / (24 * 3600 * 1000) - activityStart / (24 * 3600 * 1000);
+                    logger.info(String.valueOf(activityCount));
+                    if (activityCount == 0) {
+                        activityEndTime = CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm");
+                    } else if (activityCount > 0) {
+                        activityEndTime = "跨" + activityCount + "天 " + CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm");
                     }
                     cell = row.createCell(10);//列
-                    cell.setCellValue(Activity_endTime);
+                    cell.setCellValue(activityEndTime);
                     cell = row.createCell(11);//时长
                     /*时长需要处理成用户可读,单位：分钟*/
-                    long time_length = (Activity_end - Activity_start) / (60 * 1000);
-                    cell.setCellValue(time_length);
+                    long timeLength = (activityEnd - activityStart) / (60 * 1000);
+                    cell.setCellValue(timeLength);
                     cell = row.createCell(12);//列
                     cell.setCellValue("");
@@ -9,7 +9,6 @@ import com.cnlive.shenhe.entity.ShyNotspeak;
 import com.cnlive.shenhe.entity.ShySites;
 import com.cnlive.shenhe.entity.ShyUsers;
 import com.cnlive.shenhe.serviceImpl.*;
-import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
@@ -34,19 +33,11 @@ import java.util.List;
 public class NotSpeakController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(NotSpeakController.class);
     @Autowired
-    AuditPass Pass;
-    @Autowired
-    CommentsServiceImpl commentsService;
-    @Autowired
     NotspeakServiceImpl notSpeakService;
-
     @Autowired
     UsersServiceImpl usersService;
-
     @Autowired
     SitesServiceImpl sitesService;
-    @Autowired
-    ContentServiceImpl contentService;
     /**
      * 禁言列表页
@@ -69,10 +60,10 @@ public class NotSpeakController extends BaseController {
         if (!list.isEmpty()) {
             for (ShyNotspeak notspeak : list) {
                 String updater = CommonUtils.isEmpty(notspeak.getUpdater()) || "null".equals(notspeak.getUpdater()) ? "无" : notspeak.getUpdater();
-                String auditor_id = notspeak.getAuditor();
-                if (CommonUtils.isNotEmpty(auditor_id)) {
+                String auditorId = notspeak.getAuditor();
+                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();
 package com.cnlive.shenhe.controller;
-
 import com.alibaba.fastjson.JSON;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
-
 /**
  * @author Administrator
  * @author yanzhaowang
@@ -38,8 +36,8 @@ public class ShyActivityController extends BaseController {
     @PostMapping("/add")
     @ResponseBody
     public ResponseBean insterShyActivity(ShyActivity shyActivity) {
-        int i = shyActivityImpl.insertShyActivity(shyActivity);
-        if (i > 0) {
+        int result = shyActivityImpl.insertShyActivity(shyActivity);
+        if (result > 0) {
             return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "当前活动添加成功");
         }
         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "添加失败，请重试");
@@ -48,8 +46,8 @@ public class ShyActivityController extends BaseController {
     @PostMapping("/delete")
     @ResponseBody
     public ResponseBean deleteShyActivity(Integer id) {
-        int i = shyActivityImpl.deleteShyActivity(id);
-        if (i > 0) {
+        int result = shyActivityImpl.deleteShyActivity(id);
+        if (result > 0) {
             return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "删除当前活动成功");
         }
         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "删除失败，请重试");
@@ -60,8 +58,8 @@ public class ShyActivityController extends BaseController {
     @ResponseBody
     public ResponseBean updateShyActivity(ShyActivity shyActivity) {
-        int i = shyActivityImpl.updateShyActivity(shyActivity);
-        if (i > 0) {
+        int result = shyActivityImpl.updateShyActivity(shyActivity);
+        if (result > 0) {
             return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "修改当前活动成功");
         }
         return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "修改失败，请重试");
@@ -64,15 +64,16 @@ public class SitesController extends BaseController {
         JSONObject business = CommonConst.BUSINESS;
         if (!list.isEmpty()) {
             for (ShySites site : list) {
-                String write_business_name = site.getWrite_business();
-                if (CommonUtils.isNotEmpty(write_business_name)) {
+
+                String writeBusinessName = site.getWrite_business();
+                if (CommonUtils.isNotEmpty(writeBusinessName)) {
                     for (String bkey : business.keySet()) {
-                        write_business_name = write_business_name.replace(bkey, business.getString(bkey));
+                        writeBusinessName = writeBusinessName.replace(bkey, business.getString(bkey));
                     }
                 } else {
-                    write_business_name = "无";
+                    writeBusinessName = "无";
                 }
-                site.setWrite_business_name(write_business_name);
+                site.setWrite_business_name(writeBusinessName);
             }
         }
         model.addAttribute("sitePage", sitePage);
@@ -7,11 +7,8 @@ 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.serviceImpl.CommentsServiceImpl;
 import com.cnlive.shenhe.serviceImpl.SitesServiceImpl;
 import com.cnlive.shenhe.serviceImpl.TopicServiceImpl;
-import com.cnlive.shenhe.serviceImpl.UsersServiceImpl;
-import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.github.pagehelper.PageInfo;
@@ -38,19 +35,13 @@ import java.util.Map;
 @Controller
 @RequestMapping("/topic")
 public class TopicController extends BaseController {
+
     private static Logger logger = LoggerFactory.getLogger(TopicController.class);
     @Autowired
-    AuditPass Pass;
-    @Autowired
-    CommentsServiceImpl commentsService;
-    @Autowired
     TopicServiceImpl topicService;
     @Autowired
     SitesServiceImpl sitesService;
-    @Autowired
-    UsersServiceImpl usersService;
-
     @Value("${spring.localhost.url}")
     private String localhost_url;
@@ -102,9 +93,9 @@ public class TopicController extends BaseController {
         if (!list.isEmpty()) {
             for (ShyTopic topic : list) {
                 if (!topic.getShenhe_status().equals(CommonConst.AUDIT_INTT)) {
-                    String auditor_id = topic.getAuditor_id();
+                    String auditorId = topic.getAuditor_id();
                     String updater = CommonUtils.isEmpty(topic.getUpdater()) || "null".equals(topic.getUpdater()) ? "白名单" : topic.getUpdater();
-                    updater = sitesService.getUpdater(updater, auditor_id);
+                    updater = sitesService.getUpdater(updater, auditorId);
                     topic.setUpdater(updater);
                 }
                 //显示spid简称
@@ -178,7 +169,7 @@ public class TopicController extends BaseController {
     @GetMapping("/topicNotice")
     @ResponseBody
     public Map<String, Object> channelNotice() {
-        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>(16);
         ShyTopic shyTopic = new ShyTopic();
         shyTopic.setShenhe_status(CommonConst.AUDIT_INTT);
@@ -195,211 +186,4 @@ public class TopicController extends BaseController {
         }
         return null;
     }
-
-
-    /**
-     * 根据条件导出excel
-     */
-//    @GetMapping("excel")
-//    public void getExcel( String title,String contentId, String content_tag,
-//            String start_date, String end_date, Integer receive_status, String sp_desc,
-//            Integer page, Integer pageSize, String orderByClause, HttpSession session,HttpServletResponse response) {
-//        SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-//        Integer spid = sessionUser.getSpid();
-//        String userId = sessionUser.getUserId();
-//        if (CommonUtils.isNotEmpty(sp_desc) && spid == 0) {
-//        	ShySites shySite=sitesService.findspidBySpdesc(sp_desc);
-//        	if(CommonUtils.isNotNull(shySite)){
-//        		spid = shySite.getSpid();
-//        		}
-//        	}else if (CommonUtils.isEmpty(sp_desc) && spid == 0) {
-//            spid = null;
-//        	}
-//        Date sDate = null;
-//        Date eDate = null;
-//
-//        if (CommonUtils.isNotEmpty(start_date)) {
-//            try {
-//                sDate = CommonUtils.parseDate(start_date, "yyyy-MM-dd");
-//            } catch (Exception e) {
-//            }
-//        }
-//        if (CommonUtils.isNotEmpty(end_date)) {
-//            try {
-//                eDate = CommonUtils.parseDate(end_date, "yyyy-MM-dd");
-//            } catch (Exception e) {
-//            }
-//        }
-//        List<ShyContent> contentList = contentService.findByCondition(title,content_tag,contentId,  sDate, eDate, receive_status,  page, pageSize, orderByClause, spid);
-//        
-//        String fileName = "图文数据";
-//        
-//        XSSFWorkbook wb = new XSSFWorkbook();
-//        ServletOutputStream out = null;
-//        BufferedInputStream bis = null;
-//        BufferedOutputStream bos = null;
-//        try {
-//            XSSFSheet sheetlist = wb.createSheet(fileName);
-//            XSSFRow row = sheetlist.createRow(0);//行
-//            XSSFCell cell = row.createCell(0);//列
-//            cell.setCellValue("id");
-//            cell = row.createCell(1);//列
-//            cell.setCellValue("sp昵称");
-//            cell = row.createCell(2);//列
-//            cell.setCellValue("图文id");
-//            cell = row.createCell(3);//列
-//            cell.setCellValue("内容标题");
-//            cell = row.createCell(4);//列
-//            cell.setCellValue("图文标签");
-//            cell = row.createCell(5);//列
-//            cell.setCellValue("审核类型");
-//            cell = row.createCell(6);//列
-//            cell.setCellValue("内容状态");
-//            cell = row.createCell(7);//列
-//            cell.setCellValue("图文创建时间");
-//            cell = row.createCell(8);//列
-//            cell.setCellValue("图文送审时间");
-//            cell = row.createCell(9);//列
-//            cell.setCellValue("领取状态");
-//            cell = row.createCell(10);//列
-//            cell.setCellValue("审核人");
-//            cell = row.createCell(11);//列
-//            cell.setCellValue("审核意见");
-//            cell = row.createCell(12);//列
-//            cell.setCellValue("来源（昵称）");
-//            cell = row.createCell(13);//列
-//            cell.setCellValue("作者（sid）");
-//            cell = row.createCell(14);//列
-//            cell.setCellValue("图文url");
-//            
-//            for (int i = 0; i < contentList.size(); i++) {
-//                row = sheetlist.createRow((short) (i + 1));//行
-//                cell = row.createCell(0);//列
-//                cell.setCellValue(contentList.get(i).getId());
-//                cell = row.createCell(1);//列
-//                cell.setCellValue(sitesService.findspidDescByspid(contentList.get(i).getSp_id()).getName());
-//                cell = row.createCell(2);//列
-//                cell.setCellValue(contentList.get(i).getContent_id());
-//                cell = row.createCell(3);//列
-//                cell.setCellValue(contentList.get(i).getTitle());
-//                /*状态需要处理成用户可读*/
-//                String contentTag = "";//图文标签 content：图文发布，moment：朋友圈
-//                if (contentList.get(i).getContent_tag().equals("content") ) {
-//                	contentTag = "图文发布";
-//                } else if (contentList.get(i).getContent_tag().equals("moment")) {
-//                	contentTag = "朋友圈";
-//                }
-//                cell = row.createCell(4);//列
-//                cell.setCellValue(contentTag);
-//               
-//                /*状态需要处理成用户可读*/
-//                String shenheType = "";//审核类型，1:免审，2:机审，3:人工审
-//                if (contentList.get(i).getShenhe_type() == 1) {
-//             	   shenheType = "免审";
-//                } else if (contentList.get(i).getShenhe_type() == 2) {
-//             	   shenheType = "机审";
-//                } else {
-//             	   shenheType = "人工审";
-//                }
-//                cell = row.createCell(5);//列
-//                cell.setCellValue(shenheType);
-//                
-//                /*状态需要处理成用户可读*/
-//                String contentStatus = "";//内容状态:0:待发布,1:已发布,2:已下线，3:已删除
-//                if (contentList.get(i).getContent_status() == 0) {
-//                	contentStatus = "待发布";
-//                } else if (contentList.get(i).getContent_status() == 1) {
-//                	contentStatus = "已发布";
-//                } else if(contentList.get(i).getContent_status() == 2){
-//                	contentStatus = "已下线";
-//                }else if(contentList.get(i).getContent_status() == 3){
-//                	contentStatus = "已删除";
-//                }
-//                
-//                cell = row.createCell(6);//列
-//                cell.setCellValue(contentStatus);
-//                cell = row.createCell(7);//列
-//                cell.setCellValue(contentList.get(i).getContent_time()==null?"":CommonUtils.formatDate(contentList.get(i).getContent_time(), "yyyy-MM-dd HH:mm:ss"));
-//                cell = row.createCell(8);//列
-//                cell.setCellValue(contentList.get(i).getCreate_date()==null?"":CommonUtils.formatDate(contentList.get(i).getCreate_date(), "yyyy-MM-dd HH:mm:ss"));
-//                
-//                /*状态需要处理成用户可读*/
-//                String receiveStatus = "";//领取状态。0：未领取；1：已领取,2:已审核
-//                if (contentList.get(i).getReceive_status() == 1) {
-//                	receiveStatus = "已领取";
-//                } else if (contentList.get(i).getReceive_status() == 2) {
-//                	receiveStatus = "已审核";
-//                } else {
-//                	receiveStatus = "未领取";
-//                }
-//                
-//                cell = row.createCell(9);//列
-//                cell.setCellValue(receiveStatus);
-//                
-//                /* 审核员需要做处理*/
-//                String updater = "";//审核员名字
-//                if (contentList.get(i).getReceive_status() != CommonConst.RECEIVE_BEFORE) {
-//                	updater = CommonUtils.isEmpty(contentList.get(i).getUpdater()) || "null".equals(contentList.get(i).getUpdater())? "自动通过":contentList.get(i).getUpdater();
-//                    String auditor_id = contentList.get(i).getAuditor_id();
-//                    if (CommonUtils.isNotEmpty(auditor_id)) {
-//                        ShyUsers user = new ShyUsers();
-//                        user.setUser_id(auditor_id);
-//                        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 ;
-//                        }
-//                    }
-//                }
-//                cell = row.createCell(10);//列
-//                cell.setCellValue(updater);
-//                
-//               
-//                
-//                cell = row.createCell(11);//列
-//                cell.setCellValue(contentList.get(i).getShenhe_msg());
-//                cell = row.createCell(12);//列
-//                cell.setCellValue(contentList.get(i).getSource());
-//                cell = row.createCell(13);//列
-//                cell.setCellValue(contentList.get(i).getAuthor());
-//                cell = row.createCell(14);//列
-//                cell.setCellValue(contentList.get(i).getContent_url());
-//            }
-//
-//            ByteArrayOutputStream os = new ByteArrayOutputStream();
-//            wb.write(os);
-//            byte[] content = os.toByteArray();
-//            InputStream is = new ByteArrayInputStream(content);
-//            response.setContentType("application/vnd.ms-excel;charset=utf-8");
-//            response.setHeader("Content-Disposition", "attachment;filename=" + new String((fileName + ".xlsx").getBytes(), "iso-8859-1"));
-//            out = response.getOutputStream();
-//            bis = new BufferedInputStream(is);
-//            bos = new BufferedOutputStream(out);
-//            byte[] buff = new byte[2048];
-//            int bytesRead;
-//            while (-1 != (bytesRead = bis.read(buff, 0, buff.length))) {
-//                bos.write(buff, 0, bytesRead);
-//            }
-//        } catch (final Exception e) {
-//            e.printStackTrace();
-//            try {
-//                if (bis != null)
-//                    bis.close();
-//                if (bos != null)
-//                    bos.close();
-//            } catch (Exception e1) {
-//                e1.printStackTrace();
-//            }
-//        } finally {
-//            try {
-//                if (bis != null)
-//                    bis.close();
-//                if (bos != null)
-//                    bos.close();
-//            } catch (Exception e2) {
-//                e2.printStackTrace();
-//            }
-//        }
-//    }
 }
@@ -138,22 +138,25 @@ public class UsersController extends BaseController {
         ShyUsers shyUser = new ShyUsers();
         shyUser.setUser_id(sessionUser.getUserId());
         shyUser = usersService.select(shyUser);
-        boolean isShow_chinnal = false;//是否显示频道消息框
-        boolean isShow_liveApply = false;//是否显示直播申请消息框
-        boolean isShow_topic = false;//是否显示话题审核消息框
+        //是否显示频道消息框
+        boolean isShowChinnal = false;
+        //是否显示直播申请消息框
+        boolean isShowLiveApply = false;
+        //是否显示话题审核消息框
+        boolean isShowTopic = false;
         if (CommonUtils.isNotEmpty(shyUser.getNotice_show()) && shyUser.getNotice_show().contains(CommonConst.NOTICE_CHANNAL.toString())) {
-            isShow_chinnal = true;
+            isShowChinnal = true;
         }
         if (CommonUtils.isNotEmpty(shyUser.getNotice_show()) && shyUser.getNotice_show().contains(CommonConst.NOTICE_LIVEAPPLY.toString())) {
-            isShow_liveApply = true;
+            isShowLiveApply = true;
         }
         if (CommonUtils.isNotEmpty(shyUser.getNotice_show()) && shyUser.getNotice_show().contains(CommonConst.NOTICE_TOPIC.toString())) {
-            isShow_topic = true;
+            isShowTopic = true;
         }
-        Map<String, Object> map = new HashMap<>();
-        map.put("isShow_chinnal", isShow_chinnal);
-        map.put("isShow_liveApply", isShow_liveApply);
-        map.put("isShow_topic", isShow_topic);
+        Map<String, Object> map = new HashMap<>(16);
+        map.put("isShowChinnal", isShowChinnal);
+        map.put("isShowLiveApply", isShowLiveApply);
+        map.put("isShowTopic", isShowTopic);
         return map;
     }
@@ -161,10 +164,6 @@ public class UsersController extends BaseController {
     @PostMapping(value = "/write")
     public String write(Model model, Integer userId, String[] write_notice, HttpSession session, String redirect_url) {
         SessionUser sessionUser = (SessionUser) session.getAttribute(SessionUser.getSessionKey());
-//    	Integer spid = sessionUser.getSpid();
-//    	if (spid != 0) {
-//    		return "page/error.html";
-//    	}
         ShyUsers user = usersService.get(userId);
         String write = "";
         if (CommonUtils.isNotNull(write_notice) && write_notice.length > 0) {
@@ -71,15 +71,15 @@ public class UsersFreeController extends BaseController {
                 }
                 //获取栏目名称
-                String category_name = users.getCategory();
-                if (CommonUtils.isNotEmpty(category_name)) {
+                String categoryName = users.getCategory();
+                if (CommonUtils.isNotEmpty(categoryName)) {
                     for (String bkey : category.keySet()) {
-                        category_name = category_name.replace(bkey, category.getString(bkey));
+                        categoryName = categoryName.replace(bkey, category.getString(bkey));
                     }
                 } else {
-                    category_name = "无";
+                    categoryName = "无";
                 }
-                users.setCategory_name(category_name);
+                users.setCategory_name(categoryName);
             }
         }
@@ -48,7 +48,7 @@ import java.util.Map;
 public class VideosController extends BaseController {
     private static Logger logger = LoggerFactory.getLogger(VideosController.class);
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Autowired
     VideosServiceImpl videosService;
     @Autowired
@@ -84,7 +84,7 @@ public class VideosController extends BaseController {
         String userId = sessionUser.getUserId();
         JSONObject result;
         try {
-            result = Pass.auditPass(activity_id, state, attr_tags, msg, callback);
+            result = pass.auditPass(activity_id, state, attr_tags, msg, callback);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("视频审核失败", e);
@@ -414,10 +414,10 @@ public class VideosController extends BaseController {
                 /* 审核员需要做处理*/
                 if (!shyVideosList.get(i).getState().equals(CommonConst.AUDIT_INTT)) {
                     updater = CommonUtils.isEmpty(shyVideosList.get(i).getUpdater()) || "null".equals(shyVideosList.get(i).getUpdater()) ? "白名单" : shyVideosList.get(i).getUpdater();
-                    String auditor_id = shyVideosList.get(i).getAuditor_id();
-                    if (CommonUtils.isNotEmpty(auditor_id)) {
+                    String auditorId = shyVideosList.get(i).getAuditor_id();
+                    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();
@@ -2,7 +2,6 @@ package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyAudio;
 import com.cnlive.shenhe.serviceImpl.AudioServiceImpl;
-import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,8 +22,6 @@ public class AudioJob {
     @Autowired
     AudioServiceImpl audioService;
-    @Autowired
-    YiDunServiceImpl yiDunServiceImpl;
     /**
      * 白名单sp音频通过
@@ -2,7 +2,6 @@ package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyChannel;
 import com.cnlive.shenhe.serviceImpl.ChannelServiceImpl;
-import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.InfoUtil;
 import org.slf4j.Logger;
@@ -19,13 +18,11 @@ import java.util.List;
  */
 @Component
 public class ChannelJob {
+
     private static Logger logger = LoggerFactory.getLogger(ChannelJob.class);
     @Value("${spring.localhost.url}")
     //本机地址
     private String localhost_url;
-
-    @Autowired
-    AuditPass Pass;
     @Autowired
     InfoUtil infoUtil;
     @Autowired
@@ -33,7 +30,6 @@ public class ChannelJob {
     @Scheduled(fixedRate = 60 * 1000)
     public void updateChannel() {
-
         //遍历免审的spid去更改状态值
         ShyChannel shyChannel = new ShyChannel();
         // 审核类型为免审
@@ -53,7 +49,8 @@ public class ChannelJob {
 //    @Scheduled(fixedRate = 60 * 1000)
     public void channelNotice() {
         ShyChannel shyChannel = new ShyChannel();
-        shyChannel.setShenhe_type(CommonConst.AUDIT_TYPE_USER);// 审核类型为人工审
+        // 审核类型为人工审
+        shyChannel.setShenhe_type(CommonConst.AUDIT_TYPE_USER);
         shyChannel.setShenhe_status(CommonConst.AUDIT_INTT);
         List<ShyChannel> channelList = channelService.findshyChannel(shyChannel);
         if (channelList.size() > 0) {
@@ -16,6 +16,7 @@ import java.util.List;
  */
 @Component
 public class CommentsJob {
+
     private static Logger logger = LoggerFactory.getLogger(CommentsJob.class);
     @Autowired
     CommentsServiceImpl commentsService;
@@ -30,12 +30,9 @@ import java.util.Map;
  */
 @Component
 public class LiveApplyJob {
+
     private static Logger logger = LoggerFactory.getLogger(LiveApplyJob.class);
-    /**
-     * //本机地址
-     */
-    @Value("${spring.localhost.url}")
-    private String localhost_url;
+
     /**
      * //开发者对应的id，与app_key相对应
      */
@@ -16,6 +16,7 @@ import java.util.List;
  */
 @Component
 public class NotSpeakJob {
+
     private static Logger logger = LoggerFactory.getLogger(NotSpeakJob.class);
     @Autowired
     NotspeakServiceImpl notSpeakService;
@@ -21,7 +21,6 @@ import java.util.List;
 public class TopicJob {
     private static Logger logger = LoggerFactory.getLogger(TopicJob.class);
-
     @Autowired
     TopicServiceImpl topicService;
     @Autowired
@@ -2,7 +2,6 @@ package com.cnlive.shenhe.job;
 import com.cnlive.shenhe.entity.ShyVideos;
 import com.cnlive.shenhe.serviceImpl.VideosServiceImpl;
-import com.cnlive.shenhe.serviceImpl.YiDunServiceImpl;
 import com.cnlive.shenhe.utils.CommonConst;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,13 +18,9 @@ import java.util.List;
 public class VideosJob {
     private static Logger logger = LoggerFactory.getLogger(VideosJob.class);
-
     @Autowired
     VideosServiceImpl videosService;
-    @Autowired
-    YiDunServiceImpl yiDunServiceImpl;
-
     /**
      * 白名单sp视频通过
      * 免审、未审核
@@ -46,7 +46,6 @@ public class YiDunUrlResultJob {
      */
     private final static String URL_RESULT = "https://as.dun.163yun.com/v1/crawler/callback/results";
-
     @Autowired
     YiDunServiceImpl yiDunServiceImpl;
     @Autowired
@@ -43,14 +43,17 @@ public class GetData {
     private static List<String> getJobList(Document dom) {
         String URL = "http://www.chinanews.com";
         ArrayList<String> list = new ArrayList<>();
-        Elements select = dom.select(".content_list ul li");//获取到整个列表数据
+        //获取到整个列表数据
+        Elements select = dom.select(".content_list ul li");
         for (Element element : select) {
             /* 处理个别li标签是空格问题，直接跳过不处理*/
             if (element.attr("id") != "" && !element.attr("id").equals("")) {
                 continue;
             }
-            Elements elementa = element.select(".dd_bt a");//得到带连接的a标签
-            String href = elementa.attr("href");//从a标签里面获取到他的相对路径
+            //得到带连接的a标签
+            Elements elementa = element.select(".dd_bt a");
+            //从a标签里面获取到他的相对路径
+            String href = elementa.attr("href");
             href = URL + href;
 //            String jobName = select1.text();
 //            Elements select2 = element.select(".t2 a");
@@ -16,11 +16,16 @@ public class newCrawl {
         //String url = "http://www.chinanews.com/sh/2019/06-21/8871343.shtml";
         //Document doc = Jsoup.connect(url).get();
         Document doc = Jsoup.parse(new URL(url), 4000);
-        String title = newCl.getnewTitle(doc);//获取新闻标题
-        String time = newCl.getTime(doc);//获取新闻发布时间
-        String text = newCl.getNewtext(doc);//获取新闻内容
-        String imgurl = newCl.getImgurl(doc);//获取标题图片链接
-        String source = newCl.getSource(doc);//获取来源
+        //获取新闻标题
+        String title = newCl.getnewTitle(doc);
+        //获取新闻发布时间
+        String time = newCl.getTime(doc);
+        //获取新闻内容
+        String text = newCl.getNewtext(doc);
+        //获取标题图片链接
+        String imgurl = newCl.getImgurl(doc);
+        //获取来源
+        String source = newCl.getSource(doc);
         System.out.println("新闻Url:" + url);
         System.out.println("新闻标题:" + title);
         System.out.println("新闻标题图片url:" + imgurl);
@@ -61,7 +66,8 @@ public class newCrawl {
         String time = null;
         Elements element = doc.select(".left-t");
         String text = element.text();
-        String s1 = text.replaceAll(" ", "");//完全清除，空格
+        //完全清除，空格
+        String s1 = text.replaceAll(" ", "");
         time = s1.substring(0, 17);
         return time;
     }
@@ -37,7 +37,7 @@ public class AudioServiceImpl {
     AudioServiceImpl audioService;
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Autowired
     ShyUsersMapper shyUsersMapper;
@@ -53,12 +53,12 @@ public class AudioServiceImpl {
         return shyAudioMapper.getAudioMsg(audioId);
     }
-    public int importAudioMsg(ShyAudio ShyAudio) {
-        return shyAudioMapper.insertSelective(ShyAudio);
+    public int importAudioMsg(ShyAudio shyAudio) {
+        return shyAudioMapper.insertSelective(shyAudio);
     }
-    public int updateAudioMsg(ShyAudio ShyAudio) {
-        return shyAudioMapper.updateByPrimaryKeySelective(ShyAudio);
+    public int updateAudioMsg(ShyAudio shyAudio) {
+        return shyAudioMapper.updateByPrimaryKeySelective(shyAudio);
     }
     public ShyAudio selectByPrimaryKey(Integer id) {
@@ -79,7 +79,7 @@ public class AudioServiceImpl {
      */
     public int updateAudioAndShenhe(ShyAudio shyAudio, int audioState) {
         //修改点播云音频状态
-        JSONObject result = Pass.audioPass(shyAudio.getAudioId(), audioState, shyAudio.getAttr_tags(), shyAudio.getMsg(), shyAudio.getCallback());
+        JSONObject result = pass.audioPass(shyAudio.getAudioId(), audioState, shyAudio.getAttr_tags(), shyAudio.getMsg(), shyAudio.getCallback());
         Integer code = result.getInteger("code");
         Integer shenheState = CommonConst.AUDIT_REFUSE;
         if (0 == code) {
@@ -160,7 +160,7 @@ public class AudioServiceImpl {
         ShyAudio shyAudio = audioService.selectByPrimaryKey(Integer.parseInt(shyAudioId));
         JSONObject result;
         try {
-            result = Pass.audioPass(shyAudio.getAudioId(), 4, msg, msg, shyAudio.getCallback());
+            result = pass.audioPass(shyAudio.getAudioId(), 4, msg, msg, shyAudio.getCallback());
         } catch (Exception e) {
             logger.error("音频审核失败,id==" + shyAudioId, e);
             showMsg = showMsg + "," + shyAudio.getAudioTitle() + " 拒绝请求失败";
@@ -271,10 +271,10 @@ public class AudioServiceImpl {
         ShyAudio shyAudio = shyAudioMapper.selectByPrimaryKey(id);
         if (!shyAudio.getState().equals(CommonConst.AUDIT_INTT)) {
             String updater = CommonUtils.isEmpty(shyAudio.getUploader()) || "null".equals(shyAudio.getUploader()) ? "白名单" : shyAudio.getUploader();
-            String auditor_id = shyAudio.getAuditor_id();
-            if (CommonUtils.isNotEmpty(auditor_id)) {
+            String auditorId = shyAudio.getAuditor_id();
+            if (CommonUtils.isNotEmpty(auditorId)) {
                 ShyUsers user = new ShyUsers();
-                user.setUser_id(auditor_id);
+                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();
@@ -35,7 +35,7 @@ public class ChannelServiceImpl {
     @Autowired
     ShyUsersMapper shyUsersMapper;
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Autowired
     SitesServiceImpl sitesService;
@@ -141,7 +141,7 @@ public class ChannelServiceImpl {
             json.put("msg", msg);
             JSONObject result;
             try {
-                result = Pass.channelPass(json, channel.getCallback());
+                result = pass.channelPass(json, channel.getCallback());
             } catch (Exception e) {
                 logger.error("频道回调失败，id:{},channel_id:{}", channel.getId(), channel.getChannel_id());
                 success = false;
@@ -38,7 +38,7 @@ public class CommentsServiceImpl {
     @Autowired
     ShyUsersMapper shyUsersMapper;
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Autowired
     SitesServiceImpl sitesService;
@@ -192,10 +192,10 @@ public class CommentsServiceImpl {
         ShyComments comment = shyCommentsMapper.selectByPrimaryKey(id);
         if (!comment.getState().equals(CommonConst.AUDIT_INTT)) {
             String updater = CommonUtils.isEmpty(comment.getUpdater()) || "null".equals(comment.getUpdater()) ? "白名单" : comment.getUpdater();
-            String auditor_id = comment.getAuditor_id();
-            if (CommonUtils.isNotEmpty(auditor_id)) {
+            String auditorId = comment.getAuditor_id();
+            if (CommonUtils.isNotEmpty(auditorId)) {
                 ShyUsers user = new ShyUsers();
-                user.setUser_id(auditor_id);
+                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();
@@ -219,7 +219,7 @@ public class CommentsServiceImpl {
             json.put("msg", msg);
             JSONObject result = new JSONObject();
             try {
-                result = Pass.commentPass(json, comment.getCallback());
+                result = pass.commentPass(json, comment.getCallback());
             } catch (Exception e) {
                 logger.error("评论回调失败，activity_id:{}", comment.getActivity_id());
                 success = false;
@@ -242,7 +242,8 @@ public class CommentsServiceImpl {
                     comment.setUpdater(updater);
                 } else {
                     comment.setAuditor_id(userId);
-                    comment.setReceive(1);//已领取
+                    //已领取
+                    comment.setReceive(1);
                     comment.setReceive_user_id(userId);
                 }
                 int i = shyCommentsMapper.updateByPrimaryKeySelective(comment);
@@ -38,7 +38,7 @@ public class ContentServiceImpl {
     @Autowired
     ShyUsersMapper shyUsersMapper;
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Autowired
     SitesServiceImpl sitesService;
     @Autowired
@@ -192,10 +192,10 @@ public class ContentServiceImpl {
         ShyContent content = shyContentMapper.selectByPrimaryKey(id);
         if (content.getReceive_status().equals(CommonConst.RECEIVE_AUDIT)) {
             String updater = CommonUtils.isEmpty(content.getUpdater()) || "null".equals(content.getUpdater()) ? "白名单" : content.getUpdater();
-            String auditor_id = content.getAuditor_id();
-            if (CommonUtils.isNotEmpty(auditor_id)) {
+            String auditorId = content.getAuditor_id();
+            if (CommonUtils.isNotEmpty(auditorId)) {
                 ShyUsers user = new ShyUsers();
-                user.setUser_id(auditor_id);
+                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();
@@ -216,14 +216,14 @@ public class ContentServiceImpl {
         ShyContent content = shyContentMapper.selectByPrimaryKey(Integer.parseInt(contentId));
         JSONObject result = new JSONObject();
         try {
-            if (CommonUtils.isNotEmpty(content.getContent_tag()) && content.getContent_tag().equals("content")) {
-                result = Pass.contentPass(content.getContent_id(), state + "", msg, content.getCallback());
-            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && content.getContent_tag().equals("moment")) {
-                result = Pass.momentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
-            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && content.getContent_tag().equals("cms_photoalbum")) {
-                result = Pass.cmsCommonContentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
-            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && content.getContent_tag().equals("edu_works")) {
-                result = Pass.cmsCommonContentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
+            if (CommonUtils.isNotEmpty(content.getContent_tag()) && "content".equals(content.getContent_tag())) {
+                result = pass.contentPass(content.getContent_id(), state + "", msg, content.getCallback());
+            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && "moment".equals(content.getContent_tag())) {
+                result = pass.momentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
+            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && "cms_photoalbum".equals(content.getContent_tag())) {
+                result = pass.cmsCommonContentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
+            } else if (CommonUtils.isNotEmpty(content.getContent_tag()) && "edu_works".equals(content.getContent_tag())) {
+                result = pass.cmsCommonContentPass(content.getContent_id(), state, msg, content.getCallback(), content.getAuthor());
             }
         } catch (Exception e) {
             logger.error("图文审核回调失败，图文id:{}", content.getId());
@@ -245,7 +245,7 @@ public class ContentServiceImpl {
             //如果当前图文是朋友圈的视频，通知点播云
             if (CommonUtils.isNotEmpty(content.getContent_tag())
-                    && content.getContent_tag().equals("moment")
+                    && "moment".equals(content.getContent_tag())
                     && CommonUtils.isNotEmpty(content.getVideo_id())
                     && state.equals(CommonConst.AUDIT_REFUSE)) {
                 ShyVideos shyVideos1 = new ShyVideos();
@@ -46,9 +46,8 @@ public class EmailServiceImpl {
         }
         criteria.andEqualTo("is_delete", false);
         PageHelper.startPage(emailDTO.getPage(), emailDTO.getPageSize(), true);
-
-        List<ShyEmail> ShyEmailList = shyEmailMapper.selectByExample(example);
-        PageInfo<ShyEmail> pageInfo = new PageInfo<ShyEmail>(ShyEmailList);
+        List<ShyEmail> shyEmailList = shyEmailMapper.selectByExample(example);
+        PageInfo<ShyEmail> pageInfo = new PageInfo<ShyEmail>(shyEmailList);
         return pageInfo;
     }
@@ -7,7 +7,6 @@ import com.cnlive.shenhe.bean.ResponseBean;
 import com.cnlive.shenhe.dto.LiveApplyDTO;
 import com.cnlive.shenhe.entity.ShyLiveapply;
 import com.cnlive.shenhe.entity.ShyUsers;
-import com.cnlive.shenhe.mapper.ShyLiveMapper;
 import com.cnlive.shenhe.mapper.ShyLiveapplyMapper;
 import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.utils.CommonConst;
@@ -32,14 +31,12 @@ import java.util.List;
  */
 @Service
 public class LiveApplyServiceImpl {
+
     private static Logger logger = LoggerFactory.getLogger(LiveApplyServiceImpl.class);
     @Autowired
-    ShyLiveMapper shyLiveMapper;
-    @Autowired
     ShyLiveapplyMapper shyLiveApplyMapper;
     @Autowired
     ShyUsersMapper shyUsersMapper;
-
     @Autowired
     SitesServiceImpl sitesService;
@@ -152,10 +149,10 @@ public class LiveApplyServiceImpl {
         ShyLiveapply shyLiveapply = shyLiveApplyMapper.selectByPrimaryKey(id);
         if (!shyLiveapply.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
             String updater = CommonUtils.isEmpty(shyLiveapply.getUpdater()) || "null".equals(shyLiveapply.getUpdater()) ? "自动通过" : shyLiveapply.getUpdater();
-            String auditor_id = shyLiveapply.getAuditor();
-            if (CommonUtils.isNotEmpty(auditor_id)) {
+            String auditorId = shyLiveapply.getAuditor();
+            if (CommonUtils.isNotEmpty(auditorId)) {
                 ShyUsers user = new ShyUsers();
-                user.setUser_id(auditor_id);
+                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();
@@ -30,6 +30,7 @@ import java.util.List;
  */
 @Service
 public class LiveServiceImpl {
+
     private static Logger logger = LoggerFactory.getLogger(LiveServiceImpl.class);
     @Autowired
     ShyLiveMapper shyLiveMapper;
@@ -136,10 +137,12 @@ public class LiveServiceImpl {
         ShyLive shyLive = shyLiveMapper.selectByPrimaryKey(id);
         if (!shyLive.getShenhe_state().equals(CommonConst.RECEIVE_BEFORE)) {
             String updater = CommonUtils.isEmpty(shyLive.getUpdater()) || "null".equals(shyLive.getUpdater()) ? "自动通过" : shyLive.getUpdater();
-            String auditor_id = shyLive.getAuditor();
-            if (CommonUtils.isNotEmpty(auditor_id)) {
+
+            String auditorId = shyLive.getAuditor();
+
+            if (CommonUtils.isNotEmpty(auditorId)) {
                 ShyUsers user = new ShyUsers();
-                user.setUser_id(auditor_id);
+                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();
@@ -9,12 +9,9 @@ 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.mapper.ShySitesMapper;
-import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.utils.AuditPass;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
-import com.cnlive.shenhe.utils.TransitServiceUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.ibatis.session.RowBounds;
@@ -28,7 +25,7 @@ import tk.mybatis.mapper.entity.Example;
 import java.util.List;
 /**
- * @Auther: liwei
+ * @author Administrator
  * @Date: 2019/1/2 11:30
  * @Description:
  */
@@ -41,19 +38,7 @@ public class NotspeakServiceImpl {
     @Autowired
     ShyNotspeakMapper shyNotspeakMapper;
     @Autowired
-    ShySitesMapper shySitesMapper;
-    @Autowired
-    ShyUsersMapper shyUsersMapper;
-    @Autowired
-    TransitServiceUtils transitServiceUtils;
-    @Autowired
-    SitesServiceImpl sitesService;
-    @Autowired
-    VideosServiceImpl videosService;
-    @Autowired
-    VideofilterServiceImpl videofilterServiceImpl;
-    @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     @Value("${spring.localhost.url}")
     String localhost_url;
@@ -102,7 +87,7 @@ public class NotspeakServiceImpl {
         json.put("minute", time);
         JSONObject result = new JSONObject();
         try {
-            result = Pass.commentSpeak(json, speak_comment);
+            result = pass.commentSpeak(json, speak_comment);
         } catch (Exception e) {
             logger.error("评论禁言失败，comments_id:{}", comment.getId());
             success = new ResponseBean(500, "评论禁言调用互动云服务器失败!");
@@ -123,7 +108,8 @@ public class NotspeakServiceImpl {
             comment.setState(CommonConst.AUDIT_REFUSE);
             comment.setMsg("评论禁言操作");
             comment.setAuditor_id(userId);
-            comment.setReceive(1);//已领取
+            //已领取
+            comment.setReceive(1);
             comment.setReceive_user_id(userId);
             int i = shyCommentsMapper.updateByPrimaryKeySelective(comment);
             if (i != 1) {
@@ -131,7 +117,7 @@ public class NotspeakServiceImpl {
                 return success;
             }
             boolean res = writeNotSpeakByComment(commentId, time, userId);
-            if (res == false) {
+            if (res) {
                 success = new ResponseBean(500, "评论禁言修改禁言表失败!");
                 return success;
             }
@@ -161,7 +147,7 @@ public class NotspeakServiceImpl {
         json.put("minute", time);
         JSONObject result = new JSONObject();
         try {
-            result = Pass.commentSpeak(json, speak_comment);
+            result = pass.commentSpeak(json, speak_comment);
         } catch (Exception e) {
             logger.error("评论禁言失败，shyNotspeak_id:{}", shyNotspeak.getId());
             success = new ResponseBean(500, "评论禁言调用互动云服务器失败!");
@@ -198,7 +184,7 @@ public class NotspeakServiceImpl {
             shyNotspeak.setUpdated_at(CommonUtils.getCurrentTime());
             shyNotspeak.setMsg(shyNotspeak.getMsg() + "\n" + msg);
             boolean res = updateshyNotspeak(shyNotspeak);
-            if (res == false) {
+            if (res) {
                 success = new ResponseBean(500, "评论禁言修改禁言表失败!");
                 return success;
             }
@@ -28,7 +28,7 @@ public class ShyActivityImpl {
     private static Logger logger = LoggerFactory.getLogger(ShyActivityImpl.class);
     @Autowired
-    private ShyActivityMapper ShyActivityMapper;
+    private ShyActivityMapper shyActivityMapper;
     /**
      * 添加活动
@@ -41,7 +41,7 @@ public class ShyActivityImpl {
         shyActivity.setCreate_time(date);
         shyActivity.setUpdate_time(date);
         shyActivity.setExempt_from_trial(0);
-        int i = ShyActivityMapper.insertSelective(shyActivity);
+        int i = shyActivityMapper.insertSelective(shyActivity);
         return i;
     }
@@ -53,7 +53,7 @@ public class ShyActivityImpl {
      */
     public int deleteShyActivity(Integer id) {
-        int i = ShyActivityMapper.deleteByPrimaryKey(id);
+        int i = shyActivityMapper.deleteByPrimaryKey(id);
         return i;
     }
@@ -67,7 +67,7 @@ public class ShyActivityImpl {
         Date date = new Date();
         shyActivity.setCreate_time(date);
         shyActivity.setUpdate_time(date);
-        int i = ShyActivityMapper.updateByPrimaryKeySelective(shyActivity);
+        int i = shyActivityMapper.updateByPrimaryKeySelective(shyActivity);
         return i;
     }
@@ -95,7 +95,7 @@ public class ShyActivityImpl {
             criteria.andLike("activity", "%" + shyActivityDTO.getActivity() + "%");
         }
         PageHelper.startPage(shyActivityDTO.getPageNum(), shyActivityDTO.getPageSize(), true);
-        List<ShyActivity> shyActivities = ShyActivityMapper.selectByExample(example);
+        List<ShyActivity> shyActivities = shyActivityMapper.selectByExample(example);
         PageInfo<ShyActivity> shyActivityPageInfo = new PageInfo<>(shyActivities);
         return shyActivityPageInfo;
     }
@@ -105,11 +105,11 @@ public class ShyActivityImpl {
      * 根据条件查询活动
      *
      * @param
-     * @param exempt_from_trial
+     * @param exemptFromTrial
      * @return
      */
-    public List<Integer> selectByExample(Integer exempt_from_trial) {
-        List<Integer> shyActivities = ShyActivityMapper.selectAllByExempt_from_trial(exempt_from_trial);
+    public List<Integer> selectByExample(Integer exemptFromTrial) {
+        List<Integer> shyActivities = shyActivityMapper.selectAllByExempt_from_trial(exemptFromTrial);
         return shyActivities;
     }
@@ -120,7 +120,7 @@ public class ShyActivityImpl {
      * @return
      */
     public List<ShyActivity> selectAll() {
-        List<ShyActivity> shyActivities = ShyActivityMapper.selectAll();
+        List<ShyActivity> shyActivities = shyActivityMapper.selectAll();
         return shyActivities;
     }
@@ -26,6 +26,7 @@ import java.util.List;
  */
 @Service
 public class SitesServiceImpl {
+
     private static Logger logger = LoggerFactory.getLogger(SitesServiceImpl.class);
     @Autowired
     ShySitesMapper shySitesMapper;
@@ -7,9 +7,7 @@ import com.cnlive.shenhe.entity.ShyComments;
 import com.cnlive.shenhe.entity.ShyContent;
 import com.cnlive.shenhe.entity.ShyTopic;
 import com.cnlive.shenhe.mapper.ShyCommentsMapper;
-import com.cnlive.shenhe.mapper.ShySitesMapper;
 import com.cnlive.shenhe.mapper.ShyTopicMapper;
-import com.cnlive.shenhe.mapper.ShyUsersMapper;
 import com.cnlive.shenhe.utils.CommonConst;
 import com.cnlive.shenhe.utils.CommonUtils;
 import com.cnlive.shenhe.utils.TransitServiceUtils;
@@ -40,17 +38,9 @@ public class TopicServiceImpl {
     @Autowired
     ShyTopicMapper shyTopicMapper;
     @Autowired
-    ShySitesMapper shySitesMapper;
-    @Autowired
-    ShyUsersMapper shyUsersMapper;
-    @Autowired
     TransitServiceUtils transitServiceUtils;
     @Autowired
     SitesServiceImpl sitesService;
-    @Autowired
-    VideosServiceImpl videosService;
-    @Autowired
-    VideofilterServiceImpl videofilterServiceImpl;
     @Value("${spring.localhost.url}")
     String localhost_url;
@@ -48,20 +48,20 @@ public class UsersServiceImpl {
             criteria.andEqualTo("sp_id", usersDTO.getSp_id());
         }
         PageHelper.startPage(usersDTO.getPage(), usersDTO.getPageSize(), true);
-        List<ShyUsers> ShyUsersList = shyUsersMapper.selectByExample(example);
-        PageInfo<ShyUsers> pageInfo = new PageInfo<ShyUsers>(ShyUsersList);
+        List<ShyUsers> shyUsersList = shyUsersMapper.selectByExample(example);
+        PageInfo<ShyUsers> pageInfo = new PageInfo<ShyUsers>(shyUsersList);
         return pageInfo;
     }
-    public String findspidByName(String shen_auditor_id) {
+    public String findspidByName(String shenAuditorId) {
         Example example = new Example(ShyUsers.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("username", shen_auditor_id);
+        criteria.andEqualTo("username", shenAuditorId);
         List<ShyUsers> shyUsersList = shyUsersMapper.selectByExample(example);
         if (CommonUtils.isNotNull(shyUsersList) && shyUsersList.size() > 0) {
             ShyUsers shyUsers = shyUsersList.get(0);
-            String user_id = shyUsers.getUser_id();
-            return user_id;
+            String userId = shyUsers.getUser_id();
+            return userId;
         }
         return null;
     }
@@ -29,7 +29,7 @@ public class UsersfreeServiceImpl {
     @Autowired
     ShyUsersfreeMapper shyUsersfreeMapper;
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     public ShyUsersfree get(Integer id) {
         return shyUsersfreeMapper.selectByPrimaryKey(id);
@@ -61,8 +61,8 @@ public class UsersfreeServiceImpl {
             criteria.andLike("mobile", "%" + usersFreeDTO.getMobile() + "%");
         }
         PageHelper.startPage(usersFreeDTO.getPage(), usersFreeDTO.getPageSize(), true);
-        List<ShyUsersfree> ShyUsersList = shyUsersfreeMapper.selectByExample(example);
-        PageInfo<ShyUsersfree> pageInfo = new PageInfo<ShyUsersfree>(ShyUsersList);
+        List<ShyUsersfree> shyUsersList = shyUsersfreeMapper.selectByExample(example);
+        PageInfo<ShyUsersfree> pageInfo = new PageInfo<ShyUsersfree>(shyUsersList);
         return pageInfo;
     }
@@ -77,7 +77,6 @@ public class UsersfreeServiceImpl {
     public ShyUsersfree selectUser(Integer sp_id, String category, String user_id) {
         ShyUsersfree shyUserfree = new ShyUsersfree();
         shyUserfree.setSp_id(sp_id);
-//		shyUserfree.setCategory(category);
         shyUserfree.setUser_id(user_id);
         shyUserfree.setIs_enable(true);
         shyUserfree.setIs_delete(false);
@@ -91,7 +90,7 @@ public class UsersfreeServiceImpl {
     public boolean update(String userId, String userMobile, String write, Integer spId, String updater) {
         JSONObject result = new JSONObject();
         try {
-            result = Pass.queryUser(userId, userMobile);
+            result = pass.queryUser(userId, userMobile);
         } catch (Exception e) {
             logger.error("用户白名单获取失败，userId:{},userMobile:{}", userId, userMobile);
             return false;
@@ -108,7 +107,7 @@ public class UsersfreeServiceImpl {
             JSONObject jsonData = result.getJSONObject("data");
             String mobile = jsonData.getString("mobile");
             String user_id = jsonData.getString("uid");
-            String user_name = jsonData.getString("nickName");
+            String userName = jsonData.getString("nickName");
             String email = jsonData.getString("email");
             ShyUsersfree shyUserfree = new ShyUsersfree();
@@ -118,7 +117,7 @@ public class UsersfreeServiceImpl {
             if (shyUserfree1 != null) {
                 shyUserfree1.setMobile(mobile);
                 shyUserfree1.setCategory(write);
-                shyUserfree1.setUser_name(user_name);
+                shyUserfree1.setUser_name(userName);
                 shyUserfree1.setEmail(email);
                 shyUserfree1.setSp_id(spId);
                 shyUserfree1.setUpdated_at(CommonUtils.getCurrentTime());
@@ -132,7 +131,7 @@ public class UsersfreeServiceImpl {
             } else {
                 shyUserfree.setMobile(mobile);
                 shyUserfree.setCategory(write);
-                shyUserfree.setUser_name(user_name);
+                shyUserfree.setUser_name(userName);
                 shyUserfree.setEmail(email);
                 shyUserfree.setSp_id(spId);
                 shyUserfree.setCreated_at(CommonUtils.getCurrentTime());
@@ -64,7 +64,7 @@ public class VideosServiceImpl {
     String ks_domain;
     @Autowired
-    AuditPass Pass;
+    AuditPass pass;
     public boolean impotVideo(ShyVideos shyVideos) {
         int result = shyVideosMapper.insertSelective(shyVideos);
@@ -209,10 +209,10 @@ public class VideosServiceImpl {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
         if (!shyVideos.getState().equals(CommonConst.AUDIT_INTT)) {
             String updater = CommonUtils.isEmpty(shyVideos.getUpdater()) || "null".equals(shyVideos.getUpdater()) ? "白名单" : shyVideos.getUpdater();
-            String auditor_id = shyVideos.getAuditor_id();
-            if (CommonUtils.isNotEmpty(auditor_id)) {
+            String auditorId = shyVideos.getAuditor_id();
+            if (CommonUtils.isNotEmpty(auditorId)) {
                 ShyUsers user = new ShyUsers();
-                user.setUser_id(auditor_id);
+                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();
@@ -405,7 +405,7 @@ public class VideosServiceImpl {
      */
     public int updateDianboAndShenhe(ShyVideos video, int dianboState) {
         //修改点播云的视频状态
-        JSONObject result = Pass.auditPass(video.getVideo_id(), dianboState, video.getMsg(), video.getMsg(), video.getCallback());
+        JSONObject result = pass.auditPass(video.getVideo_id(), dianboState, video.getMsg(), video.getMsg(), video.getCallback());
         logger.error("点播回调result:{}", result);
         Integer code = result.getInteger("code");
         String errorCode = result.getString("errorCode");
@@ -525,7 +525,7 @@ public class VideosServiceImpl {
         ShyVideos shyVideos = videosService.selectByPrimaryKey(Integer.parseInt(shyVideoId));
         JSONObject result = null;
         try {
-            result = Pass.auditPass(shyVideos.getVideo_id(), 4, msg, msg, shyVideos.getCallback());
+            result = pass.auditPass(shyVideos.getVideo_id(), 4, msg, msg, shyVideos.getCallback());
         } catch (Exception e) {
             logger.error("视频审核失败,id==" + shyVideoId, e);
             showMsg = showMsg + "," + shyVideos.getVideo_title() + " 拒绝请求失败";