diff --git a/DataRoom/README.md b/DataRoom/README.md index 74347e4e..77d2b49b 100644 --- a/DataRoom/README.md +++ b/DataRoom/README.md @@ -71,7 +71,7 @@ ``` -点击查询最新版本号 +点击查询最新版本号 ### 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 diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml index 08365bf6..7fae3474 100644 --- a/DataRoom/dataroom-core/pom.xml +++ b/DataRoom/dataroom-core/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 0.0.1.2023061401.Alpha + 0.0.1.2023070402.Alpha dataroom-core @@ -21,7 +21,7 @@ com.gccloud dataset-core - 0.0.1.2023062101.Alpha + ${dataset.core.version} org.springframework.boot diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java index 53cc776f..0b463f54 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java +++ b/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 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/exception/DataRoomGlobalExceptionHandler.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/exception/DataRoomGlobalExceptionHandler.java index 3ecbfbaf..be4e912b 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/exception/DataRoomGlobalExceptionHandler.java +++ b/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); } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/basic/dao/PageDao.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/basic/dao/DataRoomPageDao.java similarity index 81% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/basic/dao/PageDao.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/basic/dao/DataRoomPageDao.java index 920cac2e..73d84bb3 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/basic/dao/PageDao.java +++ b/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 { +public interface DataRoomPageDao extends BaseMapper { } \ No newline at end of file diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/controller/BizComponentController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/controller/BizComponentController.java index 019c72d5..68e88ce4 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/controller/BizComponentController.java +++ b/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) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/dao/BizComponentDao.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/dao/DataRoomBizComponentDao.java similarity index 79% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/dao/BizComponentDao.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/dao/DataRoomBizComponentDao.java index f7cd204d..261c3573 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/dao/BizComponentDao.java +++ b/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 { +public interface DataRoomBizComponentDao extends BaseMapper { } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java index f8d2f61a..25192e3d 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/biz/component/service/impl/BizComponentServiceImpl.java +++ b/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 implements IBizComponentService { +@Service("dataRoomBizComponentService") +public class BizComponentServiceImpl extends ServiceImpl implements IBizComponentService { @Resource private DataRoomConfig bigScreenConfig; diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java index b5c0ae78..91e08be6 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java +++ b/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; diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java index 322f3b2f..25f5c5cb 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDigitalFlopChart.java +++ b/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; } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTablesChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTablesChart.java index 15a2d2fa..b0a95f5d 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTablesChart.java +++ b/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; diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/controller/ChartDataController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/controller/ChartDataController.java index 6b110500..1b2207c2 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/controller/ChartDataController.java +++ b/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 { diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/BaseChartDataService.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/BaseChartDataService.java index b1aee9f3..73f8e5c1 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/BaseChartDataService.java +++ b/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 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/ChartMockData.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/ChartMockData.java index f898178d..7677dfb9 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/service/ChartMockData.java +++ b/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) { diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/controller/DataRoomFileController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/controller/DataRoomFileController.java index a60d023d..cc118f3c 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/controller/DataRoomFileController.java +++ b/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> getAllFileSuffix() { List extensions = fileService.getAllExtension(); + // 移除空后缀 + extensions.remove(""); return R.success(extensions); } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomFileServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomFileServiceImpl.java index a518801a..8920e5fe 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomFileServiceImpl.java +++ b/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 implements IDataRoomFileService { @Override diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomLocalFileServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomLocalFileServiceImpl.java index 39409011..f79f3d05 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/file/service/impl/DataRoomLocalFileServiceImpl.java +++ b/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 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java index 2f2e61a5..9093942f 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/service/impl/DataRoomPageServiceImpl.java +++ b/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 implements IDataRoomPageService { +public class DataRoomPageServiceImpl extends ServiceImpl implements IDataRoomPageService { @Resource diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/controller/PageTemplateController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/controller/PageTemplateController.java index e8649b30..99b3fc05 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/controller/PageTemplateController.java +++ b/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) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/dao/PageTemplateDao.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/dao/DataRoomPageTemplateDao.java similarity index 79% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/dao/PageTemplateDao.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/dao/DataRoomPageTemplateDao.java index 986ef5a3..ba9cf3b0 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/dao/PageTemplateDao.java +++ b/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 { +public interface DataRoomPageTemplateDao extends BaseMapper { } diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/service/impl/PageTemplateServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/service/impl/PageTemplateServiceImpl.java index 94d985a2..6d6bd7ea 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/template/service/impl/PageTemplateServiceImpl.java +++ b/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 implements IPageTemplateService { +@Service("dataRoomPageTemplateService") +public class PageTemplateServiceImpl extends ServiceImpl implements IPageTemplateService { @Override public PageVO getPage(PageTemplateSearchDTO searchDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/controller/TypeController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/controller/TypeController.java index c6e84a6c..b122c4cd 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/controller/TypeController.java +++ b/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 { diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/dao/TypeDao.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/dao/DataRoomTypeDao.java similarity index 81% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/dao/TypeDao.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/dao/DataRoomTypeDao.java index 158b863f..4fb63275 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/dao/TypeDao.java +++ b/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 { +public interface DataRoomTypeDao extends BaseMapper { } \ No newline at end of file diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/service/impl/TypeServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/service/impl/TypeServiceImpl.java index c45c9a96..672d34e7 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/type/service/impl/TypeServiceImpl.java +++ b/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 implements ITypeService { +@Service("dataRoomTypeService") +public class TypeServiceImpl extends ServiceImpl implements ITypeService { @Override public String add(TypeDTO typeDTO) { diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/PermissionClient.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/DataRoomPermissionClient.java similarity index 90% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/PermissionClient.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/DataRoomPermissionClient.java index 562a062a..c991e93d 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/PermissionClient.java +++ b/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; diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/IPermissionService.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/IDataRoomPermissionService.java similarity index 92% rename from DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/IPermissionService.java rename to DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/IDataRoomPermissionService.java index b82a707b..f1e1f722 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/IPermissionService.java +++ b/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 { /** * 校验接口权限 diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/LoginRequiredAspect.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/LoginRequiredAspect.java index 6495f50d..f82cce2d 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/LoginRequiredAspect.java +++ b/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) { diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/PagePermissionController.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/PagePermissionController.java index 8fa46b3f..9ac72efb 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/permission/PagePermissionController.java +++ b/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 = "校验大屏页权限") diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml index 65e5438a..2c2b4b0b 100644 --- a/DataRoom/dataroom-server/pom.xml +++ b/DataRoom/dataroom-server/pom.xml @@ -6,7 +6,7 @@ com.gccloud dataroom - 0.0.1.2023061401.Alpha + 0.0.1.2023070402.Alpha dataroom-server @@ -22,7 +22,7 @@ com.gccloud dataroom-core - 0.0.1.2023061401.Alpha + 0.0.1.2023070402.Alpha io.springfox diff --git a/DataRoom/dataroom-server/src/main/java/com/gccloud/dataroom/config/CorsBeanConfig.java b/DataRoom/dataroom-server/src/main/java/com/gccloud/dataroom/config/CorsBeanConfig.java index 532aa248..9aa25d97 100644 --- a/DataRoom/dataroom-server/src/main/java/com/gccloud/dataroom/config/CorsBeanConfig.java +++ b/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 diff --git a/DataRoom/doc/init.sql b/DataRoom/doc/init.sql index 7498aeed..f450ac01 100644 --- a/DataRoom/doc/init.sql +++ b/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='数据集表'; \ No newline at end of file +) 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='数据集与标签关联表'; + diff --git a/DataRoom/doc/update.sql b/DataRoom/doc/update.sql index 8d683b9d..055f2a0b 100644 --- a/DataRoom/doc/update.sql +++ b/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='数据集表'; \ No newline at end of file +) 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`; \ No newline at end of file diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml index d3317120..108eeb49 100644 --- a/DataRoom/pom.xml +++ b/DataRoom/pom.xml @@ -12,7 +12,7 @@ com.gccloud dataroom - 0.0.1.2023061401.Alpha + 0.0.1.2023070402.Alpha pom 基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入 @@ -59,6 +59,7 @@ 42.3.3 0.3.2 2.2 + 0.0.1.2023070402.Alpha