public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-16 11:21:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 解决冲突

Browse Source
This commit is contained in:
fit2cloud-chenyw
2026-04-24 15:20:29 +08:00
committed by fit2cloud-chenyw
parent e0a0a93297
commit d496dd522b
4 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/core-backend/src/main/java/io/dataease/visualization/dao/perext/ResourcePermissionMapper.java
View File

@@ -1,29 +0,0 @@
package io.dataease.visualization.dao.perext;
import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface ResourcePermissionMapper {
@Select("select `component_data` from data_visualization_info where id = #{id}")
String queryResourceData(@Param("id") Long id);
@Select("""
<script>
select cdg.* from core_dataset_group cdg
where EXISTS
(SELECT 1 FROM core_chart_view cv WHERE cv.table_id = cdg.id and cv.id IN
<foreach item='item' index='index' collection='viewIds' open='(' separator=',' close=')'>
#{item}
</foreach>
)
</script>
""")
List<CoreDatasetGroup> queryDataSetList(@Param("viewIds") List<Long> viewIds);
}

2
core/core-backend/src/main/java/io/dataease/visualization/manage/ResourcePermissionManage.java
View File

@@ -5,7 +5,7 @@ import io.dataease.api.dataset.union.DatasetTableInfoDTO;
import io.dataease.api.dataset.union.UnionDTO;
import io.dataease.api.report.bo.DatasetPermissionTemplate;
import io.dataease.api.report.bo.TableSysVariable;
import io.dataease.dataset.dao.auto.entity.CoreDatasetGroup;
import io.dataease.dao.auto.entity.CoreDatasetGroup;
import io.dataease.dataset.dao.auto.mapper.CoreDatasetGroupRepository;
import io.dataease.dataset.utils.DatasetTableTypeConstants;
import io.dataease.extensions.datasource.dto.DatasetTableDTO;

27
core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java
View File

@@ -4,8 +4,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.querydsl.core.types.Projections;
import com.querydsl.jpa.impl.JPAQueryFactory;
import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
import io.dataease.api.dataset.union.DatasetTableInfoDTO;
import io.dataease.api.dataset.union.UnionDTO;
import io.dataease.api.report.bo.DatasetPermissionTemplate;
import io.dataease.api.template.dto.TemplateManageFileDTO;
import io.dataease.api.template.dto.VisualizationTemplateExtendDataDTO;
@@ -56,9 +55,7 @@ import io.dataease.template.manage.TemplateCenterManage;
import io.dataease.utils.*;
import io.dataease.visualization.dao.auto.entity.*;
import io.dataease.visualization.dao.auto.mapper.*;
import io.dataease.visualization.manage.CoreBusiManage;
import io.dataease.visualization.manage.CoreVisualizationManage;
import io.dataease.visualization.manage.ResourcePermissionManage;
import io.dataease.visualization.manage.*;
import io.dataease.visualization.utils.VisualizationUtils;
import jakarta.annotation.Resource;
import jakarta.persistence.EntityManager;
@@ -1154,6 +1151,26 @@ public class DataVisualizationServer implements DataVisualizationApi {
return result;
}
@Override
public void exportLogApp(DataVisualizationBaseRequest request) throws Exception {
}
@Override
public void exportLogTemplate(DataVisualizationBaseRequest request) throws Exception {
}
@Override
public void exportLogPDF(DataVisualizationBaseRequest request) throws Exception {
}
@Override
public void exportLogImg(DataVisualizationBaseRequest request) throws Exception {
}
@Resource
private ResourcePermissionManage resourcePermissionManage;
@Override

2
de-xpack

Submodule de-xpack updated: 8f43962b17...32d87694ad