Merge pull request #1300 from dataease/pr@dev@refactor_panel-speed

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

@@ -22,4 +22,6 @@ public interface ExtChartViewMapper {
     String searchAdviceSceneId(@Param("userId") String userId,@Param("panelId") String panelId);
 
     int checkSameDataSet(@Param("viewIdSource") String viewIdSource,@Param("viewIdTarget") String viewIdTarget);
+
+    ChartViewDTO searchOneWithPrivileges(@Param("userId") String userId,@Param("id") String id );
 }

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

@@ -8,6 +8,13 @@
         <result column="privileges" property="privileges"/>
     </resultMap>
 
+    <select id="searchOneWithPrivileges" resultMap="BaseResultMapDTO">
+        select
+        chart_view.*,
+        get_auths(id,'chart',#{userId}) as `privileges`
+        from chart_view where id = #{id}
+    </select>
+
     <select id="searchOne" resultMap="BaseResultMapDTO">
         select
         id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time,

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml

@@ -11,9 +11,8 @@
         select
         id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time,
         get_auths(id,'dataset',#{userId}) as `privileges`
-        from (select GET_V_AUTH_MODEL_ID_P_USE (#{userId}, 'dataset') cids) t,dataset_table
+        from dataset_table
         <where>
-            FIND_IN_SET(dataset_table.id,cids)
             <if test="id != null">
                 and id = #{id,jdbcType=VARCHAR}
             </if>

backend/src/main/java/io/dataease/controller/chart/ChartViewController.java

@@ -88,10 +88,6 @@ public class ChartViewController {
     public ChartViewDTO getOneWithPermission(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception {
         //如果能获取用户 则添加对应的权限
         ChartViewDTO dto = chartViewService.getData(id, requestList);
-        if (dto != null && AuthUtils.getUser() != null) {
-            ChartViewDTO permissionDto = chartViewService.getOneWithPermission(dto.getId());
-            dto.setPrivileges(permissionDto.getPrivileges());
-        }
         return dto;
     }
 

backend/src/main/java/io/dataease/controller/request/chart/ChartCalRequest.java

 package io.dataease.controller.request.chart;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
+import io.dataease.dto.chart.ChartViewDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +12,7 @@ import lombok.Data;
 @Data
 public class ChartCalRequest {
     @ApiModelProperty("视图")
-    private ChartViewWithBLOBs view;
+    private ChartViewDTO view;
     @ApiModelProperty("额外请求参数")
     private ChartExtRequest requestList;
 }

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -79,11 +79,6 @@ public class ChartViewService {
         Optional.ofNullable(chartView.getId()).ifPresent(id -> {
             CacheUtils.remove(JdbcConstants.VIEW_CACHE_KEY, id);
         });
-        try {
-            calcData(chartView, new ChartExtRequest(), true);
-        } catch (Exception e) {
-
-        }
         return getOneWithPermission(chartView.getId());
     }
 
@@ -167,12 +162,9 @@ public class ChartViewService {
     }
 
     public ChartViewDTO getOneWithPermission(String id) {
-        ChartViewRequest chartViewRequest = new ChartViewRequest();
-        chartViewRequest.setId(id);
-        chartViewRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
-        return extChartViewMapper.searchOne(chartViewRequest);
+        String userId = AuthUtils.getUser()!=null?String.valueOf(AuthUtils.getUser().getUserId()):"NONE";
+        return extChartViewMapper.searchOneWithPrivileges(userId,id);
     }
-
     public void delete(String id) {
         chartViewMapper.deleteByPrimaryKey(id);
     }
@@ -184,7 +176,7 @@ public class ChartViewService {
     }
 
     public ChartViewDTO getData(String id, ChartExtRequest request) throws Exception {
-        ChartViewWithBLOBs view = chartViewMapper.selectByPrimaryKey(id);
+        ChartViewDTO view = this.getOneWithPermission(id);
         // 如果是从仪表板获取视图数据，则仪表板的查询模式，查询结果的数量，覆盖视图对应的属性
         if (CommonConstants.VIEW_QUERY_FROM.PANEL.equals(request.getQueryFrom()) && CommonConstants.VIEW_RESULT_MODE.CUSTOM.equals(request.getResultMode())) {
             view.setResultMode(request.getResultMode());
@@ -193,7 +185,7 @@ public class ChartViewService {
         return calcData(view, request, request.isCache());
     }
 
-    public ChartViewDTO calcData(ChartViewWithBLOBs view, ChartExtRequest requestList, boolean cache) throws Exception {
+    public ChartViewDTO calcData(ChartViewDTO view, ChartExtRequest requestList, boolean cache) throws Exception {
         if (ObjectUtils.isEmpty(view)) {
             throw new RuntimeException(Translator.get("i18n_chart_delete"));
         }

frontend/src/api/dataset/dataset.js

@@ -80,7 +80,7 @@ export function listDatasource() {
 export function getTable(id, hideMsg = false) {
   return request({
     url: '/dataset/table/get/' + id,
-    loading: true,
+    loading: false,
     method: 'post',
     hideMsg: hideMsg
   })

frontend/src/views/dataset/group/Group.vue

@@ -428,8 +428,8 @@ export default {
               type: 'success',
               showClose: true
             })
-            _this.expandedArray.push(response.data.sceneId)
-            _this.$refs.datasetTreeRef.setCurrentKey(response.data.id)
+            _this.expandedArray.push(table.sceneId)
+            _this.$refs.datasetTreeRef.setCurrentKey(table.id)
             _this.treeNode()
             this.$store.dispatch('dataset/setTable', new Date().getTime())
           })