Merge remote-tracking branch 'origin/master' into optimize

DataRoom/README.md

@@ -71,7 +71,7 @@
 </dependency>
 ```
 
-点击<a href="https://central.sonatype.com/artifact/com.gccloud/gc-starter-bigscreen-core">查询最新版本号</a>
+点击<a href="https://central.sonatype.com/artifact/com.gccloud/dataroom-core">查询最新版本号</a>
 
 ### 2. 初始化SQL
 
@@ -102,7 +102,7 @@ gc:
   starter:
     file:
       # 一个存储文件的绝对路径，需要有写入权限
-      basePath: /root/big-screen
+      basePath: /root/dataroom
       # 静态资源访问接口前缀
       urlPrefix: http://127.0.0.1:${server.port}/${server.servlet.context-path}/static/
 ```
@@ -112,8 +112,8 @@ gc:
 ### 4. 启动类配置扫描包路径
 
 ```java
-@SpringBootApplication(scanBasePackages = {BigScreenConst.ScanPackage.COMPONENT})
-@MapperScan(value = {BigScreenConst.ScanPackage.DAO})
+@SpringBootApplication(scanBasePackages = {DataRoomConst.ScanPackage.COMPONENT, DatasetConstant.ScanPackage.COMPONENT, CommonConst.ScanPackage.COMPONENT})
+@MapperScan(value = {DataRoomConst.ScanPackage.DAO, DatasetConstant.ScanPackage.DAO})
 ```
 
 ## 演示DEMO

DataRoom/dataroom-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>0.0.1.2023061401.Alpha</version>
+        <version>0.0.1.2023070402.Alpha</version>
     </parent>
 
     <artifactId>dataroom-core</artifactId>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.gccloud</groupId>
             <artifactId>dataset-core</artifactId>
-            <version>0.0.1.2023062101.Alpha</version>
+            <version>${dataset.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java

@@ -15,7 +15,7 @@ import javax.annotation.Resource;
 
 @Slf4j
 @Configuration
-@ConditionalOnProperty(prefix = "gc.starter.component", name = "ObjectMapperConfiguration", havingValue = "ObjectMapperConfiguration", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "ObjectMapperConfiguration", havingValue = "ObjectMapperConfiguration", matchIfMissing = true)
 public class ObjectMapperConfiguration {
 
     @Resource

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/exception/DataRoomGlobalExceptionHandler.java

@@ -22,13 +22,13 @@ import javax.servlet.http.HttpServletRequest;
  */
 @RestControllerAdvice
 @Slf4j
-@ConditionalOnProperty(prefix = "gc.starter.component", name = "DataRoomGlobalExceptionHandler", havingValue = "DataRoomGlobalExceptionHandler", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "DataRoomGlobalExceptionHandler", havingValue = "DataRoomGlobalExceptionHandler", matchIfMissing = true)
 public class DataRoomGlobalExceptionHandler {
 
     @PostConstruct
     public void init() {
         log.info(DataRoomConst.Console.LINE);
-        log.info("初始化默认全局异常处理，如果和项目中的全局异常处理冲突，可以在配置文件中配置gc.starter.component.DataRoomGlobalExceptionHandler=false禁用该全局异常处理");
+        log.info("初始化默认全局异常处理，如果和项目中的全局异常处理冲突，可以在配置文件中配置gc.starter.dataroom.component.DataRoomGlobalExceptionHandler=false禁用该全局异常处理");
         log.info(DataRoomConst.Console.LINE);
     }
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/basic/dao/PageDao.java → DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/basic/dao/DataRoomPageDao.java

@@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @Version 1.0.0
  */
 @Mapper
-public interface PageDao extends BaseMapper<PageEntity> {
+public interface DataRoomPageDao extends BaseMapper<PageEntity> {
 
 }

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/controller/BizComponentController.java

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
  * @date 2023/6/5 13:43
  */
 @Slf4j
-@RestController
+@RestController("dataRoomBizComponentController")
 @RequestMapping("/bigScreen/bizComponent")
 @Api(tags = "业务组件")
 @ApiSort(value = 110)

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/dao/BizComponentDao.java → DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/dao/DataRoomBizComponentDao.java

@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2023/6/5 11:39
  */
 @Mapper
-public interface BizComponentDao extends BaseMapper<BizComponentEntity> {
+public interface DataRoomBizComponentDao extends BaseMapper<BizComponentEntity> {
 }

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java

@@ -3,7 +3,7 @@ package com.gccloud.dataroom.core.module.biz.component.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gccloud.dataroom.core.config.DataRoomConfig;
-import com.gccloud.dataroom.core.module.biz.component.dao.BizComponentDao;
+import com.gccloud.dataroom.core.module.biz.component.dao.DataRoomBizComponentDao;
 import com.gccloud.dataroom.core.module.biz.component.dto.BizComponentSearchDTO;
 import com.gccloud.dataroom.core.module.biz.component.entity.BizComponentEntity;
 import com.gccloud.dataroom.core.module.biz.component.service.IBizComponentService;
@@ -28,8 +28,8 @@ import java.util.List;
  * @date 2023/6/5 13:35
  */
 @Slf4j
-@Service
-public class BizComponentServiceImpl extends ServiceImpl<BizComponentDao, BizComponentEntity> implements IBizComponentService {
+@Service("dataRoomBizComponentService")
+public class BizComponentServiceImpl extends ServiceImpl<DataRoomBizComponentDao, BizComponentEntity> implements IBizComponentService {
 
     @Resource
     private DataRoomConfig bigScreenConfig;

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java

@@ -16,6 +16,9 @@ import java.util.List;
 @Data
 public class CustomComponentChart extends Chart {
 
+    @ApiModelProperty(notes = "版本")
+    private String version;
+
     @ApiModelProperty(notes = "类型")
     private String type = PageDesignConstant.BigScreen.Type.CUSTOM_COMPONENT;
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java

@@ -58,6 +58,8 @@ public class ScreenDigitalFlopChart extends Chart {
         @ApiModelProperty(notes = "占位符")
         private String placeHolder;
 
+        @ApiModelProperty(notes = "高度")
+        private Integer height;
 
 
     }

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTablesChart.java

@@ -20,6 +20,9 @@ public class ScreenTablesChart extends Chart {
     @ApiModelProperty(notes = "数据源")
     private BaseChartDataSource dataSource;
 
+    @ApiModelProperty(notes = "版本")
+    private String version;
+
     @ApiModelProperty(notes = "类型")
     private String type = PageDesignConstant.BigScreen.Type.TABLES;
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/controller/ChartDataController.java

@@ -30,7 +30,7 @@ import java.util.List;
  * @date 2022/8/8 15:11
  */
 @Slf4j
-@RestController
+@RestController("dataRoomChartController")
 @RequestMapping("/bigScreen/chart/data")
 @Api(tags = "图表组件数据获取")
 public class ChartDataController {

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/BaseChartDataService.java

@@ -37,7 +37,7 @@ import java.util.*;
  */
 @Data
 @Slf4j
-@Service
+@Service("dataRoomBaseChartDataService")
 public class BaseChartDataService {
 
     @Resource

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/ChartMockData.java

@@ -19,7 +19,7 @@ import java.io.InputStream;
  * @date 2022/8/25 17:09
  */
 @Slf4j
-@Service("chartMockDataService")
+@Service("dataRoomChartMockDataService")
 public class ChartMockData {
 
     public static ChartDataVO getMockData(String type) {

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/controller/DataRoomFileController.java

@@ -73,6 +73,8 @@ public class DataRoomFileController extends SuperController {
     @ApiOperation(value = "获取所有文件后缀名", notes = "获取所有文件后缀名", produces = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
     public R<List<String>> getAllFileSuffix() {
     	List<String> extensions = fileService.getAllExtension();
+        // 移除空后缀
+        extensions.remove("");
     	return R.success(extensions);
     }
 

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomFileServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.Map;
  */
 @Service
 @Slf4j
-@ConditionalOnProperty(prefix = "gc.starter.component", name = "IDataRoomFileService", havingValue = "DataRoomFileServiceImpl", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "IDataRoomFileService", havingValue = "DataRoomFileServiceImpl", matchIfMissing = true)
 public class DataRoomFileServiceImpl extends ServiceImpl<DataRoomFileDao, DataRoomFileEntity> implements IDataRoomFileService {
 
     @Override

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomLocalFileServiceImpl.java

@@ -30,7 +30,7 @@ import java.net.URLEncoder;
  */
 @Service
 @Slf4j
-@ConditionalOnProperty(prefix = "gc.starter.component", name = "IDataRoomOssService", havingValue = "DataRoomLocalFileServiceImpl", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "IDataRoomOssService", havingValue = "DataRoomLocalFileServiceImpl", matchIfMissing = true)
 public class DataRoomLocalFileServiceImpl implements IDataRoomOssService {
 
     @Resource

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gccloud.dataroom.core.config.DataRoomConfig;
 import com.gccloud.dataroom.core.constant.PageDesignConstant;
-import com.gccloud.dataroom.core.module.basic.dao.PageDao;
+import com.gccloud.dataroom.core.module.basic.dao.DataRoomPageDao;
 import com.gccloud.dataroom.core.module.basic.entity.PageEntity;
 import com.gccloud.dataroom.core.module.chart.bean.Chart;
 import com.gccloud.dataroom.core.module.chart.components.datasource.DataSetDataSource;
@@ -41,7 +41,7 @@ import java.util.Objects;
  */
 @Service
 @Slf4j
-public class DataRoomPageServiceImpl extends ServiceImpl<PageDao, PageEntity> implements IDataRoomPageService {
+public class DataRoomPageServiceImpl extends ServiceImpl<DataRoomPageDao, PageEntity> implements IDataRoomPageService {
 
 
     @Resource

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/controller/PageTemplateController.java

@@ -28,7 +28,7 @@ import java.util.List;
  * @version 1.0
  * @date 2023/3/20 16:38
  */
-@RestController
+@RestController("dataRoomPageTemplateController")
 @RequestMapping("/bigScreen/template")
 @Api(tags = "页面模板")
 @ApiSort(value = 10)

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/dao/PageTemplateDao.java → DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/dao/DataRoomPageTemplateDao.java

@@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2023/3/20 16:41
  */
 @Mapper
-public interface PageTemplateDao extends BaseMapper<PageTemplateEntity> {
+public interface DataRoomPageTemplateDao extends BaseMapper<PageTemplateEntity> {
 }

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/service/impl/PageTemplateServiceImpl.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gccloud.dataroom.core.module.basic.dto.BasePageDTO;
 import com.gccloud.dataroom.core.module.chart.components.datasource.DataSetDataSource;
 import com.gccloud.dataroom.core.module.manage.dto.DataRoomPageDTO;
-import com.gccloud.dataroom.core.module.template.dao.PageTemplateDao;
+import com.gccloud.dataroom.core.module.template.dao.DataRoomPageTemplateDao;
 import com.gccloud.dataroom.core.module.template.dto.PageTemplateSearchDTO;
 import com.gccloud.dataroom.core.module.template.entity.PageTemplateEntity;
 import com.gccloud.dataroom.core.module.template.service.IPageTemplateService;
@@ -21,8 +21,8 @@ import java.util.List;
  * @version 1.0
  * @date 2023/3/20 16:38
  */
-@Service
-public class PageTemplateServiceImpl extends ServiceImpl<PageTemplateDao, PageTemplateEntity> implements IPageTemplateService {
+@Service("dataRoomPageTemplateService")
+public class PageTemplateServiceImpl extends ServiceImpl<DataRoomPageTemplateDao, PageTemplateEntity> implements IPageTemplateService {
     @Override
     public PageVO<PageTemplateEntity> getPage(PageTemplateSearchDTO searchDTO) {
         LambdaQueryWrapper<PageTemplateEntity> queryWrapper = new LambdaQueryWrapper<>();

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/controller/TypeController.java

@@ -24,7 +24,7 @@ import java.util.List;
  * @date 2023/5/26 9:44
  */
 @Slf4j
-@RestController
+@RestController("dataRoomTypeController")
 @RequestMapping("/bigScreen/type")
 @Api(tags = "分类管理")
 public class TypeController {

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/dao/TypeDao.java → DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/dao/DataRoomTypeDao.java

@@ -10,6 +10,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @Version 1.0.0
  */
 @Mapper
-public interface TypeDao extends BaseMapper<TypeEntity> {
+public interface DataRoomTypeDao extends BaseMapper<TypeEntity> {
 
 }

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/service/impl/TypeServiceImpl.java

@@ -2,7 +2,7 @@ package com.gccloud.dataroom.core.module.type.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gccloud.dataroom.core.module.type.dao.TypeDao;
+import com.gccloud.dataroom.core.module.type.dao.DataRoomTypeDao;
 import com.gccloud.dataroom.core.module.type.dto.TypeDTO;
 import com.gccloud.dataroom.core.module.type.entity.TypeEntity;
 import com.gccloud.dataroom.core.module.type.service.ITypeService;
@@ -22,8 +22,8 @@ import java.util.List;
  * @date 2023/5/26 9:42
  */
 @Slf4j
-@Service
-public class TypeServiceImpl extends ServiceImpl<TypeDao, TypeEntity> implements ITypeService {
+@Service("dataRoomTypeService")
+public class TypeServiceImpl extends ServiceImpl<DataRoomTypeDao, TypeEntity> implements ITypeService {
 
     @Override
     public String add(TypeDTO typeDTO) {

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/PermissionClient.java → DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/DataRoomPermissionClient.java

@@ -11,10 +11,10 @@ import javax.servlet.http.HttpServletRequest;
  * @date 2023/5/15 10:43
  */
 @Component
-public class PermissionClient {
+public class DataRoomPermissionClient {
 
     @Autowired(required = false)
-    private IPermissionService tokenService;
+    private IDataRoomPermissionService tokenService;
 
     public boolean verifyApiPermission(HttpServletRequest request, String... permissions) {
         boolean verify = true;

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/IPermissionService.java → DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/IDataRoomPermissionService.java

@@ -8,7 +8,7 @@ import javax.servlet.http.HttpServletRequest;
  * @version 1.0
  * @date 2023/5/15 10:38
  */
-public interface IPermissionService {
+public interface IDataRoomPermissionService {
 
     /**
      * 校验接口权限

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/LoginRequiredAspect.java

@@ -23,10 +23,10 @@ import java.util.Objects;
  */
 @Slf4j
 @Aspect
-@Component
+@Component("dataRoomLoginRequiredAspect")
 public class LoginRequiredAspect {
     @Resource
-    private PermissionClient tokenClient;
+    private DataRoomPermissionClient tokenClient;
 
     @Before("@annotation(loginRequired) || @within(loginRequired)")
     public void doBefore(JoinPoint joinPoint, ScreenPermission loginRequired) {

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/PagePermissionController.java

@@ -18,13 +18,13 @@ import javax.servlet.http.HttpServletRequest;
  * @date 2023/5/24 10:36
  */
 @Slf4j
-@RestController
+@RestController("dataRoomPagePermissionController")
 @RequestMapping("/bigScreen/permission")
 @Api(tags = "大屏页权限控制器")
 public class PagePermissionController {
 
     @Resource
-    private PermissionClient permissionClient;
+    private DataRoomPermissionClient permissionClient;
 
     @GetMapping("/check/{code}")
     @ApiOperation(value = "校验大屏页权限")

DataRoom/dataroom-server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>0.0.1.2023061401.Alpha</version>
+        <version>0.0.1.2023070402.Alpha</version>
     </parent>
 
     <artifactId>dataroom-server</artifactId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.gccloud</groupId>
             <artifactId>dataroom-core</artifactId>
-            <version>0.0.1.2023061401.Alpha</version>
+            <version>0.0.1.2023070402.Alpha</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>

DataRoom/dataroom-server/src/main/java/com/gccloud/dataroom/config/CorsBeanConfig.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 @Slf4j
 @Configuration
-@ConditionalOnProperty(prefix = "gc.starter.component", name = "CorsBeanConfig", havingValue = "CorsBeanConfig", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "CorsBeanConfig", havingValue = "CorsBeanConfig", matchIfMissing = true)
 public class CorsBeanConfig implements WebMvcConfigurer {
 
     @Override

DataRoom/doc/init.sql

@@ -13,6 +13,8 @@ CREATE TABLE `big_screen_file`
     `user_name`      varchar(20)  NOT NULL DEFAULT '' COMMENT '上传用户',
     `create_date`    timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_date`    timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `create_by`    bigint(64)  null default 2 comment '创建人',
+    `update_by`    bigint(64)  null default 2 comment '更新人',
     `del_flag`       tinyint(4)   NOT NULL DEFAULT '0' COMMENT '删除标记0:保留，1:删除',
     `bucket`         varchar(100) NOT NULL DEFAULT 'gc-starter' COMMENT '桶名称',
     PRIMARY KEY (`id`)
@@ -39,6 +41,8 @@ CREATE TABLE `big_screen_page`
     `app_code`    varchar(255) NOT NULL DEFAULT '' COMMENT '所属应用编码',
     `update_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     `create_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `create_by`    bigint(64)  null default 2 comment '创建人',
+    `update_by`    bigint(64)  null default 2 comment '更新人',
     `del_flag`    tinyint(1)   NOT NULL DEFAULT '0' COMMENT '删除标识符 1 删除 0未删',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
@@ -56,6 +60,8 @@ CREATE TABLE `big_screen_page_template`
     `remark`      varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '备注',
     `update_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     `create_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `create_by`    bigint(64)  null default 2 comment '创建人',
+    `update_by`    bigint(64)  null default 2 comment '更新人',
     `del_flag`    tinyint(4)                       NOT NULL DEFAULT '0' COMMENT '删除标记0:保留，1:删除',
     PRIMARY KEY (`id`)
 ) ENGINE = InnoDB
@@ -71,6 +77,8 @@ CREATE TABLE `big_screen_type` (
   `order_num`   bigint(64)   NOT NULL DEFAULT '0' COMMENT '排序',
   `update_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
   `create_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by`    bigint(64)  null default 2 comment '创建人',
+  `update_by`    bigint(64)  null default 2 comment '更新人',
   `del_flag` tinyint(2) NOT NULL DEFAULT '0' COMMENT '删除标识',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='大屏、资源库、组件库分类';
@@ -88,6 +96,8 @@ CREATE TABLE `big_screen_biz_component` (
     `remark`         varchar(100) NOT NULL DEFAULT '' COMMENT '备注',
     `update_date`    timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     `create_date`    timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `create_by`    bigint(64)  null default 2 comment '创建人',
+    `update_by`    bigint(64)  null default 2 comment '更新人',
     `module_code` varchar(255) NOT NULL DEFAULT '' COMMENT '模块编码',
     `del_flag` tinyint(2) NOT NULL DEFAULT '0' COMMENT '删除标识',
     PRIMARY KEY (`id`)
@@ -103,6 +113,8 @@ CREATE TABLE `ds_category_tree` (
   `module_code` varchar(255) DEFAULT NULL,
   `update_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
   `create_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by`    bigint(64)  null default 2 comment '创建人',
+  `update_by`    bigint(64)  null default 2 comment '更新人',
   `del_flag` tinyint(2) NOT NULL DEFAULT '0' COMMENT '删除标识',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='数据集种类树';
@@ -124,6 +136,8 @@ CREATE TABLE `ds_datasource` (
   `remark` varchar(255) DEFAULT NULL,
   `update_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
   `create_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by`    bigint(64)  null default 2 comment '创建人',
+  `update_by`    bigint(64)  null default 2 comment '更新人',
   `del_flag` tinyint(2) NOT NULL DEFAULT '0' COMMENT '删除标识',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='数据源配置表';
@@ -143,6 +157,31 @@ CREATE TABLE `ds_dataset` (
   `config` longtext COMMENT '数据集配置',
   `update_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
   `create_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by`    bigint(64)  null default 2 comment '创建人',
+  `update_by`    bigint(64)  null default 2 comment '更新人',
   `del_flag` tinyint(2) NOT NULL DEFAULT '0' COMMENT '删除标识',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB   DEFAULT CHARSET=utf8 COLLATE=utf8_general_mysql500_ci COMMENT='数据集表';
+) ENGINE=InnoDB   DEFAULT CHARSET=utf8 COLLATE=utf8_general_mysql500_ci COMMENT='数据集表';
+
+DROP TABLE IF EXISTS `ds_label`;
+CREATE TABLE `ds_label` (
+  `id` bigint(32) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `label_name` varchar(255) DEFAULT NULL COMMENT '标签名称',
+  `label_type` varchar(255) DEFAULT NULL COMMENT '标签类型',
+  `label_desc` varchar(255) DEFAULT NULL COMMENT '标签描述',
+  `update_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `create_by`    bigint(64)  null default 2 comment '创建人',
+  `update_by`    bigint(64)  null default 2 comment '更新人',
+  `del_flag` tinyint(2) NOT NULL DEFAULT '0' COMMENT '删除标识',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB   DEFAULT CHARSET=utf8 COLLATE=utf8_general_mysql500_ci COMMENT='标签';
+
+DROP TABLE IF EXISTS `ds_dataset_label`;
+CREATE TABLE `ds_dataset_label` (
+  `id` bigint(32) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `dataset_id` bigint(32) DEFAULT NULL COMMENT '数据集ID',
+  `label_id` bigint(32) DEFAULT NULL COMMENT '标签ID',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB   DEFAULT CHARSET=utf8 COLLATE=utf8_general_mysql500_ci COMMENT='数据集与标签关联表';
+

DataRoom/doc/update.sql

@@ -57,4 +57,24 @@ CREATE TABLE `ds_dataset` (
   `create_date` timestamp                        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `del_flag` tinyint(2) NOT NULL DEFAULT '0' COMMENT '删除标识',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB   DEFAULT CHARSET=utf8 COLLATE=utf8_general_mysql500_ci COMMENT='数据集表';
+) ENGINE=InnoDB   DEFAULT CHARSET=utf8 COLLATE=utf8_general_mysql500_ci COMMENT='数据集表';
+
+
+# 20230705 添加create_by、update_by
+ALTER TABLE `big_screen_page` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
+ALTER TABLE `big_screen_page` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
+ALTER TABLE `big_screen_file` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
+ALTER TABLE `big_screen_file` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
+ALTER TABLE `big_screen_biz_component` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
+ALTER TABLE `big_screen_biz_component` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
+ALTER TABLE `big_screen_page_template` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
+ALTER TABLE `big_screen_page_template` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
+ALTER TABLE `big_screen_type` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
+ALTER TABLE `big_screen_type` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
+
+ALTER TABLE `ds_datasource` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
+ALTER TABLE `ds_datasource` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
+ALTER TABLE `ds_dataset` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
+ALTER TABLE `ds_dataset` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;
+ALTER TABLE `ds_category_tree` ADD COLUMN `create_by` bigint(64) NULL DEFAULT 2 COMMENT '创建人' AFTER `del_flag`;
+ALTER TABLE `ds_category_tree` ADD COLUMN `update_by` bigint(64) NULL DEFAULT 2 COMMENT '更新人' AFTER `create_by`;

DataRoom/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>0.0.1.2023061401.Alpha</version>
+    <version>0.0.1.2023070402.Alpha</version>
 
     <packaging>pom</packaging>
     <description>基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入
@@ -59,6 +59,7 @@
         <postgresql.version>42.3.3</postgresql.version>
         <clickhouse.version>0.3.2</clickhouse.version>
         <commons-io.version>2.2</commons-io.version>
+        <dataset.core.version>0.0.1.2023070402.Alpha</dataset.core.version>
     </properties>
 
     <dependencyManagement>