From 11e7eb2a880694184618d43f1df1b1b4d9bd357f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 19 Apr 2021 11:51:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BB=AA=E8=A1=A8=E7=9B=98=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/base/domain/PanelTemplate.java | 25 + .../base/domain/PanelTemplateExample.java | 740 ++++++++++++++ .../base/domain/PanelTemplateWithBLOBs.java | 21 + .../java/io/dataease/base/domain/SysDict.java | 27 + .../dataease/base/domain/SysDictExample.java | 800 +++++++++++++++ .../io/dataease/base/domain/SysDictItem.java | 31 + .../base/domain/SysDictItemExample.java | 940 ++++++++++++++++++ .../base/mapper/PanelTemplateMapper.java | 37 + .../base/mapper/PanelTemplateMapper.xml | 370 +++++++ .../base/mapper/SysDictItemMapper.java | 30 + .../base/mapper/SysDictItemMapper.xml | 306 ++++++ .../dataease/base/mapper/SysDictMapper.java | 30 + .../io/dataease/base/mapper/SysDictMapper.xml | 276 +++++ .../mapper/ext/ExtPanelTemplateMapper.java | 21 + .../mapper/ext/ExtPanelTemplateMapper.xml | 79 ++ .../commons/constants/PanelConstants.java | 5 + .../panel/PanelTemplateController.java | 50 + .../request/panel/PanelTemplateRequest.java | 23 + .../dataease/dto/panel/PanelTemplateDTO.java | 23 + .../service/panel/PanelTemplateService.java | 87 ++ .../src/main/resources/generatorConfig.xml | 4 +- frontend/src/assets/template.png | Bin 0 -> 4741 bytes .../src/views/panel/list/PanelViewShow.vue | 60 +- .../src/views/panel/list/SaveToTemplate.vue | 109 ++ .../template/component/SystemTemplateList.vue | 106 ++ .../panel/template/component/TemplateItem.vue | 92 ++ frontend/src/views/panel/template/index.vue | 79 ++ 27 files changed, 4363 insertions(+), 8 deletions(-) create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelTemplate.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelTemplateExample.java create mode 100644 backend/src/main/java/io/dataease/base/domain/PanelTemplateWithBLOBs.java create mode 100644 backend/src/main/java/io/dataease/base/domain/SysDict.java create mode 100644 backend/src/main/java/io/dataease/base/domain/SysDictExample.java create mode 100644 backend/src/main/java/io/dataease/base/domain/SysDictItem.java create mode 100644 backend/src/main/java/io/dataease/base/domain/SysDictItemExample.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelTemplateMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/PanelTemplateMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/SysDictItemMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/SysDictItemMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/SysDictMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/SysDictMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml create mode 100644 backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java create mode 100644 backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java create mode 100644 backend/src/main/java/io/dataease/dto/panel/PanelTemplateDTO.java create mode 100644 backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java create mode 100644 frontend/src/assets/template.png create mode 100644 frontend/src/views/panel/list/SaveToTemplate.vue create mode 100644 frontend/src/views/panel/template/component/SystemTemplateList.vue create mode 100644 frontend/src/views/panel/template/component/TemplateItem.vue create mode 100644 frontend/src/views/panel/template/index.vue diff --git a/backend/src/main/java/io/dataease/base/domain/PanelTemplate.java b/backend/src/main/java/io/dataease/base/domain/PanelTemplate.java new file mode 100644 index 0000000000..d85483d876 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelTemplate.java @@ -0,0 +1,25 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class PanelTemplate implements Serializable { + private String id; + + private String name; + + private String pid; + + private Integer level; + + private String nodeType; + + private String createBy; + + private Long createTime; + + private String templateType; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/PanelTemplateExample.java b/backend/src/main/java/io/dataease/base/domain/PanelTemplateExample.java new file mode 100644 index 0000000000..b5b7de1f09 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelTemplateExample.java @@ -0,0 +1,740 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class PanelTemplateExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public PanelTemplateExample() { + 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 andNameIsNull() { + addCriterion("`name` is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("`name` is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("`name` =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("`name` <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("`name` >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("`name` >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("`name` <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("`name` <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("`name` like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("`name` not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("`name` in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("`name` not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("`name` between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("`name` not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andPidIsNull() { + addCriterion("pid is null"); + return (Criteria) this; + } + + public Criteria andPidIsNotNull() { + addCriterion("pid is not null"); + return (Criteria) this; + } + + public Criteria andPidEqualTo(String value) { + addCriterion("pid =", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotEqualTo(String value) { + addCriterion("pid <>", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidGreaterThan(String value) { + addCriterion("pid >", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidGreaterThanOrEqualTo(String value) { + addCriterion("pid >=", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidLessThan(String value) { + addCriterion("pid <", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidLessThanOrEqualTo(String value) { + addCriterion("pid <=", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidLike(String value) { + addCriterion("pid like", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotLike(String value) { + addCriterion("pid not like", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidIn(List values) { + addCriterion("pid in", values, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotIn(List values) { + addCriterion("pid not in", values, "pid"); + return (Criteria) this; + } + + public Criteria andPidBetween(String value1, String value2) { + addCriterion("pid between", value1, value2, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotBetween(String value1, String value2) { + addCriterion("pid not between", value1, value2, "pid"); + return (Criteria) this; + } + + public Criteria andLevelIsNull() { + addCriterion("`level` is null"); + return (Criteria) this; + } + + public Criteria andLevelIsNotNull() { + addCriterion("`level` is not null"); + return (Criteria) this; + } + + public Criteria andLevelEqualTo(Integer value) { + addCriterion("`level` =", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotEqualTo(Integer value) { + addCriterion("`level` <>", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelGreaterThan(Integer value) { + addCriterion("`level` >", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelGreaterThanOrEqualTo(Integer value) { + addCriterion("`level` >=", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelLessThan(Integer value) { + addCriterion("`level` <", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelLessThanOrEqualTo(Integer value) { + addCriterion("`level` <=", value, "level"); + return (Criteria) this; + } + + public Criteria andLevelIn(List values) { + addCriterion("`level` in", values, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotIn(List values) { + addCriterion("`level` not in", values, "level"); + return (Criteria) this; + } + + public Criteria andLevelBetween(Integer value1, Integer value2) { + addCriterion("`level` between", value1, value2, "level"); + return (Criteria) this; + } + + public Criteria andLevelNotBetween(Integer value1, Integer value2) { + addCriterion("`level` not between", value1, value2, "level"); + return (Criteria) this; + } + + public Criteria andNodeTypeIsNull() { + addCriterion("node_type is null"); + return (Criteria) this; + } + + public Criteria andNodeTypeIsNotNull() { + addCriterion("node_type is not null"); + return (Criteria) this; + } + + public Criteria andNodeTypeEqualTo(String value) { + addCriterion("node_type =", value, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeNotEqualTo(String value) { + addCriterion("node_type <>", value, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeGreaterThan(String value) { + addCriterion("node_type >", value, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeGreaterThanOrEqualTo(String value) { + addCriterion("node_type >=", value, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeLessThan(String value) { + addCriterion("node_type <", value, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeLessThanOrEqualTo(String value) { + addCriterion("node_type <=", value, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeLike(String value) { + addCriterion("node_type like", value, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeNotLike(String value) { + addCriterion("node_type not like", value, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeIn(List values) { + addCriterion("node_type in", values, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeNotIn(List values) { + addCriterion("node_type not in", values, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeBetween(String value1, String value2) { + addCriterion("node_type between", value1, value2, "nodeType"); + return (Criteria) this; + } + + public Criteria andNodeTypeNotBetween(String value1, String value2) { + addCriterion("node_type not between", value1, value2, "nodeType"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Long value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Long value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Long value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Long value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Long value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Long value1, Long value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Long value1, Long value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andTemplateTypeIsNull() { + addCriterion("template_type is null"); + return (Criteria) this; + } + + public Criteria andTemplateTypeIsNotNull() { + addCriterion("template_type is not null"); + return (Criteria) this; + } + + public Criteria andTemplateTypeEqualTo(String value) { + addCriterion("template_type =", value, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeNotEqualTo(String value) { + addCriterion("template_type <>", value, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeGreaterThan(String value) { + addCriterion("template_type >", value, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeGreaterThanOrEqualTo(String value) { + addCriterion("template_type >=", value, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeLessThan(String value) { + addCriterion("template_type <", value, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeLessThanOrEqualTo(String value) { + addCriterion("template_type <=", value, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeLike(String value) { + addCriterion("template_type like", value, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeNotLike(String value) { + addCriterion("template_type not like", value, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeIn(List values) { + addCriterion("template_type in", values, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeNotIn(List values) { + addCriterion("template_type not in", values, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeBetween(String value1, String value2) { + addCriterion("template_type between", value1, value2, "templateType"); + return (Criteria) this; + } + + public Criteria andTemplateTypeNotBetween(String value1, String value2) { + addCriterion("template_type not between", value1, value2, "templateType"); + 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/PanelTemplateWithBLOBs.java b/backend/src/main/java/io/dataease/base/domain/PanelTemplateWithBLOBs.java new file mode 100644 index 0000000000..b046dab87e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/PanelTemplateWithBLOBs.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class PanelTemplateWithBLOBs extends PanelTemplate implements Serializable { + private String snapshot; + + private String templateStyle; + + private String templateData; + + private String dynamicData; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/SysDict.java b/backend/src/main/java/io/dataease/base/domain/SysDict.java new file mode 100644 index 0000000000..4ddd11151f --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysDict.java @@ -0,0 +1,27 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class SysDict implements Serializable { + private String id; + + private String dictName; + + private String dictCode; + + private String description; + + private Boolean delFlag; + + private String createBy; + + private Long createTime; + + private String updateBy; + + private Long updateTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/SysDictExample.java b/backend/src/main/java/io/dataease/base/domain/SysDictExample.java new file mode 100644 index 0000000000..1328dacd18 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysDictExample.java @@ -0,0 +1,800 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class SysDictExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysDictExample() { + 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 andDictNameIsNull() { + addCriterion("dict_name is null"); + return (Criteria) this; + } + + public Criteria andDictNameIsNotNull() { + addCriterion("dict_name is not null"); + return (Criteria) this; + } + + public Criteria andDictNameEqualTo(String value) { + addCriterion("dict_name =", value, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameNotEqualTo(String value) { + addCriterion("dict_name <>", value, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameGreaterThan(String value) { + addCriterion("dict_name >", value, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameGreaterThanOrEqualTo(String value) { + addCriterion("dict_name >=", value, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameLessThan(String value) { + addCriterion("dict_name <", value, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameLessThanOrEqualTo(String value) { + addCriterion("dict_name <=", value, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameLike(String value) { + addCriterion("dict_name like", value, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameNotLike(String value) { + addCriterion("dict_name not like", value, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameIn(List values) { + addCriterion("dict_name in", values, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameNotIn(List values) { + addCriterion("dict_name not in", values, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameBetween(String value1, String value2) { + addCriterion("dict_name between", value1, value2, "dictName"); + return (Criteria) this; + } + + public Criteria andDictNameNotBetween(String value1, String value2) { + addCriterion("dict_name not between", value1, value2, "dictName"); + return (Criteria) this; + } + + public Criteria andDictCodeIsNull() { + addCriterion("dict_code is null"); + return (Criteria) this; + } + + public Criteria andDictCodeIsNotNull() { + addCriterion("dict_code is not null"); + return (Criteria) this; + } + + public Criteria andDictCodeEqualTo(String value) { + addCriterion("dict_code =", value, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeNotEqualTo(String value) { + addCriterion("dict_code <>", value, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeGreaterThan(String value) { + addCriterion("dict_code >", value, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeGreaterThanOrEqualTo(String value) { + addCriterion("dict_code >=", value, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeLessThan(String value) { + addCriterion("dict_code <", value, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeLessThanOrEqualTo(String value) { + addCriterion("dict_code <=", value, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeLike(String value) { + addCriterion("dict_code like", value, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeNotLike(String value) { + addCriterion("dict_code not like", value, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeIn(List values) { + addCriterion("dict_code in", values, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeNotIn(List values) { + addCriterion("dict_code not in", values, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeBetween(String value1, String value2) { + addCriterion("dict_code between", value1, value2, "dictCode"); + return (Criteria) this; + } + + public Criteria andDictCodeNotBetween(String value1, String value2) { + addCriterion("dict_code not between", value1, value2, "dictCode"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNull() { + addCriterion("del_flag is null"); + return (Criteria) this; + } + + public Criteria andDelFlagIsNotNull() { + addCriterion("del_flag is not null"); + return (Criteria) this; + } + + public Criteria andDelFlagEqualTo(Boolean value) { + addCriterion("del_flag =", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotEqualTo(Boolean value) { + addCriterion("del_flag <>", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThan(Boolean value) { + addCriterion("del_flag >", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagGreaterThanOrEqualTo(Boolean value) { + addCriterion("del_flag >=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThan(Boolean value) { + addCriterion("del_flag <", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagLessThanOrEqualTo(Boolean value) { + addCriterion("del_flag <=", value, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagIn(List values) { + addCriterion("del_flag in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotIn(List values) { + addCriterion("del_flag not in", values, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagBetween(Boolean value1, Boolean value2) { + addCriterion("del_flag between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andDelFlagNotBetween(Boolean value1, Boolean value2) { + addCriterion("del_flag not between", value1, value2, "delFlag"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Long value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Long value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Long value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Long value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Long value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Long value1, Long value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Long value1, Long value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Long value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Long value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Long value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Long value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Long value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Long value1, Long value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Long value1, Long value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + 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/SysDictItem.java b/backend/src/main/java/io/dataease/base/domain/SysDictItem.java new file mode 100644 index 0000000000..68989fddaa --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysDictItem.java @@ -0,0 +1,31 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class SysDictItem implements Serializable { + private String id; + + private String dictId; + + private String itemText; + + private String itemValue; + + private String description; + + private Integer sortOrder; + + private String status; + + private String createBy; + + private Long createTime; + + private String updateBy; + + private Long updateTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/SysDictItemExample.java b/backend/src/main/java/io/dataease/base/domain/SysDictItemExample.java new file mode 100644 index 0000000000..37d0b17b46 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysDictItemExample.java @@ -0,0 +1,940 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class SysDictItemExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysDictItemExample() { + 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 andDictIdIsNull() { + addCriterion("dict_id is null"); + return (Criteria) this; + } + + public Criteria andDictIdIsNotNull() { + addCriterion("dict_id is not null"); + return (Criteria) this; + } + + public Criteria andDictIdEqualTo(String value) { + addCriterion("dict_id =", value, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdNotEqualTo(String value) { + addCriterion("dict_id <>", value, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdGreaterThan(String value) { + addCriterion("dict_id >", value, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdGreaterThanOrEqualTo(String value) { + addCriterion("dict_id >=", value, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdLessThan(String value) { + addCriterion("dict_id <", value, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdLessThanOrEqualTo(String value) { + addCriterion("dict_id <=", value, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdLike(String value) { + addCriterion("dict_id like", value, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdNotLike(String value) { + addCriterion("dict_id not like", value, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdIn(List values) { + addCriterion("dict_id in", values, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdNotIn(List values) { + addCriterion("dict_id not in", values, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdBetween(String value1, String value2) { + addCriterion("dict_id between", value1, value2, "dictId"); + return (Criteria) this; + } + + public Criteria andDictIdNotBetween(String value1, String value2) { + addCriterion("dict_id not between", value1, value2, "dictId"); + return (Criteria) this; + } + + public Criteria andItemTextIsNull() { + addCriterion("item_text is null"); + return (Criteria) this; + } + + public Criteria andItemTextIsNotNull() { + addCriterion("item_text is not null"); + return (Criteria) this; + } + + public Criteria andItemTextEqualTo(String value) { + addCriterion("item_text =", value, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextNotEqualTo(String value) { + addCriterion("item_text <>", value, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextGreaterThan(String value) { + addCriterion("item_text >", value, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextGreaterThanOrEqualTo(String value) { + addCriterion("item_text >=", value, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextLessThan(String value) { + addCriterion("item_text <", value, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextLessThanOrEqualTo(String value) { + addCriterion("item_text <=", value, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextLike(String value) { + addCriterion("item_text like", value, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextNotLike(String value) { + addCriterion("item_text not like", value, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextIn(List values) { + addCriterion("item_text in", values, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextNotIn(List values) { + addCriterion("item_text not in", values, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextBetween(String value1, String value2) { + addCriterion("item_text between", value1, value2, "itemText"); + return (Criteria) this; + } + + public Criteria andItemTextNotBetween(String value1, String value2) { + addCriterion("item_text not between", value1, value2, "itemText"); + return (Criteria) this; + } + + public Criteria andItemValueIsNull() { + addCriterion("item_value is null"); + return (Criteria) this; + } + + public Criteria andItemValueIsNotNull() { + addCriterion("item_value is not null"); + return (Criteria) this; + } + + public Criteria andItemValueEqualTo(String value) { + addCriterion("item_value =", value, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueNotEqualTo(String value) { + addCriterion("item_value <>", value, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueGreaterThan(String value) { + addCriterion("item_value >", value, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueGreaterThanOrEqualTo(String value) { + addCriterion("item_value >=", value, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueLessThan(String value) { + addCriterion("item_value <", value, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueLessThanOrEqualTo(String value) { + addCriterion("item_value <=", value, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueLike(String value) { + addCriterion("item_value like", value, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueNotLike(String value) { + addCriterion("item_value not like", value, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueIn(List values) { + addCriterion("item_value in", values, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueNotIn(List values) { + addCriterion("item_value not in", values, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueBetween(String value1, String value2) { + addCriterion("item_value between", value1, value2, "itemValue"); + return (Criteria) this; + } + + public Criteria andItemValueNotBetween(String value1, String value2) { + addCriterion("item_value not between", value1, value2, "itemValue"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andSortOrderIsNull() { + addCriterion("sort_order is null"); + return (Criteria) this; + } + + public Criteria andSortOrderIsNotNull() { + addCriterion("sort_order is not null"); + return (Criteria) this; + } + + public Criteria andSortOrderEqualTo(Integer value) { + addCriterion("sort_order =", value, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderNotEqualTo(Integer value) { + addCriterion("sort_order <>", value, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderGreaterThan(Integer value) { + addCriterion("sort_order >", value, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderGreaterThanOrEqualTo(Integer value) { + addCriterion("sort_order >=", value, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderLessThan(Integer value) { + addCriterion("sort_order <", value, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderLessThanOrEqualTo(Integer value) { + addCriterion("sort_order <=", value, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderIn(List values) { + addCriterion("sort_order in", values, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderNotIn(List values) { + addCriterion("sort_order not in", values, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderBetween(Integer value1, Integer value2) { + addCriterion("sort_order between", value1, value2, "sortOrder"); + return (Criteria) this; + } + + public Criteria andSortOrderNotBetween(Integer value1, Integer value2) { + addCriterion("sort_order not between", value1, value2, "sortOrder"); + return (Criteria) this; + } + + public Criteria andStatusIsNull() { + addCriterion("`status` is null"); + return (Criteria) this; + } + + public Criteria andStatusIsNotNull() { + addCriterion("`status` is not null"); + return (Criteria) this; + } + + public Criteria andStatusEqualTo(String value) { + addCriterion("`status` =", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotEqualTo(String value) { + addCriterion("`status` <>", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThan(String value) { + addCriterion("`status` >", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusGreaterThanOrEqualTo(String value) { + addCriterion("`status` >=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThan(String value) { + addCriterion("`status` <", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLessThanOrEqualTo(String value) { + addCriterion("`status` <=", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusLike(String value) { + addCriterion("`status` like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotLike(String value) { + addCriterion("`status` not like", value, "status"); + return (Criteria) this; + } + + public Criteria andStatusIn(List values) { + addCriterion("`status` in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotIn(List values) { + addCriterion("`status` not in", values, "status"); + return (Criteria) this; + } + + public Criteria andStatusBetween(String value1, String value2) { + addCriterion("`status` between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andStatusNotBetween(String value1, String value2) { + addCriterion("`status` not between", value1, value2, "status"); + return (Criteria) this; + } + + public Criteria andCreateByIsNull() { + addCriterion("create_by is null"); + return (Criteria) this; + } + + public Criteria andCreateByIsNotNull() { + addCriterion("create_by is not null"); + return (Criteria) this; + } + + public Criteria andCreateByEqualTo(String value) { + addCriterion("create_by =", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotEqualTo(String value) { + addCriterion("create_by <>", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThan(String value) { + addCriterion("create_by >", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByGreaterThanOrEqualTo(String value) { + addCriterion("create_by >=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThan(String value) { + addCriterion("create_by <", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLessThanOrEqualTo(String value) { + addCriterion("create_by <=", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByLike(String value) { + addCriterion("create_by like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotLike(String value) { + addCriterion("create_by not like", value, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByIn(List values) { + addCriterion("create_by in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotIn(List values) { + addCriterion("create_by not in", values, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByBetween(String value1, String value2) { + addCriterion("create_by between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateByNotBetween(String value1, String value2) { + addCriterion("create_by not between", value1, value2, "createBy"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Long value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Long value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Long value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Long value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Long value) { + addCriterion("create_time <=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeBetween(Long value1, Long value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Long value1, Long value2) { + addCriterion("create_time not between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNull() { + addCriterion("update_by is null"); + return (Criteria) this; + } + + public Criteria andUpdateByIsNotNull() { + addCriterion("update_by is not null"); + return (Criteria) this; + } + + public Criteria andUpdateByEqualTo(String value) { + addCriterion("update_by =", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotEqualTo(String value) { + addCriterion("update_by <>", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThan(String value) { + addCriterion("update_by >", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByGreaterThanOrEqualTo(String value) { + addCriterion("update_by >=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThan(String value) { + addCriterion("update_by <", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLessThanOrEqualTo(String value) { + addCriterion("update_by <=", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByLike(String value) { + addCriterion("update_by like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotLike(String value) { + addCriterion("update_by not like", value, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByIn(List values) { + addCriterion("update_by in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotIn(List values) { + addCriterion("update_by not in", values, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByBetween(String value1, String value2) { + addCriterion("update_by between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateByNotBetween(String value1, String value2) { + addCriterion("update_by not between", value1, value2, "updateBy"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); + return (Criteria) this; + } + + public Criteria andUpdateTimeEqualTo(Long value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Long value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Long value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Long value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Long value) { + addCriterion("update_time <=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeBetween(Long value1, Long value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Long value1, Long value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + 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/PanelTemplateMapper.java b/backend/src/main/java/io/dataease/base/mapper/PanelTemplateMapper.java new file mode 100644 index 0000000000..ecc605de17 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelTemplateMapper.java @@ -0,0 +1,37 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.PanelTemplate; +import io.dataease.base.domain.PanelTemplateExample; +import io.dataease.base.domain.PanelTemplateWithBLOBs; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface PanelTemplateMapper { + long countByExample(PanelTemplateExample example); + + int deleteByExample(PanelTemplateExample example); + + int deleteByPrimaryKey(String id); + + int insert(PanelTemplateWithBLOBs record); + + int insertSelective(PanelTemplateWithBLOBs record); + + List selectByExampleWithBLOBs(PanelTemplateExample example); + + List selectByExample(PanelTemplateExample example); + + PanelTemplateWithBLOBs selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") PanelTemplateWithBLOBs record, @Param("example") PanelTemplateExample example); + + int updateByExampleWithBLOBs(@Param("record") PanelTemplateWithBLOBs record, @Param("example") PanelTemplateExample example); + + int updateByExample(@Param("record") PanelTemplate record, @Param("example") PanelTemplateExample example); + + int updateByPrimaryKeySelective(PanelTemplateWithBLOBs record); + + int updateByPrimaryKeyWithBLOBs(PanelTemplateWithBLOBs record); + + int updateByPrimaryKey(PanelTemplate record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelTemplateMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelTemplateMapper.xml new file mode 100644 index 0000000000..f0abe9a4be --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/PanelTemplateMapper.xml @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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, `name`, pid, `level`, node_type, create_by, create_time, template_type + + + snapshot, template_style, template_data, dynamic_data + + + + + + delete from panel_template + where id = #{id,jdbcType=VARCHAR} + + + delete from panel_template + + + + + + insert into panel_template (id, `name`, pid, + `level`, node_type, create_by, + create_time, template_type, snapshot, + template_style, template_data, dynamic_data + ) + values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, + #{level,jdbcType=INTEGER}, #{nodeType,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}, #{templateType,jdbcType=VARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}, + #{templateStyle,jdbcType=LONGVARCHAR}, #{templateData,jdbcType=LONGVARCHAR}, #{dynamicData,jdbcType=LONGVARCHAR} + ) + + + insert into panel_template + + + id, + + + `name`, + + + pid, + + + `level`, + + + node_type, + + + create_by, + + + create_time, + + + template_type, + + + snapshot, + + + template_style, + + + template_data, + + + dynamic_data, + + + + + #{id,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{pid,jdbcType=VARCHAR}, + + + #{level,jdbcType=INTEGER}, + + + #{nodeType,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{templateType,jdbcType=VARCHAR}, + + + #{snapshot,jdbcType=LONGVARCHAR}, + + + #{templateStyle,jdbcType=LONGVARCHAR}, + + + #{templateData,jdbcType=LONGVARCHAR}, + + + #{dynamicData,jdbcType=LONGVARCHAR}, + + + + + + update panel_template + + + id = #{record.id,jdbcType=VARCHAR}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + pid = #{record.pid,jdbcType=VARCHAR}, + + + `level` = #{record.level,jdbcType=INTEGER}, + + + node_type = #{record.nodeType,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + template_type = #{record.templateType,jdbcType=VARCHAR}, + + + snapshot = #{record.snapshot,jdbcType=LONGVARCHAR}, + + + template_style = #{record.templateStyle,jdbcType=LONGVARCHAR}, + + + template_data = #{record.templateData,jdbcType=LONGVARCHAR}, + + + dynamic_data = #{record.dynamicData,jdbcType=LONGVARCHAR}, + + + + + + + + update panel_template + set id = #{record.id,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + pid = #{record.pid,jdbcType=VARCHAR}, + `level` = #{record.level,jdbcType=INTEGER}, + node_type = #{record.nodeType,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + template_type = #{record.templateType,jdbcType=VARCHAR}, + snapshot = #{record.snapshot,jdbcType=LONGVARCHAR}, + template_style = #{record.templateStyle,jdbcType=LONGVARCHAR}, + template_data = #{record.templateData,jdbcType=LONGVARCHAR}, + dynamic_data = #{record.dynamicData,jdbcType=LONGVARCHAR} + + + + + + update panel_template + set id = #{record.id,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + pid = #{record.pid,jdbcType=VARCHAR}, + `level` = #{record.level,jdbcType=INTEGER}, + node_type = #{record.nodeType,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + template_type = #{record.templateType,jdbcType=VARCHAR} + + + + + + update panel_template + + + `name` = #{name,jdbcType=VARCHAR}, + + + pid = #{pid,jdbcType=VARCHAR}, + + + `level` = #{level,jdbcType=INTEGER}, + + + node_type = #{nodeType,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + template_type = #{templateType,jdbcType=VARCHAR}, + + + snapshot = #{snapshot,jdbcType=LONGVARCHAR}, + + + template_style = #{templateStyle,jdbcType=LONGVARCHAR}, + + + template_data = #{templateData,jdbcType=LONGVARCHAR}, + + + dynamic_data = #{dynamicData,jdbcType=LONGVARCHAR}, + + + where id = #{id,jdbcType=VARCHAR} + + + update panel_template + set `name` = #{name,jdbcType=VARCHAR}, + pid = #{pid,jdbcType=VARCHAR}, + `level` = #{level,jdbcType=INTEGER}, + node_type = #{nodeType,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + template_type = #{templateType,jdbcType=VARCHAR}, + snapshot = #{snapshot,jdbcType=LONGVARCHAR}, + template_style = #{templateStyle,jdbcType=LONGVARCHAR}, + template_data = #{templateData,jdbcType=LONGVARCHAR}, + dynamic_data = #{dynamicData,jdbcType=LONGVARCHAR} + where id = #{id,jdbcType=VARCHAR} + + + update panel_template + set `name` = #{name,jdbcType=VARCHAR}, + pid = #{pid,jdbcType=VARCHAR}, + `level` = #{level,jdbcType=INTEGER}, + node_type = #{nodeType,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + template_type = #{templateType,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysDictItemMapper.java b/backend/src/main/java/io/dataease/base/mapper/SysDictItemMapper.java new file mode 100644 index 0000000000..036d9aba2d --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysDictItemMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.SysDictItem; +import io.dataease.base.domain.SysDictItemExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysDictItemMapper { + long countByExample(SysDictItemExample example); + + int deleteByExample(SysDictItemExample example); + + int deleteByPrimaryKey(String id); + + int insert(SysDictItem record); + + int insertSelective(SysDictItem record); + + List selectByExample(SysDictItemExample example); + + SysDictItem selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") SysDictItem record, @Param("example") SysDictItemExample example); + + int updateByExample(@Param("record") SysDictItem record, @Param("example") SysDictItemExample example); + + int updateByPrimaryKeySelective(SysDictItem record); + + int updateByPrimaryKey(SysDictItem record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysDictItemMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysDictItemMapper.xml new file mode 100644 index 0000000000..06c0126cf6 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysDictItemMapper.xml @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + 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, dict_id, item_text, item_value, description, sort_order, `status`, create_by, + create_time, update_by, update_time + + + + + delete from sys_dict_item + where id = #{id,jdbcType=VARCHAR} + + + delete from sys_dict_item + + + + + + insert into sys_dict_item (id, dict_id, item_text, + item_value, description, sort_order, + `status`, create_by, create_time, + update_by, update_time) + values (#{id,jdbcType=VARCHAR}, #{dictId,jdbcType=VARCHAR}, #{itemText,jdbcType=VARCHAR}, + #{itemValue,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{sortOrder,jdbcType=INTEGER}, + #{status,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, + #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT}) + + + insert into sys_dict_item + + + id, + + + dict_id, + + + item_text, + + + item_value, + + + description, + + + sort_order, + + + `status`, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + + + #{id,jdbcType=VARCHAR}, + + + #{dictId,jdbcType=VARCHAR}, + + + #{itemText,jdbcType=VARCHAR}, + + + #{itemValue,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{sortOrder,jdbcType=INTEGER}, + + + #{status,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=BIGINT}, + + + + + + update sys_dict_item + + + id = #{record.id,jdbcType=VARCHAR}, + + + dict_id = #{record.dictId,jdbcType=VARCHAR}, + + + item_text = #{record.itemText,jdbcType=VARCHAR}, + + + item_value = #{record.itemValue,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + sort_order = #{record.sortOrder,jdbcType=INTEGER}, + + + `status` = #{record.status,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + update_time = #{record.updateTime,jdbcType=BIGINT}, + + + + + + + + update sys_dict_item + set id = #{record.id,jdbcType=VARCHAR}, + dict_id = #{record.dictId,jdbcType=VARCHAR}, + item_text = #{record.itemText,jdbcType=VARCHAR}, + item_value = #{record.itemValue,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + sort_order = #{record.sortOrder,jdbcType=INTEGER}, + `status` = #{record.status,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + update_time = #{record.updateTime,jdbcType=BIGINT} + + + + + + update sys_dict_item + + + dict_id = #{dictId,jdbcType=VARCHAR}, + + + item_text = #{itemText,jdbcType=VARCHAR}, + + + item_value = #{itemValue,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + sort_order = #{sortOrder,jdbcType=INTEGER}, + + + `status` = #{status,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=VARCHAR} + + + update sys_dict_item + set dict_id = #{dictId,jdbcType=VARCHAR}, + item_text = #{itemText,jdbcType=VARCHAR}, + item_value = #{itemValue,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + sort_order = #{sortOrder,jdbcType=INTEGER}, + `status` = #{status,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysDictMapper.java b/backend/src/main/java/io/dataease/base/mapper/SysDictMapper.java new file mode 100644 index 0000000000..db779c8f2b --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysDictMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.SysDict; +import io.dataease.base.domain.SysDictExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysDictMapper { + long countByExample(SysDictExample example); + + int deleteByExample(SysDictExample example); + + int deleteByPrimaryKey(String id); + + int insert(SysDict record); + + int insertSelective(SysDict record); + + List selectByExample(SysDictExample example); + + SysDict selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") SysDict record, @Param("example") SysDictExample example); + + int updateByExample(@Param("record") SysDict record, @Param("example") SysDictExample example); + + int updateByPrimaryKeySelective(SysDict record); + + int updateByPrimaryKey(SysDict record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysDictMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysDictMapper.xml new file mode 100644 index 0000000000..8e09f3b950 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysDictMapper.xml @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + 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, dict_name, dict_code, description, del_flag, create_by, create_time, update_by, + update_time + + + + + delete from sys_dict + where id = #{id,jdbcType=VARCHAR} + + + delete from sys_dict + + + + + + insert into sys_dict (id, dict_name, dict_code, + description, del_flag, create_by, + create_time, update_by, update_time + ) + values (#{id,jdbcType=VARCHAR}, #{dictName,jdbcType=VARCHAR}, #{dictCode,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{delFlag,jdbcType=BIT}, #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT} + ) + + + insert into sys_dict + + + id, + + + dict_name, + + + dict_code, + + + description, + + + del_flag, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + + + #{id,jdbcType=VARCHAR}, + + + #{dictName,jdbcType=VARCHAR}, + + + #{dictCode,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{delFlag,jdbcType=BIT}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=BIGINT}, + + + + + + update sys_dict + + + id = #{record.id,jdbcType=VARCHAR}, + + + dict_name = #{record.dictName,jdbcType=VARCHAR}, + + + dict_code = #{record.dictCode,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + del_flag = #{record.delFlag,jdbcType=BIT}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + update_time = #{record.updateTime,jdbcType=BIGINT}, + + + + + + + + update sys_dict + set id = #{record.id,jdbcType=VARCHAR}, + dict_name = #{record.dictName,jdbcType=VARCHAR}, + dict_code = #{record.dictCode,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + del_flag = #{record.delFlag,jdbcType=BIT}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + update_time = #{record.updateTime,jdbcType=BIGINT} + + + + + + update sys_dict + + + dict_name = #{dictName,jdbcType=VARCHAR}, + + + dict_code = #{dictCode,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + del_flag = #{delFlag,jdbcType=BIT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=VARCHAR} + + + update sys_dict + set dict_name = #{dictName,jdbcType=VARCHAR}, + dict_code = #{dictCode,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + del_flag = #{delFlag,jdbcType=BIT}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.java new file mode 100644 index 0000000000..4fa75ff3ef --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.java @@ -0,0 +1,21 @@ +package io.dataease.base.mapper.ext; + +import io.dataease.controller.request.panel.PanelTemplateRequest; +import io.dataease.dto.panel.PanelGroupDTO; +import io.dataease.dto.panel.PanelTemplateDTO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ExtPanelTemplateMapper { + + List panelTemplateList(PanelTemplateRequest request); + + List panelSystemTemplateType(PanelTemplateRequest request); + //会级联删除pid 下的所有数据 + int deleteCircle(@Param("pid") String pid); + + PanelTemplateDTO panelTemplate(String id); + + +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml new file mode 100644 index 0000000000..7fd418256b --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelTemplateMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + delete from panel_template where FIND_IN_SET(panel_template.id,GET_PANEL_TEMPLATE_WITH_CHILDREN(#{pid})) + + diff --git a/backend/src/main/java/io/dataease/commons/constants/PanelConstants.java b/backend/src/main/java/io/dataease/commons/constants/PanelConstants.java index 3568113393..c20471eef2 100644 --- a/backend/src/main/java/io/dataease/commons/constants/PanelConstants.java +++ b/backend/src/main/java/io/dataease/commons/constants/PanelConstants.java @@ -12,4 +12,9 @@ public class PanelConstants { public final static String COMPONENT_TYPE_PUBLIC = "public"; + public final static String TEMPLATE_TYPE_SYSTEM = "system"; + + public final static String TEMPLATE_TYPE_SELF = "self"; + + } diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java b/backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java new file mode 100644 index 0000000000..b161e021b2 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java @@ -0,0 +1,50 @@ +package io.dataease.controller.panel; + +import io.dataease.base.domain.PanelTemplateWithBLOBs; +import io.dataease.controller.request.panel.PanelTemplateRequest; +import io.dataease.dto.panel.PanelTemplateDTO; +import io.dataease.service.panel.PanelTemplateService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * Author: wangjiahao + * Date: 2021-03-05 + * Description: + */ +@RestController +@RequestMapping("template") +public class PanelTemplateController { + + @Resource + private PanelTemplateService panelTemplateService; + + @PostMapping("/templateList") + public List templateList(@RequestBody PanelTemplateRequest request) { + return panelTemplateService.templateList(request); + } + + @PostMapping("/save") + public PanelTemplateDTO save(@RequestBody PanelTemplateRequest request) { + return panelTemplateService.save(request); + } + + @PostMapping("/deleteCircle/{id}") + public void deleteCircle(@PathVariable String id) { + panelTemplateService.deleteCircle(id); + } + + @GetMapping("/findOne/{id}") + public PanelTemplateWithBLOBs findOne(@PathVariable String id) throws Exception { + return panelTemplateService.findOne(id); + } + + @PostMapping("/find") + public List find(@RequestBody PanelTemplateRequest request) { + return panelTemplateService.find(request); + } + + +} diff --git a/backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java b/backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java new file mode 100644 index 0000000000..a7f57e485f --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/request/panel/PanelTemplateRequest.java @@ -0,0 +1,23 @@ +package io.dataease.controller.request.panel; + +import io.dataease.base.domain.PanelTemplateWithBLOBs; +import lombok.Data; + +/** + * Author: wangjiahao + * Date: 2021-03-05 + * Description: + */ +@Data +public class PanelTemplateRequest extends PanelTemplateWithBLOBs { + private String sort; + + private Boolean withChildren = false; + + public PanelTemplateRequest() { + } + + public PanelTemplateRequest(String pid) { + super.setPid(pid); + } +} diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelTemplateDTO.java b/backend/src/main/java/io/dataease/dto/panel/PanelTemplateDTO.java new file mode 100644 index 0000000000..83cb869664 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/panel/PanelTemplateDTO.java @@ -0,0 +1,23 @@ +package io.dataease.dto.panel; + +import io.dataease.base.domain.PanelTemplateWithBLOBs; +import lombok.Data; + +import java.util.List; + +/** + * Author: wangjiahao + * Date: 2021-03-05 + * Description: + */ +@Data +public class PanelTemplateDTO extends PanelTemplateWithBLOBs { + + private String label; + + private Integer childrenCount; + + private List children; + + +} diff --git a/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java new file mode 100644 index 0000000000..ad2c39cd4c --- /dev/null +++ b/backend/src/main/java/io/dataease/service/panel/PanelTemplateService.java @@ -0,0 +1,87 @@ +package io.dataease.service.panel; + +import io.dataease.base.domain.*; +import io.dataease.base.mapper.PanelTemplateMapper; +import io.dataease.base.mapper.ext.ExtPanelTemplateMapper; +import io.dataease.commons.constants.PanelConstants; +import io.dataease.commons.utils.BeanUtils; +import io.dataease.controller.request.panel.PanelTemplateRequest; +import io.dataease.dto.panel.PanelTemplateDTO; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +/** + * Author: wangjiahao + * Date: 2021-03-05 + * Description: + */ +@Service +public class PanelTemplateService { + + private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); + + @Resource + private PanelTemplateMapper panelTemplateMapper; + @Resource + private ExtPanelTemplateMapper extPanelTemplateMapper; + + public List templateList(PanelTemplateRequest panelTemplateRequest) { + List panelTemplateList = extPanelTemplateMapper.panelTemplateList(panelTemplateRequest); + if(panelTemplateRequest.getWithChildren()){ + getTreeChildren(panelTemplateList); + } + return panelTemplateList; + } + + public void getTreeChildren(List parentPanelTemplateDTO){ + Optional.ofNullable(parentPanelTemplateDTO).ifPresent(parent -> parent.forEach(panelTemplateDTO -> { + List panelTemplateDTOChildren = extPanelTemplateMapper.panelTemplateList(new PanelTemplateRequest(panelTemplateDTO.getId())); + panelTemplateDTO.setChildren(panelTemplateDTOChildren); + getTreeChildren(panelTemplateDTOChildren); + })); + } + + public List getSystemTemplateType(PanelTemplateRequest panelTemplateRequest){ + return extPanelTemplateMapper.panelTemplateList(panelTemplateRequest); + } + + + public PanelTemplateDTO save(PanelTemplateRequest request) { + if (StringUtils.isEmpty(request.getId())) { + request.setId(UUID.randomUUID().toString()); + request.setCreateTime(System.currentTimeMillis()); + panelTemplateMapper.insert(request); + } else { + panelTemplateMapper.updateByPrimaryKeySelective(request); + } + PanelTemplateDTO panelTemplateDTO = new PanelTemplateDTO(); + BeanUtils.copyBean(panelTemplateDTO, request); + panelTemplateDTO.setLabel(request.getName()); + return panelTemplateDTO; + } + + + public void deleteCircle(String id){ + Assert.notNull(id, "id cannot be null"); + extPanelTemplateMapper.deleteCircle(id); + } + + + public PanelTemplateWithBLOBs findOne(String panelId){ + return panelTemplateMapper.selectByPrimaryKey(panelId); + } + + public List find(PanelTemplateRequest panelTemplateRequest){ + List panelTemplateList = extPanelTemplateMapper.panelTemplateList(panelTemplateRequest); + return panelTemplateList; + } + +} diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index 6852c1bbc7..e900c8a49f 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -65,7 +65,9 @@ - + + +
diff --git a/frontend/src/assets/template.png b/frontend/src/assets/template.png new file mode 100644 index 0000000000000000000000000000000000000000..1edb6c8bf7a5a9e10770f586e0cbd2d0ba75fedf GIT binary patch literal 4741 zcmZ`-cQhP-*Pqpi644XAMqOnsR@CUxNt6)1TNaDx1QDGG5iJp2v`C`FPp^p@qL-f_ z>awh|R(&_m`+LrL-shZm&fK{(-}@=|&YAgRCf-nAlZxUt1pok4+FEMH_-ud=M>0bE zaX%_w1pp{H-R|EvbaQY3fTweruSrcazA;8_fVH)>T%!z&W0q*Q)ZJZaiHf6>(}-^A zB$2E1q=*PLF`Amzz5l?SP(ysvh&IH6J|x22&}gdn8C9l?HeikY>u_YrZ~eM`q1kU^ zDHpdf1iWJ(q)qfQq5?2#xR*`)w$3{4w=<52I3r0+K@6@wO~yWko}ToPl1Eo9f3<_E z3$6TLofBN^LxMsDnE+l!UlN1w!_lDtun;YrwMMAC85Ml!hO-|~W9A#n>HxSN56C_E z_QZF@(DzjrKUWH|92>wO6vy+8Kv|ES=~HAb@nyN_bCk#mxq8}T&T~IvR`xY;8XE>v zs{E)i$}{62`fXJ^ZixBh+b>6|Pm)ZrD^?>%5f&-e;GpLELb)NkA_`twA57kF z|G_u61YLyIKD|%cWFD|gt0fPj2$54_7~sA|x~t?{B4RGp0RSZ!S+4XnDz4mk-=ZRt zx}deBQjpXjR}s%;QR_zSsPy;i=tk{0^*WA8?(2oysGT>R2G zxhz-&f}54I>8UKJFbZz^p=xj#zki`N+o$^-f`` zYn1Bs&M;@=gBvSxeJAVPy`@7;q$?LQL{6Sf0ZlFvW%-rmE>(M-`CuXYBmjb_cLdMX8w$fx9YTh?iG^rYD7&8VYZ7ZK12!!eC?COsBE(&Eh2r|Va<~h`Xr0M1Z&VPC>r%7aH5r5x zy|cY60B)&v!E#BGJ_Ob!du?qNN(LyMbaW^W23oJ#0Vmy;uY3<%M)(Q$-ckd3)hpk5 ziFMe-B5nf2<=tR)4(9IGK@#URf_sr*GNM9T$`>GVP6pj){)`>|LZFEbU2&RM&wT4B zs|X(2^2`tfL@wHLxDtsj%gR!TMGh{*nr=+%Fg+y??hF}A670a#H%>?L-k{}@bmW)h5Y!Y(6LOR?PP|BARZZd9NTXhZVs36}EOEXyqAYno zS5E65o1)e_#tFHlr!4T^V$<|9nW)O^cOGN6kxX-u?3&E{jr6en3Qq2z^AS^Ic$*CF`>@aU zlra2OdxBC=$bmP}?ank?gMF?#a={ppE{LjN;mf*YL>hu3T;4hctHzzK@|i!l%Nv}T zt(T`_rE6udaNm?(?s8B&uFQ#vNES4_(O^bL*>Xr>!Pn_$5q?+Ck;$RE7>yD^OZA=UK=)=Jg#W0 z@OFdbFo>pQX$+Q$7EX@qkFk#_R{ogG`#Ix&?~9!Kq&tp^f2#B+XsR!$LQ^k)m?P=B$mZCRh&E|e(>vF>zmb{|E)rO)4kK(5o ztLZFLx0o06M&A2v9d13|D%-T4Q-gcJ8v+^vnoqoT19qRViL%M$^X9AOyXW)3@+p(- zdTphASst*QGs`f)^-o4dBXM67kvsmio8e=33Yp6Lr-dixivq3DpA=1$OqDbvn!}5( z!Uz{SMr`vsA<`@dhvKQAxLx6AuQ*)95UrlJ};#$m7EwZ-7URz zo^p}??j6`p2o#bF0xmIo*0t#Pem;jLkD zgq@x9Dr<(Th>7%V<~8$W^NrK7_+RwDO;JBLkKBuU2R^3{Y8J5IhG!S$rh`5lE*e=D z^(6_hPu|;3PRzeCT{8DOM|fCz$Uns+W5+`#M5b+?r19|{68mxQ#=`tUd+^g>t$W)F zUll~}O(;wUEgg-YBph3!{HJo4*-#4oExqR%sc{Bvql$0aL)pUoLIckfIp7L8O2Ipu z{o&5xtnI_$`B%Ev$ZNf;d{8MUFES@mGip8RuMT+B=rhmg`se`SR*C@XEFuods}79a zu>F_kwp_osoVa!iEeqod9~RPd4RzIbZFdECFLt}cG-}-B=H|)LTyVVeu^D95P1zv@LZhX$*MB7jJ=0N1P2;P& z)i#ncu#|ntCBW|zGNSC|yH{{8^RJ`7?sJP8rEIRzuL{PRz#3_`9cL`v5!RDU&HvXkHcs9#QCASiZl4Y}raIRT8EUK7*4eM#~q$ zOSguCq&P+>a=rvXCFLCg=2;Kr`24=EKObF`NRociD2pE_*}<_`)Fwu`KbDPHfC+e}};>UjOM z&y7<{?qt!vj?Y>&XRiy@jCEEw>Rn}UFoRS%)`&dDc}=c8+z?t6lBp@J%BtS8qWe@s{^iYG&d&K3r_v_f}z7hljhi_ z65GLvYVF6P7wgB5ccIbn-}7x=OmOr9ZR4tAwF`V#zdQfI&KS(X8e2o&B8H}(T{K0T zw+GQU7~r1NnKfX0(Od0*&oDLD!rP~>&Iq$er`U=)L_Cylm&zPLDQ?T>8t1~OljVL+ zq2@#P>n48fik6B_Y9doa6m;Y)eUZ!NKR&iS^6?lws9H^(=Wkq8NcUZt`{pAsZ=hZP z3xT1I;-yqvQu2@G=Y2;u777oaY}^4qwQ_CR3_n=r*o$EG#JYMntp!zV)nk9Jr~F{k ztR=FN3zuHo-ts_sFx6<D$29(0+6LYZjYzx*@aFWkRUS%5&})Jyp%5v$NSS%iyAlHBcFIwj z)yzPtSkCX~#m_pf?SEhDaj^qGyI)^0kGK=tf;}HqCkPX#adgrVfVQ_`3nc0}TifrC z)MI5ByZWP|8a05l9MGu{3-hLplK8&AFy#pps5Z$ARBawWzsp@%L&h4(VmDf5BS6>Q zKKz3fAandD1E+(Qu^s>f^8-L+3;>+rmm)U-z+W5ywrv3bmJI+*h`g^x_wa=!LtRt# z>+9>&Qyk{-=mdLud3kw?JHz45uCA^wE-ugUae0M1JDXoz9-o|@nOnl1o*o_^Z)~DA zxA6P!@i7+9!yF!Cv8QL}=eV=;6D)ReX8y;|nZu*w{e#1^v-63`*~_b|v5D#R4b<|= z+Vt$=;@>Mr$Jp(iy`3HO(b35{-sa-s>gxLH`g(u=aCh$j@4B_Ux3#@{e1bhYzrdd2 zPEXHJyZd`+%mL;Iy??laLhtPz92^{>(U|p(o$VbodLM(u;!aLZF_>cv<_Lw_KR!7< zIzC~`_G-dU3bKEosRq0tX4Ar7kR!A#`~ZNF?@xfVjd}O+i=;?xJ$2GGB33dYu=g@O z6aWZ@wbfKi&AWHA;ei?A^pVlURN`e}Ad2nhU)*<$zqZvkG)!3hJiES5<02>4A-#cO zRk$-+#!6st-`CGi5MW?1pxYu=;iod^`AO?0D8%K;nH(8|bODc&*FGT}b8WD!ZlI2I z&yJzq`uyx|U2Kf^QX5a64S<-X6bB&)@+){EQ5|LzJz?lip^Fha=QrEDQ#XU1!lwES zVn+ReGr}&W`tgKt^)xMk2J);K0vbL7eyU>oq|D`8&xl?(knwOWMx-Vt{3@90-0_j9 z5fBKQ`fQQ(#(z96@vO8gth{J6@m*j{*TuILF%(h8OGT{=AGPXYZ_I$=+Bb5>5*Ng) zcb{uk0}$qoY9flUqyxqaDisRz1GpIR(_2~gQ7v44A9g%j zkz(@``*_pgIZ#_}py!V&N2g5QXc*Nu$woU2rZ1_CaL!OXSif-}d1`1A9GcL~&s_C= z-skPhot^sOtP%a}C+JV&w+nvQZ-IgWK9`Ly7Q^l}kj4_uC8qK`t8EdfB+Lquv}HXk zko|uDyqhFjgqHzYtq~qsTz=rm5J5jOt8QRLN?(w_VT7o#a)~*J`s|gI*M4{VUQ-fV zX@vW-b@nw)uTTviLUK@zmqS0b4SXJl^8UWb{x;t_;Q1&29>p9ZKA$!Vp#hS!S(qK9 z)~D)FC+uzVzM|dXM^|pWYKp9GCuzqEX7zcp%7!)V221-Dp?|glfe6rdvUtmIsM=@z zv(AT9H%B_!A)R0jzE1cANQz5}i;6=;C1p*;#bM$Q7(_-`ToxuSKI*m*^nVC&Z$~%h zp#PuH2661g6YlDU#LwFq8EEJ01h^uR2tODY>;|`Ual(h2 zgNK;6ughPfZ25RB^B=6Kt3TWx22=BP@P|8jAz?5>Jk$@6D7$U}{})F4j|vQ?<@B#^ zr6ACQ+Z^8iZtEYNe=uflj!0KPQU6OWo*Uc=8H8{G{?!#2;pL)K|49G8 zbo5N|C_qA5R#seG3L-0$9Z$WBhur!P9TT@;CqPa{5~8ZgZGm;cS2g~l`p{S#aCY-_ z!cPyjLm {{ panelInfo.name || '测试仪表板' }} + + + + + - + @@ -27,21 +32,32 @@ 请从左侧选择仪表盘 + + + + + + diff --git a/frontend/src/views/panel/template/component/SystemTemplateList.vue b/frontend/src/views/panel/template/component/SystemTemplateList.vue new file mode 100644 index 0000000000..32030c7316 --- /dev/null +++ b/frontend/src/views/panel/template/component/SystemTemplateList.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/frontend/src/views/panel/template/component/TemplateItem.vue b/frontend/src/views/panel/template/component/TemplateItem.vue new file mode 100644 index 0000000000..2a5b10db93 --- /dev/null +++ b/frontend/src/views/panel/template/component/TemplateItem.vue @@ -0,0 +1,92 @@ + + + + + diff --git a/frontend/src/views/panel/template/index.vue b/frontend/src/views/panel/template/index.vue new file mode 100644 index 0000000000..409171c060 --- /dev/null +++ b/frontend/src/views/panel/template/index.vue @@ -0,0 +1,79 @@ + + + + +