diff --git a/Dockerfile b/Dockerfile index 9f63349c86..70dec5f209 100644 --- a/Dockerfile +++ b/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 diff --git a/backend/pom.xml b/backend/pom.xml index 56c47df966..8316c908e9 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,11 +5,12 @@ dataease-server io.dataease - 1.3.0 + 1.4.0 4.0.0 backend + UTF-8 @@ -200,7 +201,7 @@ io.dataease dataease-plugin-interface - 1.3 + 1.4 cn.hutool @@ -229,29 +230,19 @@ 8.3.0.7-683 - c3p0 - c3p0 - 0.9.1.2 - - - com.oracle.database.jdbc - ojdbc8 - 12.2.0.1 - - - ru.yandex.clickhouse - clickhouse-jdbc - 0.3.1 - - - com.microsoft.sqlserver - mssql-jdbc - 7.4.1.jre8 - - - org.postgresql - postgresql - 42.2.14 + com.alibaba + druid + 1.2.8 + + + com.alibaba + jconsole + + + com.alibaba + tools + + @@ -267,14 +258,34 @@ src/main/resources - + + true + + static/**/*.woff + static/**/*.woff2 + static/**/*.ttf + + + + + src/main/resources false + + static/**/*.woff + static/**/*.woff2 + static/**/*.ttf + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + org.springframework.boot spring-boot-maven-plugin @@ -370,6 +381,7 @@ maven-antrun-plugin + main-class-placement generate-resources diff --git a/backend/src/main/java/io/dataease/auth/api/AuthApi.java b/backend/src/main/java/io/dataease/auth/api/AuthApi.java index f5e72afbb0..2af165a370 100644 --- a/backend/src/main/java/io/dataease/auth/api/AuthApi.java +++ b/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(); + } diff --git a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java b/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java index 62af1ce003..20bae525ef 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java +++ b/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; } diff --git a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java index c7a46650b6..ca9dd2f013 100644 --- a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java +++ b/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; diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java b/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java index 94a43bce52..c94900c4fc 100644 --- a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java +++ b/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) { diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index 96979bfda7..219a9c5a47 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/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(){{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 diff --git a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java b/backend/src/main/java/io/dataease/auth/service/AuthUserService.java index a01fe2a3cc..13eee76696 100644 --- a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java +++ b/backend/src/main/java/io/dataease/auth/service/AuthUserService.java @@ -29,6 +29,8 @@ public interface AuthUserService { Boolean supportOidc(); + Boolean pluginLoaded(); + } diff --git a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java index ebd6febcec..9c65616c9a 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java +++ b/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 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(); + } + + + } diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index aecb307469..3546c799b5 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/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); diff --git a/backend/src/main/java/io/dataease/base/domain/ChartView.java b/backend/src/main/java/io/dataease/base/domain/ChartView.java index ed807bd4fd..69777d3f87 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartView.java +++ b/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("创建人") diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java index 7aaf8d21e5..9def62d21e 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java +++ b/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 values) { + addCriterion("render in", values, "render"); + return (Criteria) this; + } + + public Criteria andRenderNotIn(List 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 values) { + addCriterion("result_count in", values, "resultCount"); + return (Criteria) this; + } + + public Criteria andResultCountNotIn(List 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 values) { + addCriterion("result_mode in", values, "resultMode"); + return (Criteria) this; + } + + public Criteria andResultModeNotIn(List 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; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLink.java b/backend/src/main/java/io/dataease/base/domain/PanelLink.java index efe0e389fb..966a8c59c3 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelLink.java +++ b/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; } \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkExample.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkExample.java index 0dccb6d0b7..99e7fb3f91 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelLinkExample.java +++ b/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 values) { + addCriterion("over_time in", values, "overTime"); + return (Criteria) this; + } + + public Criteria andOverTimeNotIn(List 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 { diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkJump.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkJump.java new file mode 100644 index 0000000000..3f4f5d1a81 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpExample.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpExample.java new file mode 100644 index 0000000000..5997faedfd --- /dev/null +++ b/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 oredCriteria; + + public PanelLinkJumpExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("source_panel_id in", values, "sourcePanelId"); + return (Criteria) this; + } + + public Criteria andSourcePanelIdNotIn(List 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 values) { + addCriterion("source_view_id in", values, "sourceViewId"); + return (Criteria) this; + } + + public Criteria andSourceViewIdNotIn(List 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 values) { + addCriterion("link_jump_info in", values, "linkJumpInfo"); + return (Criteria) this; + } + + public Criteria andLinkJumpInfoNotIn(List 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 values) { + addCriterion("`checked` in", values, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfo.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfo.java new file mode 100644 index 0000000000..1db904bf41 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfoExample.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfoExample.java new file mode 100644 index 0000000000..3687170a43 --- /dev/null +++ b/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 oredCriteria; + + public PanelLinkJumpInfoExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("link_jump_id in", values, "linkJumpId"); + return (Criteria) this; + } + + public Criteria andLinkJumpIdNotIn(List 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 values) { + addCriterion("link_type in", values, "linkType"); + return (Criteria) this; + } + + public Criteria andLinkTypeNotIn(List 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 values) { + addCriterion("jump_type in", values, "jumpType"); + return (Criteria) this; + } + + public Criteria andJumpTypeNotIn(List 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 values) { + addCriterion("target_panel_id in", values, "targetPanelId"); + return (Criteria) this; + } + + public Criteria andTargetPanelIdNotIn(List 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 values) { + addCriterion("source_field_id in", values, "sourceFieldId"); + return (Criteria) this; + } + + public Criteria andSourceFieldIdNotIn(List 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 values) { + addCriterion("content in", values, "content"); + return (Criteria) this; + } + + public Criteria andContentNotIn(List 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 values) { + addCriterion("`checked` in", values, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpTargetViewInfo.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpTargetViewInfo.java new file mode 100644 index 0000000000..81c7a1cef3 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpTargetViewInfoExample.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkJumpTargetViewInfoExample.java new file mode 100644 index 0000000000..7f0ea708d7 --- /dev/null +++ b/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 oredCriteria; + + public PanelLinkJumpTargetViewInfoExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("target_id in", values, "targetId"); + return (Criteria) this; + } + + public Criteria andTargetIdNotIn(List 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 values) { + addCriterion("link_jump_info_id in", values, "linkJumpInfoId"); + return (Criteria) this; + } + + public Criteria andLinkJumpInfoIdNotIn(List 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 values) { + addCriterion("target_view_id in", values, "targetViewId"); + return (Criteria) this; + } + + public Criteria andTargetViewIdNotIn(List 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 values) { + addCriterion("target_field_id in", values, "targetFieldId"); + return (Criteria) this; + } + + public Criteria andTargetFieldIdNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkMapping.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkMapping.java new file mode 100644 index 0000000000..8af3488aa4 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkMappingExample.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkMappingExample.java new file mode 100644 index 0000000000..da9e2da4ca --- /dev/null +++ b/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 oredCriteria; + + public PanelLinkMappingExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("resource_id in", values, "resourceId"); + return (Criteria) this; + } + + public Criteria andResourceIdNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java b/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java index 2bae1b3142..4febdde0fb 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java +++ b/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") diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java b/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java index 49862f077e..13780af7d8 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java +++ b/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; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgType.java b/backend/src/main/java/io/dataease/base/domain/SysMsgType.java index 97262451b5..63d1e7db8a 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgType.java +++ b/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; diff --git a/backend/src/main/java/io/dataease/base/domain/SysUser.java b/backend/src/main/java/io/dataease/base/domain/SysUser.java index 8867cc75c4..19b0ad8da8 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUser.java +++ b/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; diff --git a/backend/src/main/java/io/dataease/base/domain/VAuthModel.java b/backend/src/main/java/io/dataease/base/domain/VAuthModel.java new file mode 100644 index 0000000000..7205966be8 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/VAuthModelExample.java b/backend/src/main/java/io/dataease/base/domain/VAuthModelExample.java new file mode 100644 index 0000000000..5948918233 --- /dev/null +++ b/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 oredCriteria; + + public VAuthModelExample() { + oredCriteria = new ArrayList(); + } + + 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 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 criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List 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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("pid in", values, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotIn(List 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 values) { + addCriterion("node_type in", values, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeNotIn(List 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 values) { + addCriterion("model_type in", values, "modelType"); + return (Criteria) this; + } + + public Criteria andModelTypeNotIn(List 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 values) { + addCriterion("model_inner_type in", values, "modelInnerType"); + return (Criteria) this; + } + + public Criteria andModelInnerTypeNotIn(List 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 values) { + addCriterion("auth_type in", values, "authType"); + return (Criteria) this; + } + + public Criteria andAuthTypeNotIn(List 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 values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List 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); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/VAuthModelWithBLOBs.java b/backend/src/main/java/io/dataease/base/domain/VAuthModelWithBLOBs.java new file mode 100644 index 0000000000..e5fc73af43 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml index 72b2eaaca0..1bdedbf438 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml @@ -7,6 +7,9 @@ + + + @@ -84,8 +87,8 @@ - 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 x_axis, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter, @@ -141,14 +144,16 @@ 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 @@ `type`, + + render, + + + result_count, + + + result_mode, + title, @@ -235,6 +249,15 @@ #{type,jdbcType=VARCHAR}, + + #{render,jdbcType=VARCHAR}, + + + #{resultCount,jdbcType=INTEGER}, + + + #{resultMode,jdbcType=VARCHAR}, + #{title,jdbcType=VARCHAR}, @@ -306,6 +329,15 @@ `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}, @@ -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 @@ `type` = #{type,jdbcType=VARCHAR}, + + render = #{render,jdbcType=VARCHAR}, + + + result_count = #{resultCount,jdbcType=INTEGER}, + + + result_mode = #{resultMode,jdbcType=VARCHAR}, + title = #{title,jdbcType=VARCHAR}, @@ -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}, diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.java new file mode 100644 index 0000000000..1c7eaa67e8 --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml new file mode 100644 index 0000000000..349f76cd7c --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, link_jump_id, link_type, jump_type, target_panel_id, source_field_id, content, + `checked` + + + + + delete from panel_link_jump_info + where id = #{id,jdbcType=VARCHAR} + + + delete from panel_link_jump_info + + + + + + 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 into panel_link_jump_info + + + id, + + + link_jump_id, + + + link_type, + + + jump_type, + + + target_panel_id, + + + source_field_id, + + + content, + + + `checked`, + + + + + #{id,jdbcType=VARCHAR}, + + + #{linkJumpId,jdbcType=VARCHAR}, + + + #{linkType,jdbcType=VARCHAR}, + + + #{jumpType,jdbcType=VARCHAR}, + + + #{targetPanelId,jdbcType=VARCHAR}, + + + #{sourceFieldId,jdbcType=VARCHAR}, + + + #{content,jdbcType=VARCHAR}, + + + #{checked,jdbcType=BIT}, + + + + + + update panel_link_jump_info + + + 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}, + + + + + + + + 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} + + + + + + update panel_link_jump_info + + + 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 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} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.java new file mode 100644 index 0000000000..8bdf2b71e1 --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.xml new file mode 100644 index 0000000000..8f26c736a1 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.xml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, source_panel_id, source_view_id, link_jump_info, `checked` + + + + + delete from panel_link_jump + where id = #{id,jdbcType=VARCHAR} + + + delete from panel_link_jump + + + + + + 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 into panel_link_jump + + + id, + + + source_panel_id, + + + source_view_id, + + + link_jump_info, + + + `checked`, + + + + + #{id,jdbcType=VARCHAR}, + + + #{sourcePanelId,jdbcType=VARCHAR}, + + + #{sourceViewId,jdbcType=VARCHAR}, + + + #{linkJumpInfo,jdbcType=VARCHAR}, + + + #{checked,jdbcType=BIT}, + + + + + + update panel_link_jump + + + 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}, + + + + + + + + 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} + + + + + + update panel_link_jump + + + 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 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} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.java new file mode 100644 index 0000000000..33c5295d33 --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.xml new file mode 100644 index 0000000000..76270c5357 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + target_id, link_jump_info_id, target_view_id, target_field_id + + + + + delete from panel_link_jump_target_view_info + where target_id = #{targetId,jdbcType=VARCHAR} + + + delete from panel_link_jump_target_view_info + + + + + + 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 into panel_link_jump_target_view_info + + + target_id, + + + link_jump_info_id, + + + target_view_id, + + + target_field_id, + + + + + #{targetId,jdbcType=VARCHAR}, + + + #{linkJumpInfoId,jdbcType=VARCHAR}, + + + #{targetViewId,jdbcType=VARCHAR}, + + + #{targetFieldId,jdbcType=VARCHAR}, + + + + + + update panel_link_jump_target_view_info + + + 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}, + + + + + + + + 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} + + + + + + update panel_link_jump_target_view_info + + + 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 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} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelLinkMapper.xml index 130aeb61df..eedc1062fe 100644 --- a/backend/src/main/java/io/dataease/base/mapper/PanelLinkMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/PanelLinkMapper.xml @@ -6,6 +6,7 @@ + @@ -66,7 +67,7 @@ - resource_id, `valid`, enable_pwd, pwd + resource_id, `valid`, enable_pwd, pwd, over_time @@ -156,6 +163,9 @@ pwd = #{record.pwd,jdbcType=VARCHAR}, + + over_time = #{record.overTime,jdbcType=BIGINT}, + @@ -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} @@ -183,6 +194,9 @@ pwd = #{pwd,jdbcType=VARCHAR}, + + over_time = #{overTime,jdbcType=BIGINT}, + where resource_id = #{resourceId,jdbcType=VARCHAR} @@ -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} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.java new file mode 100644 index 0000000000..934de07719 --- /dev/null +++ b/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 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); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.xml new file mode 100644 index 0000000000..78851fad13 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, resource_id + + + + + delete from panel_link_mapping + where id = #{id,jdbcType=BIGINT} + + + delete from panel_link_mapping + + + + + + insert into panel_link_mapping (id, resource_id) + values (#{id,jdbcType=BIGINT}, #{resourceId,jdbcType=VARCHAR}) + + + insert into panel_link_mapping + + + id, + + + resource_id, + + + + + #{id,jdbcType=BIGINT}, + + + #{resourceId,jdbcType=VARCHAR}, + + + + + + update panel_link_mapping + + + id = #{record.id,jdbcType=BIGINT}, + + + resource_id = #{record.resourceId,jdbcType=VARCHAR}, + + + + + + + + update panel_link_mapping + set id = #{record.id,jdbcType=BIGINT}, + resource_id = #{record.resourceId,jdbcType=VARCHAR} + + + + + + update panel_link_mapping + + + resource_id = #{resourceId,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update panel_link_mapping + set resource_id = #{resourceId,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.java b/backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.java new file mode 100644 index 0000000000..aa655532ac --- /dev/null +++ b/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 selectByExampleWithBLOBs(VAuthModelExample example); + + List 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); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.xml b/backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.xml new file mode 100644 index 0000000000..d98ac7744b --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/VAuthModelMapper.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, pid, node_type, model_type, model_inner_type, auth_type, create_by + + + `name`, `label` + + + + + delete from v_auth_model + + + + + + 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 into v_auth_model + + + id, + + + pid, + + + node_type, + + + model_type, + + + model_inner_type, + + + auth_type, + + + create_by, + + + `name`, + + + `label`, + + + + + #{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}, + + + + + + update v_auth_model + + + 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}, + + + + + + + + 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} + + + + + + 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} + + + + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml index 772f9ede85..d755e2dc61 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml +++ b/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 diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java index 6481626578..6557ffc5f2 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java +++ b/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); + + } diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml index bbb583c1e9..5e2049d067 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml @@ -86,12 +86,7 @@ and panel_group.level = #{level} - - order by ${sort} - - - order by panel_group.create_time desc - + order by panel_group.name asc,panel_group.create_time desc 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})) + + INSERT INTO panel_view ( id, panel_id, chart_view_id ) SELECT + uuid(), + #{panelId}, + chart_view_id + FROM + panel_view + WHERE + panel_id = #{panelId} + + diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java new file mode 100644 index 0000000000..5c3f5a05c6 --- /dev/null +++ b/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 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 getTargetPanelJumpInfo(@Param("request")PanelLinkJumpBaseRequest request); +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml new file mode 100644 index 0000000000..7b0a7ba4ef --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 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 lj + FROM + panel_link_jump lj + WHERE + lj.source_panel_id = #{panelId} + AND lj.source_view_id = #{viewId} + + + + + + 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 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 lj + FROM + panel_link_jump lj + WHERE + lj.source_panel_id = #{panelId} + + + + diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkMapper.java new file mode 100644 index 0000000000..621ccfe6f0 --- /dev/null +++ b/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); + +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkMapper.xml new file mode 100644 index 0000000000..6e6b278b3f --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkMapper.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + update panel_link set over_time = #{request.overTime} where resource_id = #{request.resourceId} + + + + + + diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java index 12fa0e3264..9ce1f02393 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java +++ b/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 shares); + int batchInsert(@Param("shares") List shares, @Param("userName") String userName); int batchDelete(@Param("shareIds") List shareIds); List query(Map param); + List queryOut(String userName); + List queryWithResource(GridExample example); + List queryTargets(String panelId); + + void removeShares(@Param("request") PanelShareRemoveRequest request); + List queryUserIdWithRoleIds(Map> param); List queryUserIdWithDeptIds(Map> param); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml index c260a350ed..d21efce40f 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml @@ -8,11 +8,20 @@ + + + + + + + + + - 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 - (#{share.panelGroupId}, #{share.targetId}, #{share.createTime}, #{share.type}) + (#{share.panelGroupId}, #{share.targetId}, #{userName}, #{share.createTime}, #{share.type}) @@ -25,7 +34,7 @@ + + + + + + delete from panel_share + where panel_group_id = #{request.panelId} + + and share_id = #{request.shareId} + + + diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.java index 96ac3fe6a6..9982538fda 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.java @@ -16,6 +16,8 @@ public interface ExtPanelViewLinkageMapper { List queryTableField(@Param("table_id") String tableId); + List 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); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml index fb47e5fe23..d53d29140a 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml @@ -62,6 +62,18 @@ from dataset_table_field where table_id = #{table_id} + + delete from panel_view_linkage where panel_view_linkage.panel_id = #{panelId} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java index c1822724ae..72c6169423 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.java +++ b/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 views(String userId); + List getPanelViewDetails(@Param("panelId") String panelId); + void deleteWithPanelId(String panelId); void savePanelView(@Param("panelViews") List panelViews); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml index 82b22623a3..800b23bc7a 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml @@ -9,7 +9,42 @@ + + + + + + + + + + + - - - + + + { this.$store.commit('setNowPanelTrackInfo', rsp.data) }) + // 刷新跳转信息 + queryPanelJumpInfo(panelId).then(rsp => { + this.$store.commit('setNowPanelJumpInfo', rsp.data) + }) }) } }, @@ -520,19 +555,21 @@ export default { }) } else { this.currentWidget = ApplicationContext.getService(componentInfo.id) - this.currentFilterCom = this.currentWidget.getDrawPanel() - if (this.canvasStyleData.auxiliaryMatrix) { this.currentFilterCom.x = this.dropComponentInfo.x this.currentFilterCom.y = this.dropComponentInfo.y this.currentFilterCom.sizex = this.dropComponentInfo.sizex this.currentFilterCom.sizey = this.dropComponentInfo.sizey - this.currentFilterCom.style.left = (this.dragComponentInfo.x - 1) * this.curCanvasScale.matrixStyleOriginWidth this.currentFilterCom.style.top = (this.dragComponentInfo.y - 1) * this.curCanvasScale.matrixStyleOriginHeight this.currentFilterCom.style.width = this.dragComponentInfo.sizex * this.curCanvasScale.matrixStyleOriginWidth this.currentFilterCom.style.height = this.dragComponentInfo.sizey * this.curCanvasScale.matrixStyleOriginHeight + } else { + this.currentFilterCom.style.left = this.dragComponentInfo.shadowStyle.x + this.currentFilterCom.style.top = this.dragComponentInfo.shadowStyle.y + this.currentFilterCom.style.width = this.dragComponentInfo.style.width + this.currentFilterCom.style.height = this.dragComponentInfo.style.height } this.currentFilterCom.id = newComponentId this.currentFilterCom.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix @@ -572,14 +609,6 @@ export default { this.$store.commit('addComponent', { component }) this.$store.commit('recordSnapshot', 'handleDrop') this.clearCurrentInfo() - // this.$store.commit('clearDragComponentInfo') - - // // 文字组件 - // if (component.type === 'v-text') { - // this.$store.commit('setCurComponent', { component: component, index: this.componentData.length }) - // this.styleDialogVisible = true - // this.show = false - // } }, clearCurrentInfo() { this.currentWidget = null @@ -654,9 +683,9 @@ export default { this.$nextTick(() => { const canvasHeight = document.getElementById('canvasInfo').offsetHeight const canvasWidth = document.getElementById('canvasInfo').offsetWidth - this.outStyle.height = canvasHeight + this.outStyle.height = canvasHeight - (this.componentGap * 2) // 临时处理 确保每次restore 有会更新 - this.outStyle.width = canvasWidth + (Math.random() * 0.000001) + this.outStyle.width = canvasWidth - (this.componentGap * 2) + (Math.random() * 0.000001) // console.log(canvasHeight + '--' + canvasWidth) }) } @@ -687,6 +716,7 @@ export default { ...commonAttr, id: generateID(), component: 'Picture', + type: 'picture-add', label: '图片', icon: '', propValue: fileResult, @@ -761,9 +791,19 @@ export default { } }) + component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix // position = absolution 或导致有偏移 这里中和一下偏移量 - component.style.top = 0 - component.style.left = 600 + if (this.canvasStyleData.auxiliaryMatrix) { + component.style.left = (component.x - 1) * this.curCanvasScale.matrixStyleOriginWidth + component.style.top = (component.y - 1) * this.curCanvasScale.matrixStyleOriginHeight + component.style.width = component.sizex * this.curCanvasScale.matrixStyleOriginWidth + component.style.height = component.sizey * this.curCanvasScale.matrixStyleOriginHeight + } else { + component.style.left = 0 + component.style.top = 0 + component.x = 1 + component.y = 1 + } component.id = newComponentId this.$store.commit('addComponent', { component }) this.$store.commit('recordSnapshot', 'newViewInfo') @@ -780,7 +820,7 @@ export default { } }, canvasScroll(event) { - console.log('testTop' + event.target.scrollTop) + // console.log('testTop' + event.target.scrollTop) this.scrollLeft = event.target.scrollLeft this.scrollTop = event.target.scrollTop }, @@ -882,7 +922,6 @@ export default { overflow-x: hidden; overflow-y: auto; background-size:100% 100% !important; - } .el-main{ height: calc(100vh - 91px); @@ -898,7 +937,7 @@ export default { overflow-y: auto; } .button-show{ - background-color: var(--MainContentBG, #ebf2fe)!important; + background-color: var(--ContentBG, #ebf2fe)!important; } .button-closed{ diff --git a/frontend/src/views/panel/enshrine/index.vue b/frontend/src/views/panel/enshrine/index.vue index 28b6752394..590588f67e 100644 --- a/frontend/src/views/panel/enshrine/index.vue +++ b/frontend/src/views/panel/enshrine/index.vue @@ -55,6 +55,7 @@ export default { name: row.name } this.$store.dispatch('panel/setPanelInfo', data) + bus.$emit('set-panel-show-type', 0) }) }, resetID(data) { diff --git a/frontend/src/views/panel/export/PDFPreExport.vue b/frontend/src/views/panel/export/PDFPreExport.vue index af64d5e2bb..3051561bae 100644 --- a/frontend/src/views/panel/export/PDFPreExport.vue +++ b/frontend/src/views/panel/export/PDFPreExport.vue @@ -1,5 +1,11 @@ @@ -36,6 +42,7 @@ export default { }, data() { return { + exportLoading: false, activeName: '', templateContentChange: '', time: '', @@ -82,15 +89,20 @@ export default { }, save() { const _this = this - html2canvas(document.getElementById('exportPdf')).then(function(canvas) { - const contentWidth = canvas.width - const contentHeight = canvas.height - const pageData = canvas.toDataURL('image/jpeg', 1.0) - const PDF = new JsPDF('l', 'px', [contentWidth, contentHeight]) - PDF.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight) - PDF.save(_this.panelName + '.pdf') - } - ) + _this.exportLoading = true + setTimeout(() => { + html2canvas(document.getElementById('exportPdf')).then(function(canvas) { + _this.exportLoading = false + const contentWidth = canvas.width + const contentHeight = canvas.height + const pageData = canvas.toDataURL('image/jpeg', 1.0) + const PDF = new JsPDF('l', 'px', [contentWidth, contentHeight]) + PDF.addImage(pageData, 'JPEG', 0, 0, contentWidth, contentHeight) + PDF.save(_this.panelName + '.pdf') + _this.$emit('closePreExport') + } + ) + }, 50) } } diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue index 116a5b187f..16870d794e 100644 --- a/frontend/src/views/panel/filter/index.vue +++ b/frontend/src/views/panel/filter/index.vue @@ -161,7 +161,7 @@ export default { } .filter-widget { - width: 100px; + width: 107px; height: 36px; position: relative; float: left; diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index 1bb8a1fad0..07a4e2d79d 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -131,6 +131,14 @@ + + + @@ -232,6 +240,7 @@ import bus from '@/utils/bus' import EditPanel from './EditPanel' import { addGroup, delGroup, groupTree, defaultTree, findOne, panelSave } from '@/api/panel/panel' import { getPanelAllLinkageInfo } from '@/api/panel/linkage' +import { queryPanelJumpInfo } from '@/api/panel/linkJump' import { mapState } from 'vuex' import { DEFAULT_COMMON_CANVAS_STYLE_STRING @@ -631,6 +640,8 @@ export default { // this.$store.commit('setComponentData', sourceInfo.type === 'custom' ? sourceInfo : this.resetID(sourceInfo)) const temp = JSON.parse(response.data.panelStyle) temp.refreshTime = (temp.refreshTime || 5) + temp.refreshViewLoading = (temp.refreshViewLoading || false) + temp.refreshUnit = (temp.refreshUnit || 'minute') this.$store.commit('setCanvasStyle', temp) this.$store.dispatch('panel/setPanelInfo', data) @@ -639,6 +650,13 @@ export default { getPanelAllLinkageInfo(data.id).then(rsp => { this.$store.commit('setNowPanelTrackInfo', rsp.data) }) + + // 刷新跳转信息 + queryPanelJumpInfo(data.id).then(rsp => { + this.$store.commit('setNowPanelJumpInfo', rsp.data) + }) + + bus.$emit('set-panel-show-type', 0) }) } if (node.expanded) { @@ -793,6 +811,9 @@ export default { }, searchTypeClick(searchTypeInfo) { this.searchType = searchTypeInfo + }, + editFromPanelViewShow() { + this.edit(this.lastActiveNodeData, this.lastActiveNode) } } } diff --git a/frontend/src/views/panel/list/PanelMain.vue b/frontend/src/views/panel/list/PanelMain.vue index 991e60599b..5c16329626 100644 --- a/frontend/src/views/panel/list/PanelMain.vue +++ b/frontend/src/views/panel/list/PanelMain.vue @@ -3,21 +3,21 @@ - {{ $t('panel.panel_list') }} - + {{ $t('panel.panel_list') }} + - {{ $t('panel.store') }} + {{ $t('panel.store') }} - {{ $t('panel.share') }} + {{ $t('panel.share') }} - + @@ -101,6 +101,9 @@ export default { } } }) + }, + editPanel() { + this.$refs.panelList.editFromPanelViewShow() } } diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue index 623cdfd0d7..89a5fb8719 100644 --- a/frontend/src/views/panel/list/PanelViewShow.vue +++ b/frontend/src/views/panel/list/PanelViewShow.vue @@ -1,7 +1,19 @@ + + + + diff --git a/frontend/src/views/system/SysParam/BasicSetting.vue b/frontend/src/views/system/SysParam/BasicSetting.vue new file mode 100644 index 0000000000..f29e560d02 --- /dev/null +++ b/frontend/src/views/system/SysParam/BasicSetting.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/frontend/src/views/system/systemParamSettings/EmailSetting.vue b/frontend/src/views/system/SysParam/EmailSetting.vue similarity index 95% rename from frontend/src/views/system/systemParamSettings/EmailSetting.vue rename to frontend/src/views/system/SysParam/EmailSetting.vue index 1f529b79a5..722ce2c6be 100644 --- a/frontend/src/views/system/systemParamSettings/EmailSetting.vue +++ b/frontend/src/views/system/SysParam/EmailSetting.vue @@ -1,5 +1,5 @@ - diff --git a/frontend/src/views/system/settings/sso/index.vue b/frontend/src/views/system/settings/sso/index.vue deleted file mode 100644 index 346b65549a..0000000000 --- a/frontend/src/views/system/settings/sso/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/frontend/src/views/system/settings/sso/ldap/index.vue b/frontend/src/views/system/settings/sso/ldap/index.vue deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frontend/src/views/system/settings/sso/oidc/index.vue b/frontend/src/views/system/settings/sso/oidc/index.vue deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frontend/src/views/system/settings/theme/index.vue b/frontend/src/views/system/settings/theme/index.vue deleted file mode 100644 index 8e466fc5f4..0000000000 --- a/frontend/src/views/system/settings/theme/index.vue +++ /dev/null @@ -1,10 +0,0 @@ - - diff --git a/frontend/src/views/system/systemParamSettings/UiSetting.vue b/frontend/src/views/system/systemParamSettings/UiSetting.vue deleted file mode 100644 index 338f0ad73f..0000000000 --- a/frontend/src/views/system/systemParamSettings/UiSetting.vue +++ /dev/null @@ -1,322 +0,0 @@ - - - - - diff --git a/frontend/src/views/system/systemParamSettings/index.vue b/frontend/src/views/system/systemParamSettings/index.vue deleted file mode 100644 index e43a9cf823..0000000000 --- a/frontend/src/views/system/systemParamSettings/index.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - - - diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue index 20ee51390e..d1659d0e73 100644 --- a/frontend/src/views/system/user/form.vue +++ b/frontend/src/views/system/user/form.vue @@ -1,6 +1,6 @@