Merge branch 'dev' into pr@dev@refactor_filter_default_value

backend/pom.xml

@@ -10,7 +10,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>backend</artifactId>
-    
+
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -207,7 +207,7 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.5</version>
+            <version>1.6</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -419,19 +419,19 @@
     </build>
 
     <repositories>
-    <repository>
-        <id>pentaho-public</id>
-        <name>Pentaho Public</name>
-        <url>http://nexus.pentaho.org/content/groups/omni</url>
-        <releases>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-        </releases>
-        <snapshots>
-            <enabled>true</enabled>
-            <updatePolicy>always</updatePolicy>
-        </snapshots>
-    </repository>
+        <repository>
+            <id>pentaho-public</id>
+            <name>Pentaho Public</name>
+            <url>http://nexus.pentaho.org/content/groups/omni</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
     </repositories>
 
 </project>

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

@@ -9,4 +9,5 @@ public interface ExtDataSetTableMapper {
     List<DataSetTableDTO> search(DataSetTableRequest request);
 
     DataSetTableDTO searchOne(DataSetTableRequest request);
+
 }

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

@@ -7,6 +7,12 @@
         <result column="privileges" property="privileges"/>
     </resultMap>
 
+
+    <resultMap id="roleItemMap" type="io.dataease.controller.sys.response.RoleUserItem">
+        <id property="id" column="id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
     <select id="searchOne" resultMap="BaseResultMapDTO">
         select
         id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time,
@@ -93,4 +99,5 @@
         </where>
         ORDER BY CONVERT(`name` using gbk)
     </select>
+
 </mapper>

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

@@ -12,6 +12,7 @@
     <resultMap id="LinkJumpInfoMap" type="io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO" extends="io.dataease.base.mapper.PanelLinkJumpInfoMapper.BaseResultMap">
         <result column="source_field_id" jdbcType="VARCHAR" property="sourceFieldId"/>
         <result column="source_field_name" jdbcType="VARCHAR" property="sourceFieldName"/>
+        <result column="publicJumpId" jdbcType="VARCHAR" property="publicJumpId"/>
         <collection property="targetViewInfoList" ofType="io.dataease.base.domain.PanelLinkJumpTargetViewInfo">
             <result column="target_view_id" jdbcType="VARCHAR" property="targetViewId"/>
             <result column="target_field_id" jdbcType="VARCHAR" property="targetFieldId"/>
@@ -35,6 +36,7 @@
             panel_link_jump_info.jump_type,
             panel_link_jump_info.target_panel_id,
             panel_link_jump_info.content,
+            panel_link_mapping.id as publicJumpId,
             ifnull( panel_link_jump_info.checked, 0 ) AS checked,
             panel_link_jump_target_view_info.target_view_id,
             panel_link_jump_target_view_info.target_field_id
@@ -45,6 +47,7 @@
             LEFT JOIN panel_link_jump_info ON panel_link_jump.id = panel_link_jump_info.link_jump_id
             AND dataset_table_field.id = panel_link_jump_info.source_field_id
             LEFT JOIN panel_link_jump_target_view_info ON panel_link_jump_info.id = panel_link_jump_target_view_info.link_jump_info_id
+            LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id
         WHERE
             chart_view.id =#{source_view_id}
         ORDER BY

backend/src/main/java/io/dataease/dto/chart/ChartFieldCustomFilterDTO.java

 package io.dataease.dto.chart;
 
+import io.dataease.base.domain.DatasetTableField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +13,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class ChartFieldCustomFilterDTO implements Serializable {
+public class ChartFieldCustomFilterDTO extends ChartViewFieldBaseDTO implements Serializable {
     private List<ChartCustomFilterItemDTO> filter;
+
+    private DatasetTableField field;
 }

backend/src/main/java/io/dataease/dto/chart/ChartViewFieldBaseDTO.java

+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author gin
+ * @Date 2021/3/11 1:18 下午
+ */
+@Data
+public class ChartViewFieldBaseDTO implements Serializable {
+    private String id;
+
+    private String tableId;
+
+    private String originName;
+
+    private String dataeaseName;
+
+    private String name;
+
+    private String type;
+
+    private Boolean checked;
+
+    private Integer columnIndex;
+
+    private Long lastSyncTime;
+
+    private Integer deType;
+
+    private String summary;
+
+    private String sort;
+
+    private Integer deExtractType;
+
+    private String dateStyle;
+
+    private String datePattern;
+
+    private Integer extField;
+
+    private String chartType;
+
+    private ChartFieldCompareDTO compareCalc;
+
+    private String logic;
+}

backend/src/main/java/io/dataease/dto/chart/ChartViewFieldDTO.java

@@ -10,42 +10,6 @@ import java.util.List;
  * @Date 2021/3/11 1:18 下午
  */
 @Data
-public class ChartViewFieldDTO implements Serializable {
-    private String id;
-
-    private String tableId;
-
-    private String originName;
-
-    private String dataeaseName;
-
-    private String name;
-
-    private String type;
-
-    private Boolean checked;
-
-    private Integer columnIndex;
-
-    private Long lastSyncTime;
-
-    private Integer deType;
-
-    private String summary;
-
-    private String sort;
-
+public class ChartViewFieldDTO extends ChartViewFieldBaseDTO implements Serializable {
     private List<ChartViewFieldFilterDTO> filter;
-
-    private Integer deExtractType;
-
-    private String dateStyle;
-
-    private String datePattern;
-
-    private Integer extField;
-
-    private String chartType;
-
-    private ChartFieldCompareDTO compareCalc;
 }

backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java

@@ -19,6 +19,9 @@ public class PanelLinkJumpInfoDTO extends PanelLinkJumpInfo {
 
     private String sourceJumpInfo;
 
+    //存在公共链接的目标仪表板
+    private String publicJumpId;
+
     private List<PanelLinkJumpTargetViewInfo> targetViewInfoList=new ArrayList<>();// linkType = inner 时使用
 
 

backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java

+package io.dataease.plugins.server;
+
+import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.xpack.auth.dto.request.DataSetRowPermissionsDTO;
+import io.dataease.plugins.xpack.auth.dto.request.DatasetRowPermissions;
+import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetailDTO;
+import io.dataease.plugins.xpack.auth.service.RowPermissionService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+@RestController
+@RequestMapping("plugin/dataset/rowPermissions")
+public class RowPermissionsController {
+
+    @ApiOperation("保存")
+    @PostMapping("save")
+    public void save(@RequestBody DatasetRowPermissions datasetRowPermissions) throws Exception {
+        RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class);
+        rowPermissionService.save(datasetRowPermissions);
+    }
+
+    @ApiOperation("分页查询")
+    @PostMapping("/list")
+    public List<DataSetRowPermissionsDTO> rowPermissions(@RequestBody XpackSysAuthDetailDTO request) {
+        RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class);
+       return rowPermissionService.searchRowPermissions(request);
+    }
+
+    @ApiOperation("删除")
+    @GetMapping("/delete/{id}")
+    public void dataSetRowPermissionInfo(@PathVariable String id) {
+        RowPermissionService rowPermissionService = SpringContextUtil.getBean(RowPermissionService.class);
+        rowPermissionService.delete(id);
+    }
+
+}

backend/src/main/java/io/dataease/plugins/server/XAuthServer.java

@@ -41,7 +41,15 @@ public class XAuthServer {
     @I18n
     public List<XpackSysAuthDetail>authDetailsModel(@PathVariable String authType){
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
-        return sysAuthService.searchAuthDetailsModel(authType);
+        List<XpackSysAuthDetail> authDetails =  sysAuthService.searchAuthDetailsModel(authType);
+        if(authType.equalsIgnoreCase("dataset")){
+            XpackSysAuthDetail xpackSysAuthDetail = new XpackSysAuthDetail();
+            xpackSysAuthDetail.setPrivilegeName("i18n_auth_row_permission");
+            xpackSysAuthDetail.setPrivilegeType(20);
+            xpackSysAuthDetail.setPrivilegeValue(1);
+            authDetails.add(0,xpackSysAuthDetail);
+        }
+        return authDetails;
     }
 
     @PostMapping("/authChange")

backend/src/main/java/io/dataease/provider/query/QueryProvider.java

@@ -5,9 +5,9 @@ import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.Datasource;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.dto.datasource.JdbcConfiguration;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartFieldCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.query.pg.PgConstants;
 
@@ -23,52 +23,43 @@ public abstract class QueryProvider {
 
     public abstract String createSQLPreview(String sql, String orderBy);
 
-    public abstract String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds);
+    public abstract String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup);
+    public abstract String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds);
+    public abstract String createQueryTableWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup);
+    public abstract String createQuerySQLWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds);
+    public abstract String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup);
+    public abstract String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup, List<ChartFieldCustomFilterDTO> fieldCustomFilter);
 
-    public abstract String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLAsTmp(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
+    public abstract String getSQLAsTmp(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
 
-    public abstract String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQLTableInfo(String table, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQLAsTmpTableInfo(String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view);
+    public abstract String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, ChartViewWithBLOBs view);
 
-    public abstract String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view);
+    public abstract String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds, ChartViewWithBLOBs view);
 
-    public abstract String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view);
+    public abstract String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, ChartViewWithBLOBs view);
 
     public abstract String searchTable(String table);
 
-    public abstract String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
+    public abstract String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
 
     public Integer transFieldSize(String type) {
         return 50;
     }
 
-    /**
-     * 单指标汇总
-     *
-     * @param sql
-     * @param yAxis
-     * @param customFilter
-     * @param extFilterRequestList
-     * @return
-     */
-    public abstract String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
+    public abstract String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<ChartExtFilterRequest> extFilterRequestList, ChartViewWithBLOBs view);
 
     public abstract String wrapSql(String sql);
 
@@ -84,7 +75,19 @@ public abstract class QueryProvider {
         }
     }
 
-    public String convertTableToSql(String tableName, Datasource ds){
+    public String convertTableToSql(String tableName, Datasource ds) {
         return "select * from  TABLE_NAME".replace("TABLE_NAME", tableName);
     }
+
+    public String getLogic(String logic) {
+        if (logic != null) {
+            switch (logic) {
+                case "and":
+                    return "AND";
+                case "or":
+                    return "OR";
+            }
+        }
+        return "AND";
+    }
 }