Merge remote-tracking branch 'origin/saas-api' into saas-api

fs-admin/src/main/java/com/fs/qw/controller/QwCompanyController.java

@@ -58,12 +58,12 @@ public class QwCompanyController extends BaseController
     {
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
-            qwCompany.setCreateDeptId(loginUser.getDeptId());
-            qwCompany.setCreateUserId(loginUser.getUserId());
-        }
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+//            qwCompany.setCreateDeptId(loginUser.getDeptId());
+//            qwCompany.setCreateUserId(loginUser.getUserId());
+//        }
         startPage();
         List<QwCompany> list = qwCompanyService.selectQwCompanyList(qwCompany);
         return getDataTable(list);

fs-service/src/main/resources/db/tenant-initTable.sql

@@ -18684,6 +18684,60 @@ CREATE TABLE `lobster_learning_corpus`
     KEY                 `idx_company_status` (`company_id`, `status`),
     KEY                 `idx_company_scenario` (`company_id`, `scenario`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='销售对话语料学习表';
+
+DROP TABLE IF EXISTS `tencent_word`;
+CREATE TABLE `tencent_word`
+(
+    `id`               bigint                                                        NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `title`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '标题',
+    `type`             varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '类型',
+    `template_version` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  DEFAULT NULL COMMENT '模板版本',
+    `url`              varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '文档URL',
+    `file_id`          varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '文件ID',
+    `create_by`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  DEFAULT NULL COMMENT '创建者',
+    `create_time`      datetime                                                      DEFAULT NULL COMMENT '创建时间',
+    `update_by`        varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  DEFAULT NULL COMMENT '更新者',
+    `update_time`      datetime                                                      DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY                `idx_file_id` (`file_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='腾讯文档表';
+
+DROP TABLE IF EXISTS `tencent_word_detail`;
+CREATE TABLE `tencent_word_detail`
+(
+    `id`          bigint                                                        NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `file_id`     varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '文件ID',
+    `sheet_id`    varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NOT NULL COMMENT '工作表ID',
+    `q`           text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '问题',
+    `a`           text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '答案',
+    `create_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建者',
+    `create_time` datetime                                                     DEFAULT NULL COMMENT '创建时间',
+    `update_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新者',
+    `update_time` datetime                                                     DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY           `idx_file_id` (`file_id`) USING BTREE,
+    KEY           `idx_sheet_id` (`sheet_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=175 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='腾讯文档详情表';
+
+DROP TABLE IF EXISTS `tencent_word_sheet`;
+CREATE TABLE `tencent_word_sheet`
+(
+    `id`           bigint                                                        NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `file_id`      varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '文件ID',
+    `sheet_id`     varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  NOT NULL COMMENT '工作表ID',
+    `title`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '工作表标题',
+    `row_count`    int                                                           DEFAULT NULL COMMENT '行数',
+    `column_count` int                                                           DEFAULT NULL COMMENT '列数',
+    `row_total`    int                                                           DEFAULT NULL COMMENT '总行数',
+    `column_total` int                                                           DEFAULT NULL COMMENT '总列数',
+    `create_by`    varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  DEFAULT NULL COMMENT '创建者',
+    `create_time`  datetime                                                      DEFAULT NULL COMMENT '创建时间',
+    `update_by`    varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  DEFAULT NULL COMMENT '更新者',
+    `update_time`  datetime                                                      DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY            `idx_file_id` (`file_id`) USING BTREE,
+    KEY            `idx_sheet_id` (`sheet_id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='腾讯文档工作表表';
 SET
 FOREIGN_KEY_CHECKS = 1;