Merge branch 'master' of github.com:gcpaas/DataRoom

DataRoom/dataroom-core/pom.xml

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

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/extend/DataRoomExtendClient.java

@@ -0,0 +1,28 @@
+package com.gccloud.dataroom.core.module.manage.extend;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author hongyang
+ * @version 1.0
+ * @date 2023/8/1 15:10
+ */
+@Component
+public class DataRoomExtendClient {
+
+    @Autowired(required = false)
+    private IDataRoomExtendService extendService;
+
+
+    /**
+     * 删除大屏后的扩展方法
+     * @param code
+     */
+    public void deleteByCode(String code) {
+        if (extendService != null) {
+            extendService.deleteByCode(code);
+        }
+    }
+
+}

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/manage/extend/IDataRoomExtendService.java

@@ -0,0 +1,18 @@
+package com.gccloud.dataroom.core.module.manage.extend;
+
+/**
+ * 大屏扩展接口
+ * @author hongyang
+ * @version 1.0
+ * @date 2023/8/1 15:10
+ */
+public interface IDataRoomExtendService {
+
+    /**
+     * 大屏删除拓展
+     * 会在大屏删除后调用
+     * @param code
+     */
+    void deleteByCode(String code);
+
+}

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

@@ -10,6 +10,7 @@ import com.gccloud.dataroom.core.module.chart.bean.Chart;
 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.manage.dto.DataRoomSearchDTO;
+import com.gccloud.dataroom.core.module.manage.extend.DataRoomExtendClient;
 import com.gccloud.dataroom.core.module.manage.service.IDataRoomPageService;
 import com.gccloud.dataroom.core.module.template.entity.PageTemplateEntity;
 import com.gccloud.dataroom.core.module.template.service.IPageTemplateService;
@@ -50,6 +51,9 @@ public class DataRoomPageServiceImpl extends ServiceImpl<DataRoomPageDao, PageEn
     @Resource
     private DataRoomConfig bigScreenConfig;
 
+    @Resource
+    private DataRoomExtendClient dataRoomExtendClient;
+
     @Override
     public String add(DataRoomPageDTO bigScreenPageDTO) {
         if (StringUtils.isBlank(bigScreenPageDTO.getCode())) {
@@ -245,5 +249,7 @@ public class DataRoomPageServiceImpl extends ServiceImpl<DataRoomPageDao, PageEn
         LambdaQueryWrapper<PageEntity> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PageEntity::getCode, code);
         this.remove(queryWrapper);
+        // 调用拓展接口
+        dataRoomExtendClient.deleteByCode(code);
     }
 }

DataRoom/dataroom-server/pom.xml

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

DataRoom/pom.xml

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