Merge pull request #1195 from dataease/dev

Dev

Dockerfile

@@ -8,6 +8,10 @@ RUN mkdir -p /opt/dataease/data/feature/full
 
 ADD mapFiles/* /opt/dataease/data/feature/full/
 
+RUN mkdir -p /opt/dataease/drivers
+
+ADD drivers/* /opt/dataease/drivers/
+
 ADD backend/target/backend-$IMAGE_TAG.jar /opt/apps
 
 ENV JAVA_APP_JAR=/opt/apps/backend-$IMAGE_TAG.jar

backend/pom.xml

@@ -5,12 +5,13 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.3.0</version>
+        <version>1.4.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>backend</artifactId>
     
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <shiro.version>1.7.1</shiro.version>
@@ -200,7 +201,7 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.3</version>
+            <version>1.4</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -229,29 +230,19 @@
             <version>8.3.0.7-683</version>
         </dependency>
         <dependency>
-            <groupId>c3p0</groupId>
-            <artifactId>c3p0</artifactId>
-            <version>0.9.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>12.2.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>ru.yandex.clickhouse</groupId>
-            <artifactId>clickhouse-jdbc</artifactId>
-            <version>0.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>7.4.1.jre8</version>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.14</version>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.2.8</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>jconsole</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>tools</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
@@ -267,14 +258,34 @@
             </resource>
             <resource>
                 <directory>src/main/resources</directory>
-                <includes>
+                <!-- <includes>
                     <include>**/*</include>
-                </includes>
+                </includes> -->
+                <filtering>true</filtering>
+                <excludes>
+                    <exclude>static/**/*.woff</exclude>
+                    <exclude>static/**/*.woff2</exclude>
+                    <exclude>static/**/*.ttf</exclude>
+                </excludes>
+            </resource>
+
+            <resource>
+                <directory>src/main/resources</directory>
                 <filtering>false</filtering>
+                <includes>
+                    <include>static/**/*.woff</include>
+                    <include>static/**/*.woff2</include>
+                    <include>static/**/*.ttf</include>
+                </includes>
             </resource>
         </resources>
         <plugins>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -370,6 +381,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
+                        <?m2e execute onConfiguration?>
                         <id>main-class-placement</id>
                         <phase>generate-resources</phase>
                         <configuration>

backend/src/main/java/io/dataease/auth/api/AuthApi.java

@@ -5,6 +5,9 @@ import io.dataease.auth.api.dto.CurrentUserDto;
 import io.dataease.auth.api.dto.LoginDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import springfox.documentation.annotations.ApiIgnore;
+
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -49,4 +52,12 @@ public interface AuthApi {
     @PostMapping("/isOpenOidc")
     boolean isOpenOidc();
 
+    @ApiIgnore
+    @PostMapping("/isPluginLoaded")
+    boolean isPluginLoaded();
+
+    @ApiIgnore
+    @GetMapping("/getPublicKey")
+    String getPublicKey();
+
 }

backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java

@@ -19,6 +19,6 @@ public class LoginDto implements Serializable {
      * 1：ldap登录
      * 2：单点登录
      */
-    @ApiModelProperty(value = "登录方式", required = true, allowableValues = "0, 1, 2")
+    @ApiModelProperty(value = "登录方式{0:普通登录, 1:ldap登录}", required = true, allowableValues = "0, 1")
     private int loginType;
 }

backend/src/main/java/io/dataease/auth/config/F2CRealm.java

@@ -57,6 +57,9 @@ public class F2CRealm extends AuthorizingRealm {
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) throws AuthenticationException {
 
         if (auth instanceof ASKToken) {
+            if (!authUserService.pluginLoaded()) {
+                throw new AuthenticationException("license error");
+            }
 
             Object accessKey = auth.getPrincipal();
             Object signature = auth.getCredentials();
@@ -73,7 +76,7 @@ public class F2CRealm extends AuthorizingRealm {
             CacheUtils.get("lic_info", "lic");
         }catch (Exception e) {
             LogUtil.error(e);
-            throw new AuthenticationException("lic error");
+            throw new AuthenticationException("license error");
         }
 
         TokenInfo tokenInfo = null;

backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java

@@ -39,7 +39,8 @@ public class F2CLinkFilter extends AnonymousFilter {
                 panelLink.setPwd("dataease");
                 pwd = panelLink.getPwd();
             }else {
-                pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd());
+                /* pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd()); */
+                pwd = panelLink.getPwd();
             }
             return JWTUtils.verifyLink(link_token, id, pwd);
         }catch (Exception e) {

backend/src/main/java/io/dataease/auth/server/AuthServer.java

@@ -10,10 +10,7 @@ import io.dataease.auth.entity.TokenInfo;
 import io.dataease.auth.service.AuthUserService;
 import io.dataease.auth.util.JWTUtils;
 import io.dataease.auth.util.RsaUtil;
-import io.dataease.commons.utils.BeanUtils;
-import io.dataease.commons.utils.CodingUtil;
-import io.dataease.commons.utils.LogUtil;
-import io.dataease.commons.utils.ServletUtils;
+import io.dataease.commons.utils.*;
 import io.dataease.controller.sys.request.LdapAddRequest;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
@@ -55,10 +52,9 @@ public class AuthServer implements AuthApi {
 
     @Override
     public Object login(@RequestBody LoginDto loginDto) throws Exception {
-        String username = loginDto.getUsername();
-        String password = loginDto.getPassword();
+        String username = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, loginDto.getUsername());;
+        String pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, loginDto.getPassword());
 
-        String pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, password);
         // 增加ldap登录方式
         Integer loginType = loginDto.getLoginType();
         boolean isSupportLdap = authUserService.supportLdap();
@@ -77,11 +73,11 @@ public class AuthServer implements AuthApi {
                 ldapAddRequest.setEnabled(1L);
                 // ldapAddRequest.setDeptId(1L);
                 ldapAddRequest.setRoleIds(new ArrayList<Long>(){{add(2L);}});
-                sysUserService.validateExistUser(ldapUserEntity.getUserName(),  ldapUserEntity.getEmail());
+                sysUserService.validateExistUser(ldapUserEntity.getUsername(), ldapUserEntity.getNickname(), ldapUserEntity.getEmail());
                 sysUserService.saveLdapUsers(ldapAddRequest);
             }
             
-            username = validateResult.getData().getUserName();
+            username = validateResult.getData().getUsername();
         }
         // 增加ldap登录方式
 
@@ -184,6 +180,18 @@ public class AuthServer implements AuthApi {
         return authUserService.supportOidc();
     }
 
+    @Override
+    public boolean isPluginLoaded() {
+        Boolean licValid = PluginUtils.licValid();
+        if(!licValid) return false;
+        return authUserService.pluginLoaded();
+    }
+
+
+    @Override
+    public String getPublicKey() {
+        return RsaProperties.publicKey;
+    }
     
 
     /*@Override

backend/src/main/java/io/dataease/auth/service/AuthUserService.java

@@ -29,6 +29,8 @@ public interface AuthUserService {
 
     Boolean supportOidc();
 
+    Boolean pluginLoaded();
+
 
 
 }

backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java

@@ -8,6 +8,7 @@ import io.dataease.base.mapper.ext.AuthMapper;
 import io.dataease.auth.service.AuthUserService;
 import io.dataease.commons.constants.AuthConstants;
 import io.dataease.commons.utils.LogUtil;
+import io.dataease.plugins.common.service.PluginCommonService;
 import io.dataease.plugins.config.SpringContextUtil;
 import io.dataease.plugins.xpack.ldap.service.LdapXpackService;
 import io.dataease.plugins.xpack.oidc.service.OidcXpackService;
@@ -137,5 +138,16 @@ public class AuthUserServiceImpl implements AuthUserService {
         return oidcXpackService.isSuuportOIDC();
     }
 
+    @Override
+    public Boolean pluginLoaded() {
+        Map<String, PluginCommonService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType((PluginCommonService.class));
+        if(beansOfType.keySet().size() == 0) return false;
+        PluginCommonService pluginCommonService = SpringContextUtil.getBean(PluginCommonService.class);
+        if(ObjectUtils.isEmpty(pluginCommonService)) return false;
+        return pluginCommonService.isPluginLoaded();
+    }
+
+    
+
     
 }

backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java

@@ -41,12 +41,21 @@ public class ShiroServiceImpl implements ShiroService {
         filterChainDefinitionMap.put("/link/**", ANON);
         filterChainDefinitionMap.put("/index.html", ANON);
         filterChainDefinitionMap.put("/link.html", ANON);
+        filterChainDefinitionMap.put("/xggznb/**", ANON);
+
+
+        //获取主题信息
+        filterChainDefinitionMap.put("/plugin/theme/themes", ANON);
+        filterChainDefinitionMap.put("/plugin/theme/items/**", ANON);
 
         //验证链接
         filterChainDefinitionMap.put("/api/link/validate**", ANON);
         filterChainDefinitionMap.put("/api/map/areaEntitys/**", ANON);
+        filterChainDefinitionMap.put("/dataset/field/fieldValues/**", ANON);
+        filterChainDefinitionMap.put("/linkJump/queryPanelJumpInfo/**", ANON);
+
         //未读消息数量
-        filterChainDefinitionMap.put("/api/sys_msg/unReadCount", ANON);
+        // filterChainDefinitionMap.put("/api/sys_msg/unReadCount/**", ANON);
 
         filterChainDefinitionMap.put("/**/*.json", ANON);
         filterChainDefinitionMap.put("/system/ui/**", ANON);
@@ -56,10 +65,12 @@ public class ShiroServiceImpl implements ShiroService {
         // filterChainDefinitionMap.put("/axios.map", ANON);
 
         filterChainDefinitionMap.put("/api/auth/login", ANON);
-        // filterChainDefinitionMap.put("/api/auth/logout", ANON);
+        filterChainDefinitionMap.put("/api/auth/isPluginLoaded", ANON);
+        filterChainDefinitionMap.put("/system/requestTimeOut", ANON);
         filterChainDefinitionMap.put("/api/auth/validateName", ANON);
         filterChainDefinitionMap.put("/api/auth/isOpenLdap", ANON);
         filterChainDefinitionMap.put("/api/auth/isOpenOidc", ANON);
+        filterChainDefinitionMap.put("/api/auth/getPublicKey", ANON);
         filterChainDefinitionMap.put("/api/pluginCommon/component/*", ANON);
         filterChainDefinitionMap.put("/plugin/oidc/authInfo", ANON);
         filterChainDefinitionMap.put("/sso/callBack*", ANON);

backend/src/main/java/io/dataease/base/domain/ChartView.java

@@ -17,6 +17,12 @@ public class ChartView implements Serializable {
     private String tableId;
     @ApiModelProperty("图表类型")
     private String type;
+    @ApiModelProperty("chart渲染方式")
+    private String render;
+    @ApiModelProperty("展示结果")
+    private Integer resultCount;
+    @ApiModelProperty("展示模式")
+    private String resultMode;
     @ApiModelProperty("标题")
     private String title;
     @ApiModelProperty("创建人")

backend/src/main/java/io/dataease/base/domain/ChartViewExample.java

@@ -454,6 +454,206 @@ public class ChartViewExample {
             return (Criteria) this;
         }
 
+        public Criteria andRenderIsNull() {
+            addCriterion("render is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderIsNotNull() {
+            addCriterion("render is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderEqualTo(String value) {
+            addCriterion("render =", value, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderNotEqualTo(String value) {
+            addCriterion("render <>", value, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderGreaterThan(String value) {
+            addCriterion("render >", value, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderGreaterThanOrEqualTo(String value) {
+            addCriterion("render >=", value, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderLessThan(String value) {
+            addCriterion("render <", value, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderLessThanOrEqualTo(String value) {
+            addCriterion("render <=", value, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderLike(String value) {
+            addCriterion("render like", value, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderNotLike(String value) {
+            addCriterion("render not like", value, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderIn(List<String> values) {
+            addCriterion("render in", values, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderNotIn(List<String> values) {
+            addCriterion("render not in", values, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderBetween(String value1, String value2) {
+            addCriterion("render between", value1, value2, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andRenderNotBetween(String value1, String value2) {
+            addCriterion("render not between", value1, value2, "render");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountIsNull() {
+            addCriterion("result_count is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountIsNotNull() {
+            addCriterion("result_count is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountEqualTo(Integer value) {
+            addCriterion("result_count =", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountNotEqualTo(Integer value) {
+            addCriterion("result_count <>", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountGreaterThan(Integer value) {
+            addCriterion("result_count >", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("result_count >=", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountLessThan(Integer value) {
+            addCriterion("result_count <", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountLessThanOrEqualTo(Integer value) {
+            addCriterion("result_count <=", value, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountIn(List<Integer> values) {
+            addCriterion("result_count in", values, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountNotIn(List<Integer> values) {
+            addCriterion("result_count not in", values, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountBetween(Integer value1, Integer value2) {
+            addCriterion("result_count between", value1, value2, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("result_count not between", value1, value2, "resultCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeIsNull() {
+            addCriterion("result_mode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeIsNotNull() {
+            addCriterion("result_mode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeEqualTo(String value) {
+            addCriterion("result_mode =", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeNotEqualTo(String value) {
+            addCriterion("result_mode <>", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeGreaterThan(String value) {
+            addCriterion("result_mode >", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeGreaterThanOrEqualTo(String value) {
+            addCriterion("result_mode >=", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeLessThan(String value) {
+            addCriterion("result_mode <", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeLessThanOrEqualTo(String value) {
+            addCriterion("result_mode <=", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeLike(String value) {
+            addCriterion("result_mode like", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeNotLike(String value) {
+            addCriterion("result_mode not like", value, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeIn(List<String> values) {
+            addCriterion("result_mode in", values, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeNotIn(List<String> values) {
+            addCriterion("result_mode not in", values, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeBetween(String value1, String value2) {
+            addCriterion("result_mode between", value1, value2, "resultMode");
+            return (Criteria) this;
+        }
+
+        public Criteria andResultModeNotBetween(String value1, String value2) {
+            addCriterion("result_mode not between", value1, value2, "resultMode");
+            return (Criteria) this;
+        }
+
         public Criteria andTitleIsNull() {
             addCriterion("title is null");
             return (Criteria) this;

backend/src/main/java/io/dataease/base/domain/PanelLink.java

@@ -13,5 +13,7 @@ public class PanelLink implements Serializable {
 
     private String pwd;
 
+    private Long overTime;
+
     private static final long serialVersionUID = 1L;
 }

backend/src/main/java/io/dataease/base/domain/PanelLinkExample.java

@@ -363,6 +363,66 @@ public class PanelLinkExample {
             addCriterion("pwd not between", value1, value2, "pwd");
             return (Criteria) this;
         }
+
+        public Criteria andOverTimeIsNull() {
+            addCriterion("over_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeIsNotNull() {
+            addCriterion("over_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeEqualTo(Long value) {
+            addCriterion("over_time =", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotEqualTo(Long value) {
+            addCriterion("over_time <>", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeGreaterThan(Long value) {
+            addCriterion("over_time >", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeGreaterThanOrEqualTo(Long value) {
+            addCriterion("over_time >=", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeLessThan(Long value) {
+            addCriterion("over_time <", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeLessThanOrEqualTo(Long value) {
+            addCriterion("over_time <=", value, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeIn(List<Long> values) {
+            addCriterion("over_time in", values, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotIn(List<Long> values) {
+            addCriterion("over_time not in", values, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeBetween(Long value1, Long value2) {
+            addCriterion("over_time between", value1, value2, "overTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOverTimeNotBetween(Long value1, Long value2) {
+            addCriterion("over_time not between", value1, value2, "overTime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

backend/src/main/java/io/dataease/base/domain/PanelLinkJump.java

@@ -0,0 +1,19 @@
+package io.dataease.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class PanelLinkJump implements Serializable {
+    private String id;
+
+    private String sourcePanelId;
+
+    private String sourceViewId;
+
+    private String linkJumpInfo;
+
+    private Boolean checked;
+
+    private static final long serialVersionUID = 1L;
+}

backend/src/main/java/io/dataease/base/domain/PanelLinkJumpExample.java

@@ -0,0 +1,540 @@
+package io.dataease.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PanelLinkJumpExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PanelLinkJumpExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdIsNull() {
+            addCriterion("source_panel_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdIsNotNull() {
+            addCriterion("source_panel_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdEqualTo(String value) {
+            addCriterion("source_panel_id =", value, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdNotEqualTo(String value) {
+            addCriterion("source_panel_id <>", value, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdGreaterThan(String value) {
+            addCriterion("source_panel_id >", value, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdGreaterThanOrEqualTo(String value) {
+            addCriterion("source_panel_id >=", value, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdLessThan(String value) {
+            addCriterion("source_panel_id <", value, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdLessThanOrEqualTo(String value) {
+            addCriterion("source_panel_id <=", value, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdLike(String value) {
+            addCriterion("source_panel_id like", value, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdNotLike(String value) {
+            addCriterion("source_panel_id not like", value, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdIn(List<String> values) {
+            addCriterion("source_panel_id in", values, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdNotIn(List<String> values) {
+            addCriterion("source_panel_id not in", values, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdBetween(String value1, String value2) {
+            addCriterion("source_panel_id between", value1, value2, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourcePanelIdNotBetween(String value1, String value2) {
+            addCriterion("source_panel_id not between", value1, value2, "sourcePanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdIsNull() {
+            addCriterion("source_view_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdIsNotNull() {
+            addCriterion("source_view_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdEqualTo(String value) {
+            addCriterion("source_view_id =", value, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdNotEqualTo(String value) {
+            addCriterion("source_view_id <>", value, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdGreaterThan(String value) {
+            addCriterion("source_view_id >", value, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdGreaterThanOrEqualTo(String value) {
+            addCriterion("source_view_id >=", value, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdLessThan(String value) {
+            addCriterion("source_view_id <", value, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdLessThanOrEqualTo(String value) {
+            addCriterion("source_view_id <=", value, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdLike(String value) {
+            addCriterion("source_view_id like", value, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdNotLike(String value) {
+            addCriterion("source_view_id not like", value, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdIn(List<String> values) {
+            addCriterion("source_view_id in", values, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdNotIn(List<String> values) {
+            addCriterion("source_view_id not in", values, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdBetween(String value1, String value2) {
+            addCriterion("source_view_id between", value1, value2, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceViewIdNotBetween(String value1, String value2) {
+            addCriterion("source_view_id not between", value1, value2, "sourceViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIsNull() {
+            addCriterion("link_jump_info is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIsNotNull() {
+            addCriterion("link_jump_info is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoEqualTo(String value) {
+            addCriterion("link_jump_info =", value, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoNotEqualTo(String value) {
+            addCriterion("link_jump_info <>", value, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoGreaterThan(String value) {
+            addCriterion("link_jump_info >", value, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoGreaterThanOrEqualTo(String value) {
+            addCriterion("link_jump_info >=", value, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoLessThan(String value) {
+            addCriterion("link_jump_info <", value, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoLessThanOrEqualTo(String value) {
+            addCriterion("link_jump_info <=", value, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoLike(String value) {
+            addCriterion("link_jump_info like", value, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoNotLike(String value) {
+            addCriterion("link_jump_info not like", value, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIn(List<String> values) {
+            addCriterion("link_jump_info in", values, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoNotIn(List<String> values) {
+            addCriterion("link_jump_info not in", values, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoBetween(String value1, String value2) {
+            addCriterion("link_jump_info between", value1, value2, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoNotBetween(String value1, String value2) {
+            addCriterion("link_jump_info not between", value1, value2, "linkJumpInfo");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedIsNull() {
+            addCriterion("`checked` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedIsNotNull() {
+            addCriterion("`checked` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedEqualTo(Boolean value) {
+            addCriterion("`checked` =", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedNotEqualTo(Boolean value) {
+            addCriterion("`checked` <>", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedGreaterThan(Boolean value) {
+            addCriterion("`checked` >", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("`checked` >=", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedLessThan(Boolean value) {
+            addCriterion("`checked` <", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedLessThanOrEqualTo(Boolean value) {
+            addCriterion("`checked` <=", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedIn(List<Boolean> values) {
+            addCriterion("`checked` in", values, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedNotIn(List<Boolean> values) {
+            addCriterion("`checked` not in", values, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedBetween(Boolean value1, Boolean value2) {
+            addCriterion("`checked` between", value1, value2, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("`checked` not between", value1, value2, "checked");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfo.java

@@ -0,0 +1,25 @@
+package io.dataease.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class PanelLinkJumpInfo implements Serializable {
+    private String id;
+
+    private String linkJumpId;
+
+    private String linkType;
+
+    private String jumpType;
+
+    private String targetPanelId;
+
+    private String sourceFieldId;
+
+    private String content;
+
+    private Boolean checked;
+
+    private static final long serialVersionUID = 1L;
+}

backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfoExample.java

@@ -0,0 +1,750 @@
+package io.dataease.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PanelLinkJumpInfoExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PanelLinkJumpInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdIsNull() {
+            addCriterion("link_jump_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdIsNotNull() {
+            addCriterion("link_jump_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdEqualTo(String value) {
+            addCriterion("link_jump_id =", value, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdNotEqualTo(String value) {
+            addCriterion("link_jump_id <>", value, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdGreaterThan(String value) {
+            addCriterion("link_jump_id >", value, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdGreaterThanOrEqualTo(String value) {
+            addCriterion("link_jump_id >=", value, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdLessThan(String value) {
+            addCriterion("link_jump_id <", value, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdLessThanOrEqualTo(String value) {
+            addCriterion("link_jump_id <=", value, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdLike(String value) {
+            addCriterion("link_jump_id like", value, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdNotLike(String value) {
+            addCriterion("link_jump_id not like", value, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdIn(List<String> values) {
+            addCriterion("link_jump_id in", values, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdNotIn(List<String> values) {
+            addCriterion("link_jump_id not in", values, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdBetween(String value1, String value2) {
+            addCriterion("link_jump_id between", value1, value2, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpIdNotBetween(String value1, String value2) {
+            addCriterion("link_jump_id not between", value1, value2, "linkJumpId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeIsNull() {
+            addCriterion("link_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeIsNotNull() {
+            addCriterion("link_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeEqualTo(String value) {
+            addCriterion("link_type =", value, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeNotEqualTo(String value) {
+            addCriterion("link_type <>", value, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeGreaterThan(String value) {
+            addCriterion("link_type >", value, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("link_type >=", value, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeLessThan(String value) {
+            addCriterion("link_type <", value, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeLessThanOrEqualTo(String value) {
+            addCriterion("link_type <=", value, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeLike(String value) {
+            addCriterion("link_type like", value, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeNotLike(String value) {
+            addCriterion("link_type not like", value, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeIn(List<String> values) {
+            addCriterion("link_type in", values, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeNotIn(List<String> values) {
+            addCriterion("link_type not in", values, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeBetween(String value1, String value2) {
+            addCriterion("link_type between", value1, value2, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkTypeNotBetween(String value1, String value2) {
+            addCriterion("link_type not between", value1, value2, "linkType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeIsNull() {
+            addCriterion("jump_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeIsNotNull() {
+            addCriterion("jump_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeEqualTo(String value) {
+            addCriterion("jump_type =", value, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeNotEqualTo(String value) {
+            addCriterion("jump_type <>", value, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeGreaterThan(String value) {
+            addCriterion("jump_type >", value, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("jump_type >=", value, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeLessThan(String value) {
+            addCriterion("jump_type <", value, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeLessThanOrEqualTo(String value) {
+            addCriterion("jump_type <=", value, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeLike(String value) {
+            addCriterion("jump_type like", value, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeNotLike(String value) {
+            addCriterion("jump_type not like", value, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeIn(List<String> values) {
+            addCriterion("jump_type in", values, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeNotIn(List<String> values) {
+            addCriterion("jump_type not in", values, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeBetween(String value1, String value2) {
+            addCriterion("jump_type between", value1, value2, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andJumpTypeNotBetween(String value1, String value2) {
+            addCriterion("jump_type not between", value1, value2, "jumpType");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdIsNull() {
+            addCriterion("target_panel_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdIsNotNull() {
+            addCriterion("target_panel_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdEqualTo(String value) {
+            addCriterion("target_panel_id =", value, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdNotEqualTo(String value) {
+            addCriterion("target_panel_id <>", value, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdGreaterThan(String value) {
+            addCriterion("target_panel_id >", value, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdGreaterThanOrEqualTo(String value) {
+            addCriterion("target_panel_id >=", value, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdLessThan(String value) {
+            addCriterion("target_panel_id <", value, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdLessThanOrEqualTo(String value) {
+            addCriterion("target_panel_id <=", value, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdLike(String value) {
+            addCriterion("target_panel_id like", value, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdNotLike(String value) {
+            addCriterion("target_panel_id not like", value, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdIn(List<String> values) {
+            addCriterion("target_panel_id in", values, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdNotIn(List<String> values) {
+            addCriterion("target_panel_id not in", values, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdBetween(String value1, String value2) {
+            addCriterion("target_panel_id between", value1, value2, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetPanelIdNotBetween(String value1, String value2) {
+            addCriterion("target_panel_id not between", value1, value2, "targetPanelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdIsNull() {
+            addCriterion("source_field_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdIsNotNull() {
+            addCriterion("source_field_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdEqualTo(String value) {
+            addCriterion("source_field_id =", value, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdNotEqualTo(String value) {
+            addCriterion("source_field_id <>", value, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdGreaterThan(String value) {
+            addCriterion("source_field_id >", value, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdGreaterThanOrEqualTo(String value) {
+            addCriterion("source_field_id >=", value, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdLessThan(String value) {
+            addCriterion("source_field_id <", value, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdLessThanOrEqualTo(String value) {
+            addCriterion("source_field_id <=", value, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdLike(String value) {
+            addCriterion("source_field_id like", value, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdNotLike(String value) {
+            addCriterion("source_field_id not like", value, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdIn(List<String> values) {
+            addCriterion("source_field_id in", values, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdNotIn(List<String> values) {
+            addCriterion("source_field_id not in", values, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdBetween(String value1, String value2) {
+            addCriterion("source_field_id between", value1, value2, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceFieldIdNotBetween(String value1, String value2) {
+            addCriterion("source_field_id not between", value1, value2, "sourceFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNull() {
+            addCriterion("content is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIsNotNull() {
+            addCriterion("content is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentEqualTo(String value) {
+            addCriterion("content =", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotEqualTo(String value) {
+            addCriterion("content <>", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThan(String value) {
+            addCriterion("content >", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentGreaterThanOrEqualTo(String value) {
+            addCriterion("content >=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThan(String value) {
+            addCriterion("content <", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLessThanOrEqualTo(String value) {
+            addCriterion("content <=", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentLike(String value) {
+            addCriterion("content like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotLike(String value) {
+            addCriterion("content not like", value, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentIn(List<String> values) {
+            addCriterion("content in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotIn(List<String> values) {
+            addCriterion("content not in", values, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentBetween(String value1, String value2) {
+            addCriterion("content between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentNotBetween(String value1, String value2) {
+            addCriterion("content not between", value1, value2, "content");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedIsNull() {
+            addCriterion("`checked` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedIsNotNull() {
+            addCriterion("`checked` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedEqualTo(Boolean value) {
+            addCriterion("`checked` =", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedNotEqualTo(Boolean value) {
+            addCriterion("`checked` <>", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedGreaterThan(Boolean value) {
+            addCriterion("`checked` >", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("`checked` >=", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedLessThan(Boolean value) {
+            addCriterion("`checked` <", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedLessThanOrEqualTo(Boolean value) {
+            addCriterion("`checked` <=", value, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedIn(List<Boolean> values) {
+            addCriterion("`checked` in", values, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedNotIn(List<Boolean> values) {
+            addCriterion("`checked` not in", values, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedBetween(Boolean value1, Boolean value2) {
+            addCriterion("`checked` between", value1, value2, "checked");
+            return (Criteria) this;
+        }
+
+        public Criteria andCheckedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("`checked` not between", value1, value2, "checked");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

backend/src/main/java/io/dataease/base/domain/PanelLinkJumpTargetViewInfo.java

@@ -0,0 +1,17 @@
+package io.dataease.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class PanelLinkJumpTargetViewInfo implements Serializable {
+    private String targetId;
+
+    private String linkJumpInfoId;
+
+    private String targetViewId;
+
+    private String targetFieldId;
+
+    private static final long serialVersionUID = 1L;
+}

backend/src/main/java/io/dataease/base/domain/PanelLinkJumpTargetViewInfoExample.java

@@ -0,0 +1,480 @@
+package io.dataease.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PanelLinkJumpTargetViewInfoExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PanelLinkJumpTargetViewInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andTargetIdIsNull() {
+            addCriterion("target_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdIsNotNull() {
+            addCriterion("target_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdEqualTo(String value) {
+            addCriterion("target_id =", value, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdNotEqualTo(String value) {
+            addCriterion("target_id <>", value, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdGreaterThan(String value) {
+            addCriterion("target_id >", value, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdGreaterThanOrEqualTo(String value) {
+            addCriterion("target_id >=", value, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdLessThan(String value) {
+            addCriterion("target_id <", value, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdLessThanOrEqualTo(String value) {
+            addCriterion("target_id <=", value, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdLike(String value) {
+            addCriterion("target_id like", value, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdNotLike(String value) {
+            addCriterion("target_id not like", value, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdIn(List<String> values) {
+            addCriterion("target_id in", values, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdNotIn(List<String> values) {
+            addCriterion("target_id not in", values, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdBetween(String value1, String value2) {
+            addCriterion("target_id between", value1, value2, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetIdNotBetween(String value1, String value2) {
+            addCriterion("target_id not between", value1, value2, "targetId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdIsNull() {
+            addCriterion("link_jump_info_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdIsNotNull() {
+            addCriterion("link_jump_info_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdEqualTo(String value) {
+            addCriterion("link_jump_info_id =", value, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdNotEqualTo(String value) {
+            addCriterion("link_jump_info_id <>", value, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdGreaterThan(String value) {
+            addCriterion("link_jump_info_id >", value, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdGreaterThanOrEqualTo(String value) {
+            addCriterion("link_jump_info_id >=", value, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdLessThan(String value) {
+            addCriterion("link_jump_info_id <", value, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdLessThanOrEqualTo(String value) {
+            addCriterion("link_jump_info_id <=", value, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdLike(String value) {
+            addCriterion("link_jump_info_id like", value, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdNotLike(String value) {
+            addCriterion("link_jump_info_id not like", value, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdIn(List<String> values) {
+            addCriterion("link_jump_info_id in", values, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdNotIn(List<String> values) {
+            addCriterion("link_jump_info_id not in", values, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdBetween(String value1, String value2) {
+            addCriterion("link_jump_info_id between", value1, value2, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLinkJumpInfoIdNotBetween(String value1, String value2) {
+            addCriterion("link_jump_info_id not between", value1, value2, "linkJumpInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdIsNull() {
+            addCriterion("target_view_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdIsNotNull() {
+            addCriterion("target_view_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdEqualTo(String value) {
+            addCriterion("target_view_id =", value, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdNotEqualTo(String value) {
+            addCriterion("target_view_id <>", value, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdGreaterThan(String value) {
+            addCriterion("target_view_id >", value, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdGreaterThanOrEqualTo(String value) {
+            addCriterion("target_view_id >=", value, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdLessThan(String value) {
+            addCriterion("target_view_id <", value, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdLessThanOrEqualTo(String value) {
+            addCriterion("target_view_id <=", value, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdLike(String value) {
+            addCriterion("target_view_id like", value, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdNotLike(String value) {
+            addCriterion("target_view_id not like", value, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdIn(List<String> values) {
+            addCriterion("target_view_id in", values, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdNotIn(List<String> values) {
+            addCriterion("target_view_id not in", values, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdBetween(String value1, String value2) {
+            addCriterion("target_view_id between", value1, value2, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetViewIdNotBetween(String value1, String value2) {
+            addCriterion("target_view_id not between", value1, value2, "targetViewId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdIsNull() {
+            addCriterion("target_field_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdIsNotNull() {
+            addCriterion("target_field_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdEqualTo(String value) {
+            addCriterion("target_field_id =", value, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdNotEqualTo(String value) {
+            addCriterion("target_field_id <>", value, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdGreaterThan(String value) {
+            addCriterion("target_field_id >", value, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdGreaterThanOrEqualTo(String value) {
+            addCriterion("target_field_id >=", value, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdLessThan(String value) {
+            addCriterion("target_field_id <", value, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdLessThanOrEqualTo(String value) {
+            addCriterion("target_field_id <=", value, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdLike(String value) {
+            addCriterion("target_field_id like", value, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdNotLike(String value) {
+            addCriterion("target_field_id not like", value, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdIn(List<String> values) {
+            addCriterion("target_field_id in", values, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdNotIn(List<String> values) {
+            addCriterion("target_field_id not in", values, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdBetween(String value1, String value2) {
+            addCriterion("target_field_id between", value1, value2, "targetFieldId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTargetFieldIdNotBetween(String value1, String value2) {
+            addCriterion("target_field_id not between", value1, value2, "targetFieldId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

backend/src/main/java/io/dataease/base/domain/PanelLinkMapping.java

@@ -0,0 +1,13 @@
+package io.dataease.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class PanelLinkMapping implements Serializable {
+    private Long id;
+
+    private String resourceId;
+
+    private static final long serialVersionUID = 1L;
+}

backend/src/main/java/io/dataease/base/domain/PanelLinkMappingExample.java

@@ -0,0 +1,330 @@
+package io.dataease.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PanelLinkMappingExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public PanelLinkMappingExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdIsNull() {
+            addCriterion("resource_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdIsNotNull() {
+            addCriterion("resource_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdEqualTo(String value) {
+            addCriterion("resource_id =", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdNotEqualTo(String value) {
+            addCriterion("resource_id <>", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdGreaterThan(String value) {
+            addCriterion("resource_id >", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdGreaterThanOrEqualTo(String value) {
+            addCriterion("resource_id >=", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdLessThan(String value) {
+            addCriterion("resource_id <", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdLessThanOrEqualTo(String value) {
+            addCriterion("resource_id <=", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdLike(String value) {
+            addCriterion("resource_id like", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdNotLike(String value) {
+            addCriterion("resource_id not like", value, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdIn(List<String> values) {
+            addCriterion("resource_id in", values, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdNotIn(List<String> values) {
+            addCriterion("resource_id not in", values, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdBetween(String value1, String value2) {
+            addCriterion("resource_id between", value1, value2, "resourceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andResourceIdNotBetween(String value1, String value2) {
+            addCriterion("resource_id not between", value1, value2, "resourceId");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java

@@ -2,10 +2,12 @@ package io.dataease.base.domain;
 
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel("消息渠道")
 public class SysMsgChannel implements Serializable {
 
     @ApiModelProperty("消息渠道ID")

backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java

@@ -2,10 +2,12 @@ package io.dataease.base.domain;
 
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel("订阅信息")
 public class SysMsgSetting implements Serializable {
     @ApiModelProperty(hidden = true)
     private Long msgSettingId;

backend/src/main/java/io/dataease/base/domain/SysMsgType.java

@@ -2,10 +2,12 @@ package io.dataease.base.domain;
 
 import java.io.Serializable;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
+@ApiModel("消息类型")
 public class SysMsgType implements Serializable {
 
     @ApiModelProperty("消息类型ID")
@@ -17,10 +19,10 @@ public class SysMsgType implements Serializable {
     @ApiModelProperty("消息类型名称")
     private String typeName;
 
-    @ApiModelProperty(hidden = true)
+    @ApiModelProperty("回调路由")
     private String router;
 
-    @ApiModelProperty(hidden = true)
+    @ApiModelProperty("回调函数")
     private String callback;
 
     private static final long serialVersionUID = 1L;

backend/src/main/java/io/dataease/base/domain/SysUser.java

@@ -1,44 +1,64 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class SysUser implements Serializable {
+    @ApiModelProperty("ID")
     private Long userId;
 
+    @ApiModelProperty("组织ID")
     private Long deptId;
 
+    @ApiModelProperty("账号")
     private String username;
 
+    @ApiModelProperty("姓名")
     private String nickName;
 
+    @ApiModelProperty("性别")
     private String gender;
 
+    @ApiModelProperty("电话")
     private String phone;
 
+    @ApiModelProperty("邮箱")
     private String email;
 
+    @ApiModelProperty(hidden = true)
     private String password;
 
+    @ApiModelProperty("是否管理员")
     private Boolean isAdmin;
 
+    @ApiModelProperty("状态")
     private Long enabled;
 
+    @ApiModelProperty("创建人")
     private String createBy;
 
+    @ApiModelProperty("修改人")
     private String updateBy;
 
+    @ApiModelProperty("密码重置时间")
     private Long pwdResetTime;
 
+    @ApiModelProperty("创建时间")
     private Long createTime;
 
+    @ApiModelProperty("修改时间")
     private Long updateTime;
 
+    @ApiModelProperty("语言")
     private String language;
 
+    @ApiModelProperty("用户来源")
     private Integer from;
 
+    @ApiModelProperty(hidden = true)
     private String sub;
 
     private static final long serialVersionUID = 1L;

backend/src/main/java/io/dataease/base/domain/VAuthModel.java

@@ -0,0 +1,23 @@
+package io.dataease.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class VAuthModel implements Serializable {
+    private String id;
+
+    private String pid;
+
+    private String nodeType;
+
+    private String modelType;
+
+    private String modelInnerType;
+
+    private String authType;
+
+    private String createBy;
+
+    private static final long serialVersionUID = 1L;
+}

backend/src/main/java/io/dataease/base/domain/VAuthModelExample.java

@@ -0,0 +1,690 @@
+package io.dataease.base.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class VAuthModelExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public VAuthModelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNull() {
+            addCriterion("pid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("pid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(String value) {
+            addCriterion("pid =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(String value) {
+            addCriterion("pid <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(String value) {
+            addCriterion("pid >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(String value) {
+            addCriterion("pid >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(String value) {
+            addCriterion("pid <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(String value) {
+            addCriterion("pid <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLike(String value) {
+            addCriterion("pid like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotLike(String value) {
+            addCriterion("pid not like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<String> values) {
+            addCriterion("pid in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<String> values) {
+            addCriterion("pid not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(String value1, String value2) {
+            addCriterion("pid between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(String value1, String value2) {
+            addCriterion("pid not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeIsNull() {
+            addCriterion("node_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeIsNotNull() {
+            addCriterion("node_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeEqualTo(String value) {
+            addCriterion("node_type =", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeNotEqualTo(String value) {
+            addCriterion("node_type <>", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeGreaterThan(String value) {
+            addCriterion("node_type >", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("node_type >=", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeLessThan(String value) {
+            addCriterion("node_type <", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeLessThanOrEqualTo(String value) {
+            addCriterion("node_type <=", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeLike(String value) {
+            addCriterion("node_type like", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeNotLike(String value) {
+            addCriterion("node_type not like", value, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeIn(List<String> values) {
+            addCriterion("node_type in", values, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeNotIn(List<String> values) {
+            addCriterion("node_type not in", values, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeBetween(String value1, String value2) {
+            addCriterion("node_type between", value1, value2, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andNodeTypeNotBetween(String value1, String value2) {
+            addCriterion("node_type not between", value1, value2, "nodeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeIsNull() {
+            addCriterion("model_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeIsNotNull() {
+            addCriterion("model_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeEqualTo(String value) {
+            addCriterion("model_type =", value, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeNotEqualTo(String value) {
+            addCriterion("model_type <>", value, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeGreaterThan(String value) {
+            addCriterion("model_type >", value, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("model_type >=", value, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeLessThan(String value) {
+            addCriterion("model_type <", value, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeLessThanOrEqualTo(String value) {
+            addCriterion("model_type <=", value, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeLike(String value) {
+            addCriterion("model_type like", value, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeNotLike(String value) {
+            addCriterion("model_type not like", value, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeIn(List<String> values) {
+            addCriterion("model_type in", values, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeNotIn(List<String> values) {
+            addCriterion("model_type not in", values, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeBetween(String value1, String value2) {
+            addCriterion("model_type between", value1, value2, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelTypeNotBetween(String value1, String value2) {
+            addCriterion("model_type not between", value1, value2, "modelType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeIsNull() {
+            addCriterion("model_inner_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeIsNotNull() {
+            addCriterion("model_inner_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeEqualTo(String value) {
+            addCriterion("model_inner_type =", value, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeNotEqualTo(String value) {
+            addCriterion("model_inner_type <>", value, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeGreaterThan(String value) {
+            addCriterion("model_inner_type >", value, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("model_inner_type >=", value, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeLessThan(String value) {
+            addCriterion("model_inner_type <", value, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeLessThanOrEqualTo(String value) {
+            addCriterion("model_inner_type <=", value, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeLike(String value) {
+            addCriterion("model_inner_type like", value, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeNotLike(String value) {
+            addCriterion("model_inner_type not like", value, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeIn(List<String> values) {
+            addCriterion("model_inner_type in", values, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeNotIn(List<String> values) {
+            addCriterion("model_inner_type not in", values, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeBetween(String value1, String value2) {
+            addCriterion("model_inner_type between", value1, value2, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andModelInnerTypeNotBetween(String value1, String value2) {
+            addCriterion("model_inner_type not between", value1, value2, "modelInnerType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeIsNull() {
+            addCriterion("auth_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeIsNotNull() {
+            addCriterion("auth_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeEqualTo(String value) {
+            addCriterion("auth_type =", value, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeNotEqualTo(String value) {
+            addCriterion("auth_type <>", value, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeGreaterThan(String value) {
+            addCriterion("auth_type >", value, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("auth_type >=", value, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeLessThan(String value) {
+            addCriterion("auth_type <", value, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeLessThanOrEqualTo(String value) {
+            addCriterion("auth_type <=", value, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeLike(String value) {
+            addCriterion("auth_type like", value, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeNotLike(String value) {
+            addCriterion("auth_type not like", value, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeIn(List<String> values) {
+            addCriterion("auth_type in", values, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeNotIn(List<String> values) {
+            addCriterion("auth_type not in", values, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeBetween(String value1, String value2) {
+            addCriterion("auth_type between", value1, value2, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthTypeNotBetween(String value1, String value2) {
+            addCriterion("auth_type not between", value1, value2, "authType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNull() {
+            addCriterion("create_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIsNotNull() {
+            addCriterion("create_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByEqualTo(String value) {
+            addCriterion("create_by =", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotEqualTo(String value) {
+            addCriterion("create_by <>", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThan(String value) {
+            addCriterion("create_by >", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByGreaterThanOrEqualTo(String value) {
+            addCriterion("create_by >=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThan(String value) {
+            addCriterion("create_by <", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLessThanOrEqualTo(String value) {
+            addCriterion("create_by <=", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByLike(String value) {
+            addCriterion("create_by like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotLike(String value) {
+            addCriterion("create_by not like", value, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByIn(List<String> values) {
+            addCriterion("create_by in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotIn(List<String> values) {
+            addCriterion("create_by not in", values, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByBetween(String value1, String value2) {
+            addCriterion("create_by between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateByNotBetween(String value1, String value2) {
+            addCriterion("create_by not between", value1, value2, "createBy");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

backend/src/main/java/io/dataease/base/domain/VAuthModelWithBLOBs.java

@@ -0,0 +1,17 @@
+package io.dataease.base.domain;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class VAuthModelWithBLOBs extends VAuthModel implements Serializable {
+    private String name;
+
+    private String label;
+
+    private static final long serialVersionUID = 1L;
+}

backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml

@@ -7,6 +7,9 @@
     <result column="scene_id" jdbcType="VARCHAR" property="sceneId" />
     <result column="table_id" jdbcType="VARCHAR" property="tableId" />
     <result column="type" jdbcType="VARCHAR" property="type" />
+    <result column="render" jdbcType="VARCHAR" property="render" />
+    <result column="result_count" jdbcType="INTEGER" property="resultCount" />
+    <result column="result_mode" jdbcType="VARCHAR" property="resultMode" />
     <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
@@ -84,8 +87,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time, 
-    style_priority
+    id, `name`, scene_id, table_id, `type`, render, result_count, result_mode, title, 
+    create_by, create_time, update_time, style_priority
   </sql>
   <sql id="Blob_Column_List">
     x_axis, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter, 
@@ -141,14 +144,16 @@
   </delete>
   <insert id="insert" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
     insert into chart_view (id, `name`, scene_id, 
-      table_id, `type`, title, 
+      table_id, `type`, render, 
+      result_count, result_mode, title, 
       create_by, create_time, update_time, 
       style_priority, x_axis, y_axis, 
       y_axis_ext, ext_stack, ext_bubble, 
       custom_attr, custom_style, custom_filter, 
       drill_fields, snapshot)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, 
-      #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
+      #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{render,jdbcType=VARCHAR}, 
+      #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
       #{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, 
       #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, 
@@ -173,6 +178,15 @@
       <if test="type != null">
         `type`,
       </if>
+      <if test="render != null">
+        render,
+      </if>
+      <if test="resultCount != null">
+        result_count,
+      </if>
+      <if test="resultMode != null">
+        result_mode,
+      </if>
       <if test="title != null">
         title,
       </if>
@@ -235,6 +249,15 @@
       <if test="type != null">
         #{type,jdbcType=VARCHAR},
       </if>
+      <if test="render != null">
+        #{render,jdbcType=VARCHAR},
+      </if>
+      <if test="resultCount != null">
+        #{resultCount,jdbcType=INTEGER},
+      </if>
+      <if test="resultMode != null">
+        #{resultMode,jdbcType=VARCHAR},
+      </if>
       <if test="title != null">
         #{title,jdbcType=VARCHAR},
       </if>
@@ -306,6 +329,15 @@
       <if test="record.type != null">
         `type` = #{record.type,jdbcType=VARCHAR},
       </if>
+      <if test="record.render != null">
+        render = #{record.render,jdbcType=VARCHAR},
+      </if>
+      <if test="record.resultCount != null">
+        result_count = #{record.resultCount,jdbcType=INTEGER},
+      </if>
+      <if test="record.resultMode != null">
+        result_mode = #{record.resultMode,jdbcType=VARCHAR},
+      </if>
       <if test="record.title != null">
         title = #{record.title,jdbcType=VARCHAR},
       </if>
@@ -363,6 +395,9 @@
       scene_id = #{record.sceneId,jdbcType=VARCHAR},
       table_id = #{record.tableId,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
+      render = #{record.render,jdbcType=VARCHAR},
+      result_count = #{record.resultCount,jdbcType=INTEGER},
+      result_mode = #{record.resultMode,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
@@ -389,6 +424,9 @@
       scene_id = #{record.sceneId,jdbcType=VARCHAR},
       table_id = #{record.tableId,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
+      render = #{record.render,jdbcType=VARCHAR},
+      result_count = #{record.resultCount,jdbcType=INTEGER},
+      result_mode = #{record.resultMode,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
@@ -413,6 +451,15 @@
       <if test="type != null">
         `type` = #{type,jdbcType=VARCHAR},
       </if>
+      <if test="render != null">
+        render = #{render,jdbcType=VARCHAR},
+      </if>
+      <if test="resultCount != null">
+        result_count = #{resultCount,jdbcType=INTEGER},
+      </if>
+      <if test="resultMode != null">
+        result_mode = #{resultMode,jdbcType=VARCHAR},
+      </if>
       <if test="title != null">
         title = #{title,jdbcType=VARCHAR},
       </if>
@@ -467,6 +514,9 @@
       scene_id = #{sceneId,jdbcType=VARCHAR},
       table_id = #{tableId,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
+      render = #{render,jdbcType=VARCHAR},
+      result_count = #{resultCount,jdbcType=INTEGER},
+      result_mode = #{resultMode,jdbcType=VARCHAR},
       title = #{title,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
@@ -490,6 +540,9 @@
       scene_id = #{sceneId,jdbcType=VARCHAR},
       table_id = #{tableId,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
+      render = #{render,jdbcType=VARCHAR},
+      result_count = #{resultCount,jdbcType=INTEGER},
+      result_mode = #{resultMode,jdbcType=VARCHAR},
       title = #{title,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},

backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.java

@@ -0,0 +1,30 @@
+package io.dataease.base.mapper;
+
+import io.dataease.base.domain.PanelLinkJumpInfo;
+import io.dataease.base.domain.PanelLinkJumpInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PanelLinkJumpInfoMapper {
+    long countByExample(PanelLinkJumpInfoExample example);
+
+    int deleteByExample(PanelLinkJumpInfoExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(PanelLinkJumpInfo record);
+
+    int insertSelective(PanelLinkJumpInfo record);
+
+    List<PanelLinkJumpInfo> selectByExample(PanelLinkJumpInfoExample example);
+
+    PanelLinkJumpInfo selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") PanelLinkJumpInfo record, @Param("example") PanelLinkJumpInfoExample example);
+
+    int updateByExample(@Param("record") PanelLinkJumpInfo record, @Param("example") PanelLinkJumpInfoExample example);
+
+    int updateByPrimaryKeySelective(PanelLinkJumpInfo record);
+
+    int updateByPrimaryKey(PanelLinkJumpInfo record);
+}

backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml

@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.PanelLinkJumpInfoMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.base.domain.PanelLinkJumpInfo">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="link_jump_id" jdbcType="VARCHAR" property="linkJumpId" />
+    <result column="link_type" jdbcType="VARCHAR" property="linkType" />
+    <result column="jump_type" jdbcType="VARCHAR" property="jumpType" />
+    <result column="target_panel_id" jdbcType="VARCHAR" property="targetPanelId" />
+    <result column="source_field_id" jdbcType="VARCHAR" property="sourceFieldId" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="checked" jdbcType="BIT" property="checked" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, link_jump_id, link_type, jump_type, target_panel_id, source_field_id, content, 
+    `checked`
+  </sql>
+  <select id="selectByExample" parameterType="io.dataease.base.domain.PanelLinkJumpInfoExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from panel_link_jump_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from panel_link_jump_info
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from panel_link_jump_info
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.base.domain.PanelLinkJumpInfoExample">
+    delete from panel_link_jump_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.base.domain.PanelLinkJumpInfo">
+    insert into panel_link_jump_info (id, link_jump_id, link_type, 
+      jump_type, target_panel_id, source_field_id, 
+      content, `checked`)
+    values (#{id,jdbcType=VARCHAR}, #{linkJumpId,jdbcType=VARCHAR}, #{linkType,jdbcType=VARCHAR}, 
+      #{jumpType,jdbcType=VARCHAR}, #{targetPanelId,jdbcType=VARCHAR}, #{sourceFieldId,jdbcType=VARCHAR}, 
+      #{content,jdbcType=VARCHAR}, #{checked,jdbcType=BIT})
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelLinkJumpInfo">
+    insert into panel_link_jump_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="linkJumpId != null">
+        link_jump_id,
+      </if>
+      <if test="linkType != null">
+        link_type,
+      </if>
+      <if test="jumpType != null">
+        jump_type,
+      </if>
+      <if test="targetPanelId != null">
+        target_panel_id,
+      </if>
+      <if test="sourceFieldId != null">
+        source_field_id,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+      <if test="checked != null">
+        `checked`,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="linkJumpId != null">
+        #{linkJumpId,jdbcType=VARCHAR},
+      </if>
+      <if test="linkType != null">
+        #{linkType,jdbcType=VARCHAR},
+      </if>
+      <if test="jumpType != null">
+        #{jumpType,jdbcType=VARCHAR},
+      </if>
+      <if test="targetPanelId != null">
+        #{targetPanelId,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceFieldId != null">
+        #{sourceFieldId,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="checked != null">
+        #{checked,jdbcType=BIT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.base.domain.PanelLinkJumpInfoExample" resultType="java.lang.Long">
+    select count(*) from panel_link_jump_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update panel_link_jump_info
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linkJumpId != null">
+        link_jump_id = #{record.linkJumpId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linkType != null">
+        link_type = #{record.linkType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jumpType != null">
+        jump_type = #{record.jumpType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.targetPanelId != null">
+        target_panel_id = #{record.targetPanelId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sourceFieldId != null">
+        source_field_id = #{record.sourceFieldId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.content != null">
+        content = #{record.content,jdbcType=VARCHAR},
+      </if>
+      <if test="record.checked != null">
+        `checked` = #{record.checked,jdbcType=BIT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update panel_link_jump_info
+    set id = #{record.id,jdbcType=VARCHAR},
+      link_jump_id = #{record.linkJumpId,jdbcType=VARCHAR},
+      link_type = #{record.linkType,jdbcType=VARCHAR},
+      jump_type = #{record.jumpType,jdbcType=VARCHAR},
+      target_panel_id = #{record.targetPanelId,jdbcType=VARCHAR},
+      source_field_id = #{record.sourceFieldId,jdbcType=VARCHAR},
+      content = #{record.content,jdbcType=VARCHAR},
+      `checked` = #{record.checked,jdbcType=BIT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.PanelLinkJumpInfo">
+    update panel_link_jump_info
+    <set>
+      <if test="linkJumpId != null">
+        link_jump_id = #{linkJumpId,jdbcType=VARCHAR},
+      </if>
+      <if test="linkType != null">
+        link_type = #{linkType,jdbcType=VARCHAR},
+      </if>
+      <if test="jumpType != null">
+        jump_type = #{jumpType,jdbcType=VARCHAR},
+      </if>
+      <if test="targetPanelId != null">
+        target_panel_id = #{targetPanelId,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceFieldId != null">
+        source_field_id = #{sourceFieldId,jdbcType=VARCHAR},
+      </if>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="checked != null">
+        `checked` = #{checked,jdbcType=BIT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.PanelLinkJumpInfo">
+    update panel_link_jump_info
+    set link_jump_id = #{linkJumpId,jdbcType=VARCHAR},
+      link_type = #{linkType,jdbcType=VARCHAR},
+      jump_type = #{jumpType,jdbcType=VARCHAR},
+      target_panel_id = #{targetPanelId,jdbcType=VARCHAR},
+      source_field_id = #{sourceFieldId,jdbcType=VARCHAR},
+      content = #{content,jdbcType=VARCHAR},
+      `checked` = #{checked,jdbcType=BIT}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.java

@@ -0,0 +1,30 @@
+package io.dataease.base.mapper;
+
+import io.dataease.base.domain.PanelLinkJump;
+import io.dataease.base.domain.PanelLinkJumpExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PanelLinkJumpMapper {
+    long countByExample(PanelLinkJumpExample example);
+
+    int deleteByExample(PanelLinkJumpExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(PanelLinkJump record);
+
+    int insertSelective(PanelLinkJump record);
+
+    List<PanelLinkJump> selectByExample(PanelLinkJumpExample example);
+
+    PanelLinkJump selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") PanelLinkJump record, @Param("example") PanelLinkJumpExample example);
+
+    int updateByExample(@Param("record") PanelLinkJump record, @Param("example") PanelLinkJumpExample example);
+
+    int updateByPrimaryKeySelective(PanelLinkJump record);
+
+    int updateByPrimaryKey(PanelLinkJump record);
+}

backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.xml

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.PanelLinkJumpMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.base.domain.PanelLinkJump">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="source_panel_id" jdbcType="VARCHAR" property="sourcePanelId" />
+    <result column="source_view_id" jdbcType="VARCHAR" property="sourceViewId" />
+    <result column="link_jump_info" jdbcType="VARCHAR" property="linkJumpInfo" />
+    <result column="checked" jdbcType="BIT" property="checked" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, source_panel_id, source_view_id, link_jump_info, `checked`
+  </sql>
+  <select id="selectByExample" parameterType="io.dataease.base.domain.PanelLinkJumpExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from panel_link_jump
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from panel_link_jump
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from panel_link_jump
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.base.domain.PanelLinkJumpExample">
+    delete from panel_link_jump
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.base.domain.PanelLinkJump">
+    insert into panel_link_jump (id, source_panel_id, source_view_id, 
+      link_jump_info, `checked`)
+    values (#{id,jdbcType=VARCHAR}, #{sourcePanelId,jdbcType=VARCHAR}, #{sourceViewId,jdbcType=VARCHAR}, 
+      #{linkJumpInfo,jdbcType=VARCHAR}, #{checked,jdbcType=BIT})
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelLinkJump">
+    insert into panel_link_jump
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="sourcePanelId != null">
+        source_panel_id,
+      </if>
+      <if test="sourceViewId != null">
+        source_view_id,
+      </if>
+      <if test="linkJumpInfo != null">
+        link_jump_info,
+      </if>
+      <if test="checked != null">
+        `checked`,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="sourcePanelId != null">
+        #{sourcePanelId,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceViewId != null">
+        #{sourceViewId,jdbcType=VARCHAR},
+      </if>
+      <if test="linkJumpInfo != null">
+        #{linkJumpInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="checked != null">
+        #{checked,jdbcType=BIT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.base.domain.PanelLinkJumpExample" resultType="java.lang.Long">
+    select count(*) from panel_link_jump
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update panel_link_jump
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sourcePanelId != null">
+        source_panel_id = #{record.sourcePanelId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sourceViewId != null">
+        source_view_id = #{record.sourceViewId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linkJumpInfo != null">
+        link_jump_info = #{record.linkJumpInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.checked != null">
+        `checked` = #{record.checked,jdbcType=BIT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update panel_link_jump
+    set id = #{record.id,jdbcType=VARCHAR},
+      source_panel_id = #{record.sourcePanelId,jdbcType=VARCHAR},
+      source_view_id = #{record.sourceViewId,jdbcType=VARCHAR},
+      link_jump_info = #{record.linkJumpInfo,jdbcType=VARCHAR},
+      `checked` = #{record.checked,jdbcType=BIT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.PanelLinkJump">
+    update panel_link_jump
+    <set>
+      <if test="sourcePanelId != null">
+        source_panel_id = #{sourcePanelId,jdbcType=VARCHAR},
+      </if>
+      <if test="sourceViewId != null">
+        source_view_id = #{sourceViewId,jdbcType=VARCHAR},
+      </if>
+      <if test="linkJumpInfo != null">
+        link_jump_info = #{linkJumpInfo,jdbcType=VARCHAR},
+      </if>
+      <if test="checked != null">
+        `checked` = #{checked,jdbcType=BIT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.PanelLinkJump">
+    update panel_link_jump
+    set source_panel_id = #{sourcePanelId,jdbcType=VARCHAR},
+      source_view_id = #{sourceViewId,jdbcType=VARCHAR},
+      link_jump_info = #{linkJumpInfo,jdbcType=VARCHAR},
+      `checked` = #{checked,jdbcType=BIT}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+</mapper>

backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.java

@@ -0,0 +1,30 @@
+package io.dataease.base.mapper;
+
+import io.dataease.base.domain.PanelLinkJumpTargetViewInfo;
+import io.dataease.base.domain.PanelLinkJumpTargetViewInfoExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PanelLinkJumpTargetViewInfoMapper {
+    long countByExample(PanelLinkJumpTargetViewInfoExample example);
+
+    int deleteByExample(PanelLinkJumpTargetViewInfoExample example);
+
+    int deleteByPrimaryKey(String targetId);
+
+    int insert(PanelLinkJumpTargetViewInfo record);
+
+    int insertSelective(PanelLinkJumpTargetViewInfo record);
+
+    List<PanelLinkJumpTargetViewInfo> selectByExample(PanelLinkJumpTargetViewInfoExample example);
+
+    PanelLinkJumpTargetViewInfo selectByPrimaryKey(String targetId);
+
+    int updateByExampleSelective(@Param("record") PanelLinkJumpTargetViewInfo record, @Param("example") PanelLinkJumpTargetViewInfoExample example);
+
+    int updateByExample(@Param("record") PanelLinkJumpTargetViewInfo record, @Param("example") PanelLinkJumpTargetViewInfoExample example);
+
+    int updateByPrimaryKeySelective(PanelLinkJumpTargetViewInfo record);
+
+    int updateByPrimaryKey(PanelLinkJumpTargetViewInfo record);
+}

backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.xml

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.PanelLinkJumpTargetViewInfoMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.base.domain.PanelLinkJumpTargetViewInfo">
+    <id column="target_id" jdbcType="VARCHAR" property="targetId" />
+    <result column="link_jump_info_id" jdbcType="VARCHAR" property="linkJumpInfoId" />
+    <result column="target_view_id" jdbcType="VARCHAR" property="targetViewId" />
+    <result column="target_field_id" jdbcType="VARCHAR" property="targetFieldId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    target_id, link_jump_info_id, target_view_id, target_field_id
+  </sql>
+  <select id="selectByExample" parameterType="io.dataease.base.domain.PanelLinkJumpTargetViewInfoExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from panel_link_jump_target_view_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from panel_link_jump_target_view_info
+    where target_id = #{targetId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from panel_link_jump_target_view_info
+    where target_id = #{targetId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.base.domain.PanelLinkJumpTargetViewInfoExample">
+    delete from panel_link_jump_target_view_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.base.domain.PanelLinkJumpTargetViewInfo">
+    insert into panel_link_jump_target_view_info (target_id, link_jump_info_id, target_view_id, 
+      target_field_id)
+    values (#{targetId,jdbcType=VARCHAR}, #{linkJumpInfoId,jdbcType=VARCHAR}, #{targetViewId,jdbcType=VARCHAR}, 
+      #{targetFieldId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelLinkJumpTargetViewInfo">
+    insert into panel_link_jump_target_view_info
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="targetId != null">
+        target_id,
+      </if>
+      <if test="linkJumpInfoId != null">
+        link_jump_info_id,
+      </if>
+      <if test="targetViewId != null">
+        target_view_id,
+      </if>
+      <if test="targetFieldId != null">
+        target_field_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="targetId != null">
+        #{targetId,jdbcType=VARCHAR},
+      </if>
+      <if test="linkJumpInfoId != null">
+        #{linkJumpInfoId,jdbcType=VARCHAR},
+      </if>
+      <if test="targetViewId != null">
+        #{targetViewId,jdbcType=VARCHAR},
+      </if>
+      <if test="targetFieldId != null">
+        #{targetFieldId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.base.domain.PanelLinkJumpTargetViewInfoExample" resultType="java.lang.Long">
+    select count(*) from panel_link_jump_target_view_info
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update panel_link_jump_target_view_info
+    <set>
+      <if test="record.targetId != null">
+        target_id = #{record.targetId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.linkJumpInfoId != null">
+        link_jump_info_id = #{record.linkJumpInfoId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.targetViewId != null">
+        target_view_id = #{record.targetViewId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.targetFieldId != null">
+        target_field_id = #{record.targetFieldId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update panel_link_jump_target_view_info
+    set target_id = #{record.targetId,jdbcType=VARCHAR},
+      link_jump_info_id = #{record.linkJumpInfoId,jdbcType=VARCHAR},
+      target_view_id = #{record.targetViewId,jdbcType=VARCHAR},
+      target_field_id = #{record.targetFieldId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.PanelLinkJumpTargetViewInfo">
+    update panel_link_jump_target_view_info
+    <set>
+      <if test="linkJumpInfoId != null">
+        link_jump_info_id = #{linkJumpInfoId,jdbcType=VARCHAR},
+      </if>
+      <if test="targetViewId != null">
+        target_view_id = #{targetViewId,jdbcType=VARCHAR},
+      </if>
+      <if test="targetFieldId != null">
+        target_field_id = #{targetFieldId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where target_id = #{targetId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.PanelLinkJumpTargetViewInfo">
+    update panel_link_jump_target_view_info
+    set link_jump_info_id = #{linkJumpInfoId,jdbcType=VARCHAR},
+      target_view_id = #{targetViewId,jdbcType=VARCHAR},
+      target_field_id = #{targetFieldId,jdbcType=VARCHAR}
+    where target_id = #{targetId,jdbcType=VARCHAR}
+  </update>
+</mapper>

backend/src/main/java/io/dataease/base/mapper/PanelLinkMapper.xml

@@ -6,6 +6,7 @@
     <result column="valid" jdbcType="BIT" property="valid" />
     <result column="enable_pwd" jdbcType="BIT" property="enablePwd" />
     <result column="pwd" jdbcType="VARCHAR" property="pwd" />
+    <result column="over_time" jdbcType="BIGINT" property="overTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -66,7 +67,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    resource_id, `valid`, enable_pwd, pwd
+    resource_id, `valid`, enable_pwd, pwd, over_time
   </sql>
   <select id="selectByExample" parameterType="io.dataease.base.domain.PanelLinkExample" resultMap="BaseResultMap">
     select
@@ -100,9 +101,9 @@
   </delete>
   <insert id="insert" parameterType="io.dataease.base.domain.PanelLink">
     insert into panel_link (resource_id, `valid`, enable_pwd, 
-      pwd)
+      pwd, over_time)
     values (#{resourceId,jdbcType=VARCHAR}, #{valid,jdbcType=BIT}, #{enablePwd,jdbcType=BIT}, 
-      #{pwd,jdbcType=VARCHAR})
+      #{pwd,jdbcType=VARCHAR}, #{overTime,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelLink">
     insert into panel_link
@@ -119,6 +120,9 @@
       <if test="pwd != null">
         pwd,
       </if>
+      <if test="overTime != null">
+        over_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="resourceId != null">
@@ -133,6 +137,9 @@
       <if test="pwd != null">
         #{pwd,jdbcType=VARCHAR},
       </if>
+      <if test="overTime != null">
+        #{overTime,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.dataease.base.domain.PanelLinkExample" resultType="java.lang.Long">
@@ -156,6 +163,9 @@
       <if test="record.pwd != null">
         pwd = #{record.pwd,jdbcType=VARCHAR},
       </if>
+      <if test="record.overTime != null">
+        over_time = #{record.overTime,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -166,7 +176,8 @@
     set resource_id = #{record.resourceId,jdbcType=VARCHAR},
       `valid` = #{record.valid,jdbcType=BIT},
       enable_pwd = #{record.enablePwd,jdbcType=BIT},
-      pwd = #{record.pwd,jdbcType=VARCHAR}
+      pwd = #{record.pwd,jdbcType=VARCHAR},
+      over_time = #{record.overTime,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -183,6 +194,9 @@
       <if test="pwd != null">
         pwd = #{pwd,jdbcType=VARCHAR},
       </if>
+      <if test="overTime != null">
+        over_time = #{overTime,jdbcType=BIGINT},
+      </if>
     </set>
     where resource_id = #{resourceId,jdbcType=VARCHAR}
   </update>
@@ -190,7 +204,8 @@
     update panel_link
     set `valid` = #{valid,jdbcType=BIT},
       enable_pwd = #{enablePwd,jdbcType=BIT},
-      pwd = #{pwd,jdbcType=VARCHAR}
+      pwd = #{pwd,jdbcType=VARCHAR},
+      over_time = #{overTime,jdbcType=BIGINT}
     where resource_id = #{resourceId,jdbcType=VARCHAR}
   </update>
 </mapper>

backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.java

@@ -0,0 +1,30 @@
+package io.dataease.base.mapper;
+
+import io.dataease.base.domain.PanelLinkMapping;
+import io.dataease.base.domain.PanelLinkMappingExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface PanelLinkMappingMapper {
+    long countByExample(PanelLinkMappingExample example);
+
+    int deleteByExample(PanelLinkMappingExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(PanelLinkMapping record);
+
+    int insertSelective(PanelLinkMapping record);
+
+    List<PanelLinkMapping> selectByExample(PanelLinkMappingExample example);
+
+    PanelLinkMapping selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") PanelLinkMapping record, @Param("example") PanelLinkMappingExample example);
+
+    int updateByExample(@Param("record") PanelLinkMapping record, @Param("example") PanelLinkMappingExample example);
+
+    int updateByPrimaryKeySelective(PanelLinkMapping record);
+
+    int updateByPrimaryKey(PanelLinkMapping record);
+}

backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.PanelLinkMappingMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.base.domain.PanelLinkMapping">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="resource_id" jdbcType="VARCHAR" property="resourceId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, resource_id
+  </sql>
+  <select id="selectByExample" parameterType="io.dataease.base.domain.PanelLinkMappingExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from panel_link_mapping
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from panel_link_mapping
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from panel_link_mapping
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="io.dataease.base.domain.PanelLinkMappingExample">
+    delete from panel_link_mapping
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.base.domain.PanelLinkMapping">
+    insert into panel_link_mapping (id, resource_id)
+    values (#{id,jdbcType=BIGINT}, #{resourceId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelLinkMapping">
+    insert into panel_link_mapping
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="resourceId != null">
+        resource_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="resourceId != null">
+        #{resourceId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.base.domain.PanelLinkMappingExample" resultType="java.lang.Long">
+    select count(*) from panel_link_mapping
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update panel_link_mapping
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.resourceId != null">
+        resource_id = #{record.resourceId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update panel_link_mapping
+    set id = #{record.id,jdbcType=BIGINT},
+      resource_id = #{record.resourceId,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.PanelLinkMapping">
+    update panel_link_mapping
+    <set>
+      <if test="resourceId != null">
+        resource_id = #{resourceId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.PanelLinkMapping">
+    update panel_link_mapping
+    set resource_id = #{resourceId,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.java

@@ -0,0 +1,27 @@
+package io.dataease.base.mapper;
+
+import io.dataease.base.domain.VAuthModel;
+import io.dataease.base.domain.VAuthModelExample;
+import io.dataease.base.domain.VAuthModelWithBLOBs;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface VAuthModelMapper {
+    long countByExample(VAuthModelExample example);
+
+    int deleteByExample(VAuthModelExample example);
+
+    int insert(VAuthModelWithBLOBs record);
+
+    int insertSelective(VAuthModelWithBLOBs record);
+
+    List<VAuthModelWithBLOBs> selectByExampleWithBLOBs(VAuthModelExample example);
+
+    List<VAuthModel> selectByExample(VAuthModelExample example);
+
+    int updateByExampleSelective(@Param("record") VAuthModelWithBLOBs record, @Param("example") VAuthModelExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") VAuthModelWithBLOBs record, @Param("example") VAuthModelExample example);
+
+    int updateByExample(@Param("record") VAuthModel record, @Param("example") VAuthModelExample example);
+}

backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.xml

@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.VAuthModelMapper">
+  <resultMap id="BaseResultMap" type="io.dataease.base.domain.VAuthModel">
+    <result column="id" jdbcType="VARCHAR" property="id" />
+    <result column="pid" jdbcType="VARCHAR" property="pid" />
+    <result column="node_type" jdbcType="VARCHAR" property="nodeType" />
+    <result column="model_type" jdbcType="VARCHAR" property="modelType" />
+    <result column="model_inner_type" jdbcType="VARCHAR" property="modelInnerType" />
+    <result column="auth_type" jdbcType="VARCHAR" property="authType" />
+    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.VAuthModelWithBLOBs">
+    <result column="name" jdbcType="LONGVARCHAR" property="name" />
+    <result column="label" jdbcType="LONGVARCHAR" property="label" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, pid, node_type, model_type, model_inner_type, auth_type, create_by
+  </sql>
+  <sql id="Blob_Column_List">
+    `name`, `label`
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.VAuthModelExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from v_auth_model
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="io.dataease.base.domain.VAuthModelExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from v_auth_model
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="io.dataease.base.domain.VAuthModelExample">
+    delete from v_auth_model
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="io.dataease.base.domain.VAuthModelWithBLOBs">
+    insert into v_auth_model (id, pid, node_type, 
+      model_type, model_inner_type, auth_type, 
+      create_by, `name`, `label`
+      )
+    values (#{id,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, #{nodeType,jdbcType=VARCHAR}, 
+      #{modelType,jdbcType=VARCHAR}, #{modelInnerType,jdbcType=VARCHAR}, #{authType,jdbcType=VARCHAR}, 
+      #{createBy,jdbcType=VARCHAR}, #{name,jdbcType=LONGVARCHAR}, #{label,jdbcType=LONGVARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="io.dataease.base.domain.VAuthModelWithBLOBs">
+    insert into v_auth_model
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="pid != null">
+        pid,
+      </if>
+      <if test="nodeType != null">
+        node_type,
+      </if>
+      <if test="modelType != null">
+        model_type,
+      </if>
+      <if test="modelInnerType != null">
+        model_inner_type,
+      </if>
+      <if test="authType != null">
+        auth_type,
+      </if>
+      <if test="createBy != null">
+        create_by,
+      </if>
+      <if test="name != null">
+        `name`,
+      </if>
+      <if test="label != null">
+        `label`,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="pid != null">
+        #{pid,jdbcType=VARCHAR},
+      </if>
+      <if test="nodeType != null">
+        #{nodeType,jdbcType=VARCHAR},
+      </if>
+      <if test="modelType != null">
+        #{modelType,jdbcType=VARCHAR},
+      </if>
+      <if test="modelInnerType != null">
+        #{modelInnerType,jdbcType=VARCHAR},
+      </if>
+      <if test="authType != null">
+        #{authType,jdbcType=VARCHAR},
+      </if>
+      <if test="createBy != null">
+        #{createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="label != null">
+        #{label,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="io.dataease.base.domain.VAuthModelExample" resultType="java.lang.Long">
+    select count(*) from v_auth_model
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update v_auth_model
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pid != null">
+        pid = #{record.pid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.nodeType != null">
+        node_type = #{record.nodeType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelType != null">
+        model_type = #{record.modelType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelInnerType != null">
+        model_inner_type = #{record.modelInnerType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.authType != null">
+        auth_type = #{record.authType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createBy != null">
+        create_by = #{record.createBy,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null">
+        `name` = #{record.name,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="record.label != null">
+        `label` = #{record.label,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update v_auth_model
+    set id = #{record.id,jdbcType=VARCHAR},
+      pid = #{record.pid,jdbcType=VARCHAR},
+      node_type = #{record.nodeType,jdbcType=VARCHAR},
+      model_type = #{record.modelType,jdbcType=VARCHAR},
+      model_inner_type = #{record.modelInnerType,jdbcType=VARCHAR},
+      auth_type = #{record.authType,jdbcType=VARCHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR},
+      `name` = #{record.name,jdbcType=LONGVARCHAR},
+      `label` = #{record.label,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update v_auth_model
+    set id = #{record.id,jdbcType=VARCHAR},
+      pid = #{record.pid,jdbcType=VARCHAR},
+      node_type = #{record.nodeType,jdbcType=VARCHAR},
+      model_type = #{record.modelType,jdbcType=VARCHAR},
+      model_inner_type = #{record.modelInnerType,jdbcType=VARCHAR},
+      auth_type = #{record.authType,jdbcType=VARCHAR},
+      create_by = #{record.createBy,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

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

@@ -94,12 +94,18 @@
             `custom_attr`,
             `custom_style`,
             `custom_filter`,
+            `drill_fields`,
             `create_by`,
             `create_time`,
             `update_time`,
             `snapshot`,
             `style_priority`,
-            `ext_stack`
+            `ext_stack`,
+            `ext_bubble`,
+            `y_axis_ext`,
+            `render`,
+            `result_count`,
+            `result_mode`
         ) SELECT
         #{newChartId},
         GET_CHART_VIEW_COPY_NAME ( #{oldChartId} ),
@@ -112,12 +118,18 @@
         `custom_attr`,
         `custom_style`,
         `custom_filter`,
+        `drill_fields`,
         `create_by`,
         `create_time`,
         `update_time`,
         `snapshot`,
         `style_priority`,
-        `ext_stack`
+        `ext_stack`,
+        `ext_bubble`,
+        `y_axis_ext`,
+        `render`,
+        `result_count`,
+        `result_mode`
         FROM
             chart_view
         WHERE

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

@@ -20,4 +20,7 @@ public interface ExtPanelGroupMapper {
     PanelGroupDTO panelGroup(String id);
 
 
+    void copyPanelView(@Param("pid") String panelId);
+
+
 }

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

@@ -86,12 +86,7 @@
                 and panel_group.level = #{level}
             </if>
         </where>
-        <if test="sort != null">
-            order by ${sort}
-        </if>
-        <if test="sort == null">
-            order by panel_group.create_time desc
-        </if>
+        order by panel_group.name asc,panel_group.create_time desc
     </select>
 
     <select id="panelGroupList" resultMap="BaseResultMapDTO">
@@ -165,16 +160,22 @@
                 and panel_group.level = #{level}
             </if>
         </where>
-        <if test="sort != null">
-            order by ${sort}
-        </if>
-        <if test="sort == null">
-            order by panel_group.create_time desc
-        </if>
+        order by panel_group.name asc,panel_group.create_time desc
     </select>
 
     <delete id="deleteCircle">
         delete from panel_group where FIND_IN_SET(panel_group.id,GET_PANEL_GROUP_WITH_CHILDREN(#{pid})) or FIND_IN_SET(panel_group.source,GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
     </delete>
 
+    <insert id="copyPanelView">
+    INSERT INTO panel_view ( id, panel_id, chart_view_id ) SELECT
+    uuid(),
+    #{panelId},
+    chart_view_id
+    FROM
+        panel_view
+    WHERE
+        panel_id = #{panelId}
+    </insert>
+
 </mapper>

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

@@ -0,0 +1,27 @@
+package io.dataease.base.mapper.ext;
+
+import io.dataease.dto.panel.linkJump.PanelLinkJumpBaseRequest;
+import io.dataease.dto.panel.linkJump.PanelLinkJumpDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ExtPanelLinkJumpMapper {
+    List<PanelLinkJumpDTO> queryWithPanelId(@Param("panelId") String panelId);
+
+    PanelLinkJumpDTO queryWithViewId(@Param("panelId") String panelId,@Param("viewId") String viewId);
+
+    void deleteJumpTargetViewInfo(@Param("panelId") String panelId,@Param("viewId") String viewId);
+
+    void deleteJumpInfo(@Param("panelId") String panelId,@Param("viewId") String viewId);
+
+    void deleteJump(@Param("panelId") String panelId,@Param("viewId") String viewId);
+
+    void deleteJumpTargetViewInfoWithPanel(@Param("panelId") String panelId);
+
+    void deleteJumpInfoWithPanel(@Param("panelId") String panelId);
+
+    void deleteJumpWithPanel(@Param("panelId") String panelId);
+
+    List<PanelLinkJumpDTO> getTargetPanelJumpInfo(@Param("request")PanelLinkJumpBaseRequest request);
+}

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

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="io.dataease.base.mapper.ext.ExtPanelLinkJumpMapper">
+    <resultMap id="BaseResultMapDTO" type="io.dataease.dto.panel.linkJump.PanelLinkJumpDTO"
+               extends="io.dataease.base.mapper.PanelLinkJumpMapper.BaseResultMap">
+        <collection property="linkJumpInfoArray" ofType="io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO"
+                    column="{id=id,source_view_id=source_view_id}"
+                    select="getLinkJumpInfo">
+        </collection>
+    </resultMap>
+
+    <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"/>
+        <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"/>
+        </collection>
+    </resultMap>
+
+    <resultMap id="AllJumpMap" type="io.dataease.dto.panel.linkJump.PanelLinkJumpDTO">
+        <result column="sourceInfo" jdbcType="VARCHAR" property="sourceInfo"/>
+        <collection property="targetInfoList" ofType="String">
+            <result column="targetInfo" jdbcType="VARCHAR"/>
+        </collection>
+    </resultMap>
+
+    <select id="getLinkJumpInfo" resultMap="LinkJumpInfoMap">
+        SELECT
+            dataset_table_field.id AS 'source_field_id',
+            dataset_table_field.NAME AS 'source_field_name',
+            panel_link_jump_info.id,
+            panel_link_jump_info.link_jump_id,
+            panel_link_jump_info.link_type,
+            panel_link_jump_info.jump_type,
+            panel_link_jump_info.target_panel_id,
+            panel_link_jump_info.content,
+            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
+        FROM
+            chart_view
+            LEFT JOIN dataset_table_field ON chart_view.table_id = dataset_table_field.table_id
+            LEFT JOIN panel_link_jump ON chart_view.id = panel_link_jump.source_view_id and panel_link_jump.id = #{id}
+            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
+        WHERE
+            chart_view.id =#{source_view_id}
+        ORDER BY
+            ifnull( panel_link_jump_info.checked, 0 ) DESC
+    </select>
+
+    <select id="queryWithPanelId" resultMap="BaseResultMapDTO">
+        SELECT
+            chart_view.id AS source_view_id,
+            panel_link_jump.id,
+            #{panelId} as 'source_panel_id',
+            panel_link_jump.link_jump_info,
+            ifnull( panel_link_jump.checked, 0 ) AS checked
+        FROM
+            chart_view
+            LEFT JOIN panel_link_jump ON chart_view.id = panel_link_jump.source_view_id
+        WHERE
+            panel_link_jump.source_panel_id = #{panelId}
+            and panel_link_jump.checked = 1
+    </select>
+
+    <select id="queryWithViewId" resultMap="BaseResultMapDTO">
+       SELECT
+            chart_view.id AS source_view_id,
+            panel_link_jump.id,
+            #{panelId} as 'source_panel_id',
+            panel_link_jump.link_jump_info,
+            ifnull( panel_link_jump.checked, 0 ) AS checked
+        FROM
+            chart_view
+            LEFT JOIN panel_link_jump ON chart_view.id = panel_link_jump.source_view_id
+            AND panel_link_jump.source_panel_id = #{panelId}
+        WHERE
+            chart_view.id = #{viewId}
+	</select>
+
+    <delete id="deleteJumpTargetViewInfo" >
+        DELETE ljtv
+        FROM
+            panel_link_jump_target_view_info ljtv,
+            panel_link_jump_info lji,
+            panel_link_jump lj
+        WHERE
+            ljtv.link_jump_info_id = lji.id
+            AND lji.link_jump_id = lj.id
+            AND lj.source_panel_id = #{panelId}
+            AND lj.source_view_id = #{viewId}
+	</delete>
+
+    <delete id="deleteJumpInfo" >
+        DELETE lji
+        FROM
+            panel_link_jump_info lji,
+            panel_link_jump lj
+        WHERE
+            lji.link_jump_id = lj.id
+            AND lj.source_panel_id = #{panelId}
+            AND lj.source_view_id = #{viewId}
+	</delete>
+
+    <delete id="deleteJump" >
+        DELETE lj
+        FROM
+            panel_link_jump lj
+        WHERE
+            lj.source_panel_id = #{panelId}
+            AND lj.source_view_id = #{viewId}
+	</delete>
+
+
+
+    <delete id="deleteJumpTargetViewInfoWithPanel" >
+       DELETE ljtv
+        FROM
+            panel_link_jump_target_view_info ljtv,
+            panel_link_jump_info lji,
+            panel_link_jump lj
+        WHERE
+            ljtv.link_jump_info_id = lji.id
+            AND lji.link_jump_id = lj.id
+            AND (lj.source_panel_id = #{panelId} or lji.target_panel_id = #{panelId})
+	</delete>
+
+    <delete id="deleteJumpInfoWithPanel" >
+        DELETE lji
+        FROM
+            panel_link_jump_info lji,
+            panel_link_jump lj
+        WHERE
+            lji.link_jump_id = lj.id
+            AND (lj.source_panel_id = #{panelId} or  lji.target_panel_id = #{panelId})
+	</delete>
+
+    <delete id="deleteJumpWithPanel" >
+        DELETE lj
+        FROM
+            panel_link_jump lj
+        WHERE
+            lj.source_panel_id = #{panelId}
+	</delete>
+
+    <select id="getTargetPanelJumpInfo" resultMap="AllJumpMap">
+      SELECT DISTINCT
+            concat( lj.source_view_id, '#', lji.source_field_id ) AS 'sourceInfo',
+            concat( jtvi.target_view_id, '#', jtvi.target_field_id ) AS 'targetInfo'
+        FROM
+            panel_link_jump_target_view_info jtvi
+            LEFT JOIN panel_link_jump_info lji ON jtvi.link_jump_info_id = lji.id
+            LEFT JOIN panel_link_jump lj ON lji.link_jump_id = lj.id
+        WHERE
+            lj.source_panel_id = #{request.sourcePanelId}
+            AND lj.source_view_id = #{request.sourceViewId}
+            AND lji.target_panel_id = #{request.targetPanelId}
+            AND lji.source_field_id = #{request.sourceFieldId}
+    </select>
+</mapper>

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

@@ -0,0 +1,11 @@
+package io.dataease.base.mapper.ext;
+
+import org.apache.ibatis.annotations.Param;
+
+import io.dataease.controller.request.panel.link.OverTimeRequest;
+
+public interface ExtPanelLinkMapper {
+
+    void updateOverTime(@Param("request") OverTimeRequest request);
+    
+}

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="io.dataease.base.mapper.ext.ExtPanelLinkMapper">
+
+   
+
+    
+
+
+    <update id="updateOverTime"  >
+       update panel_link set over_time = #{request.overTime} where resource_id = #{request.resourceId}
+    </update>
+
+
+
+
+</mapper>

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

@@ -2,6 +2,8 @@ package io.dataease.base.mapper.ext;
 
 import io.dataease.base.domain.PanelShare;
 import io.dataease.base.mapper.ext.query.GridExample;
+import io.dataease.controller.request.panel.PanelShareRemoveRequest;
+import io.dataease.dto.panel.PanelShareOutDTO;
 import io.dataease.dto.panel.PanelSharePo;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,14 +12,20 @@ import java.util.Map;
 
 public interface ExtPanelShareMapper {
 
-    int batchInsert(@Param("shares") List<PanelShare> shares);
+    int batchInsert(@Param("shares") List<PanelShare> shares, @Param("userName") String userName);
 
     int batchDelete(@Param("shareIds") List<Long> shareIds);
 
     List<PanelSharePo> query(Map<String, Object> param);
 
+    List<PanelSharePo> queryOut(String userName);
+
     List<PanelShare> queryWithResource(GridExample example);
 
+    List<PanelShareOutDTO> queryTargets(String panelId);
+
+    void removeShares(@Param("request") PanelShareRemoveRequest request);
+
     List<Long> queryUserIdWithRoleIds(Map<String, List<Long>> param);
 
     List<Long> queryUserIdWithDeptIds(Map<String, List<Long>> param);

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

@@ -8,11 +8,20 @@
         <result column="creator" property="creator" />
     </resultMap>
 
+    <resultMap id="targetMap" type="io.dataease.dto.panel.PanelShareOutDTO">
+        <result column="panel_id" property="panelId" />
+        <result column="share_id" property="shareId" />
+        <result column="type" property="type" />
+        <result column="target_Id" property="targetId" />
+        <result column="target_Name" property="targetName" />
+        <result column="create_time" property="createTime" />
+    </resultMap>
+
     <insert id="batchInsert" parameterType="io.dataease.base.domain.PanelShare">
-        INSERT INTO panel_share (panel_group_id,target_id,create_time,type)
+        INSERT INTO panel_share (panel_group_id,target_id,granter,create_time,type)
         VALUES 
         <foreach collection="shares" item="share" separator=",">
-            (#{share.panelGroupId}, #{share.targetId}, #{share.createTime}, #{share.type})
+            (#{share.panelGroupId}, #{share.targetId}, #{userName}, #{share.createTime}, #{share.type})
         </foreach>
     </insert>
 
@@ -25,7 +34,7 @@
     </delete>
 
     <select id="query" resultMap="treeNodeMap">
-        select distinct s.panel_group_id as id, g.create_by as creator, g.name
+        select distinct s.panel_group_id as id, IFNULL(s.granter,g.create_by) as creator, g.name
         from panel_share s
         left join panel_group g on g.id = s.panel_group_id
         where
@@ -42,6 +51,15 @@
 
     </select>
 
+    <select id="queryOut" resultMap="treeNodeMap">
+        select distinct s.panel_group_id as id, g.name
+        from panel_share s
+        left join panel_group g on g.id = s.panel_group_id
+        where ( s.granter is not null and s.granter = #{userName} ) or ( s.granter is null and g.create_by = #{userName} )
+        order by s.create_time desc
+
+    </select>
+
     <select id="queryWithResource" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="io.dataease.base.mapper.PanelShareMapper.BaseResultMap">
         select * from panel_share
         <if test="_parameter != null">
@@ -52,6 +70,26 @@
         </if>
 
 
+    </select>
+
+    <select id="queryTargets"  resultMap="targetMap">
+        select
+            s.share_id,
+            s.panel_group_id as panel_id,
+            s.type,
+            s.target_id,
+            s.create_time,
+            (
+            CASE s.type
+            WHEN 0 THEN (select nick_name from sys_user where user_id = s.target_id)
+            WHEN 1 THEN (select name from sys_role where role_id = s.target_id)
+            WHEN 2 THEN (select name from sys_dept where dept_id = s.target_id)
+            END
+            ) as target_name
+        from panel_share s
+        where s.panel_group_id = #{panelId}
+
+
     </select>
 
     <select id="queryUserIdWithRoleIds" resultType="java.lang.Long" >
@@ -73,6 +111,14 @@
         </foreach>
     </select>
 
+    <delete id="removeShares" parameterType="io.dataease.controller.request.panel.PanelShareRemoveRequest">
+        delete from panel_share
+        where panel_group_id = #{request.panelId}
+        <if test="request.shareId != null">
+            and share_id = #{request.shareId}
+        </if>
+    </delete>
+
 
 
 

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

@@ -16,6 +16,8 @@ public interface ExtPanelViewLinkageMapper {
 
     List<DatasetTableField> queryTableField(@Param("table_id") String tableId);
 
+    List<DatasetTableField> queryTableFieldWithViewId(@Param("viewId") String viewId);
+
     void deleteViewLinkage(@Param("panelId") String panelId,@Param("sourceViewId") String sourceViewId);
 
     void deleteViewLinkageField(@Param("panelId") String panelId,@Param("sourceViewId") String sourceViewId);

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

@@ -62,6 +62,18 @@
     from dataset_table_field where table_id = #{table_id}
     </select>
 
+    <select id="queryTableFieldWithViewId" resultMap="TableFieldMap">
+        select
+       dataset_table_field.id,
+       dataset_table_field.table_id,
+       dataset_table_field.origin_name,
+       dataset_table_field.`name`,
+       dataset_table_field.de_type
+        from dataset_table_field
+		left join chart_view on dataset_table_field.table_id= chart_view.table_id
+		where chart_view.id = #{viewId}
+    </select>
+
 
     <delete id="deleteViewLinkage">
         delete from panel_view_linkage where   panel_view_linkage.panel_id = #{panelId}

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

@@ -1,6 +1,8 @@
 package io.dataease.base.mapper.ext;
 
+import io.dataease.dto.chart.ChartViewDTO;
 import io.dataease.dto.panel.PanelViewDto;
+import io.dataease.dto.panel.PanelViewTableDTO;
 import io.dataease.dto.panel.po.PanelViewInsertDTO;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,6 +14,8 @@ public interface ExtPanelViewMapper {
 
     List<PanelViewDto> views(String userId);
 
+    List<PanelViewTableDTO> getPanelViewDetails(@Param("panelId") String panelId);
+
     void deleteWithPanelId(String panelId);
 
     void savePanelView(@Param("panelViews") List<PanelViewInsertDTO> panelViews);

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

@@ -9,7 +9,42 @@
         <result column="type" property="type" />
     </resultMap>
 
+    <resultMap extends="io.dataease.base.mapper.ChartViewMapper.BaseResultMap" id="PanelViewDetailsMap" type="io.dataease.dto.panel.PanelViewTableDTO">
+        <result column="panel_id" property="panelId" />
+        <collection property="tableFields" ofType="io.dataease.base.domain.DatasetTableField">
+            <result column="field_id" jdbcType="VARCHAR" property="id"/>
+            <result column="origin_name" jdbcType="VARCHAR" property="originName"/>
+            <result column="field_name" jdbcType="VARCHAR" property="name"/>
+            <result column="field_type" jdbcType="VARCHAR" property="type"/>
+            <result column="de_type" jdbcType="VARCHAR" property="deType"/>
+        </collection>
+    </resultMap>
 
+    <select id="getPanelViewDetails"  resultMap="PanelViewDetailsMap">
+       	SELECT
+            chart_view.id,
+            chart_view.`name`,
+            chart_view.scene_id,
+            chart_view.table_id,
+            chart_view.`type`,
+            chart_view.render,
+            chart_view.title,
+            chart_view.create_by,
+            chart_view.create_time,
+            chart_view.update_time,
+            chart_view.style_priority,
+            panel_view.panel_id,
+            dataset_table_field.id as 'field_id',
+            dataset_table_field.origin_name,
+            dataset_table_field.`name` as 'field_name',
+            dataset_table_field.type as 'field_type',
+            dataset_table_field.de_type
+        FROM
+            panel_view
+            LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
+            left join dataset_table_field on chart_view.table_id = dataset_table_field.table_id
+            where panel_view.panel_id =#{panelId}
+    </select>
 
     <select id="groups"  resultMap="treeNodeMap">
         select id, ifnull(pid,0) as pid,  name, `type`

backend/src/main/java/io/dataease/commons/constants/DatasourceTypes.java

@@ -1,16 +1,20 @@
-package io.dataease.datasource.constants;
+package io.dataease.commons.constants;
 
 public enum DatasourceTypes {
     excel("excel", "excel", "", "", "", "", ""),
     mysql("mysql", "mysql", "com.mysql.jdbc.Driver", "`", "`", "'", "'"),
+    hive("hive", "hive", "org.apache.hive.jdbc.HiveDriver", "`", "`", "'", "'"),
     mariadb("mariadb", "mariadb", "com.mysql.jdbc.Driver", "`", "`", "'", "'"),
     ds_doris("ds_doris", "ds_doris", "com.mysql.jdbc.Driver", "`", "`", "'", "'"),
     pg("pg", "pg", "org.postgresql.Driver", "\"", "\"", "\"", "\""),
     sqlServer("sqlServer", "sqlServer", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "\"", "\"", "\"", "\""),
     de_doris("de_doris", "de_doris", "com.mysql.jdbc.Driver", "`", "`", "", ""),
     oracle("oracle", "oracle", "oracle.jdbc.driver.OracleDriver", "\"", "\"", "\"", "\""),
+    mongo("mongo", "mongodb", "com.mongodb.jdbc.MongoDriver", "`", "`", "\"", "\""),
     ck("ch", "ch", "ru.yandex.clickhouse.ClickHouseDriver", "`", "`", "'", "'"),
-    es("es", "es", "", "\"", "\"", "\"", "\"");
+    es("es", "es", "", "\"", "\"", "\"", "\""),
+    redshift("redshift", "redshift", "org.postgresql.Driver", "\"", "\"", "\"", "\"");
+
 
     private String feature;
     private String desc;

backend/src/main/java/io/dataease/commons/constants/ParamConstants.java

@@ -109,6 +109,18 @@ public interface ParamConstants {
         }
     }
 
+    enum BASIC implements ParamConstants {
+        FRONT_TIME_OUT("basic.frontTimeOut"),
+        MSG_TIME_OUT("basic.msgTimeOut");
+        private String value;
+        public String getValue() {
+            return this.value;
+        }
+        private BASIC(String value) {
+            this.value = value;
+        }
+    }
+
     enum BASE implements ParamConstants {
         URL("base.url");
 

backend/src/main/java/io/dataease/commons/model/ITreeBase.java

@@ -9,6 +9,8 @@ import java.util.List;
  */
 public interface ITreeBase<T> {
 
+    String getNodeType();
+
     String getId();
 
     void setId(String id);

backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java

@@ -1,79 +0,0 @@
-package io.dataease.commons.utils;
-import com.google.gson.Gson;
-import io.dataease.datasource.dto.TableFiled;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.List;
-
-public class ExcelReaderUtil {
-    //excel2003扩展名
-    public static final String EXCEL03_EXTENSION = ".xls";
-    //excel2007扩展名
-    public static final String EXCEL07_EXTENSION = ".xlsx";
-
-    public static void sendRows(String filePath, String sheetName, int sheetIndex, int curRow, List<String> cellList) {
-        StringBuffer oneLineSb = new StringBuffer();
-        oneLineSb.append(filePath);
-        oneLineSb.append("--");
-        oneLineSb.append("sheet" + sheetIndex);
-        oneLineSb.append("::" + sheetName);//加上sheet名
-        oneLineSb.append("--");
-        oneLineSb.append("row" + curRow);
-        oneLineSb.append("::");
-
-        // map.put(cellList.get(9),cellList.get(0)) ;
-
-        for (String cell : cellList) {
-            oneLineSb.append(cell.trim());
-            oneLineSb.append("|");
-        }
-        String oneLine = oneLineSb.toString();
-        if (oneLine.endsWith("|")) {
-            oneLine = oneLine.substring(0, oneLine.lastIndexOf("|"));
-        }// 去除最后一个分隔符
-
-        System.out.println(oneLine);
-    }
-
-    /**
-     * 读取excel文件路径
-     * @param fileName 文件路径
-     * @throws Exception
-     */
-    public static void readExcel(String fileName, InputStream inputStream) throws Exception {
-        if (fileName.endsWith(EXCEL03_EXTENSION)) { //处理excel2003文件
-            ExcelXlsReader excelXls=new ExcelXlsReader();
-            excelXls.process(inputStream);
-            System.out.println(excelXls.totalSheets.size());
-            System.out.println(excelXls.totalSheets.get(0).getExcelLable());
-            for (TableFiled field : excelXls.totalSheets.get(0).getFields()) {
-                System.out.println(new Gson().toJson(field));
-            }
-            System.out.println(excelXls.totalSheets.get(0).getData().get(0));
-            System.out.println(excelXls.totalSheets.get(0).getData().get(1));
-            System.out.println(excelXls.totalSheets.get(0).getData().get(2));
-        } else if (fileName.endsWith(EXCEL07_EXTENSION)) {//处理excel2007文件
-            ExcelXlsxReader excelXlsxReader = new ExcelXlsxReader();
-            excelXlsxReader.process(inputStream);
-
-            System.out.println(excelXlsxReader.totalSheets.get(0).getFields().size());
-
-            for (TableFiled field : excelXlsxReader.totalSheets.get(0).getFields()) {
-                System.out.println(new Gson().toJson(field));
-            }
-            System.out.println(excelXlsxReader.totalSheets.get(0).getData().get(0));
-
-        } else {
-            throw new Exception("文件格式错误，fileName的扩展名只能是xls或xlsx。");
-        }
-    }
-
-     public static void main(String[] args) throws Exception {
-
-
-        String file ="各省市GDP-表格_加内容.xlsx";
-        ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file));
-    }
-}

backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java

@@ -1,6 +1,6 @@
 package io.dataease.commons.utils;
 
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.i18n.Translator;
 import org.apache.poi.hssf.eventusermodel.*;
@@ -23,8 +23,6 @@ import java.util.stream.Collectors;
  **/
 public class ExcelXlsReader implements HSSFListener {
 
-    public ExcelReaderUtil excelReaderUtil = new ExcelReaderUtil();
-
     private int minColums = -1;
 
     private POIFSFileSystem fs;
@@ -333,7 +331,10 @@ public class ExcelXlsReader implements HSSFListener {
                     totalSheets.add(excelSheetData);
                 }else {
                     List<String> tmp = new ArrayList<>(cellList);
+                    if(totalSheets.stream().filter(s->s.getExcelLable().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < 100){
                         totalSheets.stream().filter(s->s.getExcelLable().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp);
+                    }
+
                     totalRows++;
                 }
             }

backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java

@@ -1,5 +1,5 @@
 package io.dataease.commons.utils;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.i18n.Translator;
 import org.apache.commons.collections4.CollectionUtils;
@@ -319,6 +319,7 @@ public class ExcelXlsxReader extends DefaultHandler {
         nextDataType = CellDataType.NUMBER; //cellType为空，则表示该单元格类型为数字
         formatIndex = -1;
         formatString = null;
+        isDateFormat = false;
         String cellType = attributes.getValue("t"); //单元格类型
         if ("b".equals(cellType)) { //处理布尔值
             nextDataType = CellDataType.BOOL;
@@ -339,13 +340,12 @@ public class ExcelXlsxReader extends DefaultHandler {
             formatIndex = style.getDataFormat();
             formatString = style.getDataFormatString();
             short format = this.formatIndex;
-            if (format == 14 || format == 31 || format == 57 ||format == 59||
-                    format == 58 || (176 < format && format < 178)
-                    || (182 <= format && format <= 196) ||
-                    (210 <= format && format <= 213) || (208 == format))
+            if ( (14 <= format && format <= 17) || format == 20 || format == 22 || format == 31 || format == 35 || format == 45 || format == 46 || format == 47 || (57 <= format && format <= 59)
+                    || (175 < format && format < 178) || (182 <= format && format <= 196) || (210 <= format && format <= 213) || (208 == format))
             { // 日期
                 isDateFormat = true;
             }
+
         }
 
     }
@@ -399,8 +399,12 @@ public class ExcelXlsxReader extends DefaultHandler {
                     thisStr = value;
                 }
                 thisStr = thisStr.replace("_", "").trim();
-                if(isDateFormat){
+
+                if(isDateFormat ){
                     type = "DATETIME";isDateFormat = false;
+                    if(formatString != null && formatString.contains("%")){
+                        type = getType(thisStr);
+                    }
                 }else {
                     type = getType(thisStr);
                 }

backend/src/main/java/io/dataease/commons/utils/HttpClientUtil.java

@@ -7,22 +7,26 @@ import org.apache.http.client.entity.EntityBuilder;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.HttpClientConnectionManager;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
-import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.entity.ContentType;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.protocol.HTTP;
-import org.apache.http.ssl.SSLContexts;
+import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
+import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -42,11 +46,15 @@ public class HttpClientUtil {
     private static CloseableHttpClient buildHttpClient(String url) {
         try {
             if (url.startsWith(HTTPS)) {
-                // https 增加信任设置
-                TrustStrategy trustStrategy = new TrustSelfSignedStrategy();
-                SSLContext sslContext = SSLContexts.custom().loadTrustMaterial(trustStrategy).build();
-                HostnameVerifier hostnameVerifier = NoopHostnameVerifier.INSTANCE;
-                return HttpClients.custom().setSSLContext(sslContext).setSSLHostnameVerifier(hostnameVerifier).build();
+                SSLContextBuilder builder = new SSLContextBuilder();
+                builder.loadTrustMaterial(null, (X509Certificate[] x509Certificates, String s) -> true);
+                SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(builder.build(), new String[]{"TLSv1.1", "TLSv1.2", "SSLv3"}, null, NoopHostnameVerifier.INSTANCE);
+                Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory>create()
+                        .register("http", new PlainConnectionSocketFactory())
+                        .register("https", socketFactory).build();
+                HttpClientConnectionManager connManager = new PoolingHttpClientConnectionManager(registry);
+                CloseableHttpClient httpClient = HttpClients.custom().setConnectionManager(connManager).build();
+                return httpClient;
             } else {
                 // http
                 return HttpClientBuilder.create().build();

backend/src/main/java/io/dataease/commons/utils/TreeUtils.java

@@ -41,6 +41,7 @@ public class TreeUtils{
         return result;
     }
 
+
     /**
      * Description: rootPid 是根节点PID 档期那默认是0
      */

backend/src/main/java/io/dataease/config/Knife4jConfiguration.java

@@ -1,9 +1,9 @@
 package io.dataease.config;
 
 import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver;
-import io.dataease.commons.condition.LicStatusCondition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.*;
 import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
 import springfox.documentation.builders.*;
@@ -12,19 +12,17 @@ import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
-
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
 @EnableOpenApi
 @Configuration
 @Import(BeanValidatorPluginsConfiguration.class)
-public class Knife4jConfiguration {
+public class Knife4jConfiguration implements BeanPostProcessor{
 
     private final OpenApiExtensionResolver openApiExtensionResolver;
 
-    @Value("${app.version}")
+    @Value("${version}")
     private String version;
 
 

backend/src/main/java/io/dataease/controller/IndexController.java

@@ -2,11 +2,15 @@ package io.dataease.controller;
 
 import io.dataease.commons.license.DefaultLicenseService;
 import io.dataease.commons.license.F2CLicenseResponse;
+import io.dataease.commons.utils.ServletUtils;
+import io.dataease.service.panel.PanelLinkService;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import javax.annotation.Resource;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
 
 @Controller
 @RequestMapping
@@ -15,6 +19,9 @@ public class IndexController {
     @Resource
     private DefaultLicenseService defaultLicenseService;
 
+    @Resource
+    private PanelLinkService panelLinkService;
+
     @GetMapping(value = "/")
     public String index() {
         return "index.html";
@@ -44,9 +51,17 @@ public class IndexController {
             default:
                 // DataEaseException.throwException("Invalid License.");
                 return "nolic.html";
-                // return "doc.html";
         }
-        // return "index.html";
+    }
+
+    @GetMapping("/xggznb/{index}")
+    public String xggznb(@PathVariable(value = "index", required = true) Long index)  {
+        String url = panelLinkService.getUrlByIndex(index);
+        HttpServletResponse response = ServletUtils.response();
+        String param = url.substring(url.indexOf("?") + 1);
+        Cookie cookie = new Cookie("link", param);
+        response.addCookie(cookie);
+        return url;
     }
 
 

backend/src/main/java/io/dataease/controller/authModel/VAuthModelController.java

@@ -0,0 +1,19 @@
+package io.dataease.controller.authModel;
+
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Author: wangjiahao
+ * Date: 2021/11/5
+ * Description:
+ */
+@Api(tags = "授权树：授权树模型")
+@ApiSupport(order = 80)
+@RestController
+@RequestMapping("authModel")
+public class VAuthModelController {
+
+}

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

@@ -3,6 +3,7 @@ package io.dataease.controller.chart;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.commons.utils.AuthUtils;
+import io.dataease.controller.request.chart.ChartCalRequest;
 import io.dataease.controller.request.chart.ChartExtRequest;
 import io.dataease.controller.request.chart.ChartViewRequest;
 import io.dataease.controller.response.ChartDetail;
@@ -100,4 +101,10 @@ public class ChartViewController {
     public List<ChartViewDTO> search(@RequestBody ChartViewRequest chartViewRequest) {
         return chartViewService.search(chartViewRequest);
     }
+
+    @ApiOperation("计算结果")
+    @PostMapping("/calcData")
+    public ChartViewDTO calcData(@RequestBody ChartCalRequest request) throws Exception {
+        return chartViewService.calcData(request.getView(), request.getRequestList(), false);
+    }
 }

backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java

@@ -6,7 +6,7 @@ import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableIncrementalConfig;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.response.DataSetDetail;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.dto.dataset.ExcelFileData;
 import io.dataease.service.dataset.DataSetTableService;
@@ -41,9 +41,9 @@ public class DataSetTableController {
     @ApiOperation("更新")
     @PostMapping("update")
     public void save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
-        if(datasetTable.getType().equalsIgnoreCase("excel")){
+        if (datasetTable.getType().equalsIgnoreCase("excel")) {
             dataSetTableService.saveExcel(datasetTable);
-        }else {
+        } else {
             dataSetTableService.save(datasetTable);
         }
     }
@@ -56,7 +56,7 @@ public class DataSetTableController {
 
     @ApiOperation("删除")
     @PostMapping("delete/{id}")
-    public void delete( @ApiParam(name = "id", value = "数据集ID", required = true)  @PathVariable String id) throws Exception {
+    public void delete(@ApiParam(name = "id", value = "数据集ID", required = true) @PathVariable String id) throws Exception {
         dataSetTableService.delete(id);
     }
 
@@ -132,9 +132,9 @@ public class DataSetTableController {
         return dataSetTableService.getDatasetDetail(id);
     }
 
-//    @ApiOperation("excel上传")
+    //    @ApiOperation("excel上传")
     @PostMapping("excel/upload")
-    public ExcelFileData excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId, @RequestParam("editType") Integer editType ) throws Exception {
+    public ExcelFileData excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId, @RequestParam("editType") Integer editType) throws Exception {
         return dataSetTableService.excelSaveAndParse(file, tableId, editType);
     }
 
@@ -149,4 +149,10 @@ public class DataSetTableController {
     public List<DataSetTableDTO> search(@RequestBody DataSetTableRequest dataSetTableRequest) {
         return dataSetTableService.search(dataSetTableRequest);
     }
+
+    @ApiOperation("数据集同步表结构")
+    @PostMapping("syncField/{id}")
+    public DatasetTable syncDatasetTableField(@PathVariable String id) throws Exception {
+        return dataSetTableService.syncDatasetTableField(id);
+    }
 }

backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.controller;
+package io.dataease.controller.datasource;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -10,8 +10,8 @@ import io.dataease.commons.utils.Pager;
 import io.dataease.controller.ResultHolder;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.datasource.dto.DBTableDTO;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.dto.datasource.DBTableDTO;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.DatasourceDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +20,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Api(tags = "数据源：数据源管理")
 @ApiSupport(order = 30)
@@ -32,7 +33,7 @@ public class DatasourceController {
 
     @ApiOperation("新增数据源")
     @PostMapping("/add")
-    public Datasource addDatasource(@RequestBody Datasource datasource) {
+    public Datasource addDatasource(@RequestBody Datasource datasource) throws Exception{
         return datasourceService.addDatasource(datasource);
     }
 
@@ -57,6 +58,12 @@ public class DatasourceController {
         return datasourceService.getDatasourceList(request);
     }
 
+    @ApiOperation("查询当前用户数据源")
+    @GetMapping("/list/{type}")
+    public List<DatasourceDTO> getDatasourceListByType(@PathVariable String type) throws Exception {
+        return getDatasourceList().stream().filter(datasourceDTO -> datasourceDTO.getType().equalsIgnoreCase(type)).collect(Collectors.toList());
+    }
+
     @ApiIgnore
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<DatasourceDTO>> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception {

backend/src/main/java/io/dataease/controller/panel/PanelLinkJumpController.java

@@ -0,0 +1,66 @@
+package io.dataease.controller.panel;
+
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.base.domain.DatasetTableField;
+import io.dataease.commons.model.BaseRspModel;
+import io.dataease.controller.request.panel.PanelLinkageRequest;
+import io.dataease.controller.request.panel.PanelSubjectRequest;
+import io.dataease.dto.panel.linkJump.PanelLinkJumpBaseRequest;
+import io.dataease.dto.panel.linkJump.PanelLinkJumpBaseResponse;
+import io.dataease.dto.panel.linkJump.PanelLinkJumpDTO;
+import io.dataease.dto.panel.linkJump.PanelLinkJumpInfoDTO;
+import io.dataease.service.panel.PanelLinkJumpService;
+import io.dataease.service.panel.PanelViewLinkageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Author: wangjiahao
+ * Date: 8/4/21
+ * Description:
+ */
+@Api(tags = "仪表板：仪表板跳转")
+@ApiSupport(order = 171)
+@RestController
+@RequestMapping("linkJump")
+public class PanelLinkJumpController {
+
+    @Resource
+    private PanelLinkJumpService panelLinkJumpService;
+
+    @ApiOperation("根据视图ID获取对应表字段信息")
+    @GetMapping("/getTableFieldWithViewId/{viewId}")
+    public List<DatasetTableField>  getTableFieldWithViewId(@PathVariable String viewId){
+        return panelLinkJumpService.getViewFields(viewId);
+    }
+
+
+    @ApiOperation("根据仪表板ID和视图ID获取跳转信息")
+    @GetMapping("/queryWithViewId/{panelId}/{viewId}")
+    public PanelLinkJumpDTO queryWithViewId(@PathVariable String panelId, @PathVariable String viewId){
+        return panelLinkJumpService.queryWithView(panelId,viewId);
+    }
+
+    @ApiOperation("根据仪表板ID获取跳转信息")
+    @GetMapping("/queryPanelJumpInfo/{panelId}")
+    public PanelLinkJumpBaseResponse queryPanelJumpInfo(@PathVariable String panelId){
+        return panelLinkJumpService.queryPanelJumpInfo(panelId);
+    }
+
+    @ApiOperation("更新跳转信息")
+    @PostMapping("/updateJumpSet")
+    public void updateJumpSet(@RequestBody PanelLinkJumpDTO jumpDTO){
+        panelLinkJumpService.updateJumpSet(jumpDTO);
+    }
+
+    @ApiOperation("获取仪表板目标仪表板跳转联动信息")
+    @PostMapping("/queryTargetPanelJumpInfo")
+    public PanelLinkJumpBaseResponse queryTargetPanelJumpInfo(@RequestBody PanelLinkJumpBaseRequest request){
+        return panelLinkJumpService.queryTargetPanelJumpInfo(request);
+    }
+}

backend/src/main/java/io/dataease/controller/panel/PanelViewController.java

@@ -0,0 +1,39 @@
+package io.dataease.controller.panel;
+
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.base.domain.PanelGroup;
+import io.dataease.base.domain.PanelGroupWithBLOBs;
+import io.dataease.controller.handler.annotation.I18n;
+import io.dataease.controller.request.panel.PanelGroupRequest;
+import io.dataease.dto.chart.ChartViewDTO;
+import io.dataease.dto.panel.PanelGroupDTO;
+import io.dataease.dto.panel.PanelViewTableDTO;
+import io.dataease.service.panel.PanelGroupService;
+import io.dataease.service.panel.PanelViewService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * Author: wangjiahao
+ * Date: 2021-03-05
+ * Description:
+ */
+@Api(tags = "仪表板：仪表板视图")
+@ApiSupport(order = 150)
+@RestController
+@RequestMapping("panel/view")
+public class PanelViewController {
+
+    @Resource
+    private PanelViewService panelViewService;
+
+    @ApiOperation("视图详细信息")
+    @GetMapping("/detailList/{panelId}")
+    public List<PanelViewTableDTO> detailList(@PathVariable String panelId) throws Exception {
+        return panelViewService.detailList(panelId);
+    }
+}

backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java

@@ -4,9 +4,7 @@ package io.dataease.controller.panel.api;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.controller.ResultHolder;
 import io.dataease.controller.request.chart.ChartExtRequest;
-import io.dataease.controller.request.panel.link.EnablePwdRequest;
-import io.dataease.controller.request.panel.link.LinkRequest;
-import io.dataease.controller.request.panel.link.PasswordRequest;
+import io.dataease.controller.request.panel.link.*;
 import io.dataease.dto.panel.link.GenerateDto;
 import io.dataease.dto.panel.link.ValidateDto;
 import io.swagger.annotations.Api;
@@ -29,6 +27,10 @@ public interface LinkApi {
     @PostMapping("/enablePwd")
     void enablePwd(EnablePwdRequest request);
 
+    @ApiOperation("过期时间")
+    @PostMapping("/resetOverTime")
+    void resetOverTime(OverTimeRequest request);
+
     @ApiOperation("启用/禁用链接分享")
     @PostMapping("/switchLink")
     void switchLink(LinkRequest request);
@@ -39,7 +41,7 @@ public interface LinkApi {
 
     @ApiOperation("验证访问")
     @PostMapping("/validate")
-    ValidateDto validate(Map<String, String> param) throws Exception;
+    ValidateDto validate(LinkValidateRequest request) throws Exception;
 
     @ApiOperation("验证密码")
     @PostMapping("/validatePwd")
@@ -55,5 +57,5 @@ public interface LinkApi {
 
     @ApiOperation("压缩链接")
     @PostMapping("/shortUrl")
-    ResultHolder shortUrl(@RequestBody Map<String,String> param);
+    String shortUrl(@RequestBody Map<String,String> param);
 }

backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java

@@ -3,11 +3,16 @@ package io.dataease.controller.panel.api;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.PanelShare;
 import io.dataease.controller.request.panel.PanelShareFineDto;
+import io.dataease.controller.request.panel.PanelShareRemoveRequest;
 import io.dataease.controller.request.panel.PanelShareRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.dto.panel.PanelShareDto;
+import io.dataease.dto.panel.PanelShareOutDTO;
+import io.dataease.dto.panel.PanelSharePo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import springfox.documentation.annotations.ApiIgnore;
@@ -22,22 +27,38 @@ import java.util.List;
 @RequestMapping("/api/share")
 public interface ShareApi {
 
-    @ApiIgnore
+    /*@ApiIgnore
     @PostMapping("/")
-    void share(PanelShareRequest request);
+    void share(PanelShareRequest request);*/
 
-    @ApiOperation("查询分享")
+    @ApiOperation("查询分享给我")
     @PostMapping("/treeList")
     List<PanelShareDto> treeList(BaseGridRequest request);
 
+    @ApiOperation("查询我分享的")
+    @PostMapping("/shareOut")
+    List<PanelSharePo> shareOut();
+
+
 
     @ApiOperation("根据资源查询分享")
     @PostMapping("/queryWithResourceId")
     List<PanelShare> queryWithResourceId(BaseGridRequest request);
 
+    @ApiOperation("查询分享目标")
+    @PostMapping("/queryTargets/{panelId}")
+    @ApiImplicitParam(paramType = "path", value = "仪表板ID", name = "panelId", required = true, dataType = "String")
+    List<PanelShareOutDTO> queryTargets(@PathVariable("panelId") String panelId);
+
 
     @ApiOperation("创建分享")
     @PostMapping("/fineSave")
     void fineSave(PanelShareFineDto panelShareFineDto);
 
+
+
+    @ApiOperation("删除分享")
+    @PostMapping("/removeShares")
+    void removeShares(PanelShareRemoveRequest request);
+
 }

backend/src/main/java/io/dataease/controller/panel/server/LinkServer.java

@@ -1,15 +1,11 @@
 package io.dataease.controller.panel.server;
 
 
-import com.google.gson.Gson;
 import io.dataease.base.domain.PanelLink;
 import io.dataease.controller.ResultHolder;
 import io.dataease.controller.panel.api.LinkApi;
 import io.dataease.controller.request.chart.ChartExtRequest;
-import io.dataease.controller.request.panel.link.EnablePwdRequest;
-import io.dataease.controller.request.panel.link.LinkRequest;
-import io.dataease.controller.request.panel.link.PasswordRequest;
-import io.dataease.controller.request.panel.link.ValidateRequest;
+import io.dataease.controller.request.panel.link.*;
 import io.dataease.dto.panel.link.GenerateDto;
 import io.dataease.dto.panel.link.ValidateDto;
 import io.dataease.service.chart.ChartViewService;
@@ -46,6 +42,14 @@ public class LinkServer implements LinkApi {
         panelLinkService.changeEnablePwd(request);
     }
 
+    
+
+    @Override
+    public void resetOverTime(@RequestBody OverTimeRequest request) {
+        panelLinkService.overTime(request);
+        
+    }
+
     @Override
     public void switchLink(@RequestBody LinkRequest request) {
         panelLinkService.changeValid(request);
@@ -57,14 +61,13 @@ public class LinkServer implements LinkApi {
     }
 
     @Override
-    public ValidateDto validate(@RequestBody Map<String, String> param)  throws Exception{
-        String link = param.get("link");
+    public ValidateDto validate(@RequestBody LinkValidateRequest request)  throws Exception{
+        String link = request.getLink();
         String json = panelLinkService.decryptParam(link);
-        Gson gson = new Gson();
 
-        ValidateRequest request = gson.fromJson(json, ValidateRequest.class);
         ValidateDto dto = new ValidateDto();
-        String resourceId = request.getResourceId();
+        String resourceId = json;
+       /*  String resourceId = request.getResourceId(); */
         PanelLink one = panelLinkService.findOne(resourceId);
         dto.setResourceId(resourceId);
         if (ObjectUtils.isEmpty(one)){
@@ -74,6 +77,7 @@ public class LinkServer implements LinkApi {
         dto.setValid(one.getValid());
         dto.setEnablePwd(one.getEnablePwd());
         dto.setPassPwd(panelLinkService.validateHeads(one));
+        dto.setExpire(panelLinkService.isExpire(one));
         return dto;
     }
 
@@ -92,9 +96,15 @@ public class LinkServer implements LinkApi {
         return chartViewService.getData(viewId, requestList);
     }
 
-    @Override
+    /*@Override
     public ResultHolder shortUrl(Map<String,String> param) {
         String url = param.get("url");
         return panelLinkService.getShortUrl(url);
+    }*/
+
+    @Override
+    public String shortUrl(Map<String,String> param) {
+        String resourceId = param.get("resourceId");
+        return panelLinkService.getShortUrl(resourceId);
     }
 }

backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java

@@ -3,10 +3,14 @@ package io.dataease.controller.panel.server;
 import io.dataease.base.domain.PanelShare;
 import io.dataease.controller.panel.api.ShareApi;
 import io.dataease.controller.request.panel.PanelShareFineDto;
+import io.dataease.controller.request.panel.PanelShareRemoveRequest;
 import io.dataease.controller.request.panel.PanelShareRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.dto.panel.PanelShareDto;
+import io.dataease.dto.panel.PanelShareOutDTO;
+import io.dataease.dto.panel.PanelSharePo;
 import io.dataease.service.panel.ShareService;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -18,26 +22,40 @@ public class ShareServer implements ShareApi {
 
     @Resource
     private ShareService shareService;
-    @Override
+    /*@Override
     public void share(@RequestBody PanelShareRequest request) {
         shareService.save(request);
-    }
+    }*/
 
     @Override
     public List<PanelShareDto> treeList(@RequestBody BaseGridRequest request) {
         return shareService.queryTree(request);
     }
 
+    @Override
+    public List<PanelSharePo> shareOut() {
+        return shareService.queryShareOut();
+    }
 
     @Override
     public List<PanelShare> queryWithResourceId(@RequestBody BaseGridRequest request) {
         return shareService.queryWithResource(request);
     }
 
+    @Override
+    public List<PanelShareOutDTO> queryTargets(@PathVariable("panelId") String panelId) {
+        return shareService.queryTargets(panelId);
+    }
+
     @Override
     public void fineSave(@RequestBody PanelShareFineDto panelShareFineDto) {
         shareService.fineSave(panelShareFineDto);
     }
+
+    @Override
+    public void removeShares(@RequestBody PanelShareRemoveRequest request) {
+        shareService.removeShares(request);
+    }
 }
 
 

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

@@ -0,0 +1,17 @@
+package io.dataease.controller.request.chart;
+
+import io.dataease.base.domain.ChartViewWithBLOBs;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author gin
+ * @Date 2021/11/10 11:27 上午
+ */
+@Data
+public class ChartCalRequest {
+    @ApiModelProperty("视图")
+    private ChartViewWithBLOBs view;
+    @ApiModelProperty("额外请求参数")
+    private ChartExtRequest requestList;
+}

backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java

@@ -1,7 +1,7 @@
 package io.dataease.controller.request.dataset;
 
 import io.dataease.base.domain.DatasetTable;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

backend/src/main/java/io/dataease/controller/request/datasource/DatasourceRequest.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.request;
+package io.dataease.controller.request.datasource;
 
 import io.dataease.base.domain.Datasource;
 import lombok.Getter;

backend/src/main/java/io/dataease/controller/request/datasource/es/EsReponse.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/controller/request/panel/PanelShareRemoveRequest.java

@@ -0,0 +1,18 @@
+package io.dataease.controller.request.panel;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel("取消分享参数")
+public class PanelShareRemoveRequest implements Serializable {
+
+    @ApiModelProperty("仪表板ID")
+    private String panelId;
+
+    @ApiModelProperty("分享ID")
+    private String shareId;
+}

backend/src/main/java/io/dataease/controller/request/panel/link/LinkValidateRequest.java

@@ -0,0 +1,11 @@
+package io.dataease.controller.request.panel.link;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LinkValidateRequest implements Serializable {
+
+    private String link;
+}

backend/src/main/java/io/dataease/controller/request/panel/link/OverTimeRequest.java

@@ -0,0 +1,19 @@
+package io.dataease.controller.request.panel.link;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+@Data
+@Getter
+@Setter
+public class OverTimeRequest {
+
+    @ApiModelProperty("资源ID")
+    private String resourceId;
+
+    @ApiModelProperty("过期时间")
+    private Long overTime;
+    
+}

backend/src/main/java/io/dataease/controller/response/ExistLdapUser.java

@@ -0,0 +1,15 @@
+package io.dataease.controller.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+
+@ApiModel("已同步用户")
+public class ExistLdapUser {
+
+    @ApiModelProperty("账号")
+    private String username;
+
+}

backend/src/main/java/io/dataease/controller/sys/MsgController.java

@@ -23,6 +23,8 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 
 @Api(tags = "系统：消息管理")
 @ApiSupport(order = 230)
@@ -35,6 +37,11 @@ public class MsgController {
 
     @ApiOperation("分页查询")
     @PostMapping("/list/{goPage}/{pageSize}")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="path", name = "goPage", value = "页码", required = true, dataType = "Integer"),
+        @ApiImplicitParam(paramType="path", name = "pageSize", value = "页容量", required = true, dataType = "Integer"),
+        @ApiImplicitParam(name = "msgRequest", value = "查询条件", required = true)
+    })
     public Pager<List<MsgGridDto>> messages(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody MsgRequest msgRequest) {
         Long userId = AuthUtils.getUser().getUserId();
         List<Long> typeIds = null;
@@ -42,23 +49,26 @@ public class MsgController {
             List<SysMsgType> sysMsgTypes = sysMsgService.queryMsgTypes();
             typeIds = sysMsgTypes.stream().filter(sysMsgType -> msgRequest.getType() == sysMsgType.getPid()).map(SysMsgType::getMsgTypeId).collect(Collectors.toList());
         }
+        Long overTime = sysMsgService.overTime();
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
-        Pager<List<MsgGridDto>> listPager = PageUtils.setPageInfo(page, sysMsgService.queryGrid(userId, msgRequest, typeIds));
+        Pager<List<MsgGridDto>> listPager = PageUtils.setPageInfo(page, sysMsgService.queryGrid(userId, msgRequest, typeIds, overTime));
         return listPager;
     }
 
     @ApiOperation("查询未读数量")
     @PostMapping("/unReadCount")
-    public Long unReadCount(@RequestBody Map<String, Long> request) {
-        if(null == request || null == request.get("userId")) {
+    public Long unReadCount() {;
+        Long userId = null;
+        if(null == AuthUtils.getUser() || (userId = AuthUtils.getUser().getUserId()) == null) {
             throw new RuntimeException("缺少用户ID");
         }
-        Long userId = request.get("userId");
+        // Long userId = request.get("userId");
         return sysMsgService.queryCount(userId);
     }
 
     @ApiOperation("设置已读")
     @PostMapping("/setReaded/{msgId}")
+    @ApiImplicitParam(paramType="path", name = "msgId", value = "消息ID", required = true, dataType = "Long")
     public void setReaded(@PathVariable Long msgId) {
         sysMsgService.setReaded(msgId);
     }
@@ -66,6 +76,7 @@ public class MsgController {
 
     @ApiOperation("批量设置已读")
     @PostMapping("/batchRead")
+    @ApiImplicitParam(name = "msgIds", value = "消息ID集合", required = true, dataType = "List")
     public void batchRead(@RequestBody List<Long> msgIds) {
         sysMsgService.setBatchReaded(msgIds);
     }
@@ -78,6 +89,7 @@ public class MsgController {
 
     @ApiOperation("批量删除")
     @PostMapping("/batchDelete")
+    @ApiImplicitParam(name = "msgIds", value = "消息ID集合", required = true, dataType = "List")
     public void batchDelete(@RequestBody List<Long> msgIds) {
         sysMsgService.batchDelete(msgIds);
     }

backend/src/main/java/io/dataease/controller/sys/SysUserController.java

@@ -9,8 +9,8 @@ import io.dataease.base.domain.SysRole;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
+import io.dataease.controller.response.ExistLdapUser;
 import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.controller.sys.request.LdapAddRequest;
 import io.dataease.controller.sys.request.SysUserCreateRequest;
 import io.dataease.controller.sys.request.SysUserPwdRequest;
 import io.dataease.controller.sys.request.SysUserStateRequest;
@@ -19,13 +19,17 @@ import io.dataease.controller.sys.response.SysUserGridResponse;
 import io.dataease.service.sys.SysRoleService;
 import io.dataease.service.sys.SysUserService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 @RestController
 @Api(tags = "系统：用户管理")
@@ -41,6 +45,11 @@ public class SysUserController {
 
     @ApiOperation("查询用户")
     @PostMapping("/userGrid/{goPage}/{pageSize}")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="path", name = "goPage", value = "页码", required = true, dataType = "Integer"),
+        @ApiImplicitParam(paramType="path", name = "pageSize", value = "页容量", required = true, dataType = "Integer"),
+        @ApiImplicitParam(name = "request", value = "查询条件", required = true)
+    })
     public Pager<List<SysUserGridResponse>> userGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         return PageUtils.setPageInfo(page, sysUserService.query(request));
@@ -64,6 +73,7 @@ public class SysUserController {
 
     @ApiOperation("删除用户")
     @PostMapping("/delete/{userId}")
+    @ApiImplicitParam(paramType = "path", value = "用户ID", name = "userId", required = true, dataType = "Integer")
     public void delete(@PathVariable("userId") Long userId){
         sysUserService.delete(userId);
     }
@@ -104,6 +114,7 @@ public class SysUserController {
 
     @ApiOperation("设置语言")
     @PostMapping("/setLanguage/{language}")
+    @ApiImplicitParam(paramType="path", name = "language", value = "语言(zh_CN, zh_TW, en_US)", required = true, dataType = "String")
     public void setLanguage(@PathVariable String language) {
         CurrentUserDto user = AuthUtils.getUser();
         Optional.ofNullable(language).ifPresent(currentLanguage -> {
@@ -123,6 +134,11 @@ public class SysUserController {
 
     @ApiOperation("查询角色")
     @PostMapping("/roleGrid/{goPage}/{pageSize}")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="path", name = "goPage", value = "页码", required = true, dataType = "Integer"),
+        @ApiImplicitParam(paramType="path", name = "pageSize", value = "页容量", required = true, dataType = "Integer"),
+        @ApiImplicitParam(name = "request", value = "查询条件", required = true)
+    })
     public Pager<List<SysRole>> roleGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
         Pager<List<SysRole>> listPager = PageUtils.setPageInfo(page, sysRoleService.query(request));
@@ -130,16 +146,21 @@ public class SysUserController {
     }
 
 
-    @ApiOperation("同步用户")
+    /* @ApiOperation("同步用户")
     @PostMapping("/sync")
     public void importLdap(@RequestBody LdapAddRequest request) {
         sysUserService.saveLdapUsers(request);
-    }
+    } */
 
     @ApiOperation("已同步用户")
     @PostMapping("/existLdapUsers")
-    public List<String> getExistLdapUsers() {
-        return sysUserService.ldapUserNames();
+    public List<ExistLdapUser> getExistLdapUsers() {
+        List<String> userNames = sysUserService.ldapUserNames();
+        return userNames.stream().map(name -> {
+            ExistLdapUser ldapUser = new ExistLdapUser();
+            ldapUser.setUsername(name);
+            return ldapUser;
+        }).collect(Collectors.toList());
     }
 
 }

backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java

@@ -2,9 +2,13 @@ package io.dataease.controller.sys;
 
 import io.dataease.base.domain.SystemParameter;
 import io.dataease.commons.constants.ParamConstants;
+import io.dataease.controller.sys.response.BasicInfo;
+import io.dataease.controller.sys.response.MailInfo;
 import io.dataease.dto.SystemParameterDTO;
 import io.dataease.service.FileService;
 import io.dataease.service.system.SystemParameterService;
+
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -28,11 +32,33 @@ public class SystemParameterController {
     @Resource
     private FileService fileService;
 
+
+    @GetMapping("/mail/info")
+    public MailInfo mailInfo() {
+        return systemParameterService.mailInfo(ParamConstants.Classify.MAIL.getValue());
+    }
+
+    @GetMapping("/basic/info")
+    public BasicInfo basicInfo() {
+        return systemParameterService.basicInfo();
+    }
+    
+    @GetMapping("/requestTimeOut")
+    public Integer RequestTimeOut() {
+        BasicInfo basicInfo = systemParameterService.basicInfo();
+        return StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 10;
+    }
+
     @PostMapping("/edit/email")
     public void editMail(@RequestBody List<SystemParameter> systemParameter) {
         systemParameterService.editMail(systemParameter);
     }
 
+    @PostMapping("/edit/basic")
+    public void editBasic(@RequestBody List<SystemParameter> systemParameter) {
+        systemParameterService.editBasic(systemParameter);
+    }
+
     @PostMapping("/testConnection")
     public void testConnection(@RequestBody HashMap<String, String> hashMap) {
         systemParameterService.testConnection(hashMap);
@@ -70,4 +96,6 @@ public class SystemParameterController {
     }
 
 
+
+
 }

backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java

@@ -1,6 +1,7 @@
 package io.dataease.controller.sys.base;
 
 import io.dataease.base.mapper.ext.query.GridExample;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.collections.CollectionUtils;
 
@@ -8,9 +9,11 @@ import java.io.Serializable;
 import java.util.List;
 
 
+
+@ApiModel("查询条件")
 public class BaseGridRequest implements Serializable {
 
-    @ApiModelProperty("查询条件")
+    @ApiModelProperty("条件集合")
     private List<ConditionEntity> conditions;
 
     public List<ConditionEntity> getConditions() {

backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java

@@ -1,5 +1,6 @@
 package io.dataease.controller.sys.request;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -7,6 +8,7 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
+@ApiModel("消息条件")
 public class MsgRequest implements Serializable {
 
     private static final long serialVersionUID = 1920091635946508658L;

backend/src/main/java/io/dataease/controller/sys/request/SysUserCreateRequest.java

@@ -1,12 +1,14 @@
 package io.dataease.controller.sys.request;
 
 import io.dataease.base.domain.SysUser;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
+@ApiModel("用户信息")
 public class SysUserCreateRequest extends SysUser {
 
     @ApiModelProperty(value = "角色ID集合", required = true, position = 7)

backend/src/main/java/io/dataease/controller/sys/request/SysUserPwdRequest.java

@@ -1,12 +1,14 @@
 package io.dataease.controller.sys.request;
 
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel("更新密码参数")
 public class SysUserPwdRequest implements Serializable {
 
     @ApiModelProperty(value = "用户ID", required = true)

backend/src/main/java/io/dataease/controller/sys/request/SysUserStateRequest.java

@@ -1,16 +1,18 @@
 package io.dataease.controller.sys.request;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
+@ApiModel("更新状态参数")
 public class SysUserStateRequest implements Serializable {
 
     @ApiModelProperty(value = "用户ID", required = true)
     private Long userId;
 
-    @ApiModelProperty(value = "状态", required = true, allowableValues = "1,0")
+    @ApiModelProperty(value = "状态{1:可用, 0:禁用}", required = true, allowableValues = "1,0")
     private Long enabled;
 }

backend/src/main/java/io/dataease/controller/sys/response/BasicInfo.java

@@ -0,0 +1,16 @@
+package io.dataease.controller.sys.response;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BasicInfo implements Serializable{
+
+    @ApiModelProperty("请求超时时间")
+    private String frontTimeOut;
+    @ApiModelProperty("消息保留时间")
+    private String msgTimeOut;
+    
+}

backend/src/main/java/io/dataease/controller/sys/response/MailInfo.java

@@ -0,0 +1,18 @@
+package io.dataease.controller.sys.response;
+
+import java.io.Serializable;
+
+import lombok.Data;
+
+@Data
+public class MailInfo implements Serializable{
+
+    private String host;
+    private String port;
+    private String account;
+    private String password;
+    private String ssl;
+    private String tls;
+    private String recipient;
+    
+}

backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java

@@ -1,6 +1,7 @@
 package io.dataease.controller.sys.response;
 
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +9,7 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
+@ApiModel("消息类型节点")
 public class SettingTreeNode implements Serializable {
 
     private static final long serialVersionUID = -2416283978185545199L;

backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java

@@ -0,0 +1,12 @@
+package io.dataease.dto.authModel;
+
+import io.dataease.base.domain.VAuthModel;
+
+/**
+ * Author: wangjiahao
+ * Date: 2021/11/5
+ * Description:
+ */
+public class VAuthModelDTO extends VAuthModel {
+
+}

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

@@ -0,0 +1,21 @@
+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author gin
+ * @Date 2021/8/9 10:14 上午
+ */
+@Data
+public class AxisChartDataAntVDTO {
+    private BigDecimal value;
+    private List<ChartDimensionDTO> dimensionList;
+    private List<ChartQuotaDTO> quotaList;
+    private String field;
+    private String name;
+    private String category;
+    private BigDecimal popSize;
+}

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

@@ -16,4 +16,8 @@ public class ChartGroupDTO extends DatasetGroup implements ITreeBase<ChartGroupD
     private List<ChartGroupDTO> children;
     @ApiModelProperty("权限")
     private String privileges;
+    @ApiModelProperty("节点类型")
+    public String getNodeType(){
+        return super.getType();
+    };
 }

backend/src/main/java/io/dataease/dto/dataset/DataSetGroupDTO.java

@@ -19,4 +19,8 @@ public class DataSetGroupDTO extends DatasetGroup implements ITreeBase<DataSetGr
     private List<DataSetGroupDTO> children;
     @ApiModelProperty("权限")
     private String privileges;
+    @ApiModelProperty("节点类型")
+    public String getNodeType(){
+        return super.getType();
+    };
 }

backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java

@@ -1,6 +1,6 @@
 package io.dataease.dto.dataset;
 
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;