public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-15 19:02:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.1' of github.com:dataease/dataease into v1.1

Browse Source
This commit is contained in:
taojinlong
2021-07-28 14:19:49 +08:00
parent 5897b9b683 167c59b7b7
commit a5fccc34de
7 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java
View File

@@ -12,6 +12,8 @@ import java.util.List;
public interface ExtChartViewMapper {
List<ChartViewDTO> search(ChartViewRequest request);
ChartViewDTO searchOne(ChartViewRequest request);
void chartCopy(@Param("newChartId")String newChartId,@Param("oldChartId")String oldChartId);
@Select("select id from chart_view where table_id = #{tableId}")

19
backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
View File

@@ -8,6 +8,25 @@
<result column="privileges" property="privileges"/>
</resultMap>
<select id="searchOne" resultMap="BaseResultMapDTO">
select
id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time,
style_priority,x_axis, y_axis, custom_attr, custom_style, custom_filter, snapshot,
get_auths(id,'chart',#{userId}) as `privileges`
from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'chart') cids) t,chart_view
<where>
FIND_IN_SET(chart_view.id,cids)
<if test="sceneId != null">
and scene_id = #{sceneId,jdbcType=VARCHAR}
</if>
<if test="id != null">
and id = #{id,jdbcType=VARCHAR}
</if>
</where>
<if test="sort != null">
order by ${sort}
</if>
</select>
<select id="search" resultMap="BaseResultMapDTO">
select

10
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@@ -79,8 +79,7 @@ public class ChartViewService {
Optional.ofNullable(chartView.getId()).ifPresent(id -> {
CacheUtils.remove(JdbcConstants.VIEW_CACHE_KEY, id);
});
return chartView;
return getOneWithPermission(chartView.getId());
}
public List<ChartViewDTO> list(ChartViewRequest chartViewRequest) {
@@ -115,6 +114,13 @@ public class ChartViewService {
return chartViewMapper.selectByPrimaryKey(id);
}
public ChartViewDTO getOneWithPermission(String id) {
ChartViewRequest chartViewRequest = new ChartViewRequest();
chartViewRequest.setId(id);
chartViewRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
return extChartViewMapper.searchOne(chartViewRequest);
}
public void delete(String id) {
chartViewMapper.deleteByPrimaryKey(id);
}