2 次代碼提交 dc27d335ad ... fbddf0659c

作者 SHA1 備註 提交日期
  caoliqin fbddf0659c Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java 1 周之前
  caoliqin 4331fcbd53 feat:漏提交的数据表脚本 1 周之前

+ 54 - 0
fs-service/src/main/resources/db/20250530-初始化表结构.sql

@@ -0,0 +1,54 @@
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for sys_keyword
+-- ----------------------------
+DROP TABLE IF EXISTS `sys_keyword`;
+CREATE TABLE `sys_keyword`  (
+                                `keyword_id` bigint NOT NULL AUTO_INCREMENT COMMENT '关键字id',
+                                `keyword` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '关键字',
+                                `company_id` bigint NULL DEFAULT NULL COMMENT '所属公司',
+                                `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+                                `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+                                PRIMARY KEY (`keyword_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '系统关键字表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+    
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for fs_course_watch_comment
+-- ----------------------------
+DROP TABLE IF EXISTS `fs_course_watch_comment`;
+CREATE TABLE `fs_course_watch_comment`  (
+                                            `comment_id` bigint NOT NULL AUTO_INCREMENT COMMENT '评论id',
+                                            `user_id` bigint NULL DEFAULT NULL COMMENT '用户id',
+                                            `user_type` tinyint NULL DEFAULT 2 COMMENT '用户类型,1-管理员,2-用户',
+                                            `course_id` bigint NULL DEFAULT NULL COMMENT '课程id',
+                                            `video_id` bigint NULL DEFAULT NULL COMMENT '视频id',
+                                            `type` tinyint NULL DEFAULT 1 COMMENT '评论类型 1:评论,2:回复',
+                                            `parent_id` bigint NULL DEFAULT NULL COMMENT '父评论id',
+                                            `content` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '评论内容',
+                                            `create_time` datetime NULL DEFAULT NULL COMMENT '评论时间',
+                                            `update_time` datetime NULL DEFAULT NULL,
+                                            `is_revoke` tinyint NULL DEFAULT 0 COMMENT '是否是撤回的消息,1-是,0-否',
+                                            `time` int NULL DEFAULT NULL COMMENT '时间点,记录发送消息的视频播放时间点',
+                                            `font_size` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '字体大小',
+                                            `mode` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '展示模式',
+                                            `color` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '字体颜色',
+                                            PRIMARY KEY (`comment_id`) USING BTREE,
+                                            INDEX `user_id_index`(`user_id` ASC) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 128 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '看课评论表' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+

+ 0 - 2
fs-user-app/src/main/java/com/fs/app/config/WebSocketConfig.java

@@ -12,7 +12,6 @@ public class WebSocketConfig {
      *
      *
      * @return
      * @return
      */
      */
-
     @Bean
     @Bean
     public ServerEndpointExporter serverEndpointExporter() {
     public ServerEndpointExporter serverEndpointExporter() {
         return new ServerEndpointExporter();
         return new ServerEndpointExporter();
@@ -24,7 +23,6 @@ public class WebSocketConfig {
      *
      *
      * @return
      * @return
      */
      */
-
     @Bean
     @Bean
     public ServletServerContainerFactoryBean createWebSocketContainer() {
     public ServletServerContainerFactoryBean createWebSocketContainer() {
         ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
         ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();

+ 2 - 2
fs-user-app/src/main/java/com/fs/app/controller/CourseController.java

@@ -562,7 +562,7 @@ public class CourseController extends  AppBaseController{
 
 
     @ApiOperation("获取历史评论数据")
     @ApiOperation("获取历史评论数据")
     @GetMapping("/getComments")
     @GetMapping("/getComments")
-    public ResponseResult<PageInfo<FsCourseWatchCommentVO>> getCourseWatchComments(FsCourseWatchCommentListParam param)
+    public R getCourseWatchComments(FsCourseWatchCommentListParam param)
     {
     {
         //获取配置信息中需要查询的数据条数
         //获取配置信息中需要查询的数据条数
         String json = configService.selectConfigByKey("course.config");
         String json = configService.selectConfigByKey("course.config");
@@ -572,7 +572,7 @@ public class CourseController extends  AppBaseController{
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsCourseWatchCommentVO> list = courseWatchCommentService.selectH5CourseWatchComments(param);
         List<FsCourseWatchCommentVO> list = courseWatchCommentService.selectH5CourseWatchComments(param);
         PageInfo<FsCourseWatchCommentVO> pageInfo = new PageInfo<>(list);
         PageInfo<FsCourseWatchCommentVO> pageInfo = new PageInfo<>(list);
-        return ResponseResult.ok(pageInfo);
+        return R.ok().put("data", pageInfo);
     }
     }
 
 
 }
 }