sql字段优化

community-api/src/main/java/com/tanpu/community/api/beans/qo/CommentQo.java

@@ -21,25 +21,24 @@ public class CommentQo {
     @ApiModelProperty(value = "作者id")
     private String authorId;
 
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "用户头像")
+    private String userImg;
+
     @ApiModelProperty(value = "评论的目标id")
     private String targetId;
 
     @ApiModelProperty(value = "是否屏蔽")
     private Integer isBlock;
 
-    @ApiModelProperty(value = "转发量")
-    private Long forwardAomunt;
-
-    @ApiModelProperty(value = "点赞量")
+    @ApiModelProperty(value = "点赞次数")
     private Long likeAmount;
 
-    private String createBy;
-
-    private LocalDateTime createTime;
-
-    private String updateBy;
-
+    @ApiModelProperty(value = "评论时间")
     private LocalDateTime updateTime;
 
+
     private Integer deleteTag;
 }

community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeQo.java

@@ -48,7 +48,7 @@ public class ThemeQo {
     private String formerThemeId;
 
     @ApiModelProperty(value = "转发量")
-    private Long forwardAomunt;
+    private Long forwardAmount;
 
     @ApiModelProperty(value = "评论量")
     private Long commentAmount;

community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java

@@ -234,6 +234,10 @@ public class ThemeManager {
         HomePageEntity userEntity = homePageService.selectByUserId(userId);
         themeQO.setUserImg(userEntity.getHeadImg());
         themeQO.setNickName(userEntity.getNickName());
+        //热点数据 TODO 点赞量、评论量、转发量
+        themeQO.setCommentAmount(0L);
+        themeQO.setLikeAmount(0L);
+        themeQO.setForwardAmount(0L);
     }
 
     //组装正文详情
@@ -248,11 +252,18 @@ public class ThemeManager {
         //迄今时间
         maintTextQo.setUpToNowTime(calUpToNowTime(maintTextQo.getCreateTime()));
         //用户信息：头像、昵称
-        HomePageEntity userEntity = homePageService.selectByUserId(userId);
-        maintTextQo.setUserImg(userEntity.getHeadImg());
-        maintTextQo.setNickName(userEntity.getNickName());
+        HomePageEntity author = homePageService.selectByUserId(userId);
+        maintTextQo.setUserImg(author.getHeadImg());
+        maintTextQo.setNickName(author.getNickName());
         //评论
         List<CommentQo> commentQos = ConvertUtil.commentEntity2Qos(commentService.selectByTargetId(maintTextQo.getId()));
+        for (CommentQo comment : commentQos) {
+            HomePageEntity commentor = homePageService.selectByUserId(comment.getAuthorId());
+            comment.setUserImg(commentor.getHeadImg());
+            comment.setNickName(commentor.getNickName());
+            //TODO 评论点赞量
+            comment.setLikeAmount(0L);
+        }
         maintTextQo.setComments(commentQos);
         return;
     }

community-service/src/main/resources/application-dev.yml

@@ -9,7 +9,7 @@ apollo.bootstrap.enabled: true
 #    namespaces: application.yml
 
 server:
-  port: 8345
+  port: 8080
   servlet:
     context-path: /community
 

docs/create.sql

 CREATE TABLE `home_page` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
   `user_id` varchar(64) NOT NULL COMMENT '用户id',
   `head_img` varchar(256) NOT NULL COMMENT '头像url',
   `nick_name` varchar(32) NOT NULL COMMENT '昵称',
   `introduction` varchar(256) NOT NULL COMMENT '个人简介',
   `sex` int(3) COMMENT '性别',
   `location` varchar(256) COMMENT '地址',
-  `create_by` varchar(64) DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
   UNIQUE KEY `uk_userId` (`user_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='个人主页';
 
 
-CREATE TABLE `fans_rel` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
-  `idol_id` varchar(64) NOT NULL COMMENT '被关注的人id',
+CREATE TABLE `follow_rel` (
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
+  `follow_id` varchar(64) NOT NULL COMMENT '被关注的人id',
   `follower_id` varchar(64) NOT NULL COMMENT '粉丝id',
-  `create_by` varchar(64) DEFAULT '',
+  `follow_time` datetime COMMENT '关注时间',
+  `unfollow_time` datetime COMMENT '取消关注时间',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
-  UNIQUE KEY `uk_idol_follower` (`idol_id`, `follower_id`),
+  UNIQUE KEY `uk_idol_follower` (`follow_id`, `follower_id`),
   INDEX `idx_follower` (`follower_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='粉丝关系';
 
 
 CREATE TABLE `theme` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
+  `theme_id` varchar(64) NOT NULL COMMENT 'UUID',
   `title` varchar(64) NOT NULL COMMENT '标题',
   `theme_type` int(4) NOT NULL COMMENT '类型',
   `content` text COMMENT '文本内容',
@@ -39,58 +38,69 @@ CREATE TABLE `theme` (
   `author_id` varchar(64) NOT NULL COMMENT '作者id',
   `former_theme_id` varchar(64) COMMENT '被转发的主题',
   `topic_id` varchar(64) NOT NULL COMMENT '所属的话题',
-  `create_by` varchar(64) DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
+  INDEX `idx_thmee_id` (`theme_id`),
   INDEX `idx_author` (`author_id`),
   INDEX `idx_former` (`former_theme_id`),
   INDEX `idx_topic` (`topic_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='主题内容';
 
+CREATE TABLE `theme_attachment` (
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
+  `theme_id` varchar(64) NOT NULL COMMENT '主题ID',
+  `attach_type` int(4) NOT NULL COMMENT '附件类型：1:产品 2：直播 3：短视频 4：课程 5:图片',
+  `attach_id` varchar(64) NOT NULL COMMENT '附件对应的ID',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `delete_tag` int(3) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `theme_id` (`theme_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='主题附件';
 
 CREATE TABLE `comment` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
-  `comment_type` int(4) NOT NULL COMMENT '类型，目前仅支持1：文字，上限500字',
-  `content` text COMMENT '文本内容',
+  `id` int(32) auto_increment PRIMARY KEY NOT NULL COMMENT 'id',
+  `comment_id` varchar(64) NOT NULL COMMENT 'uuid',
+  `comment_type` int(4) NOT NULL COMMENT '类型',
+  `content` varchar(1024) DEFAULT NULL COMMENT '文本内容',
   `author_id` varchar(64) NOT NULL COMMENT '作者id',
-  `target_id` varchar(64) NOT NULL COMMENT '评论的目标id',
+  `theme_id` varchar(64) DEFAULT NULL COMMENT '主题id',
+  `parent_id` varchar(64) DEFAULT NULL COMMENT '一级评论id',
+  `reply_id` varchar(64) DEFAULT NULL COMMENT '回复评论id',
   `is_block` int(4) NOT NULL DEFAULT '0' COMMENT '是否屏蔽',
-  `create_by` varchar(64) DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
-  INDEX `idx_author` (`author_id`),
-  INDEX `idx_target` (`target_id`)
+  PRIMARY KEY (`id`),
+  KEY `idx_author` (`author_id`) USING BTREE,
+  KEY `idx_target` (`reply_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='评论';
 
 
 CREATE TABLE `collection` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
   `collection_type` int(4) NOT NULL COMMENT '类型,1:点赞，2：收藏',
-  `author_id` varchar(64) NOT NULL COMMENT '作者id',
+  `user_id` varchar(64) NOT NULL COMMENT '作者id',
   `target_id` varchar(64) NOT NULL COMMENT '评论的目标id',
-  `create_by` varchar(64) DEFAULT '',
+  `collection_time` datetime COMMENT '收藏时间',
+  `uncollection_time` datetime COMMENT '取消收藏时间',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
-  INDEX `idx_author` (`author_id`),
+  INDEX `idx_author` (`user_id`),
   INDEX `idx_target` (`target_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收藏/点赞';
 
 
 CREATE TABLE `topic` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
+  `topic_id` varchar(64) NOT NULL COMMENT 'uuid',
   `topic_title` varchar(64) NOT NULL COMMENT '话题名称',
   `is_top` int(4) NOT NULL COMMENT '是否置顶',
   `is_conceal` int(4) NOT NULL COMMENT '是否隐藏',
   `view_amount_modify` bigint NOT NULL DEFAULT 0 COMMENT '浏览量调整',
-  `create_by` varchar(64) DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
   UNIQUE KEY `uk_title` (`topic_title`)
@@ -98,27 +108,27 @@ CREATE TABLE `topic` (
 
 
 CREATE TABLE `file_record` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
-  `original_name` varchar(64) NOT NULL COMMENT '文件名称',
-  `logic_url` varchar(128) NOT NULL COMMENT '逻辑url',
-  `preview_url` varchar(512) NOT NULL COMMENT '预览url',
-  `create_by` varchar(64) DEFAULT '',
+  `id` int(32) auto_increment NOT NULL COMMENT 'id',
+  `file_id` varchar(64) NOT NULL COMMENT 'UUID',
+  `file_type` int(4) NOT NULL COMMENT '类型：1：图片',
+  `file_name` varchar(64) NOT NULL COMMENT '文件名称',
+  `file_oss_key` varchar(64) NOT NULL COMMENT '阿里云key',
+  `preview_url` varchar(512) DEFAULT NULL COMMENT '预览url',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
-  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
-  UNIQUE KEY `uk_logic` (`logic_url`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文件';
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_logic` (`file_oss_key`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='上传文件';
 
 
 CREATE TABLE `black_list` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
   `blocker` varchar(64) NOT NULL COMMENT '屏蔽发起人',
   `blocked_type` int(4) NOT NULL COMMENT '屏蔽类型，1：用户，2：内容',
   `blocked_id` varchar(64) NOT NULL COMMENT '被屏蔽的',
   `create_by` varchar(64) DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
   INDEX `uk_blocker` (`blocker`),
@@ -127,13 +137,12 @@ CREATE TABLE `black_list` (
 
 
 CREATE TABLE `black_list` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
   `blocker` varchar(64) NOT NULL COMMENT '屏蔽发起人',
   `blocked_type` int(4) NOT NULL COMMENT '屏蔽类型',
   `blocked_id` varchar(64) NOT NULL COMMENT '被屏蔽的',
   `create_by` varchar(64) DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
   INDEX `uk_blocker` (`blocker`),
@@ -142,16 +151,14 @@ CREATE TABLE `black_list` (
 
 
 CREATE TABLE `visit_summary` (
-  `id` varchar(64) PRIMARY KEY COMMENT 'id',
+  `id` int(32) auto_increment PRIMARY KEY COMMENT 'id',
   `session_id` varchar(64) NOT NULL COMMENT 'session_id',
   `visitor_id` varchar(64) NOT NULL COMMENT '浏览者id',
   `author_id` varchar(64) NOT NULL COMMENT '作者id',
   `ref_id` varchar(64) NOT NULL COMMENT '关联目标ID',
   `ref_type` int(8) NOT NULL COMMENT '关联目标类型',
   `duration` int(16) NOT NULL COMMENT '浏览时间 单位秒',
-  `create_by` varchar(64) DEFAULT '',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  `update_by` varchar(64) DEFAULT '',
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `delete_tag` int(3) NOT NULL DEFAULT '0',
   INDEX `idx_session` (`session_id`),