From 8ec93a1337490d2ff6771ae5efb47f2d12944b42 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 28 Oct 2021 17:05:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B9=8B=E9=97=B4=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=EF=BC=8C=E5=A4=96=E9=83=A8=E9=93=BE=E6=8E=A5=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/base/domain/PanelLinkJump.java | 19 + .../base/domain/PanelLinkJumpExample.java | 540 +++++++++++++ .../base/domain/PanelLinkJumpInfo.java | 25 + .../base/domain/PanelLinkJumpInfoExample.java | 750 ++++++++++++++++++ .../domain/PanelLinkJumpTargetViewInfo.java | 17 + .../PanelLinkJumpTargetViewInfoExample.java | 480 +++++++++++ .../base/mapper/PanelLinkJumpInfoMapper.java | 30 + .../base/mapper/PanelLinkJumpInfoMapper.xml | 259 ++++++ .../base/mapper/PanelLinkJumpMapper.java | 30 + .../base/mapper/PanelLinkJumpMapper.xml | 211 +++++ .../PanelLinkJumpTargetViewInfoMapper.java | 30 + .../PanelLinkJumpTargetViewInfoMapper.xml | 196 +++++ .../mapper/ext/ExtPanelLinkJumpMapper.java | 22 + .../mapper/ext/ExtPanelLinkJumpMapper.xml | 129 +++ .../mapper/ext/ExtPanelViewLinkageMapper.java | 2 + .../mapper/ext/ExtPanelViewLinkageMapper.xml | 12 + .../base/mapper/ext/ExtPanelViewMapper.java | 4 + .../base/mapper/ext/ExtPanelViewMapper.xml | 35 + .../io/dataease/commons/model/ITreeBase.java | 2 + .../io/dataease/commons/utils/TreeUtils.java | 1 + .../panel/PanelLinkJumpController.java | 66 ++ .../controller/panel/PanelViewController.java | 39 + .../io/dataease/dto/chart/ChartGroupDTO.java | 4 + .../dataease/dto/dataset/DataSetGroupDTO.java | 4 + .../io/dataease/dto/panel/PanelGroupDTO.java | 2 +- .../io/dataease/dto/panel/PanelViewDto.java | 4 + .../dataease/dto/panel/PanelViewTableDTO.java | 27 + .../linkJump/PanelLinkJumpBaseRequest.java | 21 + .../linkJump/PanelLinkJumpBaseResponse.java | 30 + .../dto/panel/linkJump/PanelLinkJumpDTO.java | 29 + .../panel/linkJump/PanelLinkJumpInfoDTO.java | 25 + .../service/panel/PanelGroupService.java | 1 + .../service/panel/PanelLinkJumpService.java | 128 +++ .../service/panel/PanelViewService.java | 8 + .../resources/db/migration/V27__de1.4.sql | 30 + .../src/main/resources/generatorConfig.xml | 4 +- frontend/package.json | 1 + frontend/src/api/panel/linkJump.js | 38 + frontend/src/api/panel/panelView.js | 8 + frontend/src/components/DeDrag/index.vue | 8 +- .../components/Editor/ComponentWrapper.vue | 2 +- .../canvas/components/Editor/EditBar.vue | 5 +- .../canvas/components/Editor/PreviewEject.vue | 24 +- .../canvas/components/Editor/SettingMenu.vue | 9 +- .../canvas/components/Editor/ViewTrackBar.vue | 3 +- .../canvas/components/Editor/index.vue | 33 +- .../components/canvas/components/Toolbar.vue | 5 + .../custom-component/LinkJumpSetDialog.vue | 69 ++ .../canvas/custom-component/UserView.vue | 56 +- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 3 +- frontend/src/store/index.js | 20 +- .../views/chart/components/ChartComponent.vue | 10 + .../chart/components/ChartComponentG2.vue | 6 +- frontend/src/views/link/view/index.vue | 5 + .../panel/LinkJumpSet/TemplateAllList.vue | 110 +++ .../src/views/panel/LinkJumpSet/index.vue | 451 +++++++++++ frontend/src/views/panel/edit/index.vue | 5 + frontend/src/views/panel/list/PanelList.vue | 6 + 60 files changed, 4074 insertions(+), 21 deletions(-) create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelLinkJump.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelLinkJumpExample.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfo.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelLinkJumpInfoExample.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelLinkJumpTargetViewInfo.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelLinkJumpTargetViewInfoExample.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpInfoMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelLinkJumpTargetViewInfoMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml create mode 100644 backend/src/main/java/io/dataease/controller/panel/PanelLinkJumpController.java create mode 100644 backend/src/main/java/io/dataease/controller/panel/PanelViewController.java create mode 100644 backend/src/main/java/io/dataease/dto/panel/PanelViewTableDTO.java create mode 100644 backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpBaseRequest.java create mode 100644 backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpBaseResponse.java create mode 100644 backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpDTO.java create mode 100644 backend/src/main/java/io/dataease/dto/panel/linkJump/PanelLinkJumpInfoDTO.java create mode 100644 backend/src/main/java/io/dataease/service/panel/PanelLinkJumpService.java create mode 100644 frontend/src/api/panel/linkJump.js create mode 100644 frontend/src/api/panel/panelView.js create mode 100644 frontend/src/components/canvas/custom-component/LinkJumpSetDialog.vue create mode 100644 frontend/src/views/panel/LinkJumpSet/TemplateAllList.vue create mode 100644 frontend/src/views/panel/LinkJumpSet/index.vue 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/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/ext/ExtPanelLinkJumpMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java new file mode 100644 index 0000000000..3b69c30a96 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.java @@ -0,0 +1,22 @@ +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); + + + 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..34d4c87601 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelLinkJumpMapper.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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} + + + + 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 @@ + + + + + + + + + + +