根据阿里巴巴开发手册、优化编码规范

王言钊
1 parent 7d17caf4
Showing 11 changed files with 26 additions and 49 deletions
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/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/config/SessionFilter.java
src/main/java/com/cnlive/shenhe/serviceImpl/AudioServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/LiveApplyServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -70,7 +70,6 @@ public class CommentsControllerApi {
         try {
             spId = json.getInteger("spId");
         } catch (Exception e) {
-            spId = null;
         }
         //存在则更新
         if (commentsList.size() > 0) {
@@ -203,7 +203,7 @@ public class ContentControllerApi {
             shyContent1.setShenhe_type(shenheType);
             //朋友圈内容创建时间
             String contentTime = json.getString("createTime");
-            shyContent1.setContent_time(new Date(Long.valueOf(contentTime)));
+            shyContent1.setContent_time(new Date(Long.parseLong(contentTime)));
             shyContent1.setCreate_date(CommonUtils.getCurrentTime());
             //回调地址
             shyContent1.setCallback(json.getString("callbackUrl"));
@@ -243,7 +243,7 @@ public class ContentControllerApi {
         shyContent.setContent_status(1);
         //创建时间
         String contentTime = json.getString("createTime");
-        shyContent.setContent_time(new Date(Long.valueOf(contentTime)));
+        shyContent.setContent_time(new Date(Long.parseLong(contentTime)));
         shyContent.setCreate_date(CommonUtils.getCurrentTime());
         //回调地址
         shyContent.setCallback(json.getString("callbackUrl"));
@@ -48,7 +48,6 @@ public class LiveApplyControllerApi {
         try {
             spId = json.getInteger("spId");
         } catch (Exception e) {
-            spId = null;
         }
         //直播发起人
         String sender = json.getString("sender");
@@ -84,13 +83,13 @@ public class LiveApplyControllerApi {
         String startTime = json.getString("preStartTime");
         Date timestampStart = null;
         if (CommonUtils.isNotEmpty(startTime)) {
-            timestampStart = new Timestamp(Long.valueOf(startTime));
+            timestampStart = new Timestamp(Long.parseLong(startTime));
         }
         //预计结束时间
         String endTime = json.getString("preEndTime");
         Date timestampEnd = null;
         if (CommonUtils.isNotEmpty(endTime)) {
-            timestampEnd = new Timestamp(Long.valueOf(endTime));
+            timestampEnd = new Timestamp(Long.parseLong(endTime));
         }
         ShyLiveapply shyliveApply1 = new ShyLiveapply();
         //得到直播活动id去查询是否已有
@@ -73,13 +73,13 @@ public class LiveControllerApi {
         Date timestampStart = null;
         if (CommonUtils.isNotEmpty(startTime)) {
-            timestampStart = new Timestamp(Long.valueOf(startTime));
+            timestampStart = new Timestamp(Long.parseLong(startTime));
         }
         //结束时间
         String endTime = json.getString("endTime");
         Date timestampEnd = null;
         if (CommonUtils.isNotEmpty(endTime)) {
-            timestampEnd = new Timestamp(Long.valueOf(endTime));
+            timestampEnd = new Timestamp(Long.parseLong(endTime));
         }
         //预计开始时间
@@ -87,13 +87,13 @@ public class LiveControllerApi {
         Date preTimestampStart = null;
         if (CommonUtils.isNotEmpty(preStartTime)) {
-            preTimestampStart = new Timestamp(Long.valueOf(preStartTime));
+            preTimestampStart = new Timestamp(Long.parseLong(preStartTime));
         }
         //预计结束时间
         String preEndTime = json.getString("preEndTime");
         Date preTimestampEnd = null;
         if (CommonUtils.isNotEmpty(preEndTime)) {
-            preTimestampEnd = new Timestamp(Long.valueOf(preEndTime));
+            preTimestampEnd = new Timestamp(Long.parseLong(preEndTime));
         }
         ShyLive shylive1 = new ShyLive();
@@ -48,7 +48,6 @@ public class TopicControllerApi {
         try {
             spId = json.getInteger("spId");
         } catch (Exception e) {
-            spId = null;
         }
         //话题标题
         String topicTitle = json.getString("topicTitle");
@@ -64,7 +64,9 @@ public class VideosControllerApi {
         //目击者类型  0-目击者 1-童声共济 2-全民健身 3-目击者政府监督
         String source = json.getString("source");
         Integer duration = json.getInteger("duration");
-        if (CommonUtils.isNotNull(duration)) duration = duration / 1000;
+        if (CommonUtils.isNotNull(duration)) {
+            duration = duration / 1000;
+        }
         //获取栏目分类  
         String category = CommonUtils.isEmpty(json.getString("multiplecategory")) ? "" : json.getString("multiplecategory");
         //获取上传人的id
@@ -113,8 +115,8 @@ public class VideosControllerApi {
             shyVideos.setUpdated_at(CommonUtils.getCurrentTime());
             //获取审核类型
             videosService.getShenheType(shyVideos);
-            boolean YorN = videosService.updateshyVideos(shyVideos);
-            if (YorN == true) {
+            boolean yorN = videosService.updateshyVideos(shyVideos);
+            if (yorN) {
                 return new ResponseBean(ErrorEnum.SUCCESS);
             } else {
                 return new ResponseBean(ErrorEnum.ERROR);
@@ -170,15 +172,15 @@ public class VideosControllerApi {
         //获取审核类型
         videosService.getShenheType(shyVideos1);
-        if (shyVideos1.getShenhe_type() != CommonConst.AUDIT_TYPE_FREE) {
+        if (!shyVideos1.getShenhe_type().equals(CommonConst.AUDIT_TYPE_FREE)) {
             //如果审核类型是人工审核，按照原有规则
-            if (shyVideos1.getShenhe_type() == CommonConst.AUDIT_TYPE_USER) {
+            if (shyVideos1.getShenhe_type().equals(CommonConst.AUDIT_TYPE_USER)) {
                 if (CommonUtils.isNotNull(duration) && duration > 80) {
                     //视频至少可以抽8张，请求抽帧
                     shyVideos1 = avsample(shyVideos1);
                 }
                 //如果审核类型是机审
-            } else if (shyVideos1.getShenhe_type() == CommonConst.AUDIT_TYPE_MACHANE) {
+            } else if (shyVideos1.getShenhe_type().equals(CommonConst.AUDIT_TYPE_MACHANE)) {
                 //"目击者"视频，小于300秒的抽帧
                 if (CommonUtils.isNotNull(duration) && duration < 300) {
                     shyVideos1 = avsample(shyVideos1);
@@ -191,7 +193,7 @@ public class VideosControllerApi {
         logger.info("当前视频类型是：" + shyVideos1.getShenhe_type());
         boolean result = videosService.impotVideo(shyVideos1);
-        if (result == true) {
+        if (result) {
             return new ResponseBean(ErrorEnum.SUCCESS);
         } else {
             return new ResponseBean(ErrorEnum.ERROR);
@@ -249,11 +251,11 @@ public class VideosControllerApi {
             }
             logger.info("抽帧attach参数：attach:{}", attach);
             extParam.put("domain", domainName);
-            if (CommonConst.KS_PLAT == plat) {
+            if (CommonConst.KS_PLAT.equals(plat)) {
                 //金山
                 params.put("plat", 0);
                 params.put("dstBucket", ks_bucket);
-            } else if (CommonConst.QINIU_PLAT == plat) {
+            } else if (CommonConst.QINIU_PLAT.equals(plat)) {
                 //七牛
                 params.put("plat", 1);
                 params.put("dstBucket", qn_bucket);
@@ -296,6 +298,4 @@ public class VideosControllerApi {
         }
         return video;
     }
-
-
 }
@@ -48,19 +48,16 @@ public class SessionFilter implements Filter {
         if (isInclude(url)) {
             chain.doFilter(httpRequest, httpResponse);
-            return;
         } else {
             HttpSession session = httpRequest.getSession();
             if (session.getAttribute(SessionUser.getSessionKey()) != null) {
                 // session存在
                 chain.doFilter(httpRequest, httpResponse);
-                return;
             } else {
                 // session不存在 准备跳转失败
                 RequestDispatcher dispatcher = request.getRequestDispatcher("/users/login");
                 dispatcher.forward(request, response);
                 //chain.doFilter(httpRequest, httpResponse);
-                return;
             }
         }
@@ -373,7 +373,7 @@ public class AudioServiceImpl {
             }
         }
         //默认按上传时间倒序排序
-        //example.setOrderByClause("video_upload_time desc");
+        example.setOrderByClause("createTime desc");
         List<ShyAudio> shyAudioList = shyAudioMapper.selectByExample(example);
         return shyAudioList;
     }
@@ -112,9 +112,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getComment_user_id())) {
             criteria.andEqualTo("comment_user_id", commentsDTO.getComment_user_id());
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 0) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.parseInt(commentsDTO.getType()) == 0) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 1) {
+        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.parseInt(commentsDTO.getType()) == 1) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_ELSE);
         }
         if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
@@ -169,9 +169,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getIs_hot())) {
             criteria.andEqualTo("is_hot", commentsDTO.getIs_hot());
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 0) {
+        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.parseInt(commentsDTO.getType()) == 0) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 1) {
+        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.parseInt(commentsDTO.getType()) == 1) {
             criteria.andIsNull("type");
         }
         if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
@@ -77,19 +77,6 @@ public class LiveApplyServiceImpl {
     }
     /**
-     * 根据活动id查询直播申请对象
-     *
-     * @param activity_id
-     * @return
-     */
-    public ShyLiveapply queryshyLiveApply(String activity_id) {
-        ShyLiveapply shyLiveApply = new ShyLiveapply();
-        shyLiveApply.setActivity_id(activity_id);
-        List<ShyLiveapply> shyLiveApplylist = shyLiveApplyMapper.select(shyLiveApply);
-        return shyLiveApplylist.get(0);
-    }
-
-    /**
      * 修改直播申请对象  返回布尔类型
      *
      * @param shyLiveApply
@@ -441,9 +441,8 @@ public class VideosServiceImpl {
      *
      * @param video
      * @param dianboState 视频状态，1通过，2不通过
-     * @return
      */
-    public int updateDianboAndShenhe(ShyVideos video, int dianboState) {
+    public void updateDianboAndShenhe(ShyVideos video, int dianboState) {
         //修改点播云的视频状态
         JSONObject result = pass.auditPass(video.getVideo_id(), dianboState, video.getMsg(), video.getMsg(), video.getCallback());
         logger.error("点播回调result:{}", result);
@@ -461,7 +460,6 @@ public class VideosServiceImpl {
                 if (i != 1) {
                     logger.error("点播视频更改失败,activity_id:{}", video.getVideo_id());
                 }
-                return i;
             } else {
                 video.setMsg("点播视频回调失败，" + video.getMsg());
                 videosService.updateVideo(video.getId(), null, video.getUpdater(), "", CommonConst.AUDIT_CALLBACK_FAIL, video.getMsg());
@@ -477,14 +475,12 @@ public class VideosServiceImpl {
                 if (i != 1) {
                     logger.error("点播视频更改失败,activity_id:{}", video.getVideo_id());
                 }
-                return i;
             } else {
                 video.setMsg("点播视频回调失败，" + video.getMsg());
                 videosService.updateVideo(video.getId(), null, video.getUpdater(), "", CommonConst.AUDIT_CALLBACK_FAIL, video.getMsg());
                 logger.error("点播视频回调失败，activity_id:{},code:{},msg:{}", video.getVideo_id(), code, result.getString("msg"));
             }
         }
-        return 0;
     }
@@ -499,7 +495,7 @@ public class VideosServiceImpl {
         logger.info("====sites:{}", sites.toString());
         String source = shyVideo.getSource();
         // 根据source 查询审核类型    source有传空的时候 默认给0
-        Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? 0 : Integer.valueOf(source));
+        Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? Integer.valueOf(0) : Integer.valueOf(source));
         logger.info("审核类型为:{}", shType);
         ShyUsersfree shyUserfree = null;
         //如果用户id存在