diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParams.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParams.java new file mode 100644 index 0000000000..5030904042 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParams.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class PanelOuterParams implements Serializable { + private String paramsId; + + private String panelId; + + private Boolean checked; + + private String remark; + + private String copyFrom; + + private String copyId; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsExample.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsExample.java new file mode 100644 index 0000000000..6fe57dc790 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsExample.java @@ -0,0 +1,610 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class PanelOuterParamsExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PanelOuterParamsExample() { + 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 andParamsIdIsNull() { + addCriterion("params_id is null"); + return (Criteria) this; + } + + public Criteria andParamsIdIsNotNull() { + addCriterion("params_id is not null"); + return (Criteria) this; + } + + public Criteria andParamsIdEqualTo(String value) { + addCriterion("params_id =", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotEqualTo(String value) { + addCriterion("params_id <>", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdGreaterThan(String value) { + addCriterion("params_id >", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdGreaterThanOrEqualTo(String value) { + addCriterion("params_id >=", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLessThan(String value) { + addCriterion("params_id <", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLessThanOrEqualTo(String value) { + addCriterion("params_id <=", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLike(String value) { + addCriterion("params_id like", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotLike(String value) { + addCriterion("params_id not like", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdIn(List values) { + addCriterion("params_id in", values, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotIn(List values) { + addCriterion("params_id not in", values, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdBetween(String value1, String value2) { + addCriterion("params_id between", value1, value2, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotBetween(String value1, String value2) { + addCriterion("params_id not between", value1, value2, "paramsId"); + return (Criteria) this; + } + + public Criteria andPanelIdIsNull() { + addCriterion("panel_id is null"); + return (Criteria) this; + } + + public Criteria andPanelIdIsNotNull() { + addCriterion("panel_id is not null"); + return (Criteria) this; + } + + public Criteria andPanelIdEqualTo(String value) { + addCriterion("panel_id =", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdNotEqualTo(String value) { + addCriterion("panel_id <>", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdGreaterThan(String value) { + addCriterion("panel_id >", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdGreaterThanOrEqualTo(String value) { + addCriterion("panel_id >=", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdLessThan(String value) { + addCriterion("panel_id <", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdLessThanOrEqualTo(String value) { + addCriterion("panel_id <=", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdLike(String value) { + addCriterion("panel_id like", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdNotLike(String value) { + addCriterion("panel_id not like", value, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdIn(List values) { + addCriterion("panel_id in", values, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdNotIn(List values) { + addCriterion("panel_id not in", values, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdBetween(String value1, String value2) { + addCriterion("panel_id between", value1, value2, "panelId"); + return (Criteria) this; + } + + public Criteria andPanelIdNotBetween(String value1, String value2) { + addCriterion("panel_id not between", value1, value2, "panelId"); + 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 Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNull() { + addCriterion("copy_from is null"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNotNull() { + addCriterion("copy_from is not null"); + return (Criteria) this; + } + + public Criteria andCopyFromEqualTo(String value) { + addCriterion("copy_from =", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotEqualTo(String value) { + addCriterion("copy_from <>", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThan(String value) { + addCriterion("copy_from >", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThanOrEqualTo(String value) { + addCriterion("copy_from >=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThan(String value) { + addCriterion("copy_from <", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThanOrEqualTo(String value) { + addCriterion("copy_from <=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLike(String value) { + addCriterion("copy_from like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotLike(String value) { + addCriterion("copy_from not like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromIn(List values) { + addCriterion("copy_from in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotIn(List values) { + addCriterion("copy_from not in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromBetween(String value1, String value2) { + addCriterion("copy_from between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotBetween(String value1, String value2) { + addCriterion("copy_from not between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNull() { + addCriterion("copy_id is null"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNotNull() { + addCriterion("copy_id is not null"); + return (Criteria) this; + } + + public Criteria andCopyIdEqualTo(String value) { + addCriterion("copy_id =", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotEqualTo(String value) { + addCriterion("copy_id <>", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThan(String value) { + addCriterion("copy_id >", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThanOrEqualTo(String value) { + addCriterion("copy_id >=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThan(String value) { + addCriterion("copy_id <", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThanOrEqualTo(String value) { + addCriterion("copy_id <=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLike(String value) { + addCriterion("copy_id like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotLike(String value) { + addCriterion("copy_id not like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdIn(List values) { + addCriterion("copy_id in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotIn(List values) { + addCriterion("copy_id not in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdBetween(String value1, String value2) { + addCriterion("copy_id between", value1, value2, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotBetween(String value1, String value2) { + addCriterion("copy_id not between", value1, value2, "copyId"); + 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/PanelOuterParamsInfo.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfo.java new file mode 100644 index 0000000000..4095a769ea --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfo.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class PanelOuterParamsInfo implements Serializable { + private String paramsInfoId; + + private String paramsId; + + private String paramName; + + private Boolean checked; + + private String copyFrom; + + private String copyId; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfoExample.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfoExample.java new file mode 100644 index 0000000000..9336967019 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsInfoExample.java @@ -0,0 +1,610 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class PanelOuterParamsInfoExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PanelOuterParamsInfoExample() { + 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 andParamsInfoIdIsNull() { + addCriterion("params_info_id is null"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIsNotNull() { + addCriterion("params_info_id is not null"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdEqualTo(String value) { + addCriterion("params_info_id =", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotEqualTo(String value) { + addCriterion("params_info_id <>", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdGreaterThan(String value) { + addCriterion("params_info_id >", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdGreaterThanOrEqualTo(String value) { + addCriterion("params_info_id >=", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLessThan(String value) { + addCriterion("params_info_id <", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLessThanOrEqualTo(String value) { + addCriterion("params_info_id <=", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLike(String value) { + addCriterion("params_info_id like", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotLike(String value) { + addCriterion("params_info_id not like", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIn(List values) { + addCriterion("params_info_id in", values, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotIn(List values) { + addCriterion("params_info_id not in", values, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdBetween(String value1, String value2) { + addCriterion("params_info_id between", value1, value2, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotBetween(String value1, String value2) { + addCriterion("params_info_id not between", value1, value2, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsIdIsNull() { + addCriterion("params_id is null"); + return (Criteria) this; + } + + public Criteria andParamsIdIsNotNull() { + addCriterion("params_id is not null"); + return (Criteria) this; + } + + public Criteria andParamsIdEqualTo(String value) { + addCriterion("params_id =", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotEqualTo(String value) { + addCriterion("params_id <>", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdGreaterThan(String value) { + addCriterion("params_id >", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdGreaterThanOrEqualTo(String value) { + addCriterion("params_id >=", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLessThan(String value) { + addCriterion("params_id <", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLessThanOrEqualTo(String value) { + addCriterion("params_id <=", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdLike(String value) { + addCriterion("params_id like", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotLike(String value) { + addCriterion("params_id not like", value, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdIn(List values) { + addCriterion("params_id in", values, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotIn(List values) { + addCriterion("params_id not in", values, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdBetween(String value1, String value2) { + addCriterion("params_id between", value1, value2, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamsIdNotBetween(String value1, String value2) { + addCriterion("params_id not between", value1, value2, "paramsId"); + return (Criteria) this; + } + + public Criteria andParamNameIsNull() { + addCriterion("param_name is null"); + return (Criteria) this; + } + + public Criteria andParamNameIsNotNull() { + addCriterion("param_name is not null"); + return (Criteria) this; + } + + public Criteria andParamNameEqualTo(String value) { + addCriterion("param_name =", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameNotEqualTo(String value) { + addCriterion("param_name <>", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameGreaterThan(String value) { + addCriterion("param_name >", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameGreaterThanOrEqualTo(String value) { + addCriterion("param_name >=", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameLessThan(String value) { + addCriterion("param_name <", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameLessThanOrEqualTo(String value) { + addCriterion("param_name <=", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameLike(String value) { + addCriterion("param_name like", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameNotLike(String value) { + addCriterion("param_name not like", value, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameIn(List values) { + addCriterion("param_name in", values, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameNotIn(List values) { + addCriterion("param_name not in", values, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameBetween(String value1, String value2) { + addCriterion("param_name between", value1, value2, "paramName"); + return (Criteria) this; + } + + public Criteria andParamNameNotBetween(String value1, String value2) { + addCriterion("param_name not between", value1, value2, "paramName"); + 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 Criteria andCopyFromIsNull() { + addCriterion("copy_from is null"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNotNull() { + addCriterion("copy_from is not null"); + return (Criteria) this; + } + + public Criteria andCopyFromEqualTo(String value) { + addCriterion("copy_from =", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotEqualTo(String value) { + addCriterion("copy_from <>", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThan(String value) { + addCriterion("copy_from >", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThanOrEqualTo(String value) { + addCriterion("copy_from >=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThan(String value) { + addCriterion("copy_from <", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThanOrEqualTo(String value) { + addCriterion("copy_from <=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLike(String value) { + addCriterion("copy_from like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotLike(String value) { + addCriterion("copy_from not like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromIn(List values) { + addCriterion("copy_from in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotIn(List values) { + addCriterion("copy_from not in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromBetween(String value1, String value2) { + addCriterion("copy_from between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotBetween(String value1, String value2) { + addCriterion("copy_from not between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNull() { + addCriterion("copy_id is null"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNotNull() { + addCriterion("copy_id is not null"); + return (Criteria) this; + } + + public Criteria andCopyIdEqualTo(String value) { + addCriterion("copy_id =", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotEqualTo(String value) { + addCriterion("copy_id <>", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThan(String value) { + addCriterion("copy_id >", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThanOrEqualTo(String value) { + addCriterion("copy_id >=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThan(String value) { + addCriterion("copy_id <", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThanOrEqualTo(String value) { + addCriterion("copy_id <=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLike(String value) { + addCriterion("copy_id like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotLike(String value) { + addCriterion("copy_id not like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdIn(List values) { + addCriterion("copy_id in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotIn(List values) { + addCriterion("copy_id not in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdBetween(String value1, String value2) { + addCriterion("copy_id between", value1, value2, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotBetween(String value1, String value2) { + addCriterion("copy_id not between", value1, value2, "copyId"); + 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/PanelOuterParamsTargetViewInfo.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfo.java new file mode 100644 index 0000000000..ad35bdf7de --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfo.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class PanelOuterParamsTargetViewInfo implements Serializable { + private String targetId; + + private String paramsInfoId; + + private String targetViewId; + + private String targetFieldId; + + private String copyFrom; + + private String copyId; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfoExample.java b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfoExample.java new file mode 100644 index 0000000000..feb98341d5 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelOuterParamsTargetViewInfoExample.java @@ -0,0 +1,620 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class PanelOuterParamsTargetViewInfoExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PanelOuterParamsTargetViewInfoExample() { + 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 andParamsInfoIdIsNull() { + addCriterion("params_info_id is null"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIsNotNull() { + addCriterion("params_info_id is not null"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdEqualTo(String value) { + addCriterion("params_info_id =", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotEqualTo(String value) { + addCriterion("params_info_id <>", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdGreaterThan(String value) { + addCriterion("params_info_id >", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdGreaterThanOrEqualTo(String value) { + addCriterion("params_info_id >=", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLessThan(String value) { + addCriterion("params_info_id <", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLessThanOrEqualTo(String value) { + addCriterion("params_info_id <=", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdLike(String value) { + addCriterion("params_info_id like", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotLike(String value) { + addCriterion("params_info_id not like", value, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdIn(List values) { + addCriterion("params_info_id in", values, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotIn(List values) { + addCriterion("params_info_id not in", values, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdBetween(String value1, String value2) { + addCriterion("params_info_id between", value1, value2, "paramsInfoId"); + return (Criteria) this; + } + + public Criteria andParamsInfoIdNotBetween(String value1, String value2) { + addCriterion("params_info_id not between", value1, value2, "paramsInfoId"); + 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 Criteria andCopyFromIsNull() { + addCriterion("copy_from is null"); + return (Criteria) this; + } + + public Criteria andCopyFromIsNotNull() { + addCriterion("copy_from is not null"); + return (Criteria) this; + } + + public Criteria andCopyFromEqualTo(String value) { + addCriterion("copy_from =", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotEqualTo(String value) { + addCriterion("copy_from <>", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThan(String value) { + addCriterion("copy_from >", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromGreaterThanOrEqualTo(String value) { + addCriterion("copy_from >=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThan(String value) { + addCriterion("copy_from <", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLessThanOrEqualTo(String value) { + addCriterion("copy_from <=", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromLike(String value) { + addCriterion("copy_from like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotLike(String value) { + addCriterion("copy_from not like", value, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromIn(List values) { + addCriterion("copy_from in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotIn(List values) { + addCriterion("copy_from not in", values, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromBetween(String value1, String value2) { + addCriterion("copy_from between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyFromNotBetween(String value1, String value2) { + addCriterion("copy_from not between", value1, value2, "copyFrom"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNull() { + addCriterion("copy_id is null"); + return (Criteria) this; + } + + public Criteria andCopyIdIsNotNull() { + addCriterion("copy_id is not null"); + return (Criteria) this; + } + + public Criteria andCopyIdEqualTo(String value) { + addCriterion("copy_id =", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotEqualTo(String value) { + addCriterion("copy_id <>", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThan(String value) { + addCriterion("copy_id >", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdGreaterThanOrEqualTo(String value) { + addCriterion("copy_id >=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThan(String value) { + addCriterion("copy_id <", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLessThanOrEqualTo(String value) { + addCriterion("copy_id <=", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdLike(String value) { + addCriterion("copy_id like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotLike(String value) { + addCriterion("copy_id not like", value, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdIn(List values) { + addCriterion("copy_id in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotIn(List values) { + addCriterion("copy_id not in", values, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdBetween(String value1, String value2) { + addCriterion("copy_id between", value1, value2, "copyId"); + return (Criteria) this; + } + + public Criteria andCopyIdNotBetween(String value1, String value2) { + addCriterion("copy_id not between", value1, value2, "copyId"); + 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/PanelOuterParamsInfoMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.java new file mode 100644 index 0000000000..0da15d6141 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.PanelOuterParamsInfo; +import io.dataease.base.domain.PanelOuterParamsInfoExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PanelOuterParamsInfoMapper { + long countByExample(PanelOuterParamsInfoExample example); + + int deleteByExample(PanelOuterParamsInfoExample example); + + int deleteByPrimaryKey(String paramsInfoId); + + int insert(PanelOuterParamsInfo record); + + int insertSelective(PanelOuterParamsInfo record); + + List selectByExample(PanelOuterParamsInfoExample example); + + PanelOuterParamsInfo selectByPrimaryKey(String paramsInfoId); + + int updateByExampleSelective(@Param("record") PanelOuterParamsInfo record, @Param("example") PanelOuterParamsInfoExample example); + + int updateByExample(@Param("record") PanelOuterParamsInfo record, @Param("example") PanelOuterParamsInfoExample example); + + int updateByPrimaryKeySelective(PanelOuterParamsInfo record); + + int updateByPrimaryKey(PanelOuterParamsInfo record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.xml new file mode 100644 index 0000000000..1460d4a4fd --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsInfoMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + 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} + + + + + + + + + + + params_info_id, params_id, param_name, `checked`, copy_from, copy_id + + + + + delete from panel_outer_params_info + where params_info_id = #{paramsInfoId,jdbcType=VARCHAR} + + + delete from panel_outer_params_info + + + + + + insert into panel_outer_params_info (params_info_id, params_id, param_name, + `checked`, copy_from, copy_id + ) + values (#{paramsInfoId,jdbcType=VARCHAR}, #{paramsId,jdbcType=VARCHAR}, #{paramName,jdbcType=VARCHAR}, + #{checked,jdbcType=BIT}, #{copyFrom,jdbcType=VARCHAR}, #{copyId,jdbcType=VARCHAR} + ) + + + insert into panel_outer_params_info + + + params_info_id, + + + params_id, + + + param_name, + + + `checked`, + + + copy_from, + + + copy_id, + + + + + #{paramsInfoId,jdbcType=VARCHAR}, + + + #{paramsId,jdbcType=VARCHAR}, + + + #{paramName,jdbcType=VARCHAR}, + + + #{checked,jdbcType=BIT}, + + + #{copyFrom,jdbcType=VARCHAR}, + + + #{copyId,jdbcType=VARCHAR}, + + + + + + update panel_outer_params_info + + + params_info_id = #{record.paramsInfoId,jdbcType=VARCHAR}, + + + params_id = #{record.paramsId,jdbcType=VARCHAR}, + + + param_name = #{record.paramName,jdbcType=VARCHAR}, + + + `checked` = #{record.checked,jdbcType=BIT}, + + + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{record.copyId,jdbcType=VARCHAR}, + + + + + + + + update panel_outer_params_info + set params_info_id = #{record.paramsInfoId,jdbcType=VARCHAR}, + params_id = #{record.paramsId,jdbcType=VARCHAR}, + param_name = #{record.paramName,jdbcType=VARCHAR}, + `checked` = #{record.checked,jdbcType=BIT}, + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + copy_id = #{record.copyId,jdbcType=VARCHAR} + + + + + + update panel_outer_params_info + + + params_id = #{paramsId,jdbcType=VARCHAR}, + + + param_name = #{paramName,jdbcType=VARCHAR}, + + + `checked` = #{checked,jdbcType=BIT}, + + + copy_from = #{copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{copyId,jdbcType=VARCHAR}, + + + where params_info_id = #{paramsInfoId,jdbcType=VARCHAR} + + + update panel_outer_params_info + set params_id = #{paramsId,jdbcType=VARCHAR}, + param_name = #{paramName,jdbcType=VARCHAR}, + `checked` = #{checked,jdbcType=BIT}, + copy_from = #{copyFrom,jdbcType=VARCHAR}, + copy_id = #{copyId,jdbcType=VARCHAR} + where params_info_id = #{paramsInfoId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.java new file mode 100644 index 0000000000..2acfaa56a6 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.PanelOuterParams; +import io.dataease.base.domain.PanelOuterParamsExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PanelOuterParamsMapper { + long countByExample(PanelOuterParamsExample example); + + int deleteByExample(PanelOuterParamsExample example); + + int deleteByPrimaryKey(String paramsId); + + int insert(PanelOuterParams record); + + int insertSelective(PanelOuterParams record); + + List selectByExample(PanelOuterParamsExample example); + + PanelOuterParams selectByPrimaryKey(String paramsId); + + int updateByExampleSelective(@Param("record") PanelOuterParams record, @Param("example") PanelOuterParamsExample example); + + int updateByExample(@Param("record") PanelOuterParams record, @Param("example") PanelOuterParamsExample example); + + int updateByPrimaryKeySelective(PanelOuterParams record); + + int updateByPrimaryKey(PanelOuterParams record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.xml new file mode 100644 index 0000000000..4e314b16dc --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + 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} + + + + + + + + + + + params_id, panel_id, `checked`, remark, copy_from, copy_id + + + + + delete from panel_outer_params + where params_id = #{paramsId,jdbcType=VARCHAR} + + + delete from panel_outer_params + + + + + + insert into panel_outer_params (params_id, panel_id, `checked`, + remark, copy_from, copy_id + ) + values (#{paramsId,jdbcType=VARCHAR}, #{panelId,jdbcType=VARCHAR}, #{checked,jdbcType=BIT}, + #{remark,jdbcType=VARCHAR}, #{copyFrom,jdbcType=VARCHAR}, #{copyId,jdbcType=VARCHAR} + ) + + + insert into panel_outer_params + + + params_id, + + + panel_id, + + + `checked`, + + + remark, + + + copy_from, + + + copy_id, + + + + + #{paramsId,jdbcType=VARCHAR}, + + + #{panelId,jdbcType=VARCHAR}, + + + #{checked,jdbcType=BIT}, + + + #{remark,jdbcType=VARCHAR}, + + + #{copyFrom,jdbcType=VARCHAR}, + + + #{copyId,jdbcType=VARCHAR}, + + + + + + update panel_outer_params + + + params_id = #{record.paramsId,jdbcType=VARCHAR}, + + + panel_id = #{record.panelId,jdbcType=VARCHAR}, + + + `checked` = #{record.checked,jdbcType=BIT}, + + + remark = #{record.remark,jdbcType=VARCHAR}, + + + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{record.copyId,jdbcType=VARCHAR}, + + + + + + + + update panel_outer_params + set params_id = #{record.paramsId,jdbcType=VARCHAR}, + panel_id = #{record.panelId,jdbcType=VARCHAR}, + `checked` = #{record.checked,jdbcType=BIT}, + remark = #{record.remark,jdbcType=VARCHAR}, + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + copy_id = #{record.copyId,jdbcType=VARCHAR} + + + + + + update panel_outer_params + + + panel_id = #{panelId,jdbcType=VARCHAR}, + + + `checked` = #{checked,jdbcType=BIT}, + + + remark = #{remark,jdbcType=VARCHAR}, + + + copy_from = #{copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{copyId,jdbcType=VARCHAR}, + + + where params_id = #{paramsId,jdbcType=VARCHAR} + + + update panel_outer_params + set panel_id = #{panelId,jdbcType=VARCHAR}, + `checked` = #{checked,jdbcType=BIT}, + remark = #{remark,jdbcType=VARCHAR}, + copy_from = #{copyFrom,jdbcType=VARCHAR}, + copy_id = #{copyId,jdbcType=VARCHAR} + where params_id = #{paramsId,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.java new file mode 100644 index 0000000000..5557ac40d9 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.PanelOuterParamsTargetViewInfo; +import io.dataease.base.domain.PanelOuterParamsTargetViewInfoExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PanelOuterParamsTargetViewInfoMapper { + long countByExample(PanelOuterParamsTargetViewInfoExample example); + + int deleteByExample(PanelOuterParamsTargetViewInfoExample example); + + int deleteByPrimaryKey(String targetId); + + int insert(PanelOuterParamsTargetViewInfo record); + + int insertSelective(PanelOuterParamsTargetViewInfo record); + + List selectByExample(PanelOuterParamsTargetViewInfoExample example); + + PanelOuterParamsTargetViewInfo selectByPrimaryKey(String targetId); + + int updateByExampleSelective(@Param("record") PanelOuterParamsTargetViewInfo record, @Param("example") PanelOuterParamsTargetViewInfoExample example); + + int updateByExample(@Param("record") PanelOuterParamsTargetViewInfo record, @Param("example") PanelOuterParamsTargetViewInfoExample example); + + int updateByPrimaryKeySelective(PanelOuterParamsTargetViewInfo record); + + int updateByPrimaryKey(PanelOuterParamsTargetViewInfo record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.xml new file mode 100644 index 0000000000..c5d9d8781e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelOuterParamsTargetViewInfoMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + 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, params_info_id, target_view_id, target_field_id, copy_from, copy_id + + + + + delete from panel_outer_params_target_view_info + where target_id = #{targetId,jdbcType=VARCHAR} + + + delete from panel_outer_params_target_view_info + + + + + + insert into panel_outer_params_target_view_info (target_id, params_info_id, target_view_id, + target_field_id, copy_from, copy_id + ) + values (#{targetId,jdbcType=VARCHAR}, #{paramsInfoId,jdbcType=VARCHAR}, #{targetViewId,jdbcType=VARCHAR}, + #{targetFieldId,jdbcType=VARCHAR}, #{copyFrom,jdbcType=VARCHAR}, #{copyId,jdbcType=VARCHAR} + ) + + + insert into panel_outer_params_target_view_info + + + target_id, + + + params_info_id, + + + target_view_id, + + + target_field_id, + + + copy_from, + + + copy_id, + + + + + #{targetId,jdbcType=VARCHAR}, + + + #{paramsInfoId,jdbcType=VARCHAR}, + + + #{targetViewId,jdbcType=VARCHAR}, + + + #{targetFieldId,jdbcType=VARCHAR}, + + + #{copyFrom,jdbcType=VARCHAR}, + + + #{copyId,jdbcType=VARCHAR}, + + + + + + update panel_outer_params_target_view_info + + + target_id = #{record.targetId,jdbcType=VARCHAR}, + + + params_info_id = #{record.paramsInfoId,jdbcType=VARCHAR}, + + + target_view_id = #{record.targetViewId,jdbcType=VARCHAR}, + + + target_field_id = #{record.targetFieldId,jdbcType=VARCHAR}, + + + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{record.copyId,jdbcType=VARCHAR}, + + + + + + + + update panel_outer_params_target_view_info + set target_id = #{record.targetId,jdbcType=VARCHAR}, + params_info_id = #{record.paramsInfoId,jdbcType=VARCHAR}, + target_view_id = #{record.targetViewId,jdbcType=VARCHAR}, + target_field_id = #{record.targetFieldId,jdbcType=VARCHAR}, + copy_from = #{record.copyFrom,jdbcType=VARCHAR}, + copy_id = #{record.copyId,jdbcType=VARCHAR} + + + + + + update panel_outer_params_target_view_info + + + params_info_id = #{paramsInfoId,jdbcType=VARCHAR}, + + + target_view_id = #{targetViewId,jdbcType=VARCHAR}, + + + target_field_id = #{targetFieldId,jdbcType=VARCHAR}, + + + copy_from = #{copyFrom,jdbcType=VARCHAR}, + + + copy_id = #{copyId,jdbcType=VARCHAR}, + + + where target_id = #{targetId,jdbcType=VARCHAR} + + + update panel_outer_params_target_view_info + set params_info_id = #{paramsInfoId,jdbcType=VARCHAR}, + target_view_id = #{targetViewId,jdbcType=VARCHAR}, + target_field_id = #{targetFieldId,jdbcType=VARCHAR}, + copy_from = #{copyFrom,jdbcType=VARCHAR}, + copy_id = #{copyId,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/ExtPanelOuterParamsMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.java new file mode 100644 index 0000000000..893d9bb014 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.java @@ -0,0 +1,13 @@ +package io.dataease.base.mapper.ext; + + +import io.dataease.dto.panel.outerParams.PanelOuterParamsDTO; +import org.apache.ibatis.annotations.Param; + +public interface ExtPanelOuterParamsMapper { + + PanelOuterParamsDTO queryWithPanelId(@Param("panelId") String panelId); + + void deleteOuterParamsWithPanelId(@Param("panelId") String panelId); + +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml new file mode 100644 index 0000000000..3533af620e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + DELETE poptvi,popi,pop + FROM + panel_outer_params_target_view_info poptvi, + panel_outer_params_info popi, + panel_outer_params pop + WHERE + poptvi.params_info_id = popi.params_info_id + AND popi.params_id = pop.params_id + AND pop.panel_id = #{panelId} + + + diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java b/backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java new file mode 100644 index 0000000000..7d75dbd3e2 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/panel/PanelOuterParamsController.java @@ -0,0 +1,39 @@ +package io.dataease.controller.panel; + +import com.github.xiaoymin.knife4j.annotations.ApiSupport; +import io.dataease.base.domain.PanelOuterParams; +import io.dataease.dto.panel.linkJump.PanelLinkJumpDTO; +import io.dataease.dto.panel.outerParams.PanelOuterParamsDTO; +import io.dataease.service.panel.PanelOuterParamsService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; + +/** + * Author: wangjiahao + * Date: 2022/3/17 + * Description: + */ +@Api(tags = "仪表板：外部参数") +@ApiSupport(order = 172) +@RestController +@RequestMapping("outerParams") +public class PanelOuterParamsController { + + @Resource + private PanelOuterParamsService panelOuterParamsService; + + @ApiOperation("根据仪表板ID获取外部参数信息") + @GetMapping("/queryWithPanelId/{panelId}") + public PanelOuterParamsDTO queryWithPanelId(@PathVariable("panelId") String panelId){ + return panelOuterParamsService.queryWithPanelId(panelId) ; + } + + @ApiOperation("更新外部参数信息") + @PostMapping("/updateOuterParamsSet") + public void updateOuterParamsSet(@RequestBody PanelOuterParamsDTO OuterParamsDTO) { + panelOuterParamsService.updateOuterParamsSet(OuterParamsDTO); + } +} diff --git a/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsDTO.java b/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsDTO.java new file mode 100644 index 0000000000..abb96f34d1 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsDTO.java @@ -0,0 +1,24 @@ +package io.dataease.dto.panel.outerParams; + +import io.dataease.base.domain.PanelOuterParams; +import lombok.Data; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Author: wangjiahao + * Date: 2022/3/17 + * Description: + */ +@Data +public class PanelOuterParamsDTO extends PanelOuterParams { + + private List targetInfoList; + + private List outerParamsInfoArray = new ArrayList<>(); + + private Map mapOuterParamsInfoArray = new HashMap<>(); +} diff --git a/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsInfoDTO.java b/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsInfoDTO.java new file mode 100644 index 0000000000..0f79c1bb77 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/panel/outerParams/PanelOuterParamsInfoDTO.java @@ -0,0 +1,21 @@ +package io.dataease.dto.panel.outerParams; + +import io.dataease.base.domain.PanelOuterParamsInfo; +import io.dataease.base.domain.PanelOuterParamsTargetViewInfo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Author: wangjiahao + * Date: 2022/3/17 + * Description: + */ +@Data +public class PanelOuterParamsInfoDTO extends PanelOuterParamsInfo { + + private String panelId; + + private List targetViewInfoList=new ArrayList<>(); +} diff --git a/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java b/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java new file mode 100644 index 0000000000..995377b036 --- /dev/null +++ b/backend/src/main/java/io/dataease/service/panel/PanelOuterParamsService.java @@ -0,0 +1,68 @@ +package io.dataease.service.panel; + +import io.dataease.base.mapper.PanelOuterParamsInfoMapper; +import io.dataease.base.mapper.PanelOuterParamsMapper; +import io.dataease.base.mapper.PanelOuterParamsTargetViewInfoMapper; +import io.dataease.base.mapper.ext.ExtPanelOuterParamsMapper; +import io.dataease.dto.panel.linkJump.PanelLinkJumpDTO; +import io.dataease.dto.panel.outerParams.PanelOuterParamsDTO; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Optional; +import java.util.UUID; + +/** + * Author: wangjiahao + * Date: 2022/3/17 + * Description: + */ +@Service +public class PanelOuterParamsService { + + @Resource + private ExtPanelOuterParamsMapper extPanelOuterParamsMapper; + + @Resource + private PanelOuterParamsMapper panelOuterParamsMapper; + + @Resource + private PanelOuterParamsInfoMapper panelOuterParamsInfoMapper; + + @Resource + private PanelOuterParamsTargetViewInfoMapper panelOuterParamsTargetViewInfoMapper; + + + public PanelOuterParamsDTO queryWithPanelId(String panelId){ + PanelOuterParamsDTO panelOuterParamsDTO = extPanelOuterParamsMapper.queryWithPanelId(panelId); + return panelOuterParamsDTO; + } + + @Transactional + public void updateOuterParamsSet(PanelOuterParamsDTO outerParamsDTO) { + String panelId = outerParamsDTO.getPanelId(); + Assert.notNull(panelId, "panelId cannot be null"); + //清理原有数据 + extPanelOuterParamsMapper.deleteOuterParamsWithPanelId(panelId); + // 插入新的数据 + String paramsId = UUID.randomUUID().toString(); + outerParamsDTO.setParamsId(paramsId); + panelOuterParamsMapper.insertSelective(outerParamsDTO); + Optional.ofNullable(outerParamsDTO.getOuterParamsInfoArray()).orElse(new ArrayList<>()).forEach(outerParamsInfo -> { + String paramsInfoId = UUID.randomUUID().toString(); + outerParamsInfo.setParamsInfoId(paramsInfoId); + outerParamsInfo.setParamsId(paramsId); + panelOuterParamsInfoMapper.insertSelective(outerParamsInfo); + Optional.ofNullable(outerParamsInfo.getTargetViewInfoList()).orElse(new ArrayList<>()).forEach(targetViewInfo -> { + String targetViewInfoId = UUID.randomUUID().toString(); + targetViewInfo.setTargetId(targetViewInfoId); + targetViewInfo.setParamsInfoId(paramsInfoId); + panelOuterParamsTargetViewInfoMapper.insertSelective(targetViewInfo); + }); + }); + } + +} diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index 9a6f59b4d0..ca6e4672c7 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -63,8 +63,8 @@ - -
-
+
+
+
diff --git a/frontend/src/api/panel/outerParams.js b/frontend/src/api/panel/outerParams.js new file mode 100644 index 0000000000..7f8ecb3c5d --- /dev/null +++ b/frontend/src/api/panel/outerParams.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +export function queryWithPanelId(panelId) { + return request({ + url: '/outerParams/queryWithPanelId/' + panelId, + method: 'get' + }) +} + + + +export function updateOuterParamsSet(requestInfo) { + return request({ + url: '/outerParams/updateOuterParamsSet', + method: 'post', + data: requestInfo, + loading: true + }) +} diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index a7663d7af6..e986b83344 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -38,6 +38,9 @@ + + + {{ $t('commons.save') }} @@ -299,6 +302,9 @@ export default { clickPreview() { this.$emit('previewFullScreen') }, + openOuterParamsSet() { + this.$emit('outerParamsSetVisibleChange', true) + }, changeAidedDesign() { this.$emit('changeAidedDesign') }, diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index e13dc44306..2bed62509f 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1381,6 +1381,7 @@ export default { sure_bt: 'Confirm' }, panel: { + params_setting: 'Outer Params Setting', template_view_tips: "Template's Views. Please Change", no_auth_role: 'Unshared roles', auth_role: 'Shared roles', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 8ec39b0355..48d30b56e7 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1382,6 +1382,7 @@ export default { sure_bt: '確定' }, panel: { + params_setting: '外部参数设置', template_view_tips: '当前是模板视图,请点击更换数据集', no_auth_role: '未分享角色', auth_role: '已分享角色', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 67b257077c..23dd1e030e 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1390,6 +1390,7 @@ export default { sure_bt: '确定' }, panel: { + params_setting: '外部参数设置', template_view_tips: '当前是模板视图,请点击更换数据集', no_auth_role: '未分享角色', auth_role: '已分享角色', diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html index 7b9d1d8a9e..c63d234675 100644 --- a/frontend/src/styles/deicon/demo_index.html +++ b/frontend/src/styles/deicon/demo_index.html @@ -54,6 +54,12 @@
    +
  • + +
    参数
    +
    &#xe6d7;
    +
    • +
  • 更换
    @@ -186,6 +192,12 @@
    &#xe8e6;
    • +
  • + +
    右悬浮-选中
    +
    &#xeb86;
    +
    • +
  • 44.tabs
    @@ -504,9 +516,9 @@ 
    @font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1642061879222') format('woff2'),
-       url('iconfont.woff?t=1642061879222') format('woff'),
-       url('iconfont.ttf?t=1642061879222') format('truetype');
+  src: url('iconfont.woff2?t=1647483965100') format('woff2'),
+       url('iconfont.woff?t=1647483965100') format('woff'),
+       url('iconfont.ttf?t=1647483965100') format('truetype');
 }

    第二步：定义使用 iconfont 的样式

    @@ -532,6 +544,15 @@
      +
    • + +
      + 参数 +
      +
      .icon-canshu +
      +
      • +
    • @@ -730,6 +751,15 @@
      • +
    • + +
      + 右悬浮-选中 +
      +
      .icon-youxuanfu-copy-copy +
      +
      • +
    • @@ -1207,6 +1237,14 @@
        +
      • + +
        参数
        +
        #icon-canshu
        +
        • +
      • #icon-xuanfuanniu
        • +
      • + +
        右悬浮-选中
        +
        #icon-youxuanfu-copy-copy
        +
        • +
      • {{ $t('panel.jump_set') }} + {{ $t('panel.enable_jump') }} + + + + + + {{ $t('panel.column_name') }} + {{ $t('panel.enable_column') }} + + + + + + + +
        + + + + +
        + +         +         +         + + 添加参数 + +         + + + + + {{ $t('panel.link_type') }}： + + + + {{ $t('panel.link_outer') }} + {{ $t('panel.link_panel') }} + + + + + + + + + {{ $t('panel.open_model') }}： + + + + {{ $t('panel.now_window') }} + {{ $t('panel.new_window') }} + + + + + + +
        {{ $t('panel.link_view') }}
        +         + +
        {{ $t('panel.link_view_field') }}
        +         +         + + + +
        + + + + + + {{ item.name }} + + +
        +         + +
        + + + + + + + + + {{ viewField.name }} + + +
        +         + +
        + +
        +         +         +         + + + {{ $t('panel.add_jump_field') }} + + + + +         + + + +         + + {{ $t('panel.select_dimension') }} + +         +         +         + + {{ $t('commons.cancel') }} + {{ $t('commons.confirm') }} + + + + + + + diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 084cf2a8a7..2ed0b4da86 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -18,6 +18,7 @@ @showPanel="showPanel" @previewFullScreen="previewFullScreen" @changeAidedDesign="changeAidedDesign" + @outerParamsSetVisibleChange="outerParamsSetVisibleChange" /> @@ -312,6 +313,18 @@ @newViewInfo="newViewInfo" /> + + + + + @@ -334,14 +347,14 @@ import componentList, { import { mapState } from 'vuex' import { uuid } from 'vue-uuid' import Toolbar from '@/components/canvas/components/Toolbar' -import { initPanelComponentsData, initPanelData, initViewCache } from '@/api/panel/panel' +import { initPanelData, initViewCache } from '@/api/panel/panel' import Preview from '@/components/canvas/components/Editor/Preview' import AttrListExtend from '@/components/canvas/components/AttrListExtend' import elementResizeDetectorMaker from 'element-resize-detector' import AssistComponent from '@/views/panel/AssistComponent' import PanelTextEditor from '@/components/canvas/custom-component/PanelTextEditor' import ChartGroup from '@/views/chart/group/Group' -import { chartCopy, searchAdviceSceneId } from '@/api/chart/chart' +import { chartCopy } from '@/api/chart/chart' // 引入样式 import '@/components/canvas/assets/iconfont/iconfont.css' import '@/components/canvas/styles/animate.css' @@ -354,10 +367,12 @@ import TextAttr from '@/components/canvas/components/TextAttr' import ComponentWait from '@/views/panel/edit/ComponentWait' import { deleteEnshrine, saveEnshrine, starStatus } from '@/api/panel/enshrine' import ChartEdit from '@/views/chart/view/ChartEdit' +import OuterParamsSet from '@/views/panel/OuterParamsSet/index' export default { name: 'PanelEdit', components: { + OuterParamsSet, ComponentWait, DeMainContainer, DeContainer, @@ -378,6 +393,7 @@ export default { }, data() { return { + outerParamsSetVisible: false, autoMoveOffSet: 15, mobileEditorShow: true, hasStar: false, @@ -596,6 +612,9 @@ export default { elx && elx.remove() }, methods: { + closeOuterParamsSetDialog(){ + this.outerParamsSetVisible = false + }, changeRightDrawOpen(param) { this.rightDrawOpen = param if (this.rightDrawOpen) { @@ -860,6 +879,9 @@ export default { changeAidedDesign() { this.aidedButtonActive = !this.aidedButtonActive }, + outerParamsSetVisibleChange(param) { + this.outerParamsSetVisible = param + }, getOriginStyle(value) { const scale = this.canvasStyleData.scale const result = value / (scale / 100)