fix: 修改实现类、mapper、controller、bean等的bean名称，保证唯一，避免与dashboard同时使用时冲突；发布测试版本0.0.1.2023070402.Alpha

修改实现类、mapper、controller、bean等的bean名称，保证唯一，避免与dashboard同时使用时冲突；发布测试版本0.0.1.2023070402.Alpha

DataRoom/dataroom-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>0.0.1.2023070401.Alpha</version>
+        <version>0.0.1.2023070402.Alpha</version>
     </parent>
 
     <artifactId>dataroom-core</artifactId>

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/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/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/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/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/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/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/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/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.2023070401.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.2023070401.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/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>0.0.1.2023070401.Alpha</version>
+    <version>0.0.1.2023070402.Alpha</version>
 
     <packaging>pom</packaging>
     <description>基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入