优化图文、朋友圈、评论、频道api

王言钊
1 parent 247ba669
Showing 3 changed files with 127 additions and 184 deletions
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
@@ -40,36 +40,45 @@ public class ChannelControllerApi {
     public ResponseBean impotChannel(String param) {
         logger.info("频道入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
+        boolean yorN;
         //判断是否存在
         ShyChannel shyChannel = new ShyChannel();
         shyChannel.setChannel_id(json.getString("channelId"));
         List<ShyChannel> channelList = channelService.findshyChannel(shyChannel);
-
+        shyChannel.setCreated_at(CommonUtils.getCurrentTime());
         Integer spId;
         try {
             spId = json.getInteger("spId");
         } catch (Exception e) {
             spId = null;
         }
-        //存在则更新
         if (channelList.size() > 0) {
+            //  存在则更新
             ShyChannel shyChannel1 = channelList.get(0);
-            shyChannel1.setShenhe_status(CommonConst.AUDIT_INTT);
-            shyChannel1.setChannel_name(json.getString("channelName"));
-            shyChannel1.setChannel_img(json.getString("face"));
-            shyChannel1.setCallback(json.getString("callback"));
-            shyChannel1.setSp_id(spId);
-            //是否下线 0表示正常 1表示下线
-            shyChannel1.setOffline(CommonConstStates.ZHENGCHANG);
-            shyChannel1.setUpdated_at(CommonUtils.getCurrentTime());
-            channelService.getShenheType(shyChannel1);
-            boolean yorN = channelService.updateshyChannel(shyChannel1);
-            if (yorN) {
-                return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "审核请求收到成功");
-            }
-            return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "审核请求收到失败(更新)");
+            yorN = saveOrUpdateChannel(shyChannel1, json, spId);
+            logger.info("频道修改操作");
+        } else {
+            //  不存在则保存
+            yorN = saveOrUpdateChannel(shyChannel, json, spId);
+            logger.info("频道保存操作");
+        }
+        if (yorN) {
+            return new ResponseBean(ErrorEnum.SUCCESS);
+        } else {
+            return new ResponseBean(ErrorEnum.ERROR);
         }
-        //如果不存在直接插入
+    }
+
+    /**
+     * 保存和修改频道
+     *
+     * @param shyChannel
+     * @param json
+     * @param spId
+     * @return
+     */
+    private boolean saveOrUpdateChannel(ShyChannel shyChannel, JSONObject json, Integer spId) {
+        // 如果不存在直接插入  存在就直接修改
         shyChannel.setShenhe_status(CommonConst.AUDIT_INTT);
         shyChannel.setChannel_name(json.getString("channelName"));
         shyChannel.setChannel_img(json.getString("face"));
@@ -77,15 +86,12 @@ public class ChannelControllerApi {
         shyChannel.setSp_id(spId);
         //是否下线 0表示正常 1表示下线
         shyChannel.setOffline(CommonConstStates.ZHENGCHANG);
-        shyChannel.setCreated_at(CommonUtils.getCurrentTime());
         shyChannel.setUpdated_at(CommonUtils.getCurrentTime());
         channelService.getShenheType(shyChannel);
-        boolean yorN = channelService.impotChannel(shyChannel);
-        if (yorN) {
-            return new ResponseBean(ErrorEnum.SUCCESS.getErrorCode(), "审核请求收到成功");
+        if (shyChannel.getId() == null) {
+            return channelService.impotChannel(shyChannel);
+        } else {
+            return channelService.updateshyChannel(shyChannel);
         }
-        return new ResponseBean(ErrorEnum.ERROR.getErrorCode(), "审核请求收到失败(新增)");
     }
-
-
 }
@@ -38,29 +38,16 @@ public class CommentsControllerApi {
     public ResponseBean impotComment(String param) {
         logger.info("评论入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
+        boolean yorN;
         //评论类型，topic:话题
         String type = json.getString("type") == null ? "else" : json.getString("type");
         //评论的级别
         Integer level = json.getInteger("level") == null ? 1 : json.getInteger("level");
-        String programId = json.getString("programId");
-        String originalUrl = json.getString("originalUrl");
-        String commentTitle = json.getString("commentTitle");
-        Integer commentUserId = json.getInteger("commentUserId");
-        String commentUserName = json.getString("commentUserName");
-        String commentUserAvatar = json.getString("commentUserAvatar");
-        String commentUserIp = json.getString("commentUserIP");
-        String commentContent = json.getString("commentContent");
-        String appId = json.getString("appId");
-        String platform = json.getString("platform");
-        String activityId = json.getString("activityId");
-        Boolean priority = json.getBoolean("priority");
-        String callback = json.getString("callback");
         String commentTime = json.getString("commentTime");
         Date timestamp = null;
         if (CommonUtils.isNotEmpty(commentTime)) {
             timestamp = CommonUtils.getTimestamp(commentTime, "yyyy-MM-dd HH:mm");
         }
-
         //判断是否存在
         ShyComments shyComments = new ShyComments();
         shyComments.setActivity_id(json.getString("activityId"));
@@ -71,59 +58,53 @@ public class CommentsControllerApi {
             spId = json.getInteger("spId");
         } catch (Exception e) {
         }
-        //存在则更新
         if (commentsList.size() > 0) {
+            //存在则更新
             ShyComments shyComments1 = commentsList.get(0);
-            shyComments1.setState(CommonConst.AUDIT_INTT);
-            shyComments1.setProgram_id(programId);
-            shyComments1.setComment_original_url(originalUrl);
-            shyComments1.setComment_title(commentTitle);
-            shyComments1.setComment_user_id(commentUserId);
-            shyComments1.setComment_user_name(commentUserName);
-            shyComments1.setComment_user_avatar(commentUserAvatar);
-            shyComments1.setComment_user_ip(commentUserIp);
-            shyComments1.setComment_content(commentContent);
-            shyComments1.setType(type);
-            shyComments1.setLevel(level);
-            shyComments1.setComment_time(timestamp);
-            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) {
-                return new ResponseBean(ErrorEnum.SUCCESS);
-            } else {
-                return new ResponseBean(ErrorEnum.ERROR);
-            }
+            yorN = saveOrUpdateComments(json, shyComments1, type, level, spId, timestamp);
+            logger.info("评论修改");
+        } else {
+            // 不存在就保存
+            yorN = saveOrUpdateComments(json, shyComments, type, level, spId, timestamp);
+            logger.info("评论保存");
+        }
+        if (yorN) {
+            return new ResponseBean(ErrorEnum.SUCCESS);
+        } else {
+            return new ResponseBean(ErrorEnum.ERROR);
         }
-        //如果不存在直接插入
+    }
+
+    /**
+     * 保存和修改 评论
+     *
+     * @param json
+     * @param shyComments
+     * @return
+     */
+    private boolean saveOrUpdateComments(JSONObject json, ShyComments shyComments, String type, Integer level, Integer spId, Date timestamp) {
         shyComments.setState(CommonConst.AUDIT_INTT);
-        shyComments.setProgram_id(programId);
-        shyComments.setComment_original_url(originalUrl);
-        shyComments.setComment_title(commentTitle);
-        shyComments.setComment_user_id(commentUserId);
-        shyComments.setComment_user_name(commentUserName);
-        shyComments.setComment_user_avatar(commentUserAvatar);
-        shyComments.setComment_user_ip(commentUserIp);
-        shyComments.setComment_content(commentContent);
+        shyComments.setProgram_id(json.getString("programId"));
+        shyComments.setComment_original_url(json.getString("originalUrl"));
+        shyComments.setComment_title(json.getString("commentTitle"));
+        shyComments.setComment_user_id(json.getInteger("commentUserId"));
+        shyComments.setComment_user_name(json.getString("commentUserName"));
+        shyComments.setComment_user_avatar(json.getString("commentUserAvatar"));
+        shyComments.setComment_user_ip(json.getString("commentUserIP"));
+        shyComments.setComment_content(json.getString("commentContent"));
         shyComments.setComment_time(timestamp);
         shyComments.setType(type);
         shyComments.setLevel(level);
         shyComments.setSpid(spId);
-        shyComments.setApp_id(appId);
-        shyComments.setPlatform(platform);
-        shyComments.setIs_hot(priority);
-        shyComments.setCallback(callback);
+        shyComments.setApp_id(json.getString("appId"));
+        shyComments.setPlatform(json.getString("platform"));
+        shyComments.setIs_hot(json.getBoolean("priority"));
+        shyComments.setCallback(json.getString("callback"));
         commentsService.getShenheType(shyComments);
-        boolean yorN = commentsService.impotComments(shyComments);
-        if (yorN) {
-            return new ResponseBean(ErrorEnum.SUCCESS);
+        if (shyComments.getId() == null) {
+            return commentsService.impotComments(shyComments);
         } else {
-            return new ResponseBean(ErrorEnum.ERROR);
+            return commentsService.updateshyComments1(shyComments);
         }
     }
-
 }
@@ -44,76 +44,46 @@ public class ContentControllerApi {
     public ResponseBean importContent(String param) {
         logger.info("图文入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
+        boolean yorN;
         //判断是否存在
-        ShyContent shyContent = new ShyContent();
         String contentId = json.getString("contentId");
-        shyContent.setContent_id(contentId);
-        //图文标签
-        shyContent.setContent_tag("content");
         //图文标签
         String contentTag = json.getString("content_tag");
         String newContentTag = StringUtils.isEmpty(contentTag) ? "content" : contentTag;
+
+        ShyContent shyContent = new ShyContent();
+        shyContent.setContent_id(contentId);
+        shyContent.setContent_tag(newContentTag);
         //获取审核类型
         Integer shenheType = contentService.getShenheType(json.getInteger("spId"), newContentTag);
         List<ShyContent> contentList = contentService.findshyContent(shyContent);
-        //存在则更新
         if (contentList.size() > 0) {
             ShyContent shyContent1 = contentList.get(0);
-            //标题
-            shyContent1.setTitle(json.getString("title"));
-            //标题图片
-            shyContent1.setTitle_image(json.getString("titleImage"));
-            //审核类型
-            shyContent1.setShenhe_type(shenheType);
-            //当前图文的审核状态
-            shyContent1.setContent_status(json.getInteger("contentStatus"));
-            //来源
-            shyContent1.setSource(json.getString("source"));
-            //作者
-            shyContent1.setAuthor(json.getString("author"));
-            //图文内容
-            shyContent1.setContent_text(json.getString("content_text"));
-            //图文创建时间
-            String contentTime = json.getString("contentTime");
-            if (CommonUtils.isNotEmpty(contentTime)) {
-                Date timestamp = CommonUtils.getTimestamp(contentTime, "yyyy-MM-dd HH:mm:ss");
-                shyContent1.setContent_time(timestamp);
-            }
-            shyContent1.setCreate_date(CommonUtils.getCurrentTime());
-            //回调地址
-            shyContent1.setCallback(json.getString("callback"));
-            //图文发布h5的url
-            shyContent1.setContent_url(json.getString("contentUrl"));
-            //图文发布pc的url
-            shyContent1.setContent_pc_url(json.getString("contentPCUrl"));
-            //spid
-            shyContent1.setSp_id(json.getInteger("spId"));
-            //图文标签
-            shyContent1.setContent_tag(newContentTag);
-            //领取状态
-            shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);
-            //最后一次更新时间
-            shyContent1.setLast_update(CommonUtils.getCurrentTime());
-            boolean yorN = contentService.updateshyContent(shyContent1);
-            if (yorN) {
-                logger.info("图文同步接口更新成功:{}", contentId);
-                return new ResponseBean(ErrorEnum.SUCCESS);
-            } else {
-                return new ResponseBean(ErrorEnum.ERROR);
-            }
+            // 图文存在则更新
+            yorN = saveOrUpdateContent(json, shyContent1, shenheType);
+            logger.info("图文同步接口更新操作:{}", contentId);
+        } else {
+            // 图文不存在就保存
+            yorN = saveOrUpdateContent(json, shyContent, shenheType);
+            logger.info("图文同步接口保存操作:{}", contentId);
+        }
+        if (yorN) {
+            return new ResponseBean(ErrorEnum.SUCCESS);
+        } else {
+            return new ResponseBean(ErrorEnum.ERROR);
         }
-        return saveContent(json, shyContent, shenheType);
     }
     /**
-     * 保存操作
+     * 保存和修改 图文 家庭相册 作业作品 操作
      *
      * @param json
      * @param shyContent
      * @param shenheType
+     * @param
      * @return
      */
-    private ResponseBean saveContent(JSONObject json, ShyContent shyContent, Integer shenheType) {
+    private boolean saveOrUpdateContent(JSONObject json, ShyContent shyContent, Integer shenheType) {
         //如果不存在直接插入
         //标题
         shyContent.setTitle(json.getString("title"));
@@ -131,8 +101,6 @@ public class ContentControllerApi {
         shyContent.setContent_text(json.getString("content_text"));
         //创建时间
         shyContent.setContent_time(new Date());
-        String contentTag = json.getString("content_tag");
-        shyContent.setContent_tag(StringUtils.isEmpty(contentTag) ? "content" : contentTag);
         shyContent.setCreate_date(CommonUtils.getCurrentTime());
         //回调地址
         shyContent.setCallback(json.getString("callback"));
@@ -146,12 +114,12 @@ public class ContentControllerApi {
         shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);
         //最后一次更新时间
         shyContent.setLast_update(CommonUtils.getCurrentTime());
-        boolean yorN = contentService.impotContent(shyContent);
-        if (yorN) {
-            logger.info("图文同步接口保存操作成功:{}", json.getString("contentId"));
-            return new ResponseBean(ErrorEnum.SUCCESS);
+        if (shyContent.getId() == null) {
+            //id 存在就插入
+            return contentService.impotContent(shyContent);
         } else {
-            return new ResponseBean(ErrorEnum.ERROR);
+            // id不存在就修改
+            return contentService.updateshyContent(shyContent);
         }
     }
@@ -166,13 +134,17 @@ public class ContentControllerApi {
     public ResponseBean impotMoment(@RequestBody String param) {
         logger.info("朋友圈入库，param=====" + param);
         JSONObject json = JSONObject.parseObject(param);
+        boolean yorN;
         //判断是否存在
+        String momentId = json.getString("momentId");
         ShyContent shyContent = new ShyContent();
         //朋友圈id
-        shyContent.setContent_id(json.getString("momentId"));
+        shyContent.setContent_id(momentId);
         //朋友圈标签
         shyContent.setContent_tag("moment");
         List<ShyContent> contentList = contentService.findshyContent(shyContent);
+        //当前朋友圈内容的审核状态，先发后审
+        shyContent.setContent_status(1);
         //获取审核类型
         Integer shenheType = contentService.getShenheType(json.getInteger("spId"), "moment");
         //获取生活圈内容的类型 1：图片 2：视频 3：分享
@@ -191,56 +163,39 @@ public class ContentControllerApi {
         } else {
             contentImageUrl = json.getString("contentImageUrl");
         }
-
-        //存在则更新
         if (contentList.size() > 0) {
+            //朋友圈存在则更新
             ShyContent shyContent1 = contentList.get(0);
-            //标题
-            shyContent1.setTitle(json.getString("title"));
-            //用户头像
-            shyContent1.setTitle_image(json.getString("image"));
-            //审核类型
-            shyContent1.setShenhe_type(shenheType);
-            //朋友圈内容创建时间
-            String contentTime = json.getString("createTime");
-            shyContent1.setContent_time(new Date(Long.parseLong(contentTime)));
-            shyContent1.setCreate_date(CommonUtils.getCurrentTime());
-            //回调地址
-            shyContent1.setCallback(json.getString("callbackUrl"));
-            //朋友圈分享的url
-            shyContent1.setContent_url(json.getString("pageUrl"));
-            //朋友圈分享的内容的url，以逗号分隔
-            shyContent1.setContent_pc_url(contentImageUrl);
-            //spid
-            shyContent1.setSp_id(json.getInteger("spId"));
-            //用户id
-            shyContent1.setAuthor(json.getString("userId"));
-            //用户昵称
-            shyContent1.setSource(json.getString("nickName"));
-            //关联videoId
-            shyContent1.setVideo_id(json.getString("videoId"));
-            //图文标签
-            shyContent1.setContent_tag("moment");
-            //领取状态
-            shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);
-            //最后一次更新时间
-            shyContent1.setLast_update(CommonUtils.getCurrentTime());
-            boolean yorN = contentService.updateshyContent(shyContent1);
-            if (yorN) {
-                return new ResponseBean(ErrorEnum.SUCCESS);
-            } else {
-                return new ResponseBean(ErrorEnum.ERROR);
-            }
+            yorN = saveOrUpdateMoment(json, shyContent1, shenheType, contentImageUrl);
+            logger.info("朋友圈接口更新操作:{}", momentId);
+        } else {
+            //朋友圈不存在直接保存
+            yorN = saveOrUpdateMoment(json, shyContent, shenheType, contentImageUrl);
+            logger.info("朋友圈接口保存操作:{}", momentId);
         }
-        //如果不存在直接插入
+        if (yorN) {
+            return new ResponseBean(ErrorEnum.SUCCESS);
+        } else {
+            return new ResponseBean(ErrorEnum.ERROR);
+        }
+    }
+
+    /**
+     * 朋友圈 保存和修改
+     *
+     * @param json
+     * @param shyContent
+     * @param shenheType
+     * @param contentImageUrl
+     * @return
+     */
+    private boolean saveOrUpdateMoment(JSONObject json, ShyContent shyContent, Integer shenheType, String contentImageUrl) {
         //标题
         shyContent.setTitle(json.getString("title"));
         //用户头像
         shyContent.setTitle_image(json.getString("image"));
         //审核类型
         shyContent.setShenhe_type(shenheType);
-        //当前朋友圈内容的审核状态，先发后审
-        shyContent.setContent_status(1);
         //创建时间
         String contentTime = json.getString("createTime");
         shyContent.setContent_time(new Date(Long.parseLong(contentTime)));
@@ -263,11 +218,12 @@ public class ContentControllerApi {
         shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);
         //最后一次更新时间
         shyContent.setLast_update(CommonUtils.getCurrentTime());
-        boolean yorN = contentService.impotContent(shyContent);
-        if (yorN) {
-            return new ResponseBean(ErrorEnum.SUCCESS);
+        if (shyContent.getId() == null) {
+            //id不存在直接插入
+            return contentService.impotContent(shyContent);
         } else {
-            return new ResponseBean(ErrorEnum.ERROR);
+            // id存在就修改
+            return contentService.updateshyContent(shyContent);
         }
     }
 }