diff --git a/backend/pom.xml b/backend/pom.xml index 75d4e1b0fe..dd8cbc692d 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -13,10 +13,8 @@ UTF-8 - 1.6.0 + 1.7.1 1.8 - 1.1.3 - 2.7.8 20.1.0 @@ -80,6 +78,10 @@ org.springframework.boot spring-boot-starter-websocket + + com.google.code.gson + gson + @@ -91,6 +93,11 @@ mysql-connector-java runtime + + com.microsoft.sqlserver + mssql-jdbc + runtime + com.github.pagehelper pagehelper @@ -110,7 +117,7 @@ org.apache.commons commons-collections4 - 4.1 + 4.4 org.apache.commons @@ -122,11 +129,11 @@ commons-codec - + @@ -135,11 +142,7 @@ 1.2.32 - - org.python - jython-standalone - 2.7.0 - + com.microsoft.sqlserver @@ -159,17 +162,7 @@ 19.7.0.0 - - - org.apache.dubbo - dubbo - ${dubbo.version} - - - org.apache.zookeeper - zookeeper - 3.4.14 - + org.apache.curator curator-framework @@ -181,22 +174,7 @@ 4.0.1 - - - org.apache.dubbo - dubbo-registry-nacos - ${dubbo.version} - - - com.alibaba.nacos - nacos-api - ${nacos.version} - - - com.alibaba.nacos - nacos-client - ${nacos.version} - + com.alibaba @@ -296,12 +274,7 @@ json 20171018 - - - com.aliyun - alibaba-dingtalk-service-sdk - 1.0.1 - + org.apache.httpcomponents httpclient @@ -314,7 +287,7 @@ 0.11.7 - + @@ -409,33 +382,6 @@ 2.6 - - org.apache.maven.plugins - maven-antrun-plugin - - - main-class-placement - generate-resources - - - - - - - - - - - - - - - - run - - - - org.mybatis.generator mybatis-generator-maven-plugin diff --git a/backend/src/main/java/io/dataease/base/domain/ChartGroup.java b/backend/src/main/java/io/dataease/base/domain/ChartGroup.java new file mode 100644 index 0000000000..4d2128a4b6 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/ChartGroup.java @@ -0,0 +1,23 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class ChartGroup implements Serializable { + private String id; + + private String name; + + private String pid; + + private Integer level; + + private String type; + + private String createBy; + + private Long createTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java b/backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java new file mode 100644 index 0000000000..c3bf4973e6 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java @@ -0,0 +1,670 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class ChartGroupExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ChartGroupExample() { + 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 andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(String value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(String value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(String value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(String value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(String value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(String value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLike(String value) { + addCriterion("`type` like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotLike(String value) { + addCriterion("`type` not like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(String value1, String value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(String value1, String value2) { + addCriterion("`type` not between", value1, value2, "type"); + 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 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/DatasetTable.java b/backend/src/main/java/io/dataease/base/domain/DatasetTable.java new file mode 100644 index 0000000000..a9d66c4f6d --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DatasetTable.java @@ -0,0 +1,25 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class DatasetTable implements Serializable { + private String id; + + private String name; + + private String sceneId; + + private String dataSourceId; + + private String type; + + private String createBy; + + private Long createTime; + + private String info; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableExample.java b/backend/src/main/java/io/dataease/base/domain/DatasetTableExample.java new file mode 100644 index 0000000000..2aa5150e3b --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DatasetTableExample.java @@ -0,0 +1,680 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class DatasetTableExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public DatasetTableExample() { + 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 andSceneIdIsNull() { + addCriterion("scene_id is null"); + return (Criteria) this; + } + + public Criteria andSceneIdIsNotNull() { + addCriterion("scene_id is not null"); + return (Criteria) this; + } + + public Criteria andSceneIdEqualTo(String value) { + addCriterion("scene_id =", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotEqualTo(String value) { + addCriterion("scene_id <>", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdGreaterThan(String value) { + addCriterion("scene_id >", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdGreaterThanOrEqualTo(String value) { + addCriterion("scene_id >=", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdLessThan(String value) { + addCriterion("scene_id <", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdLessThanOrEqualTo(String value) { + addCriterion("scene_id <=", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdLike(String value) { + addCriterion("scene_id like", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotLike(String value) { + addCriterion("scene_id not like", value, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdIn(List values) { + addCriterion("scene_id in", values, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotIn(List values) { + addCriterion("scene_id not in", values, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdBetween(String value1, String value2) { + addCriterion("scene_id between", value1, value2, "sceneId"); + return (Criteria) this; + } + + public Criteria andSceneIdNotBetween(String value1, String value2) { + addCriterion("scene_id not between", value1, value2, "sceneId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdIsNull() { + addCriterion("data_source_id is null"); + return (Criteria) this; + } + + public Criteria andDataSourceIdIsNotNull() { + addCriterion("data_source_id is not null"); + return (Criteria) this; + } + + public Criteria andDataSourceIdEqualTo(String value) { + addCriterion("data_source_id =", value, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdNotEqualTo(String value) { + addCriterion("data_source_id <>", value, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdGreaterThan(String value) { + addCriterion("data_source_id >", value, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdGreaterThanOrEqualTo(String value) { + addCriterion("data_source_id >=", value, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdLessThan(String value) { + addCriterion("data_source_id <", value, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdLessThanOrEqualTo(String value) { + addCriterion("data_source_id <=", value, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdLike(String value) { + addCriterion("data_source_id like", value, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdNotLike(String value) { + addCriterion("data_source_id not like", value, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdIn(List values) { + addCriterion("data_source_id in", values, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdNotIn(List values) { + addCriterion("data_source_id not in", values, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdBetween(String value1, String value2) { + addCriterion("data_source_id between", value1, value2, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andDataSourceIdNotBetween(String value1, String value2) { + addCriterion("data_source_id not between", value1, value2, "dataSourceId"); + return (Criteria) this; + } + + public Criteria andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(String value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(String value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(String value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(String value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(String value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(String value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLike(String value) { + addCriterion("`type` like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotLike(String value) { + addCriterion("`type` not like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(String value1, String value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(String value1, String value2) { + addCriterion("`type` not between", value1, value2, "type"); + 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 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/DatasetTableField.java b/backend/src/main/java/io/dataease/base/domain/DatasetTableField.java new file mode 100644 index 0000000000..99f3a2741b --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DatasetTableField.java @@ -0,0 +1,25 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class DatasetTableField implements Serializable { + private String id; + + private String tableId; + + private String originName; + + private String name; + + private String type; + + private Boolean checked; + + private Integer columnIndex; + + private Long lastSyncTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableFieldExample.java b/backend/src/main/java/io/dataease/base/domain/DatasetTableFieldExample.java new file mode 100644 index 0000000000..43156b884e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DatasetTableFieldExample.java @@ -0,0 +1,730 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class DatasetTableFieldExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public DatasetTableFieldExample() { + 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 andTableIdIsNull() { + addCriterion("table_id is null"); + return (Criteria) this; + } + + public Criteria andTableIdIsNotNull() { + addCriterion("table_id is not null"); + return (Criteria) this; + } + + public Criteria andTableIdEqualTo(String value) { + addCriterion("table_id =", value, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdNotEqualTo(String value) { + addCriterion("table_id <>", value, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdGreaterThan(String value) { + addCriterion("table_id >", value, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdGreaterThanOrEqualTo(String value) { + addCriterion("table_id >=", value, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdLessThan(String value) { + addCriterion("table_id <", value, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdLessThanOrEqualTo(String value) { + addCriterion("table_id <=", value, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdLike(String value) { + addCriterion("table_id like", value, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdNotLike(String value) { + addCriterion("table_id not like", value, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdIn(List values) { + addCriterion("table_id in", values, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdNotIn(List values) { + addCriterion("table_id not in", values, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdBetween(String value1, String value2) { + addCriterion("table_id between", value1, value2, "tableId"); + return (Criteria) this; + } + + public Criteria andTableIdNotBetween(String value1, String value2) { + addCriterion("table_id not between", value1, value2, "tableId"); + return (Criteria) this; + } + + public Criteria andOriginNameIsNull() { + addCriterion("origin_name is null"); + return (Criteria) this; + } + + public Criteria andOriginNameIsNotNull() { + addCriterion("origin_name is not null"); + return (Criteria) this; + } + + public Criteria andOriginNameEqualTo(String value) { + addCriterion("origin_name =", value, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameNotEqualTo(String value) { + addCriterion("origin_name <>", value, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameGreaterThan(String value) { + addCriterion("origin_name >", value, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameGreaterThanOrEqualTo(String value) { + addCriterion("origin_name >=", value, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameLessThan(String value) { + addCriterion("origin_name <", value, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameLessThanOrEqualTo(String value) { + addCriterion("origin_name <=", value, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameLike(String value) { + addCriterion("origin_name like", value, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameNotLike(String value) { + addCriterion("origin_name not like", value, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameIn(List values) { + addCriterion("origin_name in", values, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameNotIn(List values) { + addCriterion("origin_name not in", values, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameBetween(String value1, String value2) { + addCriterion("origin_name between", value1, value2, "originName"); + return (Criteria) this; + } + + public Criteria andOriginNameNotBetween(String value1, String value2) { + addCriterion("origin_name not between", value1, value2, "originName"); + 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 andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(String value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(String value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(String value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(String value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(String value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(String value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLike(String value) { + addCriterion("`type` like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotLike(String value) { + addCriterion("`type` not like", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(String value1, String value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(String value1, String value2) { + addCriterion("`type` not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andCheckedIsNull() { + addCriterion("`checked` is null"); + return (Criteria) this; + } + + public Criteria andCheckedIsNotNull() { + addCriterion("`checked` is not null"); + return (Criteria) this; + } + + public Criteria andCheckedEqualTo(Boolean value) { + addCriterion("`checked` =", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotEqualTo(Boolean value) { + addCriterion("`checked` <>", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedGreaterThan(Boolean value) { + addCriterion("`checked` >", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedGreaterThanOrEqualTo(Boolean value) { + addCriterion("`checked` >=", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedLessThan(Boolean value) { + addCriterion("`checked` <", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedLessThanOrEqualTo(Boolean value) { + addCriterion("`checked` <=", value, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedIn(List values) { + addCriterion("`checked` in", values, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotIn(List values) { + addCriterion("`checked` not in", values, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedBetween(Boolean value1, Boolean value2) { + addCriterion("`checked` between", value1, value2, "checked"); + return (Criteria) this; + } + + public Criteria andCheckedNotBetween(Boolean value1, Boolean value2) { + addCriterion("`checked` not between", value1, value2, "checked"); + return (Criteria) this; + } + + public Criteria andColumnIndexIsNull() { + addCriterion("column_index is null"); + return (Criteria) this; + } + + public Criteria andColumnIndexIsNotNull() { + addCriterion("column_index is not null"); + return (Criteria) this; + } + + public Criteria andColumnIndexEqualTo(Integer value) { + addCriterion("column_index =", value, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexNotEqualTo(Integer value) { + addCriterion("column_index <>", value, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexGreaterThan(Integer value) { + addCriterion("column_index >", value, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexGreaterThanOrEqualTo(Integer value) { + addCriterion("column_index >=", value, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexLessThan(Integer value) { + addCriterion("column_index <", value, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexLessThanOrEqualTo(Integer value) { + addCriterion("column_index <=", value, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexIn(List values) { + addCriterion("column_index in", values, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexNotIn(List values) { + addCriterion("column_index not in", values, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexBetween(Integer value1, Integer value2) { + addCriterion("column_index between", value1, value2, "columnIndex"); + return (Criteria) this; + } + + public Criteria andColumnIndexNotBetween(Integer value1, Integer value2) { + addCriterion("column_index not between", value1, value2, "columnIndex"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeIsNull() { + addCriterion("last_sync_time is null"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeIsNotNull() { + addCriterion("last_sync_time is not null"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeEqualTo(Long value) { + addCriterion("last_sync_time =", value, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeNotEqualTo(Long value) { + addCriterion("last_sync_time <>", value, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeGreaterThan(Long value) { + addCriterion("last_sync_time >", value, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeGreaterThanOrEqualTo(Long value) { + addCriterion("last_sync_time >=", value, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeLessThan(Long value) { + addCriterion("last_sync_time <", value, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeLessThanOrEqualTo(Long value) { + addCriterion("last_sync_time <=", value, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeIn(List values) { + addCriterion("last_sync_time in", values, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeNotIn(List values) { + addCriterion("last_sync_time not in", values, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeBetween(Long value1, Long value2) { + addCriterion("last_sync_time between", value1, value2, "lastSyncTime"); + return (Criteria) this; + } + + public Criteria andLastSyncTimeNotBetween(Long value1, Long value2) { + addCriterion("last_sync_time not between", value1, value2, "lastSyncTime"); + 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/SysMenu.java b/backend/src/main/java/io/dataease/base/domain/SysMenu.java new file mode 100644 index 0000000000..a9df1d56ce --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysMenu.java @@ -0,0 +1,73 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import java.util.Objects; + +import lombok.Data; + +@Data +public class SysMenu implements Serializable { + private Long menuId; + + private Long pid; + + private Integer subCount; + + private Integer type; + + private String title; + + private String name; + + private String component; + + private Integer menuSort; + + private String icon; + + private String path; + + private Boolean iFrame; + + private Boolean cache; + + private Boolean hidden; + + private String permission; + + private String createBy; + + private String updateBy; + + private Long createTime; + + private Long updateTime; + + private static final long serialVersionUID = 1L; + + + /** + * 由于该类型作为HashSet key所以必须重写以下方法 + * @param o + * @return + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SysMenu menu = (SysMenu) o; + return Objects.equals(menuId, menu.menuId); + } + + @Override + public int hashCode() { + return Objects.hash(menuId); + } + + + +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/SysMenuExample.java b/backend/src/main/java/io/dataease/base/domain/SysMenuExample.java new file mode 100644 index 0000000000..568db3af27 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysMenuExample.java @@ -0,0 +1,1360 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class SysMenuExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysMenuExample() { + 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 andMenuIdIsNull() { + addCriterion("menu_id is null"); + return (Criteria) this; + } + + public Criteria andMenuIdIsNotNull() { + addCriterion("menu_id is not null"); + return (Criteria) this; + } + + public Criteria andMenuIdEqualTo(Long value) { + addCriterion("menu_id =", value, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdNotEqualTo(Long value) { + addCriterion("menu_id <>", value, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdGreaterThan(Long value) { + addCriterion("menu_id >", value, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdGreaterThanOrEqualTo(Long value) { + addCriterion("menu_id >=", value, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdLessThan(Long value) { + addCriterion("menu_id <", value, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdLessThanOrEqualTo(Long value) { + addCriterion("menu_id <=", value, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdIn(List values) { + addCriterion("menu_id in", values, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdNotIn(List values) { + addCriterion("menu_id not in", values, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdBetween(Long value1, Long value2) { + addCriterion("menu_id between", value1, value2, "menuId"); + return (Criteria) this; + } + + public Criteria andMenuIdNotBetween(Long value1, Long value2) { + addCriterion("menu_id not between", value1, value2, "menuId"); + 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(Long value) { + addCriterion("pid =", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotEqualTo(Long value) { + addCriterion("pid <>", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidGreaterThan(Long value) { + addCriterion("pid >", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidGreaterThanOrEqualTo(Long value) { + addCriterion("pid >=", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidLessThan(Long value) { + addCriterion("pid <", value, "pid"); + return (Criteria) this; + } + + public Criteria andPidLessThanOrEqualTo(Long value) { + addCriterion("pid <=", 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(Long value1, Long value2) { + addCriterion("pid between", value1, value2, "pid"); + return (Criteria) this; + } + + public Criteria andPidNotBetween(Long value1, Long value2) { + addCriterion("pid not between", value1, value2, "pid"); + return (Criteria) this; + } + + public Criteria andSubCountIsNull() { + addCriterion("sub_count is null"); + return (Criteria) this; + } + + public Criteria andSubCountIsNotNull() { + addCriterion("sub_count is not null"); + return (Criteria) this; + } + + public Criteria andSubCountEqualTo(Integer value) { + addCriterion("sub_count =", value, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountNotEqualTo(Integer value) { + addCriterion("sub_count <>", value, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountGreaterThan(Integer value) { + addCriterion("sub_count >", value, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountGreaterThanOrEqualTo(Integer value) { + addCriterion("sub_count >=", value, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountLessThan(Integer value) { + addCriterion("sub_count <", value, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountLessThanOrEqualTo(Integer value) { + addCriterion("sub_count <=", value, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountIn(List values) { + addCriterion("sub_count in", values, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountNotIn(List values) { + addCriterion("sub_count not in", values, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountBetween(Integer value1, Integer value2) { + addCriterion("sub_count between", value1, value2, "subCount"); + return (Criteria) this; + } + + public Criteria andSubCountNotBetween(Integer value1, Integer value2) { + addCriterion("sub_count not between", value1, value2, "subCount"); + return (Criteria) this; + } + + public Criteria andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Integer value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Integer value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Integer value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Integer value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Integer value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Integer value1, Integer value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Integer value1, Integer value2) { + addCriterion("`type` not between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTitleIsNull() { + addCriterion("title is null"); + return (Criteria) this; + } + + public Criteria andTitleIsNotNull() { + addCriterion("title is not null"); + return (Criteria) this; + } + + public Criteria andTitleEqualTo(String value) { + addCriterion("title =", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotEqualTo(String value) { + addCriterion("title <>", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThan(String value) { + addCriterion("title >", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleGreaterThanOrEqualTo(String value) { + addCriterion("title >=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThan(String value) { + addCriterion("title <", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLessThanOrEqualTo(String value) { + addCriterion("title <=", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleLike(String value) { + addCriterion("title like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotLike(String value) { + addCriterion("title not like", value, "title"); + return (Criteria) this; + } + + public Criteria andTitleIn(List values) { + addCriterion("title in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotIn(List values) { + addCriterion("title not in", values, "title"); + return (Criteria) this; + } + + public Criteria andTitleBetween(String value1, String value2) { + addCriterion("title between", value1, value2, "title"); + return (Criteria) this; + } + + public Criteria andTitleNotBetween(String value1, String value2) { + addCriterion("title not between", value1, value2, "title"); + 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 andComponentIsNull() { + addCriterion("component is null"); + return (Criteria) this; + } + + public Criteria andComponentIsNotNull() { + addCriterion("component is not null"); + return (Criteria) this; + } + + public Criteria andComponentEqualTo(String value) { + addCriterion("component =", value, "component"); + return (Criteria) this; + } + + public Criteria andComponentNotEqualTo(String value) { + addCriterion("component <>", value, "component"); + return (Criteria) this; + } + + public Criteria andComponentGreaterThan(String value) { + addCriterion("component >", value, "component"); + return (Criteria) this; + } + + public Criteria andComponentGreaterThanOrEqualTo(String value) { + addCriterion("component >=", value, "component"); + return (Criteria) this; + } + + public Criteria andComponentLessThan(String value) { + addCriterion("component <", value, "component"); + return (Criteria) this; + } + + public Criteria andComponentLessThanOrEqualTo(String value) { + addCriterion("component <=", value, "component"); + return (Criteria) this; + } + + public Criteria andComponentLike(String value) { + addCriterion("component like", value, "component"); + return (Criteria) this; + } + + public Criteria andComponentNotLike(String value) { + addCriterion("component not like", value, "component"); + return (Criteria) this; + } + + public Criteria andComponentIn(List values) { + addCriterion("component in", values, "component"); + return (Criteria) this; + } + + public Criteria andComponentNotIn(List values) { + addCriterion("component not in", values, "component"); + return (Criteria) this; + } + + public Criteria andComponentBetween(String value1, String value2) { + addCriterion("component between", value1, value2, "component"); + return (Criteria) this; + } + + public Criteria andComponentNotBetween(String value1, String value2) { + addCriterion("component not between", value1, value2, "component"); + return (Criteria) this; + } + + public Criteria andMenuSortIsNull() { + addCriterion("menu_sort is null"); + return (Criteria) this; + } + + public Criteria andMenuSortIsNotNull() { + addCriterion("menu_sort is not null"); + return (Criteria) this; + } + + public Criteria andMenuSortEqualTo(Integer value) { + addCriterion("menu_sort =", value, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortNotEqualTo(Integer value) { + addCriterion("menu_sort <>", value, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortGreaterThan(Integer value) { + addCriterion("menu_sort >", value, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortGreaterThanOrEqualTo(Integer value) { + addCriterion("menu_sort >=", value, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortLessThan(Integer value) { + addCriterion("menu_sort <", value, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortLessThanOrEqualTo(Integer value) { + addCriterion("menu_sort <=", value, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortIn(List values) { + addCriterion("menu_sort in", values, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortNotIn(List values) { + addCriterion("menu_sort not in", values, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortBetween(Integer value1, Integer value2) { + addCriterion("menu_sort between", value1, value2, "menuSort"); + return (Criteria) this; + } + + public Criteria andMenuSortNotBetween(Integer value1, Integer value2) { + addCriterion("menu_sort not between", value1, value2, "menuSort"); + return (Criteria) this; + } + + public Criteria andIconIsNull() { + addCriterion("icon is null"); + return (Criteria) this; + } + + public Criteria andIconIsNotNull() { + addCriterion("icon is not null"); + return (Criteria) this; + } + + public Criteria andIconEqualTo(String value) { + addCriterion("icon =", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotEqualTo(String value) { + addCriterion("icon <>", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconGreaterThan(String value) { + addCriterion("icon >", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconGreaterThanOrEqualTo(String value) { + addCriterion("icon >=", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLessThan(String value) { + addCriterion("icon <", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLessThanOrEqualTo(String value) { + addCriterion("icon <=", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconLike(String value) { + addCriterion("icon like", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotLike(String value) { + addCriterion("icon not like", value, "icon"); + return (Criteria) this; + } + + public Criteria andIconIn(List values) { + addCriterion("icon in", values, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotIn(List values) { + addCriterion("icon not in", values, "icon"); + return (Criteria) this; + } + + public Criteria andIconBetween(String value1, String value2) { + addCriterion("icon between", value1, value2, "icon"); + return (Criteria) this; + } + + public Criteria andIconNotBetween(String value1, String value2) { + addCriterion("icon not between", value1, value2, "icon"); + return (Criteria) this; + } + + public Criteria andPathIsNull() { + addCriterion("`path` is null"); + return (Criteria) this; + } + + public Criteria andPathIsNotNull() { + addCriterion("`path` is not null"); + return (Criteria) this; + } + + public Criteria andPathEqualTo(String value) { + addCriterion("`path` =", value, "path"); + return (Criteria) this; + } + + public Criteria andPathNotEqualTo(String value) { + addCriterion("`path` <>", value, "path"); + return (Criteria) this; + } + + public Criteria andPathGreaterThan(String value) { + addCriterion("`path` >", value, "path"); + return (Criteria) this; + } + + public Criteria andPathGreaterThanOrEqualTo(String value) { + addCriterion("`path` >=", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLessThan(String value) { + addCriterion("`path` <", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLessThanOrEqualTo(String value) { + addCriterion("`path` <=", value, "path"); + return (Criteria) this; + } + + public Criteria andPathLike(String value) { + addCriterion("`path` like", value, "path"); + return (Criteria) this; + } + + public Criteria andPathNotLike(String value) { + addCriterion("`path` not like", value, "path"); + return (Criteria) this; + } + + public Criteria andPathIn(List values) { + addCriterion("`path` in", values, "path"); + return (Criteria) this; + } + + public Criteria andPathNotIn(List values) { + addCriterion("`path` not in", values, "path"); + return (Criteria) this; + } + + public Criteria andPathBetween(String value1, String value2) { + addCriterion("`path` between", value1, value2, "path"); + return (Criteria) this; + } + + public Criteria andPathNotBetween(String value1, String value2) { + addCriterion("`path` not between", value1, value2, "path"); + return (Criteria) this; + } + + public Criteria andIFrameIsNull() { + addCriterion("i_frame is null"); + return (Criteria) this; + } + + public Criteria andIFrameIsNotNull() { + addCriterion("i_frame is not null"); + return (Criteria) this; + } + + public Criteria andIFrameEqualTo(Boolean value) { + addCriterion("i_frame =", value, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameNotEqualTo(Boolean value) { + addCriterion("i_frame <>", value, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameGreaterThan(Boolean value) { + addCriterion("i_frame >", value, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameGreaterThanOrEqualTo(Boolean value) { + addCriterion("i_frame >=", value, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameLessThan(Boolean value) { + addCriterion("i_frame <", value, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameLessThanOrEqualTo(Boolean value) { + addCriterion("i_frame <=", value, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameIn(List values) { + addCriterion("i_frame in", values, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameNotIn(List values) { + addCriterion("i_frame not in", values, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameBetween(Boolean value1, Boolean value2) { + addCriterion("i_frame between", value1, value2, "iFrame"); + return (Criteria) this; + } + + public Criteria andIFrameNotBetween(Boolean value1, Boolean value2) { + addCriterion("i_frame not between", value1, value2, "iFrame"); + return (Criteria) this; + } + + public Criteria andCacheIsNull() { + addCriterion("`cache` is null"); + return (Criteria) this; + } + + public Criteria andCacheIsNotNull() { + addCriterion("`cache` is not null"); + return (Criteria) this; + } + + public Criteria andCacheEqualTo(Boolean value) { + addCriterion("`cache` =", value, "cache"); + return (Criteria) this; + } + + public Criteria andCacheNotEqualTo(Boolean value) { + addCriterion("`cache` <>", value, "cache"); + return (Criteria) this; + } + + public Criteria andCacheGreaterThan(Boolean value) { + addCriterion("`cache` >", value, "cache"); + return (Criteria) this; + } + + public Criteria andCacheGreaterThanOrEqualTo(Boolean value) { + addCriterion("`cache` >=", value, "cache"); + return (Criteria) this; + } + + public Criteria andCacheLessThan(Boolean value) { + addCriterion("`cache` <", value, "cache"); + return (Criteria) this; + } + + public Criteria andCacheLessThanOrEqualTo(Boolean value) { + addCriterion("`cache` <=", value, "cache"); + return (Criteria) this; + } + + public Criteria andCacheIn(List values) { + addCriterion("`cache` in", values, "cache"); + return (Criteria) this; + } + + public Criteria andCacheNotIn(List values) { + addCriterion("`cache` not in", values, "cache"); + return (Criteria) this; + } + + public Criteria andCacheBetween(Boolean value1, Boolean value2) { + addCriterion("`cache` between", value1, value2, "cache"); + return (Criteria) this; + } + + public Criteria andCacheNotBetween(Boolean value1, Boolean value2) { + addCriterion("`cache` not between", value1, value2, "cache"); + return (Criteria) this; + } + + public Criteria andHiddenIsNull() { + addCriterion("hidden is null"); + return (Criteria) this; + } + + public Criteria andHiddenIsNotNull() { + addCriterion("hidden is not null"); + return (Criteria) this; + } + + public Criteria andHiddenEqualTo(Boolean value) { + addCriterion("hidden =", value, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenNotEqualTo(Boolean value) { + addCriterion("hidden <>", value, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenGreaterThan(Boolean value) { + addCriterion("hidden >", value, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenGreaterThanOrEqualTo(Boolean value) { + addCriterion("hidden >=", value, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenLessThan(Boolean value) { + addCriterion("hidden <", value, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenLessThanOrEqualTo(Boolean value) { + addCriterion("hidden <=", value, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenIn(List values) { + addCriterion("hidden in", values, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenNotIn(List values) { + addCriterion("hidden not in", values, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenBetween(Boolean value1, Boolean value2) { + addCriterion("hidden between", value1, value2, "hidden"); + return (Criteria) this; + } + + public Criteria andHiddenNotBetween(Boolean value1, Boolean value2) { + addCriterion("hidden not between", value1, value2, "hidden"); + return (Criteria) this; + } + + public Criteria andPermissionIsNull() { + addCriterion("permission is null"); + return (Criteria) this; + } + + public Criteria andPermissionIsNotNull() { + addCriterion("permission is not null"); + return (Criteria) this; + } + + public Criteria andPermissionEqualTo(String value) { + addCriterion("permission =", value, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionNotEqualTo(String value) { + addCriterion("permission <>", value, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionGreaterThan(String value) { + addCriterion("permission >", value, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionGreaterThanOrEqualTo(String value) { + addCriterion("permission >=", value, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionLessThan(String value) { + addCriterion("permission <", value, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionLessThanOrEqualTo(String value) { + addCriterion("permission <=", value, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionLike(String value) { + addCriterion("permission like", value, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionNotLike(String value) { + addCriterion("permission not like", value, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionIn(List values) { + addCriterion("permission in", values, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionNotIn(List values) { + addCriterion("permission not in", values, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionBetween(String value1, String value2) { + addCriterion("permission between", value1, value2, "permission"); + return (Criteria) this; + } + + public Criteria andPermissionNotBetween(String value1, String value2) { + addCriterion("permission not between", value1, value2, "permission"); + 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 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 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 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/SysRole.java b/backend/src/main/java/io/dataease/base/domain/SysRole.java new file mode 100644 index 0000000000..85e561117b --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysRole.java @@ -0,0 +1,23 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class SysRole implements Serializable { + private Long roleId; + + private String name; + + private String description; + + private String createBy; + + private String updateBy; + + private Long createTime; + + 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/SysRoleExample.java b/backend/src/main/java/io/dataease/base/domain/SysRoleExample.java new file mode 100644 index 0000000000..bf2c892cdc --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysRoleExample.java @@ -0,0 +1,660 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class SysRoleExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysRoleExample() { + 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 andRoleIdIsNull() { + addCriterion("role_id is null"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNotNull() { + addCriterion("role_id is not null"); + return (Criteria) this; + } + + public Criteria andRoleIdEqualTo(Long value) { + addCriterion("role_id =", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotEqualTo(Long value) { + addCriterion("role_id <>", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThan(Long value) { + addCriterion("role_id >", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThanOrEqualTo(Long value) { + addCriterion("role_id >=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThan(Long value) { + addCriterion("role_id <", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThanOrEqualTo(Long value) { + addCriterion("role_id <=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdIn(List values) { + addCriterion("role_id in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotIn(List values) { + addCriterion("role_id not in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdBetween(Long value1, Long value2) { + addCriterion("role_id between", value1, value2, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotBetween(Long value1, Long value2) { + addCriterion("role_id not between", value1, value2, "roleId"); + 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 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 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 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 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 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/SysUser.java b/backend/src/main/java/io/dataease/base/domain/SysUser.java new file mode 100644 index 0000000000..56775ba68b --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysUser.java @@ -0,0 +1,39 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class SysUser implements Serializable { + private Long userId; + + private Long deptId; + + private String username; + + private String nickName; + + private String gender; + + private String phone; + + private String email; + + private String password; + + private Boolean isAdmin; + + private Long enabled; + + private String createBy; + + private String updateBy; + + private Long pwdResetTime; + + private Long createTime; + + 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/SysUserExample.java b/backend/src/main/java/io/dataease/base/domain/SysUserExample.java new file mode 100644 index 0000000000..1bc5260883 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysUserExample.java @@ -0,0 +1,1180 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class SysUserExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysUserExample() { + 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 andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andDeptIdIsNull() { + addCriterion("dept_id is null"); + return (Criteria) this; + } + + public Criteria andDeptIdIsNotNull() { + addCriterion("dept_id is not null"); + return (Criteria) this; + } + + public Criteria andDeptIdEqualTo(Long value) { + addCriterion("dept_id =", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotEqualTo(Long value) { + addCriterion("dept_id <>", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdGreaterThan(Long value) { + addCriterion("dept_id >", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdGreaterThanOrEqualTo(Long value) { + addCriterion("dept_id >=", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdLessThan(Long value) { + addCriterion("dept_id <", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdLessThanOrEqualTo(Long value) { + addCriterion("dept_id <=", value, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdIn(List values) { + addCriterion("dept_id in", values, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotIn(List values) { + addCriterion("dept_id not in", values, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdBetween(Long value1, Long value2) { + addCriterion("dept_id between", value1, value2, "deptId"); + return (Criteria) this; + } + + public Criteria andDeptIdNotBetween(Long value1, Long value2) { + addCriterion("dept_id not between", value1, value2, "deptId"); + return (Criteria) this; + } + + public Criteria andUsernameIsNull() { + addCriterion("username is null"); + return (Criteria) this; + } + + public Criteria andUsernameIsNotNull() { + addCriterion("username is not null"); + return (Criteria) this; + } + + public Criteria andUsernameEqualTo(String value) { + addCriterion("username =", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotEqualTo(String value) { + addCriterion("username <>", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameGreaterThan(String value) { + addCriterion("username >", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameGreaterThanOrEqualTo(String value) { + addCriterion("username >=", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLessThan(String value) { + addCriterion("username <", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLessThanOrEqualTo(String value) { + addCriterion("username <=", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameLike(String value) { + addCriterion("username like", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotLike(String value) { + addCriterion("username not like", value, "username"); + return (Criteria) this; + } + + public Criteria andUsernameIn(List values) { + addCriterion("username in", values, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotIn(List values) { + addCriterion("username not in", values, "username"); + return (Criteria) this; + } + + public Criteria andUsernameBetween(String value1, String value2) { + addCriterion("username between", value1, value2, "username"); + return (Criteria) this; + } + + public Criteria andUsernameNotBetween(String value1, String value2) { + addCriterion("username not between", value1, value2, "username"); + return (Criteria) this; + } + + public Criteria andNickNameIsNull() { + addCriterion("nick_name is null"); + return (Criteria) this; + } + + public Criteria andNickNameIsNotNull() { + addCriterion("nick_name is not null"); + return (Criteria) this; + } + + public Criteria andNickNameEqualTo(String value) { + addCriterion("nick_name =", value, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameNotEqualTo(String value) { + addCriterion("nick_name <>", value, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameGreaterThan(String value) { + addCriterion("nick_name >", value, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameGreaterThanOrEqualTo(String value) { + addCriterion("nick_name >=", value, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameLessThan(String value) { + addCriterion("nick_name <", value, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameLessThanOrEqualTo(String value) { + addCriterion("nick_name <=", value, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameLike(String value) { + addCriterion("nick_name like", value, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameNotLike(String value) { + addCriterion("nick_name not like", value, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameIn(List values) { + addCriterion("nick_name in", values, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameNotIn(List values) { + addCriterion("nick_name not in", values, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameBetween(String value1, String value2) { + addCriterion("nick_name between", value1, value2, "nickName"); + return (Criteria) this; + } + + public Criteria andNickNameNotBetween(String value1, String value2) { + addCriterion("nick_name not between", value1, value2, "nickName"); + return (Criteria) this; + } + + public Criteria andGenderIsNull() { + addCriterion("gender is null"); + return (Criteria) this; + } + + public Criteria andGenderIsNotNull() { + addCriterion("gender is not null"); + return (Criteria) this; + } + + public Criteria andGenderEqualTo(String value) { + addCriterion("gender =", value, "gender"); + return (Criteria) this; + } + + public Criteria andGenderNotEqualTo(String value) { + addCriterion("gender <>", value, "gender"); + return (Criteria) this; + } + + public Criteria andGenderGreaterThan(String value) { + addCriterion("gender >", value, "gender"); + return (Criteria) this; + } + + public Criteria andGenderGreaterThanOrEqualTo(String value) { + addCriterion("gender >=", value, "gender"); + return (Criteria) this; + } + + public Criteria andGenderLessThan(String value) { + addCriterion("gender <", value, "gender"); + return (Criteria) this; + } + + public Criteria andGenderLessThanOrEqualTo(String value) { + addCriterion("gender <=", value, "gender"); + return (Criteria) this; + } + + public Criteria andGenderLike(String value) { + addCriterion("gender like", value, "gender"); + return (Criteria) this; + } + + public Criteria andGenderNotLike(String value) { + addCriterion("gender not like", value, "gender"); + return (Criteria) this; + } + + public Criteria andGenderIn(List values) { + addCriterion("gender in", values, "gender"); + return (Criteria) this; + } + + public Criteria andGenderNotIn(List values) { + addCriterion("gender not in", values, "gender"); + return (Criteria) this; + } + + public Criteria andGenderBetween(String value1, String value2) { + addCriterion("gender between", value1, value2, "gender"); + return (Criteria) this; + } + + public Criteria andGenderNotBetween(String value1, String value2) { + addCriterion("gender not between", value1, value2, "gender"); + return (Criteria) this; + } + + public Criteria andPhoneIsNull() { + addCriterion("phone is null"); + return (Criteria) this; + } + + public Criteria andPhoneIsNotNull() { + addCriterion("phone is not null"); + return (Criteria) this; + } + + public Criteria andPhoneEqualTo(String value) { + addCriterion("phone =", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotEqualTo(String value) { + addCriterion("phone <>", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThan(String value) { + addCriterion("phone >", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneGreaterThanOrEqualTo(String value) { + addCriterion("phone >=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThan(String value) { + addCriterion("phone <", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLessThanOrEqualTo(String value) { + addCriterion("phone <=", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneLike(String value) { + addCriterion("phone like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotLike(String value) { + addCriterion("phone not like", value, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneIn(List values) { + addCriterion("phone in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotIn(List values) { + addCriterion("phone not in", values, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneBetween(String value1, String value2) { + addCriterion("phone between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andPhoneNotBetween(String value1, String value2) { + addCriterion("phone not between", value1, value2, "phone"); + return (Criteria) this; + } + + public Criteria andEmailIsNull() { + addCriterion("email is null"); + return (Criteria) this; + } + + public Criteria andEmailIsNotNull() { + addCriterion("email is not null"); + return (Criteria) this; + } + + public Criteria andEmailEqualTo(String value) { + addCriterion("email =", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotEqualTo(String value) { + addCriterion("email <>", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailGreaterThan(String value) { + addCriterion("email >", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailGreaterThanOrEqualTo(String value) { + addCriterion("email >=", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLessThan(String value) { + addCriterion("email <", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLessThanOrEqualTo(String value) { + addCriterion("email <=", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailLike(String value) { + addCriterion("email like", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotLike(String value) { + addCriterion("email not like", value, "email"); + return (Criteria) this; + } + + public Criteria andEmailIn(List values) { + addCriterion("email in", values, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotIn(List values) { + addCriterion("email not in", values, "email"); + return (Criteria) this; + } + + public Criteria andEmailBetween(String value1, String value2) { + addCriterion("email between", value1, value2, "email"); + return (Criteria) this; + } + + public Criteria andEmailNotBetween(String value1, String value2) { + addCriterion("email not between", value1, value2, "email"); + return (Criteria) this; + } + + public Criteria andPasswordIsNull() { + addCriterion("`password` is null"); + return (Criteria) this; + } + + public Criteria andPasswordIsNotNull() { + addCriterion("`password` is not null"); + return (Criteria) this; + } + + public Criteria andPasswordEqualTo(String value) { + addCriterion("`password` =", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotEqualTo(String value) { + addCriterion("`password` <>", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThan(String value) { + addCriterion("`password` >", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordGreaterThanOrEqualTo(String value) { + addCriterion("`password` >=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThan(String value) { + addCriterion("`password` <", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLessThanOrEqualTo(String value) { + addCriterion("`password` <=", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordLike(String value) { + addCriterion("`password` like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotLike(String value) { + addCriterion("`password` not like", value, "password"); + return (Criteria) this; + } + + public Criteria andPasswordIn(List values) { + addCriterion("`password` in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotIn(List values) { + addCriterion("`password` not in", values, "password"); + return (Criteria) this; + } + + public Criteria andPasswordBetween(String value1, String value2) { + addCriterion("`password` between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andPasswordNotBetween(String value1, String value2) { + addCriterion("`password` not between", value1, value2, "password"); + return (Criteria) this; + } + + public Criteria andIsAdminIsNull() { + addCriterion("is_admin is null"); + return (Criteria) this; + } + + public Criteria andIsAdminIsNotNull() { + addCriterion("is_admin is not null"); + return (Criteria) this; + } + + public Criteria andIsAdminEqualTo(Boolean value) { + addCriterion("is_admin =", value, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminNotEqualTo(Boolean value) { + addCriterion("is_admin <>", value, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminGreaterThan(Boolean value) { + addCriterion("is_admin >", value, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminGreaterThanOrEqualTo(Boolean value) { + addCriterion("is_admin >=", value, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminLessThan(Boolean value) { + addCriterion("is_admin <", value, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminLessThanOrEqualTo(Boolean value) { + addCriterion("is_admin <=", value, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminIn(List values) { + addCriterion("is_admin in", values, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminNotIn(List values) { + addCriterion("is_admin not in", values, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminBetween(Boolean value1, Boolean value2) { + addCriterion("is_admin between", value1, value2, "isAdmin"); + return (Criteria) this; + } + + public Criteria andIsAdminNotBetween(Boolean value1, Boolean value2) { + addCriterion("is_admin not between", value1, value2, "isAdmin"); + return (Criteria) this; + } + + public Criteria andEnabledIsNull() { + addCriterion("enabled is null"); + return (Criteria) this; + } + + public Criteria andEnabledIsNotNull() { + addCriterion("enabled is not null"); + return (Criteria) this; + } + + public Criteria andEnabledEqualTo(Long value) { + addCriterion("enabled =", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotEqualTo(Long value) { + addCriterion("enabled <>", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledGreaterThan(Long value) { + addCriterion("enabled >", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledGreaterThanOrEqualTo(Long value) { + addCriterion("enabled >=", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledLessThan(Long value) { + addCriterion("enabled <", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledLessThanOrEqualTo(Long value) { + addCriterion("enabled <=", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledIn(List values) { + addCriterion("enabled in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotIn(List values) { + addCriterion("enabled not in", values, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledBetween(Long value1, Long value2) { + addCriterion("enabled between", value1, value2, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotBetween(Long value1, Long value2) { + addCriterion("enabled not between", value1, value2, "enabled"); + 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 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 andPwdResetTimeIsNull() { + addCriterion("pwd_reset_time is null"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeIsNotNull() { + addCriterion("pwd_reset_time is not null"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeEqualTo(Long value) { + addCriterion("pwd_reset_time =", value, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeNotEqualTo(Long value) { + addCriterion("pwd_reset_time <>", value, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeGreaterThan(Long value) { + addCriterion("pwd_reset_time >", value, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeGreaterThanOrEqualTo(Long value) { + addCriterion("pwd_reset_time >=", value, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeLessThan(Long value) { + addCriterion("pwd_reset_time <", value, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeLessThanOrEqualTo(Long value) { + addCriterion("pwd_reset_time <=", value, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeIn(List values) { + addCriterion("pwd_reset_time in", values, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeNotIn(List values) { + addCriterion("pwd_reset_time not in", values, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeBetween(Long value1, Long value2) { + addCriterion("pwd_reset_time between", value1, value2, "pwdResetTime"); + return (Criteria) this; + } + + public Criteria andPwdResetTimeNotBetween(Long value1, Long value2) { + addCriterion("pwd_reset_time not between", value1, value2, "pwdResetTime"); + 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 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/SysUsersRolesExample.java b/backend/src/main/java/io/dataease/base/domain/SysUsersRolesExample.java new file mode 100644 index 0000000000..7065c280ba --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysUsersRolesExample.java @@ -0,0 +1,320 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class SysUsersRolesExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysUsersRolesExample() { + 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 andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(Long value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(Long value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(Long value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(Long value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(Long value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(Long value1, Long value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(Long value1, Long value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNull() { + addCriterion("role_id is null"); + return (Criteria) this; + } + + public Criteria andRoleIdIsNotNull() { + addCriterion("role_id is not null"); + return (Criteria) this; + } + + public Criteria andRoleIdEqualTo(Long value) { + addCriterion("role_id =", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotEqualTo(Long value) { + addCriterion("role_id <>", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThan(Long value) { + addCriterion("role_id >", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdGreaterThanOrEqualTo(Long value) { + addCriterion("role_id >=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThan(Long value) { + addCriterion("role_id <", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdLessThanOrEqualTo(Long value) { + addCriterion("role_id <=", value, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdIn(List values) { + addCriterion("role_id in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotIn(List values) { + addCriterion("role_id not in", values, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdBetween(Long value1, Long value2) { + addCriterion("role_id between", value1, value2, "roleId"); + return (Criteria) this; + } + + public Criteria andRoleIdNotBetween(Long value1, Long value2) { + addCriterion("role_id not between", value1, value2, "roleId"); + 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/SysUsersRolesKey.java b/backend/src/main/java/io/dataease/base/domain/SysUsersRolesKey.java new file mode 100644 index 0000000000..5fd0a8974e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysUsersRolesKey.java @@ -0,0 +1,13 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class SysUsersRolesKey implements Serializable { + private Long userId; + + private Long roleId; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java b/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java new file mode 100644 index 0000000000..92e6264833 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.ChartGroup; +import io.dataease.base.domain.ChartGroupExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ChartGroupMapper { + long countByExample(ChartGroupExample example); + + int deleteByExample(ChartGroupExample example); + + int deleteByPrimaryKey(String id); + + int insert(ChartGroup record); + + int insertSelective(ChartGroup record); + + List selectByExample(ChartGroupExample example); + + ChartGroup selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") ChartGroup record, @Param("example") ChartGroupExample example); + + int updateByExample(@Param("record") ChartGroup record, @Param("example") ChartGroupExample example); + + int updateByPrimaryKeySelective(ChartGroup record); + + int updateByPrimaryKey(ChartGroup record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml new file mode 100644 index 0000000000..58f37d6da4 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + 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`, `type`, create_by, create_time + + + + + delete from chart_group + where id = #{id,jdbcType=VARCHAR} + + + delete from chart_group + + + + + + insert into chart_group (id, `name`, pid, + `level`, `type`, create_by, + create_time) + values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, + #{level,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}) + + + insert into chart_group + + + id, + + + `name`, + + + pid, + + + `level`, + + + `type`, + + + create_by, + + + create_time, + + + + + #{id,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{pid,jdbcType=VARCHAR}, + + + #{level,jdbcType=INTEGER}, + + + #{type,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + + + + update chart_group + + + id = #{record.id,jdbcType=VARCHAR}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + pid = #{record.pid,jdbcType=VARCHAR}, + + + `level` = #{record.level,jdbcType=INTEGER}, + + + `type` = #{record.type,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + + + + + + update chart_group + set id = #{record.id,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + pid = #{record.pid,jdbcType=VARCHAR}, + `level` = #{record.level,jdbcType=INTEGER}, + `type` = #{record.type,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT} + + + + + + update chart_group + + + `name` = #{name,jdbcType=VARCHAR}, + + + pid = #{pid,jdbcType=VARCHAR}, + + + `level` = #{level,jdbcType=INTEGER}, + + + `type` = #{type,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=VARCHAR} + + + update chart_group + set `name` = #{name,jdbcType=VARCHAR}, + pid = #{pid,jdbcType=VARCHAR}, + `level` = #{level,jdbcType=INTEGER}, + `type` = #{type,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.java b/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.java new file mode 100644 index 0000000000..a22f2e1786 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.DatasetTableFieldExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface DatasetTableFieldMapper { + long countByExample(DatasetTableFieldExample example); + + int deleteByExample(DatasetTableFieldExample example); + + int deleteByPrimaryKey(String id); + + int insert(DatasetTableField record); + + int insertSelective(DatasetTableField record); + + List selectByExample(DatasetTableFieldExample example); + + DatasetTableField selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") DatasetTableField record, @Param("example") DatasetTableFieldExample example); + + int updateByExample(@Param("record") DatasetTableField record, @Param("example") DatasetTableFieldExample example); + + int updateByPrimaryKeySelective(DatasetTableField record); + + int updateByPrimaryKey(DatasetTableField record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.xml new file mode 100644 index 0000000000..d8704dc80c --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + 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, table_id, origin_name, `name`, `type`, `checked`, column_index, last_sync_time + + + + + delete from dataset_table_field + where id = #{id,jdbcType=VARCHAR} + + + delete from dataset_table_field + + + + + + insert into dataset_table_field (id, table_id, origin_name, + `name`, `type`, `checked`, column_index, + last_sync_time) + values (#{id,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{originName,jdbcType=VARCHAR}, + #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{checked,jdbcType=BIT}, #{columnIndex,jdbcType=INTEGER}, + #{lastSyncTime,jdbcType=BIGINT}) + + + insert into dataset_table_field + + + id, + + + table_id, + + + origin_name, + + + `name`, + + + `type`, + + + `checked`, + + + column_index, + + + last_sync_time, + + + + + #{id,jdbcType=VARCHAR}, + + + #{tableId,jdbcType=VARCHAR}, + + + #{originName,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{type,jdbcType=VARCHAR}, + + + #{checked,jdbcType=BIT}, + + + #{columnIndex,jdbcType=INTEGER}, + + + #{lastSyncTime,jdbcType=BIGINT}, + + + + + + update dataset_table_field + + + id = #{record.id,jdbcType=VARCHAR}, + + + table_id = #{record.tableId,jdbcType=VARCHAR}, + + + origin_name = #{record.originName,jdbcType=VARCHAR}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + `type` = #{record.type,jdbcType=VARCHAR}, + + + `checked` = #{record.checked,jdbcType=BIT}, + + + column_index = #{record.columnIndex,jdbcType=INTEGER}, + + + last_sync_time = #{record.lastSyncTime,jdbcType=BIGINT}, + + + + + + + + update dataset_table_field + set id = #{record.id,jdbcType=VARCHAR}, + table_id = #{record.tableId,jdbcType=VARCHAR}, + origin_name = #{record.originName,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + `type` = #{record.type,jdbcType=VARCHAR}, + `checked` = #{record.checked,jdbcType=BIT}, + column_index = #{record.columnIndex,jdbcType=INTEGER}, + last_sync_time = #{record.lastSyncTime,jdbcType=BIGINT} + + + + + + update dataset_table_field + + + table_id = #{tableId,jdbcType=VARCHAR}, + + + origin_name = #{originName,jdbcType=VARCHAR}, + + + `name` = #{name,jdbcType=VARCHAR}, + + + `type` = #{type,jdbcType=VARCHAR}, + + + `checked` = #{checked,jdbcType=BIT}, + + + column_index = #{columnIndex,jdbcType=INTEGER}, + + + last_sync_time = #{lastSyncTime,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=VARCHAR} + + + update dataset_table_field + set table_id = #{tableId,jdbcType=VARCHAR}, + origin_name = #{originName,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, + `type` = #{type,jdbcType=VARCHAR}, + `checked` = #{checked,jdbcType=BIT}, + column_index = #{columnIndex,jdbcType=INTEGER}, + last_sync_time = #{lastSyncTime,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.java b/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.java new file mode 100644 index 0000000000..41e195161c --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.java @@ -0,0 +1,36 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.DatasetTable; +import io.dataease.base.domain.DatasetTableExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface DatasetTableMapper { + long countByExample(DatasetTableExample example); + + int deleteByExample(DatasetTableExample example); + + int deleteByPrimaryKey(String id); + + int insert(DatasetTable record); + + int insertSelective(DatasetTable record); + + List selectByExampleWithBLOBs(DatasetTableExample example); + + List selectByExample(DatasetTableExample example); + + DatasetTable selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") DatasetTable record, @Param("example") DatasetTableExample example); + + int updateByExampleWithBLOBs(@Param("record") DatasetTable record, @Param("example") DatasetTableExample example); + + int updateByExample(@Param("record") DatasetTable record, @Param("example") DatasetTableExample example); + + int updateByPrimaryKeySelective(DatasetTable record); + + int updateByPrimaryKeyWithBLOBs(DatasetTable record); + + int updateByPrimaryKey(DatasetTable record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.xml new file mode 100644 index 0000000000..bec94d3931 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.xml @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + 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`, scene_id, data_source_id, `type`, create_by, create_time + + + info + + + + + + delete from dataset_table + where id = #{id,jdbcType=VARCHAR} + + + delete from dataset_table + + + + + + insert into dataset_table (id, `name`, scene_id, + data_source_id, `type`, create_by, + create_time, info) + values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, + #{dataSourceId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}, #{info,jdbcType=LONGVARCHAR}) + + + insert into dataset_table + + + id, + + + `name`, + + + scene_id, + + + data_source_id, + + + `type`, + + + create_by, + + + create_time, + + + info, + + + + + #{id,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{sceneId,jdbcType=VARCHAR}, + + + #{dataSourceId,jdbcType=VARCHAR}, + + + #{type,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{info,jdbcType=LONGVARCHAR}, + + + + + + update dataset_table + + + id = #{record.id,jdbcType=VARCHAR}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + scene_id = #{record.sceneId,jdbcType=VARCHAR}, + + + data_source_id = #{record.dataSourceId,jdbcType=VARCHAR}, + + + `type` = #{record.type,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + info = #{record.info,jdbcType=LONGVARCHAR}, + + + + + + + + update dataset_table + set id = #{record.id,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + scene_id = #{record.sceneId,jdbcType=VARCHAR}, + data_source_id = #{record.dataSourceId,jdbcType=VARCHAR}, + `type` = #{record.type,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + info = #{record.info,jdbcType=LONGVARCHAR} + + + + + + update dataset_table + set id = #{record.id,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + scene_id = #{record.sceneId,jdbcType=VARCHAR}, + data_source_id = #{record.dataSourceId,jdbcType=VARCHAR}, + `type` = #{record.type,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT} + + + + + + update dataset_table + + + `name` = #{name,jdbcType=VARCHAR}, + + + scene_id = #{sceneId,jdbcType=VARCHAR}, + + + data_source_id = #{dataSourceId,jdbcType=VARCHAR}, + + + `type` = #{type,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + info = #{info,jdbcType=LONGVARCHAR}, + + + where id = #{id,jdbcType=VARCHAR} + + + update dataset_table + set `name` = #{name,jdbcType=VARCHAR}, + scene_id = #{sceneId,jdbcType=VARCHAR}, + data_source_id = #{dataSourceId,jdbcType=VARCHAR}, + `type` = #{type,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + info = #{info,jdbcType=LONGVARCHAR} + where id = #{id,jdbcType=VARCHAR} + + + update dataset_table + set `name` = #{name,jdbcType=VARCHAR}, + scene_id = #{sceneId,jdbcType=VARCHAR}, + data_source_id = #{dataSourceId,jdbcType=VARCHAR}, + `type` = #{type,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysMenuMapper.java b/backend/src/main/java/io/dataease/base/mapper/SysMenuMapper.java new file mode 100644 index 0000000000..94501b6600 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysMenuMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.SysMenu; +import io.dataease.base.domain.SysMenuExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysMenuMapper { + long countByExample(SysMenuExample example); + + int deleteByExample(SysMenuExample example); + + int deleteByPrimaryKey(Long menuId); + + int insert(SysMenu record); + + int insertSelective(SysMenu record); + + List selectByExample(SysMenuExample example); + + SysMenu selectByPrimaryKey(Long menuId); + + int updateByExampleSelective(@Param("record") SysMenu record, @Param("example") SysMenuExample example); + + int updateByExample(@Param("record") SysMenu record, @Param("example") SysMenuExample example); + + int updateByPrimaryKeySelective(SysMenu record); + + int updateByPrimaryKey(SysMenu record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysMenuMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysMenuMapper.xml new file mode 100644 index 0000000000..83c01e5890 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysMenuMapper.xml @@ -0,0 +1,415 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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} + + + + + + + + + + + menu_id, pid, sub_count, `type`, title, `name`, component, menu_sort, icon, `path`, + i_frame, `cache`, hidden, permission, create_by, update_by, create_time, update_time + + + + + delete from sys_menu + where menu_id = #{menuId,jdbcType=BIGINT} + + + delete from sys_menu + + + + + + insert into sys_menu (menu_id, pid, sub_count, + `type`, title, `name`, + component, menu_sort, icon, + `path`, i_frame, `cache`, hidden, + permission, create_by, update_by, + create_time, update_time) + values (#{menuId,jdbcType=BIGINT}, #{pid,jdbcType=BIGINT}, #{subCount,jdbcType=INTEGER}, + #{type,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{component,jdbcType=VARCHAR}, #{menuSort,jdbcType=INTEGER}, #{icon,jdbcType=VARCHAR}, + #{path,jdbcType=VARCHAR}, #{iFrame,jdbcType=BIT}, #{cache,jdbcType=BIT}, #{hidden,jdbcType=BIT}, + #{permission,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}) + + + insert into sys_menu + + + menu_id, + + + pid, + + + sub_count, + + + `type`, + + + title, + + + `name`, + + + component, + + + menu_sort, + + + icon, + + + `path`, + + + i_frame, + + + `cache`, + + + hidden, + + + permission, + + + create_by, + + + update_by, + + + create_time, + + + update_time, + + + + + #{menuId,jdbcType=BIGINT}, + + + #{pid,jdbcType=BIGINT}, + + + #{subCount,jdbcType=INTEGER}, + + + #{type,jdbcType=INTEGER}, + + + #{title,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{component,jdbcType=VARCHAR}, + + + #{menuSort,jdbcType=INTEGER}, + + + #{icon,jdbcType=VARCHAR}, + + + #{path,jdbcType=VARCHAR}, + + + #{iFrame,jdbcType=BIT}, + + + #{cache,jdbcType=BIT}, + + + #{hidden,jdbcType=BIT}, + + + #{permission,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{updateTime,jdbcType=BIGINT}, + + + + + + update sys_menu + + + menu_id = #{record.menuId,jdbcType=BIGINT}, + + + pid = #{record.pid,jdbcType=BIGINT}, + + + sub_count = #{record.subCount,jdbcType=INTEGER}, + + + `type` = #{record.type,jdbcType=INTEGER}, + + + title = #{record.title,jdbcType=VARCHAR}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + component = #{record.component,jdbcType=VARCHAR}, + + + menu_sort = #{record.menuSort,jdbcType=INTEGER}, + + + icon = #{record.icon,jdbcType=VARCHAR}, + + + `path` = #{record.path,jdbcType=VARCHAR}, + + + i_frame = #{record.iFrame,jdbcType=BIT}, + + + `cache` = #{record.cache,jdbcType=BIT}, + + + hidden = #{record.hidden,jdbcType=BIT}, + + + permission = #{record.permission,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + update_time = #{record.updateTime,jdbcType=BIGINT}, + + + + + + + + update sys_menu + set menu_id = #{record.menuId,jdbcType=BIGINT}, + pid = #{record.pid,jdbcType=BIGINT}, + sub_count = #{record.subCount,jdbcType=INTEGER}, + `type` = #{record.type,jdbcType=INTEGER}, + title = #{record.title,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + component = #{record.component,jdbcType=VARCHAR}, + menu_sort = #{record.menuSort,jdbcType=INTEGER}, + icon = #{record.icon,jdbcType=VARCHAR}, + `path` = #{record.path,jdbcType=VARCHAR}, + i_frame = #{record.iFrame,jdbcType=BIT}, + `cache` = #{record.cache,jdbcType=BIT}, + hidden = #{record.hidden,jdbcType=BIT}, + permission = #{record.permission,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + update_time = #{record.updateTime,jdbcType=BIGINT} + + + + + + update sys_menu + + + pid = #{pid,jdbcType=BIGINT}, + + + sub_count = #{subCount,jdbcType=INTEGER}, + + + `type` = #{type,jdbcType=INTEGER}, + + + title = #{title,jdbcType=VARCHAR}, + + + `name` = #{name,jdbcType=VARCHAR}, + + + component = #{component,jdbcType=VARCHAR}, + + + menu_sort = #{menuSort,jdbcType=INTEGER}, + + + icon = #{icon,jdbcType=VARCHAR}, + + + `path` = #{path,jdbcType=VARCHAR}, + + + i_frame = #{iFrame,jdbcType=BIT}, + + + `cache` = #{cache,jdbcType=BIT}, + + + hidden = #{hidden,jdbcType=BIT}, + + + permission = #{permission,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + update_time = #{updateTime,jdbcType=BIGINT}, + + + where menu_id = #{menuId,jdbcType=BIGINT} + + + update sys_menu + set pid = #{pid,jdbcType=BIGINT}, + sub_count = #{subCount,jdbcType=INTEGER}, + `type` = #{type,jdbcType=INTEGER}, + title = #{title,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, + component = #{component,jdbcType=VARCHAR}, + menu_sort = #{menuSort,jdbcType=INTEGER}, + icon = #{icon,jdbcType=VARCHAR}, + `path` = #{path,jdbcType=VARCHAR}, + i_frame = #{iFrame,jdbcType=BIT}, + `cache` = #{cache,jdbcType=BIT}, + hidden = #{hidden,jdbcType=BIT}, + permission = #{permission,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + update_by = #{updateBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + update_time = #{updateTime,jdbcType=BIGINT} + where menu_id = #{menuId,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.java b/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.java new file mode 100644 index 0000000000..cf64185f11 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.SysRole; +import io.dataease.base.domain.SysRoleExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysRoleMapper { + long countByExample(SysRoleExample example); + + int deleteByExample(SysRoleExample example); + + int deleteByPrimaryKey(Long roleId); + + int insert(SysRole record); + + int insertSelective(SysRole record); + + List selectByExample(SysRoleExample example); + + SysRole selectByPrimaryKey(Long roleId); + + int updateByExampleSelective(@Param("record") SysRole record, @Param("example") SysRoleExample example); + + int updateByExample(@Param("record") SysRole record, @Param("example") SysRoleExample example); + + int updateByPrimaryKeySelective(SysRole record); + + int updateByPrimaryKey(SysRole record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.xml new file mode 100644 index 0000000000..3af3284422 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysRoleMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + 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} + + + + + + + + + + + role_id, `name`, description, create_by, update_by, create_time, update_time + + + + + delete from sys_role + where role_id = #{roleId,jdbcType=BIGINT} + + + delete from sys_role + + + + + + insert into sys_role (role_id, `name`, description, + create_by, update_by, create_time, + update_time) + values (#{roleId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, + #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, + #{updateTime,jdbcType=BIGINT}) + + + insert into sys_role + + + role_id, + + + `name`, + + + description, + + + create_by, + + + update_by, + + + create_time, + + + update_time, + + + + + #{roleId,jdbcType=BIGINT}, + + + #{name,jdbcType=VARCHAR}, + + + #{description,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + #{updateTime,jdbcType=BIGINT}, + + + + + + update sys_role + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + update_time = #{record.updateTime,jdbcType=BIGINT}, + + + + + + + + update sys_role + set role_id = #{record.roleId,jdbcType=BIGINT}, + `name` = #{record.name,jdbcType=VARCHAR}, + description = #{record.description,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT}, + update_time = #{record.updateTime,jdbcType=BIGINT} + + + + + + update sys_role + + + `name` = #{name,jdbcType=VARCHAR}, + + + description = #{description,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + update_time = #{updateTime,jdbcType=BIGINT}, + + + where role_id = #{roleId,jdbcType=BIGINT} + + + update sys_role + set `name` = #{name,jdbcType=VARCHAR}, + description = #{description,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + update_by = #{updateBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=BIGINT}, + update_time = #{updateTime,jdbcType=BIGINT} + where role_id = #{roleId,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.java b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.java new file mode 100644 index 0000000000..8456e7ad70 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.SysUser; +import io.dataease.base.domain.SysUserExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysUserMapper { + long countByExample(SysUserExample example); + + int deleteByExample(SysUserExample example); + + int deleteByPrimaryKey(Long userId); + + int insert(SysUser record); + + int insertSelective(SysUser record); + + List selectByExample(SysUserExample example); + + SysUser selectByPrimaryKey(Long userId); + + int updateByExampleSelective(@Param("record") SysUser record, @Param("example") SysUserExample example); + + int updateByExample(@Param("record") SysUser record, @Param("example") SysUserExample example); + + int updateByPrimaryKeySelective(SysUser record); + + int updateByPrimaryKey(SysUser record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.xml new file mode 100644 index 0000000000..de12f32bbc --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysUserMapper.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} + + + + + + + + + + + user_id, dept_id, username, nick_name, gender, phone, email, `password`, is_admin, + enabled, create_by, update_by, pwd_reset_time, create_time, update_time + + + + + delete from sys_user + where user_id = #{userId,jdbcType=BIGINT} + + + delete from sys_user + + + + + + insert into sys_user (user_id, dept_id, username, + nick_name, gender, phone, + email, `password`, is_admin, + enabled, create_by, update_by, + pwd_reset_time, create_time, update_time + ) + values (#{userId,jdbcType=BIGINT}, #{deptId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, + #{nickName,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, + #{email,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{isAdmin,jdbcType=BIT}, + #{enabled,jdbcType=BIGINT}, #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}, + #{pwdResetTime,jdbcType=BIGINT}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT} + ) + + + insert into sys_user + + + user_id, + + + dept_id, + + + username, + + + nick_name, + + + gender, + + + phone, + + + email, + + + `password`, + + + is_admin, + + + enabled, + + + create_by, + + + update_by, + + + pwd_reset_time, + + + create_time, + + + update_time, + + + + + #{userId,jdbcType=BIGINT}, + + + #{deptId,jdbcType=BIGINT}, + + + #{username,jdbcType=VARCHAR}, + + + #{nickName,jdbcType=VARCHAR}, + + + #{gender,jdbcType=VARCHAR}, + + + #{phone,jdbcType=VARCHAR}, + + + #{email,jdbcType=VARCHAR}, + + + #{password,jdbcType=VARCHAR}, + + + #{isAdmin,jdbcType=BIT}, + + + #{enabled,jdbcType=BIGINT}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{pwdResetTime,jdbcType=BIGINT}, + + + #{createTime,jdbcType=BIGINT}, + + + #{updateTime,jdbcType=BIGINT}, + + + + + + update sys_user + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + dept_id = #{record.deptId,jdbcType=BIGINT}, + + + username = #{record.username,jdbcType=VARCHAR}, + + + nick_name = #{record.nickName,jdbcType=VARCHAR}, + + + gender = #{record.gender,jdbcType=VARCHAR}, + + + phone = #{record.phone,jdbcType=VARCHAR}, + + + email = #{record.email,jdbcType=VARCHAR}, + + + `password` = #{record.password,jdbcType=VARCHAR}, + + + is_admin = #{record.isAdmin,jdbcType=BIT}, + + + enabled = #{record.enabled,jdbcType=BIGINT}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + pwd_reset_time = #{record.pwdResetTime,jdbcType=BIGINT}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + update_time = #{record.updateTime,jdbcType=BIGINT}, + + + + + + + + update sys_user + set user_id = #{record.userId,jdbcType=BIGINT}, + dept_id = #{record.deptId,jdbcType=BIGINT}, + username = #{record.username,jdbcType=VARCHAR}, + nick_name = #{record.nickName,jdbcType=VARCHAR}, + gender = #{record.gender,jdbcType=VARCHAR}, + phone = #{record.phone,jdbcType=VARCHAR}, + email = #{record.email,jdbcType=VARCHAR}, + `password` = #{record.password,jdbcType=VARCHAR}, + is_admin = #{record.isAdmin,jdbcType=BIT}, + enabled = #{record.enabled,jdbcType=BIGINT}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + pwd_reset_time = #{record.pwdResetTime,jdbcType=BIGINT}, + create_time = #{record.createTime,jdbcType=BIGINT}, + update_time = #{record.updateTime,jdbcType=BIGINT} + + + + + + update sys_user + + + dept_id = #{deptId,jdbcType=BIGINT}, + + + username = #{username,jdbcType=VARCHAR}, + + + nick_name = #{nickName,jdbcType=VARCHAR}, + + + gender = #{gender,jdbcType=VARCHAR}, + + + phone = #{phone,jdbcType=VARCHAR}, + + + email = #{email,jdbcType=VARCHAR}, + + + `password` = #{password,jdbcType=VARCHAR}, + + + is_admin = #{isAdmin,jdbcType=BIT}, + + + enabled = #{enabled,jdbcType=BIGINT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + pwd_reset_time = #{pwdResetTime,jdbcType=BIGINT}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + update_time = #{updateTime,jdbcType=BIGINT}, + + + where user_id = #{userId,jdbcType=BIGINT} + + + update sys_user + set dept_id = #{deptId,jdbcType=BIGINT}, + username = #{username,jdbcType=VARCHAR}, + nick_name = #{nickName,jdbcType=VARCHAR}, + gender = #{gender,jdbcType=VARCHAR}, + phone = #{phone,jdbcType=VARCHAR}, + email = #{email,jdbcType=VARCHAR}, + `password` = #{password,jdbcType=VARCHAR}, + is_admin = #{isAdmin,jdbcType=BIT}, + enabled = #{enabled,jdbcType=BIGINT}, + create_by = #{createBy,jdbcType=VARCHAR}, + update_by = #{updateBy,jdbcType=VARCHAR}, + pwd_reset_time = #{pwdResetTime,jdbcType=BIGINT}, + create_time = #{createTime,jdbcType=BIGINT}, + update_time = #{updateTime,jdbcType=BIGINT} + where user_id = #{userId,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysUsersRolesMapper.java b/backend/src/main/java/io/dataease/base/mapper/SysUsersRolesMapper.java new file mode 100644 index 0000000000..101fa6238f --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysUsersRolesMapper.java @@ -0,0 +1,24 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.SysUsersRolesExample; +import io.dataease.base.domain.SysUsersRolesKey; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysUsersRolesMapper { + long countByExample(SysUsersRolesExample example); + + int deleteByExample(SysUsersRolesExample example); + + int deleteByPrimaryKey(SysUsersRolesKey key); + + int insert(SysUsersRolesKey record); + + int insertSelective(SysUsersRolesKey record); + + List selectByExample(SysUsersRolesExample example); + + int updateByExampleSelective(@Param("record") SysUsersRolesKey record, @Param("example") SysUsersRolesExample example); + + int updateByExample(@Param("record") SysUsersRolesKey record, @Param("example") SysUsersRolesExample example); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysUsersRolesMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysUsersRolesMapper.xml new file mode 100644 index 0000000000..4be29edeee --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysUsersRolesMapper.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + 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} + + + + + + + + + + + user_id, role_id + + + + delete from sys_users_roles + where user_id = #{userId,jdbcType=BIGINT} + and role_id = #{roleId,jdbcType=BIGINT} + + + delete from sys_users_roles + + + + + + insert into sys_users_roles (user_id, role_id) + values (#{userId,jdbcType=BIGINT}, #{roleId,jdbcType=BIGINT}) + + + insert into sys_users_roles + + + user_id, + + + role_id, + + + + + #{userId,jdbcType=BIGINT}, + + + #{roleId,jdbcType=BIGINT}, + + + + + + update sys_users_roles + + + user_id = #{record.userId,jdbcType=BIGINT}, + + + role_id = #{record.roleId,jdbcType=BIGINT}, + + + + + + + + update sys_users_roles + set user_id = #{record.userId,jdbcType=BIGINT}, + role_id = #{record.roleId,jdbcType=BIGINT} + + + + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtMenuMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtMenuMapper.java new file mode 100644 index 0000000000..7eff7f649d --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtMenuMapper.java @@ -0,0 +1,15 @@ +package io.dataease.base.mapper.ext; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; + +@Mapper +public interface ExtMenuMapper { + + @Update(" update sys_menu set sub_count = sub_count+1 where menu_id = #{menuId} ") + int incrementalSubcount(@Param("menuId") Long menuId); + + @Update(" update sys_menu set sub_count = sub_count-1 where menu_id = #{menuId} and sub_count > 0") + int decreasingSubcount(@Param("menuId") Long menuId); +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysRoleMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysRoleMapper.java new file mode 100644 index 0000000000..3c0f779594 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysRoleMapper.java @@ -0,0 +1,22 @@ +package io.dataease.base.mapper.ext; + +import io.dataease.controller.sys.request.RoleGridRequest; +import io.dataease.controller.sys.response.RoleNodeResponse; +import io.dataease.controller.sys.response.RoleUserItem; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + + +public interface ExtSysRoleMapper { + + + List query(@Param("request")RoleGridRequest request); + + int deleteRoleMenu(@Param("roleId") Long roleId); + + int batchInsertRoleMenu(@Param("maps") List> maps); + + List queryAll(); +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysRoleMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysRoleMapper.xml new file mode 100644 index 0000000000..9f64a0d908 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysRoleMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + delete from sys_roles_menus where role_id = #{roleId} + + + + insert into sys_roles_menus (role_id, menu_id) values + + (#{map.roleId},#{map.menuId}) + + + + + + + + diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.java new file mode 100644 index 0000000000..7fd6fc89c2 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.java @@ -0,0 +1,12 @@ +package io.dataease.base.mapper.ext; + +import io.dataease.controller.sys.request.UserGridRequest; +import io.dataease.controller.sys.response.SysUserGridResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ExtSysUserMapper { + + List query(@Param("request")UserGridRequest request); +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml new file mode 100644 index 0000000000..981982136c --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtSysUserMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/src/main/java/io/dataease/controller/chart/ChartController.java b/backend/src/main/java/io/dataease/controller/chart/ChartController.java new file mode 100644 index 0000000000..8c752f76dd --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/chart/ChartController.java @@ -0,0 +1,26 @@ +package io.dataease.controller.chart; + +import com.alibaba.fastjson.JSON; +import io.dataease.base.domain.DatasetTable; +import io.dataease.controller.request.dataset.DataSetTableRequest; +import io.dataease.datasource.dto.TableFiled; +import io.dataease.service.dataset.DataSetTableService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("chart/table") +public class ChartController { + + + + @PostMapping("list") + public List list(@RequestBody DataSetTableRequest dataSetTableRequest) { + return new ArrayList<>(); + } + +} diff --git a/backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java b/backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java new file mode 100644 index 0000000000..2c642886c5 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java @@ -0,0 +1,32 @@ +package io.dataease.controller.chart; + +import io.dataease.base.domain.ChartGroup; +import io.dataease.controller.request.chart.ChartGroupRequest; +import io.dataease.dto.chart.ChartGroupDTO; +import io.dataease.service.chart.ChartGroupService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("chart/group") +public class ChartGroupController { + @Resource + private ChartGroupService chartGroupService; + + @PostMapping("/save") + public ChartGroupDTO save(@RequestBody ChartGroup ChartGroup) { + return chartGroupService.save(ChartGroup); + } + + @PostMapping("/tree") + public List tree(@RequestBody ChartGroupRequest ChartGroup) { + return chartGroupService.tree(ChartGroup); + } + + @PostMapping("/delete/{id}") + public void tree(@PathVariable String id) { + chartGroupService.delete(id); + } +} diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java new file mode 100644 index 0000000000..1543f54a0b --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java @@ -0,0 +1,62 @@ +package io.dataease.controller.dataset; + +import io.dataease.base.domain.DatasetTable; +import io.dataease.controller.request.dataset.DataSetTableRequest; +import io.dataease.datasource.dto.TableFiled; +import io.dataease.service.dataset.DataSetTableService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * @Author gin + * @Date 2021/2/20 8:29 下午 + */ +@RestController +@RequestMapping("dataset/table") +public class DataSetTableController { + @Resource + private DataSetTableService dataSetTableService; + + @PostMapping("batchAdd") + public void batchAdd(@RequestBody List datasetTable) throws Exception { + dataSetTableService.batchInsert(datasetTable); + } + + @PostMapping("update") + public DatasetTable save(@RequestBody DatasetTable datasetTable) throws Exception { + return dataSetTableService.save(datasetTable); + } + + @PostMapping("delete/{id}") + public void delete(@PathVariable String id) { + dataSetTableService.delete(id); + } + + @PostMapping("list") + public List list(@RequestBody DataSetTableRequest dataSetTableRequest) { + return dataSetTableService.list(dataSetTableRequest); + } + + @PostMapping("get/{id}") + public DatasetTable get(@PathVariable String id) { + return dataSetTableService.get(id); + } + + @PostMapping("getFields") + public List getFields(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { + return dataSetTableService.getFields(dataSetTableRequest); + } + + @PostMapping("getData") + public List getData(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { + return dataSetTableService.getData(dataSetTableRequest); + } + + @PostMapping("getPreviewData") + public Map getPreviewData(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { + return dataSetTableService.getPreviewData(dataSetTableRequest); + } +} diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java new file mode 100644 index 0000000000..691948db33 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java @@ -0,0 +1,31 @@ +package io.dataease.controller.dataset; + +import io.dataease.base.domain.DatasetTableField; +import io.dataease.service.dataset.DataSetTableFieldsService; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author gin + * @Date 2021/2/24 4:28 下午 + */ +@RestController +@RequestMapping("/dataset/field") +public class DataSetTableFieldController { + @Resource + private DataSetTableFieldsService dataSetTableFieldsService; + + @PostMapping("list/{tableId}") + public List list(@PathVariable String tableId) { + DatasetTableField datasetTableField = new DatasetTableField(); + datasetTableField.setTableId(tableId); + return dataSetTableFieldsService.list(datasetTableField); + } + + @PostMapping("batchEdit") + public void batchEdit(@RequestBody List list) { + dataSetTableFieldsService.batchEdit(list); + } +} diff --git a/backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java b/backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java new file mode 100644 index 0000000000..27b0d12b9a --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/request/chart/ChartGroupRequest.java @@ -0,0 +1,11 @@ +package io.dataease.controller.request.chart; + +import io.dataease.base.domain.ChartGroup; +import io.dataease.base.domain.DatasetGroup; +import lombok.Data; + + +@Data +public class ChartGroupRequest extends ChartGroup { + private String sort; +} diff --git a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java new file mode 100644 index 0000000000..aed452a87a --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java @@ -0,0 +1,18 @@ +package io.dataease.controller.request.dataset; + +import io.dataease.base.domain.DatasetTable; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +/** + * @Author gin + * @Date 2021/2/23 3:06 下午 + */ +@Setter +@Getter +public class DataSetTableRequest extends DatasetTable { + private String sort; + private List tableNames; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java b/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java new file mode 100644 index 0000000000..19e7026fdf --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java @@ -0,0 +1,67 @@ +package io.dataease.controller.sys; + + +import io.dataease.base.domain.SysMenu; +import io.dataease.commons.utils.BeanUtils; + +import io.dataease.controller.sys.request.MenuCreateRequest; +import io.dataease.controller.sys.request.MenuDeleteRequest; +import io.dataease.controller.sys.response.MenuNodeResponse; +import io.dataease.service.sys.MenuService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@RestController +@RequiredArgsConstructor +@Api(tags = "系统：菜单管理") +@RequestMapping("/api/menu") +public class SysMenuController { + + @Resource + private MenuService menuService; + + @ApiOperation("查询跟节点菜单") + @PostMapping("/childNodes/{pid}") + public List childNodes(@PathVariable("pid") Long pid){ + List nodes = menuService.nodesByPid(pid); + return menuService.convert(nodes); + } + + + + @ApiOperation("新增菜单") + @PostMapping("/create") + public void create(@RequestBody MenuCreateRequest request){ + menuService.add(request); + } + + @ApiOperation("删除菜单") + @PostMapping("/delete") + public void delete(@RequestBody MenuDeleteRequest request){ + menuService.delete(request); + } + + @ApiOperation("更新菜单") + @PostMapping("/update") + public void update(@RequestBody MenuCreateRequest menu){ + menuService.update(menu); + } + + + + @PostMapping("/childMenus/{pid}") + public Set childMenus(@PathVariable Long pid){ + List childs = menuService.childs(pid); + Set sets = childs.stream().map(MenuNodeResponse::getMenuId).collect(Collectors.toSet()); + sets.add(pid); + return sets; + } + + +} diff --git a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java new file mode 100644 index 0000000000..ca5c9bf163 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java @@ -0,0 +1,69 @@ +package io.dataease.controller.sys; + + +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import io.dataease.base.domain.SysRole; +import io.dataease.commons.utils.PageUtils; +import io.dataease.commons.utils.Pager; +import io.dataease.controller.sys.request.RoleGridRequest; +import io.dataease.controller.sys.request.RoleMenusRequest; +import io.dataease.controller.sys.response.RoleNodeResponse; +import io.dataease.controller.sys.response.RoleUserItem; +import io.dataease.service.sys.SysRoleService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequiredArgsConstructor +@Api(tags = "系统：角色管理") +@RequestMapping("/api/role") +public class SysRoleController { + + @Resource + private SysRoleService sysRoleService; + + + @ApiOperation("新增角色") + @PostMapping("/create") + public void create(@RequestBody SysRole role){ + sysRoleService.add(role); + } + + + @ApiOperation("删除角色") + @PostMapping("/delete/{roleId}") + public void delete(@PathVariable("roleId") Long roleId){ + sysRoleService.delete(roleId); + } + + + @ApiOperation("更新角色") + @PostMapping("/update") + public void update(@RequestBody SysRole role){ + sysRoleService.update(role); + } + + @ApiOperation("查询角色") + @PostMapping("/roleGrid/{goPage}/{pageSize}") + public Pager> roleGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody RoleGridRequest request) { + Page page = PageHelper.startPage(goPage, pageSize, true); + return PageUtils.setPageInfo(page, sysRoleService.query(request)); + } + + + @PostMapping("/saveRolesMenus") + public void saveRolesMenus(@RequestBody RoleMenusRequest request){ + sysRoleService.batchSaveRolesMenus(request); + } + + + @PostMapping("/all") + public List all(){ + return sysRoleService.allRoles(); + } +} diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java new file mode 100644 index 0000000000..7a71c00253 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -0,0 +1,50 @@ +package io.dataease.controller.sys; + + +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import io.dataease.commons.utils.PageUtils; +import io.dataease.commons.utils.Pager; +import io.dataease.controller.sys.request.SysUserCreateRequest; +import io.dataease.controller.sys.request.UserGridRequest; +import io.dataease.controller.sys.response.SysUserGridResponse; +import io.dataease.service.sys.SysUserService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import java.util.List; + +@RestController +@Api(tags = "系统：用户管理") +@RequestMapping("/api/user") +public class SysUserController { + + @Resource + private SysUserService sysUserService; + + @ApiOperation("查询用户") + @PostMapping("/userGrid/{goPage}/{pageSize}") + public Pager> userGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody UserGridRequest request) { + Page page = PageHelper.startPage(goPage, pageSize, true); + return PageUtils.setPageInfo(page, sysUserService.query(request)); + } + + @ApiOperation("创建用户") + @PostMapping("/create") + public void create(@RequestBody SysUserCreateRequest request){ + sysUserService.save(request); + } + + @ApiOperation("更新用户") + @PostMapping("/update") + public void update(@RequestBody SysUserCreateRequest request){ + sysUserService.update(request); + } + + @ApiOperation("更新用户") + @PostMapping("/delete/{userId}") + public void delete(@PathVariable("userId") Long userId){ + sysUserService.delete(userId); + } +} diff --git a/backend/src/main/java/io/dataease/controller/sys/request/MenuCreateRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/MenuCreateRequest.java new file mode 100644 index 0000000000..aaeb55b0cf --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/request/MenuCreateRequest.java @@ -0,0 +1,10 @@ +package io.dataease.controller.sys.request; + +import io.dataease.base.domain.SysMenu; +import lombok.Data; + +@Data +public class MenuCreateRequest extends SysMenu { + + private boolean top; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/request/MenuDeleteRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/MenuDeleteRequest.java new file mode 100644 index 0000000000..6aad45e5a4 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/request/MenuDeleteRequest.java @@ -0,0 +1,11 @@ +package io.dataease.controller.sys.request; + +import lombok.Data; + +@Data +public class MenuDeleteRequest { + + private Long menuId; + + private Long pid; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/request/RoleGridRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/RoleGridRequest.java new file mode 100644 index 0000000000..744c9a7c9e --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/request/RoleGridRequest.java @@ -0,0 +1,11 @@ +package io.dataease.controller.sys.request; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RoleGridRequest implements Serializable { + + private String name; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/request/RoleMenusRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/RoleMenusRequest.java new file mode 100644 index 0000000000..72cb3a3478 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/request/RoleMenusRequest.java @@ -0,0 +1,13 @@ +package io.dataease.controller.sys.request; + +import lombok.Data; + +import java.util.List; + +@Data +public class RoleMenusRequest { + + private Long roleId; + + private List menuIds; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/request/SysUserCreateRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/SysUserCreateRequest.java new file mode 100644 index 0000000000..e5d24f98f4 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/request/SysUserCreateRequest.java @@ -0,0 +1,13 @@ +package io.dataease.controller.sys.request; + +import io.dataease.base.domain.SysUser; +import lombok.Data; + +import java.util.List; + +@Data +public class SysUserCreateRequest extends SysUser { + + private List roleIds; + +} diff --git a/backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java new file mode 100644 index 0000000000..4b325a3c17 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java @@ -0,0 +1,10 @@ +package io.dataease.controller.sys.request; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class UserGridRequest implements Serializable { + private String name; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/response/MenuNodeResponse.java b/backend/src/main/java/io/dataease/controller/sys/response/MenuNodeResponse.java new file mode 100644 index 0000000000..60fa6f57d4 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/response/MenuNodeResponse.java @@ -0,0 +1,12 @@ +package io.dataease.controller.sys.response; + +import io.dataease.base.domain.SysMenu; +import lombok.Data; + +@Data +public class MenuNodeResponse extends SysMenu { + + private boolean hasChildren; + + private boolean top; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/response/RoleNodeResponse.java b/backend/src/main/java/io/dataease/controller/sys/response/RoleNodeResponse.java new file mode 100644 index 0000000000..ee500f16e4 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/response/RoleNodeResponse.java @@ -0,0 +1,14 @@ +package io.dataease.controller.sys.response; + +import io.dataease.base.domain.SysRole; +import lombok.Data; + +import java.util.List; + +@Data +public class RoleNodeResponse extends SysRole { + + private List menuIds; + + private List dataIds; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/response/RoleUserItem.java b/backend/src/main/java/io/dataease/controller/sys/response/RoleUserItem.java new file mode 100644 index 0000000000..acbcd06890 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/response/RoleUserItem.java @@ -0,0 +1,13 @@ +package io.dataease.controller.sys.response; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RoleUserItem implements Serializable { + + private Long id; + + private String name; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/response/SysUserDept.java b/backend/src/main/java/io/dataease/controller/sys/response/SysUserDept.java new file mode 100644 index 0000000000..0303c9bc16 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/response/SysUserDept.java @@ -0,0 +1,15 @@ +package io.dataease.controller.sys.response; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SysUserDept implements Serializable { + + private Long deptId; + + private Long pid; + + private String deptName; +} diff --git a/backend/src/main/java/io/dataease/controller/sys/response/SysUserGridResponse.java b/backend/src/main/java/io/dataease/controller/sys/response/SysUserGridResponse.java new file mode 100644 index 0000000000..592a79689b --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/response/SysUserGridResponse.java @@ -0,0 +1,18 @@ +package io.dataease.controller.sys.response; + + +import io.dataease.base.domain.SysUser; +import lombok.Data; +import java.util.List; +@Data +public class SysUserGridResponse extends SysUser { + + private Long id; + + private List roles; + + private SysUserDept dept; + + private List roleIds; + +} diff --git a/backend/src/main/java/io/dataease/controller/sys/response/SysUserRole.java b/backend/src/main/java/io/dataease/controller/sys/response/SysUserRole.java new file mode 100644 index 0000000000..5a2ff2abcf --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/response/SysUserRole.java @@ -0,0 +1,13 @@ +package io.dataease.controller.sys.response; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SysUserRole implements Serializable { + + private Long roleId; + + private String roleName; +} diff --git a/backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java b/backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java index 1c3860db49..e2982eb4cd 100644 --- a/backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java +++ b/backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java @@ -1,5 +1,5 @@ package io.dataease.datasource.constants; public enum DatasourceTypes { - mysql + mysql, sqlServer } diff --git a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java index 6e37a346e1..b019df64a5 100644 --- a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java +++ b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java @@ -24,7 +24,7 @@ public class DatasourceController { } @PostMapping("/validate") - public void validate(@RequestBody Datasource datasource) throws Exception{ + public void validate(@RequestBody Datasource datasource) throws Exception { datasourceService.validate(datasource); } @@ -34,7 +34,7 @@ public class DatasourceController { } @PostMapping("/list/{goPage}/{pageSize}") - public Pager> getDatasourceList(@RequestBody Datasource request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception{ + public Pager> getDatasourceList(@RequestBody Datasource request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, datasourceService.getDatasourceList(request)); } @@ -48,4 +48,9 @@ public class DatasourceController { public void updateDatasource(@RequestBody Datasource Datasource) { datasourceService.updateDatasource(Datasource); } + + @PostMapping("/getTables") + public List getTables(@RequestBody Datasource datasource) throws Exception { + return datasourceService.getTables(datasource); + } } diff --git a/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java b/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java new file mode 100644 index 0000000000..4f5c6b822a --- /dev/null +++ b/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java @@ -0,0 +1,16 @@ +package io.dataease.datasource.dto; + + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class JdbcDTO { + private String host; + private Integer port; + private String username; + private String password; + private String dataBase; + private String dataSourceType = "jdbc"; +} diff --git a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigrationDTO.java b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigrationDTO.java index a7197eb75c..9e2d444480 100644 --- a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigrationDTO.java +++ b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigrationDTO.java @@ -6,20 +6,11 @@ import org.apache.commons.lang3.StringUtils; @Getter @Setter -public class MysqlConfigrationDTO { - private String host; - private Integer port; - private String username; - private String password; - private String jdbc; - private String dataBase; +public class MysqlConfigrationDTO extends JdbcDTO { + private String driver = "com.mysql.cj.jdbc.Driver"; public String getJdbc(){ - if(StringUtils.isNotEmpty(jdbc)){ - return jdbc; - }else { - return "jdbc:mysql://HOSTNAME:PORT/DATABASE".replace("HOSTNAME", host).replace("PORT", port.toString()).replace("DATABASE", dataBase); - } + return "jdbc:mysql://HOSTNAME:PORT/DATABASE".replace("HOSTNAME", getHost()).replace("PORT", getPort().toString()).replace("DATABASE", getDataBase()); } } diff --git a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java new file mode 100644 index 0000000000..47ee64bce1 --- /dev/null +++ b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java @@ -0,0 +1,16 @@ +package io.dataease.datasource.dto; + +import lombok.Getter; +import lombok.Setter; +import org.apache.commons.lang3.StringUtils; + + +@Getter +@Setter +public class SqlServerConfigration extends JdbcDTO { + private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; + + public String getJdbc(){ + return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE".replace("HOSTNAME", getHost()).replace("PORT", getPort().toString()).replace("DATABASE", getDataBase()); + } +} diff --git a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java index e3856cbd18..d3c94c8230 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java @@ -3,6 +3,7 @@ package io.dataease.datasource.provider; import com.google.gson.Gson; import io.dataease.datasource.constants.DatasourceTypes; import io.dataease.datasource.dto.MysqlConfigrationDTO; +import io.dataease.datasource.dto.SqlServerConfigration; import io.dataease.datasource.dto.TableFiled; import io.dataease.datasource.request.DatasourceRequest; import org.apache.commons.lang3.StringUtils; @@ -13,13 +14,14 @@ import java.util.*; @Service("jdbc") public class JdbcProvider extends DatasourceProvider{ + @Override public List getData(DatasourceRequest datasourceRequest) throws Exception { List list = new LinkedList<>(); try ( - Connection connection = getConnection(datasourceRequest); - Statement stat = connection.createStatement(); - ResultSet rs = stat.executeQuery(datasourceRequest.getQuery()) + Connection connection = getConnection(datasourceRequest); + Statement stat = connection.createStatement(); + ResultSet rs = stat.executeQuery(datasourceRequest.getQuery()) ) { ResultSetMetaData metaData = rs.getMetaData(); int columnCount = metaData.getColumnCount(); @@ -49,11 +51,7 @@ public class JdbcProvider extends DatasourceProvider{ @Override public List getTables(DatasourceRequest datasourceRequest) throws Exception { List tables = new ArrayList<>(); - - String queryStr = "show tables"; - if(StringUtils.isNotEmpty(datasourceRequest.getQuery())){ - queryStr = datasourceRequest.getQuery(); - } + String queryStr = getTablesSql(datasourceRequest); try (Connection con = getConnection(datasourceRequest); Statement ps = con.createStatement()) { ResultSet resultSet = ps.executeQuery(queryStr); while (resultSet.next()){ @@ -74,7 +72,7 @@ public class JdbcProvider extends DatasourceProvider{ DatabaseMetaData databaseMetaData = connection.getMetaData(); ResultSet resultSet = databaseMetaData.getColumns(null, "%", datasourceRequest.getTable().toUpperCase(), "%"); while (resultSet.next()) { - String tableName=resultSet.getString("TABLE_NAME"); + String tableName = resultSet.getString("TABLE_NAME"); String database = resultSet.getString("TABLE_CAT"); if(tableName.equals(datasourceRequest.getTable()) && database.equalsIgnoreCase(getDatabase(datasourceRequest))){ TableFiled tableFiled = new TableFiled(); @@ -100,7 +98,7 @@ public class JdbcProvider extends DatasourceProvider{ @Override public void test(DatasourceRequest datasourceRequest) throws Exception { - String queryStr = "show tables"; + String queryStr = getTablesSql(datasourceRequest); try (Connection con = getConnection(datasourceRequest); Statement ps = con.createStatement()) { ResultSet resultSet = ps.executeQuery(queryStr); } catch (Exception e) { @@ -122,6 +120,13 @@ public class JdbcProvider extends DatasourceProvider{ driver = mysqlConfigrationDTO.getDriver(); jdbcurl = mysqlConfigrationDTO.getJdbc(); break; + case sqlServer: + SqlServerConfigration sqlServerConfigration= new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class); + username = sqlServerConfigration.getUsername(); + password = sqlServerConfigration.getPassword(); + driver = sqlServerConfigration.getDriver(); + jdbcurl = sqlServerConfigration.getJdbc(); + break; default: break; } @@ -141,45 +146,23 @@ public class JdbcProvider extends DatasourceProvider{ case mysql: MysqlConfigrationDTO mysqlConfigrationDTO = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfigrationDTO.class); return mysqlConfigrationDTO.getDataBase(); + case sqlServer: + SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class); + return sqlServerConfigration.getDataBase(); default: return null; } } - private static String getSchema(Connection conn) throws Exception { - String schema; - schema = conn.getMetaData().getUserName(); - System.out.println(schema); - if ((schema == null) || (schema.length() == 0)) { - throw new Exception("ORACLE数据库模式不允许为空"); - } - return schema.toUpperCase().toString(); - } - - private static String changeDbType(String dbType) { - dbType = dbType.toUpperCase(); - switch(dbType){ - case "VARCHAR": - case "VARCHAR2": - case "CHAR": - return "1"; - case "NUMBER": - case "DECIMAL": - return "4"; - case "INT": - case "SMALLINT": - case "INTEGER": - return "2"; - case "BIGINT": - return "6"; - case "DATETIME": - case "TIMESTAMP": - case "DATE": - return "7"; + private String getTablesSql(DatasourceRequest datasourceRequest){ + DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType()); + switch (datasourceType){ + case mysql: + return "show tables;"; + case sqlServer: + return "SELECT TABLE_NAME FROM fit2cloud2.INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE';"; default: - return "1"; + return "show tables;"; } } - - } diff --git a/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java b/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java index 1866664756..244a3ccde3 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java +++ b/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java @@ -19,12 +19,12 @@ public class ProviderFactory implements ApplicationContextAware { } public static DatasourceProvider getProvider(String type){ - System.out.println(type); DatasourceTypes datasourceType = DatasourceTypes.valueOf(type); - System.out.println(datasourceType.name()); switch (datasourceType){ case mysql: return context.getBean("jdbc", DatasourceProvider.class); + case sqlServer: + return context.getBean("jdbc", DatasourceProvider.class); default: return context.getBean("jdbc", DatasourceProvider.class); } diff --git a/backend/src/main/java/io/dataease/datasource/request/DatasourceRequest.java b/backend/src/main/java/io/dataease/datasource/request/DatasourceRequest.java index 74521fd605..60d7b4f1b0 100644 --- a/backend/src/main/java/io/dataease/datasource/request/DatasourceRequest.java +++ b/backend/src/main/java/io/dataease/datasource/request/DatasourceRequest.java @@ -4,7 +4,6 @@ import io.dataease.base.domain.Datasource; import lombok.Getter; import lombok.Setter; -import javax.sql.DataSource; @Getter @Setter diff --git a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java index e81a18fe25..852384b7a6 100644 --- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java +++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java @@ -1,24 +1,19 @@ package io.dataease.datasource.service; -import com.google.gson.Gson; import io.dataease.base.domain.*; import io.dataease.base.mapper.*; import io.dataease.commons.exception.DEException; -import io.dataease.datasource.dto.MysqlConfigrationDTO; import io.dataease.datasource.provider.DatasourceProvider; -import io.dataease.datasource.provider.JdbcProvider; import io.dataease.datasource.provider.ProviderFactory; import io.dataease.datasource.request.DatasourceRequest; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; import java.util.UUID; -import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) @@ -30,7 +25,7 @@ public class DatasourceService { public Datasource addDatasource(Datasource datasource) { DatasourceExample example = new DatasourceExample(); example.createCriteria().andNameEqualTo(datasource.getName()); - if(CollectionUtils.isNotEmpty(datasourceMapper.selectByExample(example))){ + if (CollectionUtils.isNotEmpty(datasourceMapper.selectByExample(example))) { DEException.throwException("Exist data connection with the same name "); } long currentTimeMillis = System.currentTimeMillis(); @@ -41,7 +36,7 @@ public class DatasourceService { return datasource; } - public List getDatasourceList(Datasource request)throws Exception{ + public List getDatasourceList(Datasource request) throws Exception { DatasourceExample example = new DatasourceExample(); DatasourceExample.Criteria criteria = example.createCriteria(); if (StringUtils.isNotBlank(request.getName())) { @@ -64,13 +59,19 @@ public class DatasourceService { datasourceMapper.updateByPrimaryKeySelective(datasource); } - public void validate(Datasource datasource)throws Exception { + public void validate(Datasource datasource) throws Exception { DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(datasource); datasourceProvider.test(datasourceRequest); } - + public List getTables(Datasource datasource) throws Exception { + Datasource ds = datasourceMapper.selectByPrimaryKey(datasource.getId()); + DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); + DatasourceRequest datasourceRequest = new DatasourceRequest(); + datasourceRequest.setDatasource(ds); + return datasourceProvider.getTables(datasourceRequest); + } } diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartGroupDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartGroupDTO.java new file mode 100644 index 0000000000..1542759994 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/chart/ChartGroupDTO.java @@ -0,0 +1,13 @@ +package io.dataease.dto.chart; + +import io.dataease.base.domain.DatasetGroup; +import lombok.Data; + +import java.util.List; + + +@Data +public class ChartGroupDTO extends DatasetGroup { + private String label; + private List children; +} diff --git a/backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java b/backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java new file mode 100644 index 0000000000..87b996749f --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java @@ -0,0 +1,17 @@ +package io.dataease.dto.dataset; + +import io.dataease.base.domain.DatasetTable; +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +/** + * @Author gin + * @Date 2021/2/23 2:55 下午 + */ +@Setter +@Getter +public class DataSetTableDTO extends DatasetTable { + private List children; +} diff --git a/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoDTO.java b/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoDTO.java new file mode 100644 index 0000000000..1cb2bb4427 --- /dev/null +++ b/backend/src/main/java/io/dataease/dto/dataset/DataTableInfoDTO.java @@ -0,0 +1,15 @@ +package io.dataease.dto.dataset; + +import lombok.Getter; +import lombok.Setter; + +/** + * @Author gin + * @Date 2021/2/23 8:47 下午 + */ +@Setter +@Getter +public class DataTableInfoDTO { + private String table; + private String sql; +} diff --git a/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java b/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java new file mode 100644 index 0000000000..2f2b858c2a --- /dev/null +++ b/backend/src/main/java/io/dataease/service/chart/ChartGroupService.java @@ -0,0 +1,111 @@ +package io.dataease.service.chart; + +import com.alibaba.nacos.common.util.UuidUtils; +import io.dataease.base.domain.ChartGroup; +import io.dataease.base.domain.ChartGroupExample; +import io.dataease.base.mapper.ChartGroupMapper; +import io.dataease.commons.utils.BeanUtils; +import io.dataease.controller.request.chart.ChartGroupRequest; +import io.dataease.dto.chart.ChartGroupDTO; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + + +@Service +public class ChartGroupService { + @Resource + private ChartGroupMapper chartGroupMapper; + + public ChartGroupDTO save(ChartGroup chartGroup) { + if (StringUtils.isEmpty(chartGroup.getId())) { + chartGroup.setId(UuidUtils.generateUuid()); + chartGroup.setCreateTime(System.currentTimeMillis()); + chartGroupMapper.insert(chartGroup); + } else { + chartGroupMapper.updateByPrimaryKey(chartGroup); + } + ChartGroupDTO ChartGroupDTO = new ChartGroupDTO(); + BeanUtils.copyBean(ChartGroupDTO, chartGroup); + ChartGroupDTO.setLabel(ChartGroupDTO.getName()); + return ChartGroupDTO; + } + + public void delete(String id) { + ChartGroupRequest ChartGroup = new ChartGroupRequest(); + ChartGroup.setId(id); + List tree = tree(ChartGroup); + List ids = new ArrayList<>(); + getAllId(tree, ids); + ChartGroupExample ChartGroupExample = new ChartGroupExample(); + ChartGroupExample.createCriteria().andIdIn(ids); + chartGroupMapper.deleteByExample(ChartGroupExample); + } + + public List tree(ChartGroupRequest ChartGroup) { + ChartGroupExample ChartGroupExample = new ChartGroupExample(); + ChartGroupExample.Criteria criteria = ChartGroupExample.createCriteria(); + if (StringUtils.isNotEmpty(ChartGroup.getName())) { + criteria.andNameLike("%" + ChartGroup.getName() + "%"); + } + if (StringUtils.isNotEmpty(ChartGroup.getType())) { + criteria.andTypeEqualTo(ChartGroup.getType()); + } + if (StringUtils.isNotEmpty(ChartGroup.getId())) { + criteria.andIdEqualTo(ChartGroup.getId()); + } else { + criteria.andLevelEqualTo(0); + } + ChartGroupExample.setOrderByClause(ChartGroup.getSort()); + List ChartGroups = chartGroupMapper.selectByExample(ChartGroupExample); + List DTOs = ChartGroups.stream().map(ele -> { + ChartGroupDTO dto = new ChartGroupDTO(); + BeanUtils.copyBean(dto, ele); + dto.setLabel(ele.getName()); + return dto; + }).collect(Collectors.toList()); + getAll(DTOs, ChartGroup); + return DTOs; + } + + public void getAll(List list, ChartGroupRequest ChartGroup) { + for (ChartGroupDTO obj : list) { + ChartGroupExample ChartGroupExample = new ChartGroupExample(); + ChartGroupExample.Criteria criteria = ChartGroupExample.createCriteria(); + if (StringUtils.isNotEmpty(ChartGroup.getName())) { + criteria.andNameLike("%" + ChartGroup.getName() + "%"); + } + if (StringUtils.isNotEmpty(ChartGroup.getType())) { + criteria.andTypeEqualTo(ChartGroup.getType()); + } + criteria.andPidEqualTo(obj.getId()); + ChartGroupExample.setOrderByClause(ChartGroup.getSort()); + List ChartGroups = chartGroupMapper.selectByExample(ChartGroupExample); + List DTOs = ChartGroups.stream().map(ele -> { + ChartGroupDTO dto = new ChartGroupDTO(); + BeanUtils.copyBean(dto, ele); + dto.setLabel(ele.getName()); + return dto; + }).collect(Collectors.toList()); + obj.setChildren(DTOs); + if (CollectionUtils.isNotEmpty(DTOs)) { + getAll(DTOs, ChartGroup); + } + } + } + + public List getAllId(List list, List ids) { + for (ChartGroupDTO dto : list) { + ids.add(dto.getId()); + if (CollectionUtils.isNotEmpty(dto.getChildren())) { + getAllId(dto.getChildren(), ids); + } + } + return ids; + } +} diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java index fa97f5af66..ea0d4abc91 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java @@ -1,19 +1,19 @@ package io.dataease.service.dataset; -import com.alibaba.nacos.common.util.UuidUtils; import io.dataease.base.domain.DatasetGroup; import io.dataease.base.domain.DatasetGroupExample; import io.dataease.base.mapper.DatasetGroupMapper; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.request.dataset.DataSetGroupRequest; import io.dataease.dto.dataset.DataSetGroupDTO; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.UUID; import java.util.stream.Collectors; /** @@ -27,7 +27,7 @@ public class DataSetGroupService { public DataSetGroupDTO save(DatasetGroup datasetGroup) { if (StringUtils.isEmpty(datasetGroup.getId())) { - datasetGroup.setId(UuidUtils.generateUuid()); + datasetGroup.setId(UUID.randomUUID().toString()); datasetGroup.setCreateTime(System.currentTimeMillis()); datasetGroupMapper.insert(datasetGroup); } else { diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java new file mode 100644 index 0000000000..7b469d1319 --- /dev/null +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java @@ -0,0 +1,57 @@ +package io.dataease.service.dataset; + +import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.DatasetTableFieldExample; +import io.dataease.base.mapper.DatasetTableFieldMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.UUID; + +/** + * @Author gin + * @Date 2021/2/24 2:03 下午 + */ +@Service +public class DataSetTableFieldsService { + @Resource + private DatasetTableFieldMapper datasetTableFieldMapper; + + public void batchEdit(List list) { + for (DatasetTableField field : list) { + save(field); + } + } + + public DatasetTableField save(DatasetTableField datasetTableField) { + if (StringUtils.isEmpty(datasetTableField.getId())) { + datasetTableField.setId(UUID.randomUUID().toString()); + datasetTableFieldMapper.insert(datasetTableField); + } else { + datasetTableFieldMapper.updateByPrimaryKey(datasetTableField); + } + return datasetTableField; + } + + public List list(DatasetTableField datasetTableField) { + DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); + DatasetTableFieldExample.Criteria criteria = datasetTableFieldExample.createCriteria(); + if (StringUtils.isNotEmpty(datasetTableField.getTableId())) { + criteria.andTableIdEqualTo(datasetTableField.getTableId()); + } + if (ObjectUtils.isNotEmpty(datasetTableField.getChecked())) { + criteria.andCheckedEqualTo(datasetTableField.getChecked()); + } + datasetTableFieldExample.setOrderByClause("column_index asc"); + return datasetTableFieldMapper.selectByExample(datasetTableFieldExample); + } + + public void deleteByTableId(String tableId) { + DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample(); + datasetTableFieldExample.createCriteria().andTableIdEqualTo(tableId); + datasetTableFieldMapper.deleteByExample(datasetTableFieldExample); + } +} diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java new file mode 100644 index 0000000000..e25776bcb4 --- /dev/null +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -0,0 +1,195 @@ +package io.dataease.service.dataset; + + +import com.google.gson.Gson; +import io.dataease.base.domain.DatasetTable; +import io.dataease.base.domain.DatasetTableExample; +import io.dataease.base.domain.DatasetTableField; +import io.dataease.base.domain.Datasource; +import io.dataease.base.mapper.DatasetTableMapper; +import io.dataease.base.mapper.DatasourceMapper; +import io.dataease.commons.utils.BeanUtils; +import io.dataease.controller.request.dataset.DataSetTableRequest; +import io.dataease.datasource.constants.DatasourceTypes; +import io.dataease.datasource.dto.TableFiled; +import io.dataease.datasource.provider.DatasourceProvider; +import io.dataease.datasource.provider.ProviderFactory; +import io.dataease.datasource.request.DatasourceRequest; +import io.dataease.dto.dataset.DataTableInfoDTO; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.text.MessageFormat; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @Author gin + * @Date 2021/2/23 2:54 下午 + */ +@Service +public class DataSetTableService { + @Resource + private DatasetTableMapper datasetTableMapper; + @Resource + private DatasourceMapper datasourceMapper; + @Resource + private DataSetTableFieldsService dataSetTableFieldsService; + + public void batchInsert(List datasetTable) throws Exception { + for (DatasetTable table : datasetTable) { + save(table); + } + } + + public DatasetTable save(DatasetTable datasetTable) throws Exception { + if (StringUtils.isEmpty(datasetTable.getId())) { + datasetTable.setId(UUID.randomUUID().toString()); + datasetTable.setCreateTime(System.currentTimeMillis()); + DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO(); + if (StringUtils.equalsIgnoreCase("db", datasetTable.getType())) { + dataTableInfoDTO.setTable(datasetTable.getName()); + } + datasetTable.setInfo(new Gson().toJson(dataTableInfoDTO)); + int insert = datasetTableMapper.insert(datasetTable); + // 添加表成功后，获取当前表字段和类型，抽象到dataease数据库 + if (insert == 1) { + saveTableField(datasetTable); + } + } else { + datasetTableMapper.updateByPrimaryKeyWithBLOBs(datasetTable); + } + return datasetTable; + } + + public void delete(String id) { + datasetTableMapper.deleteByPrimaryKey(id); + dataSetTableFieldsService.deleteByTableId(id); + } + + public List list(DataSetTableRequest dataSetTableRequest) { + DatasetTableExample datasetTableExample = new DatasetTableExample(); + datasetTableExample.createCriteria().andSceneIdEqualTo(dataSetTableRequest.getSceneId()); + if (StringUtils.isNotEmpty(dataSetTableRequest.getSort())) { + datasetTableExample.setOrderByClause(dataSetTableRequest.getSort()); + } + return datasetTableMapper.selectByExampleWithBLOBs(datasetTableExample); + } + + public DatasetTable get(String id) { + return datasetTableMapper.selectByPrimaryKey(id); + } + + public List getFields(DataSetTableRequest dataSetTableRequest) throws Exception { + Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); + DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); + DatasourceRequest datasourceRequest = new DatasourceRequest(); + datasourceRequest.setDatasource(ds); + datasourceRequest.setTable(new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable()); + return datasourceProvider.getTableFileds(datasourceRequest); + } + + public List getData(DataSetTableRequest dataSetTableRequest) throws Exception { + Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); + DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); + DatasourceRequest datasourceRequest = new DatasourceRequest(); + datasourceRequest.setDatasource(ds); + String table = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable(); + + DatasetTableField datasetTableField = new DatasetTableField(); + datasetTableField.setTableId(dataSetTableRequest.getId()); + datasetTableField.setChecked(Boolean.TRUE); + List fields = dataSetTableFieldsService.list(datasetTableField); + String[] fieldArray = fields.stream().map(DatasetTableField::getOriginName).toArray(String[]::new); + datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray)); + + return datasourceProvider.getData(datasourceRequest); + } + + public Map getPreviewData(DataSetTableRequest dataSetTableRequest) throws Exception { + Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); + DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); + DatasourceRequest datasourceRequest = new DatasourceRequest(); + datasourceRequest.setDatasource(ds); + String table = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class).getTable(); +// datasourceRequest.setTable(table); + + DatasetTableField datasetTableField = new DatasetTableField(); + datasetTableField.setTableId(dataSetTableRequest.getId()); + datasetTableField.setChecked(Boolean.TRUE); + List fields = dataSetTableFieldsService.list(datasetTableField); + + String[] fieldArray = fields.stream().map(DatasetTableField::getOriginName).toArray(String[]::new); +// datasourceRequest.setQuery("SELECT " + StringUtils.join(fieldArray, ",") + " FROM " + table + " LIMIT 0,10;"); + datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0,10"); + + List data = new ArrayList<>(); + try { + data.addAll(datasourceProvider.getData(datasourceRequest)); + } catch (Exception e) { + } + + + /*JSONArray jsonArray = new JSONArray(); + if (CollectionUtils.isNotEmpty(data)) { + data.forEach(ele -> { + JSONObject jsonObject = new JSONObject(); + for (int i = 0; i < ele.length; i++) { + jsonObject.put(fieldArray[i], ele[i]); + } + jsonArray.add(jsonObject); + }); + }*/ + List> jsonArray = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(data)) { + jsonArray = data.stream().map(ele -> { + Map map = new HashMap<>(); + for (int i = 0; i < ele.length; i++) { + map.put(fieldArray[i], ele[i]); + } + return map; + }).collect(Collectors.toList()); + } + + + Map map = new HashMap<>(); + map.put("fields", fields); + map.put("data", jsonArray); + + return map; + } + + public void saveTableField(DatasetTable datasetTable) throws Exception { + DataSetTableRequest dataSetTableRequest = new DataSetTableRequest(); + BeanUtils.copyBean(dataSetTableRequest, datasetTable); + List fields = getFields(dataSetTableRequest); + long syncTime = System.currentTimeMillis(); + if (CollectionUtils.isNotEmpty(fields)) { + for (int i = 0; i < fields.size(); i++) { + TableFiled filed = fields.get(i); + DatasetTableField datasetTableField = new DatasetTableField(); + datasetTableField.setTableId(datasetTable.getId()); + datasetTableField.setOriginName(filed.getFieldName()); + datasetTableField.setName(filed.getRemarks()); + datasetTableField.setType(filed.getFieldType()); + datasetTableField.setChecked(true); + datasetTableField.setColumnIndex(i); + datasetTableField.setLastSyncTime(syncTime); + dataSetTableFieldsService.save(datasetTableField); + } + } + } + + public String createQuerySQL(String type, String table, String[] fields) { + DatasourceTypes datasourceType = DatasourceTypes.valueOf(type); + switch (datasourceType) { + case mysql: + return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(fields, ","), table); + case sqlServer: + return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(fields, ","), table); + default: + return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(fields, ","), table); + } + } +} diff --git a/backend/src/main/java/io/dataease/service/sys/MenuService.java b/backend/src/main/java/io/dataease/service/sys/MenuService.java new file mode 100644 index 0000000000..083b33c5e3 --- /dev/null +++ b/backend/src/main/java/io/dataease/service/sys/MenuService.java @@ -0,0 +1,144 @@ +package io.dataease.service.sys; + +import io.dataease.base.domain.SysMenu; +import io.dataease.base.domain.SysMenuExample; +import io.dataease.base.mapper.SysMenuMapper; +import io.dataease.base.mapper.ext.ExtMenuMapper; +import io.dataease.commons.utils.BeanUtils; +import io.dataease.controller.sys.request.MenuCreateRequest; +import io.dataease.controller.sys.request.MenuDeleteRequest; +import io.dataease.controller.sys.response.MenuNodeResponse; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@Service +public class MenuService { + + + + private final static Integer DEFAULT_SUBCOUNT = 0; + public final static Long MENU_ROOT_PID = 0L; + + @Resource + private SysMenuMapper sysMenuMapper; + + + @Resource + private ExtMenuMapper extMenuMapper; + + public List nodesByPid(Long pid){ + SysMenuExample example = new SysMenuExample(); + SysMenuExample.Criteria criteria = example.createCriteria(); + if (ObjectUtils.isEmpty(pid)){ + criteria.andPidEqualTo(MENU_ROOT_PID); + }else { + criteria.andPidEqualTo(pid); + } + example.setOrderByClause("menu_sort"); + List sysMenus = sysMenuMapper.selectByExample(example); + return sysMenus; + } + + @Transactional + public boolean add(MenuCreateRequest menuCreateRequest){ + SysMenu sysMenu = BeanUtils.copyBean(new SysMenu(), menuCreateRequest); + if (menuCreateRequest.isTop()){ + sysMenu.setPid(MENU_ROOT_PID); + } + long now = System.currentTimeMillis(); + sysMenu.setCreateTime(now); + sysMenu.setUpdateTime(now); + sysMenu.setCreateBy(null); + sysMenu.setUpdateBy(null); + sysMenu.setSubCount(DEFAULT_SUBCOUNT); + try { + int insert = sysMenuMapper.insert(sysMenu); + Long pid = null; + if ((pid = sysMenu.getPid()) != MENU_ROOT_PID ){ + //这里需要更新上级节点SubCount + extMenuMapper.incrementalSubcount(pid); + } + if (insert == 1){ + return true; + } + }catch (Exception e){ + e.printStackTrace(); + } + return false; + } + + @Transactional + public int delete(MenuDeleteRequest request){ + Long pid = request.getPid(); + if (pid != MENU_ROOT_PID){ + extMenuMapper.decreasingSubcount(pid); + } + Long menuId = request.getMenuId(); + + return sysMenuMapper.deleteByPrimaryKey(menuId); + } + + + + @Transactional + public int update(MenuCreateRequest menuCreateRequest){ + SysMenu sysMenu = BeanUtils.copyBean(new SysMenu(), menuCreateRequest); + if (menuCreateRequest.isTop()){ + sysMenu.setPid(MENU_ROOT_PID); + } + + sysMenu.setUpdateBy(null); + sysMenu.setUpdateTime(System.currentTimeMillis()); + Long menuId = sysMenu.getMenuId(); + SysMenu menu_old = sysMenuMapper.selectByPrimaryKey(menuId); + //如果PID发生了改变 + //判断oldPid是否是跟节点PID ？ nothing : parent.subcount-1 + //判断newPid是否是跟节点PID ？ nothing : parent.subcount+1 + if (menu_old.getPid() != sysMenu.getPid()){ + Long oldPid = menu_old.getPid(); + if (oldPid != MENU_ROOT_PID){ + extMenuMapper.decreasingSubcount(oldPid); + } + if (sysMenu.getPid() != MENU_ROOT_PID){ + extMenuMapper.incrementalSubcount(sysMenu.getPid()); + } + } + return sysMenuMapper.updateByPrimaryKeySelective(sysMenu); + } + + public List childs(Long pid){ + Set childs = getChilds(nodesByPid(pid), new HashSet()); + List menus = childs.stream().collect(Collectors.toList()); + List responses = convert(menus); + return responses; + } + + private Set getChilds(List lists, Set sets){ + lists.forEach(menu -> { + sets.add(menu); + List kidMenus = nodesByPid(menu.getMenuId()); + if (CollectionUtils.isNotEmpty(kidMenus)){ + getChilds(kidMenus, sets); + } + }); + return sets; + } + + public List convert(List menus){ + return menus.stream().map(node -> { + MenuNodeResponse menuNodeResponse = BeanUtils.copyBean(new MenuNodeResponse(), node); + menuNodeResponse.setHasChildren(node.getSubCount() > 0); + menuNodeResponse.setTop(node.getPid() == MENU_ROOT_PID); + return menuNodeResponse; + }).collect(Collectors.toList()); + } + + +} diff --git a/backend/src/main/java/io/dataease/service/sys/SysRoleService.java b/backend/src/main/java/io/dataease/service/sys/SysRoleService.java new file mode 100644 index 0000000000..6dce1dd9f5 --- /dev/null +++ b/backend/src/main/java/io/dataease/service/sys/SysRoleService.java @@ -0,0 +1,83 @@ +package io.dataease.service.sys; + + +import io.dataease.base.domain.SysRole; +import io.dataease.base.domain.SysUsersRolesExample; +import io.dataease.base.mapper.SysRoleMapper; +import io.dataease.base.mapper.SysUsersRolesMapper; +import io.dataease.base.mapper.ext.ExtSysRoleMapper; +import io.dataease.controller.sys.request.RoleGridRequest; +import io.dataease.controller.sys.request.RoleMenusRequest; +import io.dataease.controller.sys.response.RoleNodeResponse; +import io.dataease.controller.sys.response.RoleUserItem; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +public class SysRoleService { + + @Resource + private SysRoleMapper mapper; + + @Resource + private ExtSysRoleMapper extSysRoleMapper; + + @Resource + private SysUsersRolesMapper sysUsersRolesMapper; + + + public int add(SysRole role){ + Long now = System.currentTimeMillis(); + role.setCreateTime(now); + role.setUpdateTime(now); + return mapper.insert(role); + } + + + public int update(SysRole role){ + Long now = System.currentTimeMillis(); + role.setUpdateTime(now); + return mapper.updateByPrimaryKey(role); + } + + @Transactional + public int delete(Long roleId){ + SysUsersRolesExample example = new SysUsersRolesExample(); + example.createCriteria().andRoleIdEqualTo(roleId); + sysUsersRolesMapper.deleteByExample(example);//删除用户角色关联关系 + extSysRoleMapper.deleteRoleMenu(roleId);//删除菜单角色关联关系 + return mapper.deleteByPrimaryKey(roleId); + } + + + public List query(RoleGridRequest request){ + List result = extSysRoleMapper.query(request); + + return result; + } + + + @Transactional + public int batchSaveRolesMenus(RoleMenusRequest request){ + extSysRoleMapper.deleteRoleMenu(request.getRoleId()); + List> maps = request.getMenuIds().stream().map(menuId -> { + Map map = new HashMap<>(); + map.put("roleId", request.getRoleId()); + map.put("menuId", menuId); + return map; + }).collect(Collectors.toList()); + return extSysRoleMapper.batchInsertRoleMenu(maps); + } + + public List allRoles(){ + return extSysRoleMapper.queryAll(); + } + + +} diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java new file mode 100644 index 0000000000..837e9efb0e --- /dev/null +++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java @@ -0,0 +1,125 @@ +package io.dataease.service.sys; + +import io.dataease.base.domain.SysUser; +import io.dataease.base.domain.SysUserExample; +import io.dataease.base.domain.SysUsersRolesExample; +import io.dataease.base.domain.SysUsersRolesKey; +import io.dataease.base.mapper.SysUserMapper; +import io.dataease.base.mapper.SysUsersRolesMapper; +import io.dataease.base.mapper.ext.ExtSysUserMapper; +import io.dataease.commons.utils.BeanUtils; +import io.dataease.commons.utils.CodingUtil; +import io.dataease.controller.sys.request.SysUserCreateRequest; +import io.dataease.controller.sys.request.UserGridRequest; +import io.dataease.controller.sys.response.SysUserGridResponse; +import io.dataease.controller.sys.response.SysUserRole; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@Service +public class SysUserService { + + private final static String DEFAULT_PWD = "DataEase123.."; + + @Resource + private SysUserMapper sysUserMapper; + + @Resource + private SysUsersRolesMapper sysUsersRolesMapper; + + @Resource + private ExtSysUserMapper extSysUserMapper; + + public List query(UserGridRequest request){ + List lists = extSysUserMapper.query(request); + lists.forEach(item -> { + List roles = item.getRoles(); + List roleIds = roles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); + item.setRoleIds(roleIds); + }); + return lists; + } + + @Transactional + public int save(SysUserCreateRequest request){ + SysUser user = BeanUtils.copyBean(new SysUser(), request); + long now = System.currentTimeMillis(); + user.setCreateTime(now); + user.setUpdateTime(now); + user.setIsAdmin(false); + if (ObjectUtils.isEmpty(user.getPassword()) || StringUtils.equals(user.getPassword(), DEFAULT_PWD)){ + user.setPassword(CodingUtil.md5(DEFAULT_PWD)); + }else{ + user.setPassword(CodingUtil.md5(user.getPassword())); + } + int insert = sysUserMapper.insert(user); + SysUser dbUser = findOne(user); + saveUserRoles(dbUser.getUserId(), request.getRoleIds());//插入用户角色关联 + return insert; + } + + @Transactional + public int update(SysUserCreateRequest request){ + SysUser user = BeanUtils.copyBean(new SysUser(), request); + long now = System.currentTimeMillis(); + user.setUpdateTime(now); + deleteUserRoles(user.getUserId());//先删除用户角色关联 + saveUserRoles(user.getUserId(), request.getRoleIds());//再插入角色关联 + return sysUserMapper.updateByPrimaryKey(user); + } + + /** + * 删除用户角色关联 + * @param userId + * @return + */ + private int deleteUserRoles(Long userId){ + SysUsersRolesExample example = new SysUsersRolesExample(); + example.createCriteria().andUserIdEqualTo(userId); + return sysUsersRolesMapper.deleteByExample(example); + } + + /** + * 保存用户角色关联 + * @param userId + * @param roleIds + */ + private void saveUserRoles(Long userId, List roleIds){ + roleIds.forEach(roleId -> { + SysUsersRolesKey sysUsersRolesKey = new SysUsersRolesKey(); + sysUsersRolesKey.setUserId(userId); + sysUsersRolesKey.setRoleId(roleId); + sysUsersRolesMapper.insert(sysUsersRolesKey); + }); + } + + @Transactional + public int delete(Long userId){ + deleteUserRoles(userId); + return sysUserMapper.deleteByPrimaryKey(userId); + } + + public SysUser findOne(SysUser user){ + if (ObjectUtils.isEmpty(user)) return null; + if (ObjectUtils.isNotEmpty(user.getUserId())){ + return sysUserMapper.selectByPrimaryKey(user.getUserId()); + } + SysUserExample example = new SysUserExample(); + SysUserExample.Criteria criteria = example.createCriteria(); + if (ObjectUtils.isNotEmpty(user.getUsername())){ + criteria.andUsernameEqualTo(user.getUsername()); + List sysUsers = sysUserMapper.selectByExample(example); + if (CollectionUtils.isNotEmpty(sysUsers))return sysUsers.get(0); + } + return null; + } + +} diff --git a/backend/src/main/resources/db/migration/V10__chart.sql b/backend/src/main/resources/db/migration/V10__chart.sql new file mode 100644 index 0000000000..3d4e563eb4 --- /dev/null +++ b/backend/src/main/resources/db/migration/V10__chart.sql @@ -0,0 +1,12 @@ +-- chart start +CREATE TABLE IF NOT EXISTS `chart_group` ( + `id` varchar(50) NOT NULL COMMENT 'ID', + `name` varchar(64) NOT NULL COMMENT '名称', + `pid` varchar(50) COMMENT '父级ID', + `level` int(10) COMMENT '当前分组处于第几级', + `type` varchar(50) COMMENT 'group or scene', + `create_by` varchar(50) COMMENT '创建人ID', + `create_time` bigint(13) COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- chart end diff --git a/backend/src/main/resources/db/migration/V8__system.sql b/backend/src/main/resources/db/migration/V8__system.sql index 9e0094ff4e..59b3808773 100644 --- a/backend/src/main/resources/db/migration/V8__system.sql +++ b/backend/src/main/resources/db/migration/V8__system.sql @@ -13,4 +13,85 @@ CREATE TABLE IF NOT EXISTS `sys_dept` ( PRIMARY KEY (`dept_id`) USING BTREE, KEY `inx_pid` (`pid`), KEY `inx_enabled` (`enabled`) -) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='部门'; \ No newline at end of file +) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='部门'; + + +CREATE TABLE IF NOT EXISTS `sys_menu` ( + `menu_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `pid` bigint(20) DEFAULT NULL COMMENT '上级菜单ID', + `sub_count` int(5) DEFAULT 0 COMMENT '子菜单数目', + `type` int(11) DEFAULT NULL COMMENT '菜单类型', + `title` varchar(255) DEFAULT NULL COMMENT '菜单标题', + `name` varchar(255) DEFAULT NULL COMMENT '组件名称', + `component` varchar(255) DEFAULT NULL COMMENT '组件', + `menu_sort` int(5) DEFAULT NULL COMMENT '排序', + `icon` varchar(255) DEFAULT NULL COMMENT '图标', + `path` varchar(255) DEFAULT NULL COMMENT '链接地址', + `i_frame` bit(1) DEFAULT NULL COMMENT '是否外链', + `cache` bit(1) DEFAULT b'0' COMMENT '缓存', + `hidden` bit(1) DEFAULT b'0' COMMENT '隐藏', + `permission` varchar(255) DEFAULT NULL COMMENT '权限', + `create_by` varchar(255) DEFAULT NULL COMMENT '创建者', + `update_by` varchar(255) DEFAULT NULL COMMENT '更新者', + `create_time` bigint(13) DEFAULT NULL COMMENT '创建日期', + `update_time` bigint(13) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`menu_id`) USING BTREE, + UNIQUE KEY `uniq_title` (`title`), + UNIQUE KEY `uniq_name` (`name`), + KEY `inx_pid` (`pid`) +) ENGINE=InnoDB AUTO_INCREMENT=118 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='系统菜单'; + + +CREATE TABLE IF NOT EXISTS `sys_role` ( + `role_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `name` varchar(255) NOT NULL COMMENT '名称', + `description` varchar(255) DEFAULT NULL COMMENT '描述', + `create_by` varchar(255) DEFAULT NULL COMMENT '创建者', + `update_by` varchar(255) DEFAULT NULL COMMENT '更新者', + `create_time` bigint(13) DEFAULT NULL COMMENT '创建日期', + `update_time` bigint(13) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`role_id`) USING BTREE, + UNIQUE KEY `uniq_name` (`name`), + KEY `role_name_index` (`name`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='角色表'; + + +CREATE TABLE IF NOT EXISTS `sys_roles_menus` ( + `menu_id` bigint(20) NOT NULL COMMENT '菜单ID', + `role_id` bigint(20) NOT NULL COMMENT '角色ID', + PRIMARY KEY (`menu_id`,`role_id`) USING BTREE, + KEY `FKcngg2qadojhi3a651a5adkvbq` (`role_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='角色菜单关联'; + +CREATE TABLE IF NOT EXISTS `sys_user` ( + `user_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `dept_id` bigint(20) DEFAULT NULL COMMENT '部门名称', + `username` varchar(255) DEFAULT NULL COMMENT '用户名', + `nick_name` varchar(255) DEFAULT NULL COMMENT '昵称', + `gender` varchar(2) DEFAULT NULL COMMENT '性别', + `phone` varchar(255) DEFAULT NULL COMMENT '手机号码', + `email` varchar(255) DEFAULT NULL COMMENT '邮箱', + `password` varchar(255) DEFAULT NULL COMMENT '密码', + `is_admin` bit(1) DEFAULT b'0' COMMENT '是否为admin账号', + `enabled` bigint(20) DEFAULT NULL COMMENT '状态：1启用、0禁用', + `create_by` varchar(255) DEFAULT NULL COMMENT '创建者', + `update_by` varchar(255) DEFAULT NULL COMMENT '更新着', + `pwd_reset_time` bigint(13) DEFAULT NULL COMMENT '修改密码的时间', + `create_time` bigint(13) DEFAULT NULL COMMENT '创建日期', + `update_time` bigint(13) DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`user_id`) USING BTREE, + UNIQUE KEY `UK_kpubos9gc2cvtkb0thktkbkes` (`email`) USING BTREE, + UNIQUE KEY `username` (`username`) USING BTREE, + UNIQUE KEY `uniq_username` (`username`), + UNIQUE KEY `uniq_email` (`email`), + KEY `FK5rwmryny6jthaaxkogownknqp` (`dept_id`) USING BTREE, + KEY `inx_enabled` (`enabled`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='系统用户'; + + +CREATE TABLE IF NOT EXISTS `sys_users_roles` ( + `user_id` bigint(20) NOT NULL COMMENT '用户ID', + `role_id` bigint(20) NOT NULL COMMENT '角色ID', + PRIMARY KEY (`user_id`,`role_id`) USING BTREE, + KEY `FKq4eq273l04bpu4efj0jd0jb98` (`role_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='用户角色关联'; \ No newline at end of file diff --git a/backend/src/main/resources/db/migration/V9__dataset_tables.sql b/backend/src/main/resources/db/migration/V9__dataset_tables.sql new file mode 100644 index 0000000000..42a58909cc --- /dev/null +++ b/backend/src/main/resources/db/migration/V9__dataset_tables.sql @@ -0,0 +1,29 @@ +CREATE TABLE IF NOT EXISTS `dataset_table` +( + `id` varchar(50) NOT NULL COMMENT 'ID', + `name` varchar(64) NOT NULL COMMENT '表名称', + `scene_id` varchar(50) NOT NULL COMMENT '场景ID', + `data_source_id` varchar(50) NOT NULL COMMENT '数据源ID', + `type` varchar(50) COMMENT 'db,sql,excel,custom', + `info` longtext COMMENT '表原始信息', + `create_by` varchar(50) COMMENT '创建人ID', + `create_time` bigint(13) COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; + +CREATE TABLE IF NOT EXISTS `dataset_table_field` +( + `id` varchar(50) NOT NULL COMMENT 'ID', + `table_id` varchar(50) NOT NULL COMMENT '表ID', + `origin_name` varchar(255) NOT NULL COMMENT '原始名', + `name` varchar(255) NOT NULL COMMENT '字段名', + `type` varchar(50) NOT NULL COMMENT '字段类型', + `checked` tinyint(1) NOT NULL DEFAULT true COMMENT '是否选中', + `column_index` int(10) NOT NULL COMMENT '列位置', + `last_sync_time` bigint(13) COMMENT '同步时间', + PRIMARY KEY (`id`), + KEY `IDX_TABLE_ID` (`table_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; + diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml index 7335b04159..11e0f4bcd3 100644 --- a/backend/src/main/resources/generatorConfig.xml +++ b/backend/src/main/resources/generatorConfig.xml @@ -64,7 +64,7 @@ - +
diff --git a/frontend/package.json b/frontend/package.json index b49ee6fbc8..331b892442 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -5,7 +5,8 @@ "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "lint": "vue-cli-service lint" + "lint": "vue-cli-service lint", + "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml" }, "dependencies": { "@ckeditor/ckeditor5-build-classic": "^18.0.0", @@ -47,7 +48,11 @@ "vuedraggable": "^2.24.3", "vuex": "^3.1.2", "xml-js": "^1.6.11", - "yan-progress": "^1.0.3" + "yan-progress": "^1.0.3", + "sass": "^1.26.10", + "sass-loader": "^7.1.0", + "svgo": "1.2.0", + "svg-sprite-loader": "4.1.3" }, "devDependencies": { "@vue/cli-plugin-babel": "^4.1.0", diff --git a/frontend/src/assets/icons/index.js b/frontend/src/assets/icons/index.js new file mode 100644 index 0000000000..9a796fbc23 --- /dev/null +++ b/frontend/src/assets/icons/index.js @@ -0,0 +1,9 @@ +import Vue from 'vue' +import SvgIcon from '@/business/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/frontend/src/assets/icons/svg/Steve-Jobs.svg b/frontend/src/assets/icons/svg/Steve-Jobs.svg new file mode 100644 index 0000000000..53843e2461 --- /dev/null +++ b/frontend/src/assets/icons/svg/Steve-Jobs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/alipay.svg b/frontend/src/assets/icons/svg/alipay.svg new file mode 100644 index 0000000000..9138981301 --- /dev/null +++ b/frontend/src/assets/icons/svg/alipay.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/anq.svg b/frontend/src/assets/icons/svg/anq.svg new file mode 100644 index 0000000000..a466608db5 --- /dev/null +++ b/frontend/src/assets/icons/svg/anq.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/app.svg b/frontend/src/assets/icons/svg/app.svg new file mode 100644 index 0000000000..0796da3510 --- /dev/null +++ b/frontend/src/assets/icons/svg/app.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/backup.svg b/frontend/src/assets/icons/svg/backup.svg new file mode 100644 index 0000000000..a3272a4697 --- /dev/null +++ b/frontend/src/assets/icons/svg/backup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/chain.svg b/frontend/src/assets/icons/svg/chain.svg new file mode 100644 index 0000000000..ed3317f4f2 --- /dev/null +++ b/frontend/src/assets/icons/svg/chain.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/chart.svg b/frontend/src/assets/icons/svg/chart.svg new file mode 100644 index 0000000000..27728fb0ba --- /dev/null +++ b/frontend/src/assets/icons/svg/chart.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/codeConsole.svg b/frontend/src/assets/icons/svg/codeConsole.svg new file mode 100644 index 0000000000..672ec6e4e3 --- /dev/null +++ b/frontend/src/assets/icons/svg/codeConsole.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/dashboard.svg b/frontend/src/assets/icons/svg/dashboard.svg new file mode 100644 index 0000000000..5317d37029 --- /dev/null +++ b/frontend/src/assets/icons/svg/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/database.svg b/frontend/src/assets/icons/svg/database.svg new file mode 100644 index 0000000000..7fbad9b802 --- /dev/null +++ b/frontend/src/assets/icons/svg/database.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/date.svg b/frontend/src/assets/icons/svg/date.svg new file mode 100644 index 0000000000..0540e99355 --- /dev/null +++ b/frontend/src/assets/icons/svg/date.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/deploy.svg b/frontend/src/assets/icons/svg/deploy.svg new file mode 100644 index 0000000000..f4a1c56e63 --- /dev/null +++ b/frontend/src/assets/icons/svg/deploy.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/dept.svg b/frontend/src/assets/icons/svg/dept.svg new file mode 100644 index 0000000000..894e4bff6c --- /dev/null +++ b/frontend/src/assets/icons/svg/dept.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/dev.svg b/frontend/src/assets/icons/svg/dev.svg new file mode 100644 index 0000000000..ed4d23cf40 --- /dev/null +++ b/frontend/src/assets/icons/svg/dev.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/develop.svg b/frontend/src/assets/icons/svg/develop.svg new file mode 100644 index 0000000000..e189223dd5 --- /dev/null +++ b/frontend/src/assets/icons/svg/develop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/dictionary.svg b/frontend/src/assets/icons/svg/dictionary.svg new file mode 100644 index 0000000000..6e83c43540 --- /dev/null +++ b/frontend/src/assets/icons/svg/dictionary.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/doc.svg b/frontend/src/assets/icons/svg/doc.svg new file mode 100644 index 0000000000..9160de8c90 --- /dev/null +++ b/frontend/src/assets/icons/svg/doc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/download.svg b/frontend/src/assets/icons/svg/download.svg new file mode 100644 index 0000000000..0243c6a701 --- /dev/null +++ b/frontend/src/assets/icons/svg/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/edit.svg b/frontend/src/assets/icons/svg/edit.svg new file mode 100644 index 0000000000..d26101f298 --- /dev/null +++ b/frontend/src/assets/icons/svg/edit.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/education.svg b/frontend/src/assets/icons/svg/education.svg new file mode 100644 index 0000000000..7bfb01d180 --- /dev/null +++ b/frontend/src/assets/icons/svg/education.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/email.svg b/frontend/src/assets/icons/svg/email.svg new file mode 100644 index 0000000000..f1cf3ae8e7 --- /dev/null +++ b/frontend/src/assets/icons/svg/email.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/error.svg b/frontend/src/assets/icons/svg/error.svg new file mode 100644 index 0000000000..fd935da9b7 --- /dev/null +++ b/frontend/src/assets/icons/svg/error.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/exit-fullscreen.svg b/frontend/src/assets/icons/svg/exit-fullscreen.svg new file mode 100644 index 0000000000..485c128b61 --- /dev/null +++ b/frontend/src/assets/icons/svg/exit-fullscreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/fullscreen.svg b/frontend/src/assets/icons/svg/fullscreen.svg new file mode 100644 index 0000000000..0e86b6fa80 --- /dev/null +++ b/frontend/src/assets/icons/svg/fullscreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/fwb.svg b/frontend/src/assets/icons/svg/fwb.svg new file mode 100644 index 0000000000..59933fc75d --- /dev/null +++ b/frontend/src/assets/icons/svg/fwb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/github.svg b/frontend/src/assets/icons/svg/github.svg new file mode 100644 index 0000000000..8145e9579f --- /dev/null +++ b/frontend/src/assets/icons/svg/github.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/gonggao.svg b/frontend/src/assets/icons/svg/gonggao.svg new file mode 100644 index 0000000000..22aed08fdb --- /dev/null +++ b/frontend/src/assets/icons/svg/gonggao.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/icon.svg b/frontend/src/assets/icons/svg/icon.svg new file mode 100644 index 0000000000..82fbdd9808 --- /dev/null +++ b/frontend/src/assets/icons/svg/icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/image.svg b/frontend/src/assets/icons/svg/image.svg new file mode 100644 index 0000000000..16d572fd14 --- /dev/null +++ b/frontend/src/assets/icons/svg/image.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/index.svg b/frontend/src/assets/icons/svg/index.svg new file mode 100644 index 0000000000..fdb38269c7 --- /dev/null +++ b/frontend/src/assets/icons/svg/index.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/international.svg b/frontend/src/assets/icons/svg/international.svg new file mode 100644 index 0000000000..e9b56eee2c --- /dev/null +++ b/frontend/src/assets/icons/svg/international.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/ipvisits.svg b/frontend/src/assets/icons/svg/ipvisits.svg new file mode 100644 index 0000000000..4ca473d702 --- /dev/null +++ b/frontend/src/assets/icons/svg/ipvisits.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/java.svg b/frontend/src/assets/icons/svg/java.svg new file mode 100644 index 0000000000..e2effbbf0a --- /dev/null +++ b/frontend/src/assets/icons/svg/java.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/link.svg b/frontend/src/assets/icons/svg/link.svg new file mode 100644 index 0000000000..48197ba4da --- /dev/null +++ b/frontend/src/assets/icons/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/list.svg b/frontend/src/assets/icons/svg/list.svg new file mode 100644 index 0000000000..20259eddb7 --- /dev/null +++ b/frontend/src/assets/icons/svg/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/lock.svg b/frontend/src/assets/icons/svg/lock.svg new file mode 100644 index 0000000000..0f842ea4ec --- /dev/null +++ b/frontend/src/assets/icons/svg/lock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/log.svg b/frontend/src/assets/icons/svg/log.svg new file mode 100644 index 0000000000..4fefe747c6 --- /dev/null +++ b/frontend/src/assets/icons/svg/log.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/login.svg b/frontend/src/assets/icons/svg/login.svg new file mode 100644 index 0000000000..cc5a854e09 --- /dev/null +++ b/frontend/src/assets/icons/svg/login.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/markdown.svg b/frontend/src/assets/icons/svg/markdown.svg new file mode 100644 index 0000000000..7cd67475b3 --- /dev/null +++ b/frontend/src/assets/icons/svg/markdown.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/menu.svg b/frontend/src/assets/icons/svg/menu.svg new file mode 100644 index 0000000000..e4360a021f --- /dev/null +++ b/frontend/src/assets/icons/svg/menu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/message.svg b/frontend/src/assets/icons/svg/message.svg new file mode 100644 index 0000000000..14ca81728a --- /dev/null +++ b/frontend/src/assets/icons/svg/message.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/mnt.svg b/frontend/src/assets/icons/svg/mnt.svg new file mode 100644 index 0000000000..502a7c055f --- /dev/null +++ b/frontend/src/assets/icons/svg/mnt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/money.svg b/frontend/src/assets/icons/svg/money.svg new file mode 100644 index 0000000000..c1580de10e --- /dev/null +++ b/frontend/src/assets/icons/svg/money.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/monitor.svg b/frontend/src/assets/icons/svg/monitor.svg new file mode 100644 index 0000000000..fbf0a2f2a7 --- /dev/null +++ b/frontend/src/assets/icons/svg/monitor.svg @@ -0,0 +1 @@ + diff --git a/frontend/src/assets/icons/svg/nested.svg b/frontend/src/assets/icons/svg/nested.svg new file mode 100644 index 0000000000..06713a86c6 --- /dev/null +++ b/frontend/src/assets/icons/svg/nested.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/password.svg b/frontend/src/assets/icons/svg/password.svg new file mode 100644 index 0000000000..4ab451f085 --- /dev/null +++ b/frontend/src/assets/icons/svg/password.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/people.svg b/frontend/src/assets/icons/svg/people.svg new file mode 100644 index 0000000000..2bd54aeb72 --- /dev/null +++ b/frontend/src/assets/icons/svg/people.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/peoples.svg b/frontend/src/assets/icons/svg/peoples.svg new file mode 100644 index 0000000000..2c911615dc --- /dev/null +++ b/frontend/src/assets/icons/svg/peoples.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/permission.svg b/frontend/src/assets/icons/svg/permission.svg new file mode 100644 index 0000000000..c4c7409102 --- /dev/null +++ b/frontend/src/assets/icons/svg/permission.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/phone.svg b/frontend/src/assets/icons/svg/phone.svg new file mode 100644 index 0000000000..da339f978c --- /dev/null +++ b/frontend/src/assets/icons/svg/phone.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/qiniu.svg b/frontend/src/assets/icons/svg/qiniu.svg new file mode 100644 index 0000000000..c2f9f8b246 --- /dev/null +++ b/frontend/src/assets/icons/svg/qiniu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/redis.svg b/frontend/src/assets/icons/svg/redis.svg new file mode 100644 index 0000000000..bef111b63e --- /dev/null +++ b/frontend/src/assets/icons/svg/redis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/role.svg b/frontend/src/assets/icons/svg/role.svg new file mode 100644 index 0000000000..76cb18ff3a --- /dev/null +++ b/frontend/src/assets/icons/svg/role.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/search.svg b/frontend/src/assets/icons/svg/search.svg new file mode 100644 index 0000000000..84233ddaa9 --- /dev/null +++ b/frontend/src/assets/icons/svg/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/server.svg b/frontend/src/assets/icons/svg/server.svg new file mode 100644 index 0000000000..db6dcdf59f --- /dev/null +++ b/frontend/src/assets/icons/svg/server.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/shopping.svg b/frontend/src/assets/icons/svg/shopping.svg new file mode 100644 index 0000000000..87513e7c5f --- /dev/null +++ b/frontend/src/assets/icons/svg/shopping.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/size.svg b/frontend/src/assets/icons/svg/size.svg new file mode 100644 index 0000000000..ddb25b8d58 --- /dev/null +++ b/frontend/src/assets/icons/svg/size.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/skill.svg b/frontend/src/assets/icons/svg/skill.svg new file mode 100644 index 0000000000..a3b7312186 --- /dev/null +++ b/frontend/src/assets/icons/svg/skill.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/source.svg b/frontend/src/assets/icons/svg/source.svg new file mode 100644 index 0000000000..1c3a03805d --- /dev/null +++ b/frontend/src/assets/icons/svg/source.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/sqlMonitor.svg b/frontend/src/assets/icons/svg/sqlMonitor.svg new file mode 100644 index 0000000000..950a430d15 --- /dev/null +++ b/frontend/src/assets/icons/svg/sqlMonitor.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/swagger.svg b/frontend/src/assets/icons/svg/swagger.svg new file mode 100644 index 0000000000..ded7de81ac --- /dev/null +++ b/frontend/src/assets/icons/svg/swagger.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/sys-tools.svg b/frontend/src/assets/icons/svg/sys-tools.svg new file mode 100644 index 0000000000..324aa04f21 --- /dev/null +++ b/frontend/src/assets/icons/svg/sys-tools.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/system.svg b/frontend/src/assets/icons/svg/system.svg new file mode 100644 index 0000000000..9333c60ae8 --- /dev/null +++ b/frontend/src/assets/icons/svg/system.svg @@ -0,0 +1 @@ + diff --git a/frontend/src/assets/icons/svg/system1.svg b/frontend/src/assets/icons/svg/system1.svg new file mode 100644 index 0000000000..37b0a0a8d9 --- /dev/null +++ b/frontend/src/assets/icons/svg/system1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/tab.svg b/frontend/src/assets/icons/svg/tab.svg new file mode 100644 index 0000000000..b4b48e4808 --- /dev/null +++ b/frontend/src/assets/icons/svg/tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/theme.svg b/frontend/src/assets/icons/svg/theme.svg new file mode 100644 index 0000000000..5982a2f784 --- /dev/null +++ b/frontend/src/assets/icons/svg/theme.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/timing.svg b/frontend/src/assets/icons/svg/timing.svg new file mode 100644 index 0000000000..f8fdc6dd0c --- /dev/null +++ b/frontend/src/assets/icons/svg/timing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/tools.svg b/frontend/src/assets/icons/svg/tools.svg new file mode 100644 index 0000000000..aba1a40194 --- /dev/null +++ b/frontend/src/assets/icons/svg/tools.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/tree-table.svg b/frontend/src/assets/icons/svg/tree-table.svg new file mode 100644 index 0000000000..8aafdb829e --- /dev/null +++ b/frontend/src/assets/icons/svg/tree-table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/tree.svg b/frontend/src/assets/icons/svg/tree.svg new file mode 100644 index 0000000000..dd4b7dd22f --- /dev/null +++ b/frontend/src/assets/icons/svg/tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/unlock.svg b/frontend/src/assets/icons/svg/unlock.svg new file mode 100644 index 0000000000..1219e41d4b --- /dev/null +++ b/frontend/src/assets/icons/svg/unlock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/user.svg b/frontend/src/assets/icons/svg/user.svg new file mode 100644 index 0000000000..09d7a812b8 --- /dev/null +++ b/frontend/src/assets/icons/svg/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/user1.svg b/frontend/src/assets/icons/svg/user1.svg new file mode 100644 index 0000000000..14ca51e4e5 --- /dev/null +++ b/frontend/src/assets/icons/svg/user1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/validCode.svg b/frontend/src/assets/icons/svg/validCode.svg new file mode 100644 index 0000000000..a1feb74aed --- /dev/null +++ b/frontend/src/assets/icons/svg/validCode.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/visits.svg b/frontend/src/assets/icons/svg/visits.svg new file mode 100644 index 0000000000..8425662dac --- /dev/null +++ b/frontend/src/assets/icons/svg/visits.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/web.svg b/frontend/src/assets/icons/svg/web.svg new file mode 100644 index 0000000000..9c574156f5 --- /dev/null +++ b/frontend/src/assets/icons/svg/web.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/wechat.svg b/frontend/src/assets/icons/svg/wechat.svg new file mode 100644 index 0000000000..c586e55117 --- /dev/null +++ b/frontend/src/assets/icons/svg/wechat.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/weixin.svg b/frontend/src/assets/icons/svg/weixin.svg new file mode 100644 index 0000000000..8dbcfa5c2a --- /dev/null +++ b/frontend/src/assets/icons/svg/weixin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svg/zujian.svg b/frontend/src/assets/icons/svg/zujian.svg new file mode 100644 index 0000000000..2aba32fc7f --- /dev/null +++ b/frontend/src/assets/icons/svg/zujian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/assets/icons/svgo.yml b/frontend/src/assets/icons/svgo.yml new file mode 100644 index 0000000000..d11906aec2 --- /dev/null +++ b/frontend/src/assets/icons/svgo.yml @@ -0,0 +1,22 @@ +# replace default config + +# multipass: true +# full: true + +plugins: + + # - name + # + # or: + # - name: false + # - name: true + # + # or: + # - name: + # param1: 1 + # param2: 2 + +- removeAttrs: + attrs: + - 'fill' + - 'fill-rule' diff --git a/frontend/src/business/components/IconSelect/index.vue b/frontend/src/business/components/IconSelect/index.vue new file mode 100644 index 0000000000..b0ec9fa1a4 --- /dev/null +++ b/frontend/src/business/components/IconSelect/index.vue @@ -0,0 +1,68 @@ + + + + + + diff --git a/frontend/src/business/components/IconSelect/requireIcons.js b/frontend/src/business/components/IconSelect/requireIcons.js new file mode 100644 index 0000000000..b06348310b --- /dev/null +++ b/frontend/src/business/components/IconSelect/requireIcons.js @@ -0,0 +1,11 @@ + +const req = require.context('../../../assets/icons/svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys() + +const re = /\.\/(.*)\.svg/ + +const icons = requireAll(req).map(i => { + return i.match(re)[1] +}) + +export default icons diff --git a/frontend/src/business/components/SvgIcon/index.vue b/frontend/src/business/components/SvgIcon/index.vue new file mode 100644 index 0000000000..9a3318e5e6 --- /dev/null +++ b/frontend/src/business/components/SvgIcon/index.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/frontend/src/business/components/chart/Chart.vue b/frontend/src/business/components/chart/Chart.vue new file mode 100644 index 0000000000..bc27092c0b --- /dev/null +++ b/frontend/src/business/components/chart/Chart.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/frontend/src/business/components/chart/data/AddDB.vue b/frontend/src/business/components/chart/data/AddDB.vue new file mode 100644 index 0000000000..bdc47a0553 --- /dev/null +++ b/frontend/src/business/components/chart/data/AddDB.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/frontend/src/business/components/chart/data/ChartHome.vue b/frontend/src/business/components/chart/data/ChartHome.vue new file mode 100644 index 0000000000..a3e454d98f --- /dev/null +++ b/frontend/src/business/components/chart/data/ChartHome.vue @@ -0,0 +1,25 @@ + + + + + diff --git a/frontend/src/business/components/chart/data/TabDataPreview.vue b/frontend/src/business/components/chart/data/TabDataPreview.vue new file mode 100644 index 0000000000..8a8e52eb13 --- /dev/null +++ b/frontend/src/business/components/chart/data/TabDataPreview.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/frontend/src/business/components/chart/data/ViewTable.vue b/frontend/src/business/components/chart/data/ViewTable.vue new file mode 100644 index 0000000000..38a9ad1408 --- /dev/null +++ b/frontend/src/business/components/chart/data/ViewTable.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/frontend/src/business/components/chart/group/Group.vue b/frontend/src/business/components/chart/group/Group.vue new file mode 100644 index 0000000000..e587bd51e2 --- /dev/null +++ b/frontend/src/business/components/chart/group/Group.vue @@ -0,0 +1,517 @@ + + + + + diff --git a/frontend/src/business/components/chart/router.js b/frontend/src/business/components/chart/router.js new file mode 100644 index 0000000000..579847c8fb --- /dev/null +++ b/frontend/src/business/components/chart/router.js @@ -0,0 +1,18 @@ +const Chart = () => import('@/business/components/chart/Chart'); +const ChartHome = () => import('@/business/components/chart/data/ChartHome'); + +export default { + path: "/chart", + name: "ChartGroup", + redirect: "/chart/home", + components: { + content: Chart, + }, + children: [ + { + path: 'home', + name: 'home', + component: ChartHome, + } + ] +} diff --git a/frontend/src/business/components/common/components/MsDeleteConfirm.vue b/frontend/src/business/components/common/components/MsDeleteConfirm.vue index 0c083a332a..0e72d4bdd3 100644 --- a/frontend/src/business/components/common/components/MsDeleteConfirm.vue +++ b/frontend/src/business/components/common/components/MsDeleteConfirm.vue @@ -7,7 +7,7 @@ {{$t('commons.delete_confirm')}} - DELETE-{{record.name}} + DELETE-{{record.name || record.title}}
@@ -61,7 +61,7 @@ this.record = record; }, confirm() { - if (this.value.trim() != 'DELETE-' + this.record.name) { + if (this.value.trim() != 'DELETE-' + (this.record.name || this.record.title) ) { this.$warning(this.$t('commons.incorrect_input')); return; } diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue index aab3357a99..8ddc5ca9b0 100644 --- a/frontend/src/business/components/common/head/HeaderTopMenus.vue +++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue @@ -11,7 +11,7 @@ {{ $t('test_track.test_track') }} - + {{ $t('commons.api') }} - + - - - + + + - - - - - - + + + + + + diff --git a/frontend/src/business/components/dataset/data/AddDB.vue b/frontend/src/business/components/dataset/data/AddDB.vue deleted file mode 100644 index 73d93db8bb..0000000000 --- a/frontend/src/business/components/dataset/data/AddDB.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/frontend/src/business/components/dataset/data/TabDataPreview.vue b/frontend/src/business/components/dataset/data/TabDataPreview.vue new file mode 100644 index 0000000000..4fb3f12c14 --- /dev/null +++ b/frontend/src/business/components/dataset/data/TabDataPreview.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/frontend/src/business/components/dataset/data/ViewTable.vue b/frontend/src/business/components/dataset/data/ViewTable.vue new file mode 100644 index 0000000000..8a131a9fbe --- /dev/null +++ b/frontend/src/business/components/dataset/data/ViewTable.vue @@ -0,0 +1,165 @@ + + + + + diff --git a/frontend/src/business/components/dataset/group/Group.vue b/frontend/src/business/components/dataset/group/Group.vue index 1377d9aa58..8251b68a7f 100644 --- a/frontend/src/business/components/dataset/group/Group.vue +++ b/frontend/src/business/components/dataset/group/Group.vue @@ -2,10 +2,13 @@ - - {{ $t('dataset.datalist') }} - + + + {{ $t('dataset.datalist') }} + + + {{$t('dataset.add_group')}} @@ -46,7 +49,7 @@ size="mini"> - {{ data.label }} + {{ data.name }} @@ -111,8 +114,8 @@ - - + + {{currGroup.name}} @@ -121,7 +124,7 @@ - + {{$t('dataset.add_table')}} @@ -160,27 +163,22 @@ - - + {{sceneData}} + @node-click="sceneClick"> - - - + + ({{data.type}}) - {{ data.label }} + {{ data.name }} - + - + {{$t('dataset.rename')}} - + {{$t('dataset.delete')}} @@ -204,6 +202,19 @@ + + + + + + + +
+ {{$t('dataset.cancel')}} + {{$t('dataset.confirm')}} +
+ + @@ -217,7 +228,9 @@ export default { dialogTitle: '', search: '', editGroup: false, - data: null, + editTable: false, + data: [], + tableData: [], currGroup: null, expandedArray: [], groupForm: { @@ -228,18 +241,40 @@ export default { children: [], sort: 'type desc,name asc' }, + tableForm: { + name: '', + sort: 'type asc,create_time desc,name asc' + }, groupFormRules: { name: [ {required: true, message: this.$t('commons.input_content'), trigger: 'blur'}, ], + }, + tableFormRules: { + name: [ + {required: true, message: this.$t('commons.input_content'), trigger: 'blur'}, + ], } } }, + computed: { + sceneData: function () { + console.log(this.$store.state.dataset.sceneData + ' do post'); + this.tableTree(); + return this.$store.state.dataset.sceneData; + } + }, mounted() { this.tree(this.groupForm); + this.tableTree(); + this.$router.push('/dataset'); + this.$store.commit('setTable', null); }, activated() { this.tree(this.groupForm); + this.tableTree(); + this.$router.push('/dataset'); + this.$store.commit('setTable', null); }, watch: { // search(val){ @@ -264,11 +299,11 @@ export default { }, clickMore(param) { - // console.log(param); + console.log(param); switch (param.type) { case 'rename': this.add(param.data.type); - this.groupForm = param.data; + this.groupForm = JSON.parse(JSON.stringify(param.data)); break; case 'move': @@ -276,6 +311,13 @@ export default { case 'delete': this.delete(param.data); break; + case 'renameTable': + this.editTable = true; + this.tableForm = JSON.parse(JSON.stringify(param.data)); + break; + case 'deleteTable': + this.deleteTable(param.data); + break; } }, @@ -324,6 +366,32 @@ export default { }); }, + saveTable(table) { + console.log(table); + this.$refs['tableForm'].validate((valid) => { + if (valid) { + this.$post("/dataset/table/update", table, response => { + this.closeTable(); + this.$message({ + message: this.$t('commons.save_success'), + type: 'success', + showClose: true, + }); + this.tableTree(); + this.$router.push('/dataset/home'); + this.$store.commit('setTable', null); + }) + } else { + this.$message({ + message: this.$t('commons.input_content'), + type: 'error', + showClose: true, + }); + return false; + } + }); + }, + delete(data) { this.$confirm(this.$t('dataset.confirm_delete'), this.$t('dataset.tips'), { confirmButtonText: this.$t('dataset.confirm'), @@ -342,6 +410,26 @@ export default { }); }, + deleteTable(data) { + this.$confirm(this.$t('dataset.confirm_delete'), this.$t('dataset.tips'), { + confirmButtonText: this.$t('dataset.confirm'), + cancelButtonText: this.$t('dataset.cancel'), + type: 'warning' + }).then(() => { + this.$post("/dataset/table/delete/" + data.id, null, response => { + this.$message({ + type: 'success', + message: this.$t('dataset.delete_success'), + showClose: true, + }); + this.tableTree(); + this.$router.push('/dataset/home'); + this.$store.commit('setTable', null); + }); + }).catch(() => { + }); + }, + close() { this.editGroup = false; this.groupForm = { @@ -354,12 +442,31 @@ export default { } }, + closeTable() { + this.editTable = false; + this.tableForm = { + name: '', + } + }, + tree(group) { this.$post("/dataset/group/tree", group, response => { this.data = response.data; }) }, + tableTree() { + this.tableData = []; + if (this.currGroup) { + this.$post('/dataset/table/list', { + sort: 'type asc,create_time desc,name asc', + sceneId: this.currGroup.id + }, response => { + this.tableData = response.data; + }); + } + }, + nodeClick(data, node) { // console.log(data); // console.log(node); @@ -384,19 +491,19 @@ export default { }, clickAddData(param) { - console.log(param); + // console.log(param); switch (param.type) { case 'db': this.addDB(); break; case 'sql': - + this.$message(param.type); break; case 'excel': - + this.$message(param.type); break; case 'custom': - + this.$message(param.type); break; } }, @@ -408,9 +515,27 @@ export default { }, addDB() { - this.$router.push('/dataset/add_db'); - } - } + this.$router.push({ + name: 'add_db', + params: { + scene: this.currGroup + } + }) + }, + + sceneClick(data, node) { + // console.log(data); + this.$store.commit('setTable', null); + this.$store.commit('setTable', data.id); + this.$router.push({ + name: 'table', + params: { + table: data + } + }); + }, + + }, } @@ -443,4 +568,12 @@ export default { .form-item { margin-bottom: 0; } + + .title-css { + height: 26px; + } + + .title-text { + line-height: 26px; + } diff --git a/frontend/src/business/components/dataset/router.js b/frontend/src/business/components/dataset/router.js index cc1c3693c2..742b0619a3 100644 --- a/frontend/src/business/components/dataset/router.js +++ b/frontend/src/business/components/dataset/router.js @@ -1,6 +1,8 @@ const DataSet = () => import('@/business/components/dataset/DataSet'); const DataSetHome = () => import('@/business/components/dataset/data/DataHome'); -const DataSetAddDB = () => import('@/business/components/dataset/data/AddDB'); +const DataSetTable = () => import('@/business/components/dataset/data/ViewTable'); + +const DataSetAddDB = () => import('@/business/components/dataset/add/AddDB'); // const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome') // const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest') // const PerformanceTestList = () => import('@/business/components/performance/test/PerformanceTestList') @@ -18,14 +20,19 @@ export default { children: [ { path: 'home', - name: 'DataSetHome', + name: 'home', component: DataSetHome, }, { path: 'add_db', - name: 'DataSetAddDB', + name: 'add_db', component: DataSetAddDB, }, + { + path: 'table', + name: 'table', + component: DataSetTable, + }, // { // path: 'test/create', // name: "createPerTest", diff --git a/frontend/src/business/components/settings/router.js b/frontend/src/business/components/settings/router.js index 91231d326d..7a19cd9d44 100644 --- a/frontend/src/business/components/settings/router.js +++ b/frontend/src/business/components/settings/router.js @@ -22,6 +22,21 @@ export default { component: () => import('@/business/components/settings/sys/dept'), meta: {system: true, title: 'commons.organization'} }, + { + path: 'menu', + component: () => import('@/business/components/settings/sys/menu'), + meta: {system: true, title: 'commons.menu'} + }, + { + path: 'role', + component: () => import('@/business/components/settings/sys/role'), + meta: {system: true, title: 'commons.role'} + }, + { + path: 'sysuser', + component: () => import('@/business/components/settings/sys/user'), + meta: {system: true, title: 'commons.user'} + }, // { // path: 'systemworkspace', // component: () => import('@/business/components/settings/system/SystemWorkspace'), diff --git a/frontend/src/business/components/settings/sys/menu.vue b/frontend/src/business/components/settings/sys/menu.vue new file mode 100644 index 0000000000..c06735fcde --- /dev/null +++ b/frontend/src/business/components/settings/sys/menu.vue @@ -0,0 +1,438 @@ + + + + + diff --git a/frontend/src/business/components/settings/sys/role.vue b/frontend/src/business/components/settings/sys/role.vue new file mode 100644 index 0000000000..141f2e493b --- /dev/null +++ b/frontend/src/business/components/settings/sys/role.vue @@ -0,0 +1,257 @@ + + + + diff --git a/frontend/src/business/components/settings/sys/user.vue b/frontend/src/business/components/settings/sys/user.vue new file mode 100644 index 0000000000..ff335fcb70 --- /dev/null +++ b/frontend/src/business/components/settings/sys/user.vue @@ -0,0 +1,422 @@ + + + + + diff --git a/frontend/src/business/components/settings/system/Datasource.vue b/frontend/src/business/components/settings/system/Datasource.vue index faafa93ef8..0806eb926c 100644 --- a/frontend/src/business/components/settings/system/Datasource.vue +++ b/frontend/src/business/components/settings/system/Datasource.vue @@ -34,29 +34,29 @@ - + + :key="item.name" + :label="item.name" + :value="item.name"> - + - + - + - + - + @@ -84,19 +84,19 @@ {min: 2, max: 50, message: this.$t('commons.input_limit', [2, 50]), trigger: 'blur'}]"> - + - + - + - + - + @@ -169,7 +169,7 @@ tableData: [], memberLineData: [], form: {configuration: {}}, - allTypes: ['mysql', 'oracle'], + allTypes: [{name: "mysql", type: "jdbc"}, {name: "sqlServer", type: "jdbc"}], memberForm: {}, rule: { name: [ @@ -320,6 +320,13 @@ } }) }, + changeType(){ + for (let i = 0; i < this.allTypes.length; i++) { + if(this.allTypes[i].name == this.form.type){ + this.form.configuration.dataSourceType = this.allTypes[i].type; + } + } + }, initTableData() { this.result = this.$post(this.queryPath + "/" + this.currentPage + "/" + this.pageSize, this.condition, response => { let data = response.data; diff --git a/frontend/src/business/main.js b/frontend/src/business/main.js index ed78b3c9c7..bafc5c80d6 100644 --- a/frontend/src/business/main.js +++ b/frontend/src/business/main.js @@ -3,6 +3,7 @@ import ElementUI from 'element-ui'; import Fit2CloudUI from 'fit2cloud-ui'; import '../assets/theme/index.css'; import icon from "../common/js/icon"; +import '../assets/icons' // icon import filters from "../common/js/filter"; import ajax from "../common/js/ajax"; import App from './App.vue'; diff --git a/frontend/src/business/store.js b/frontend/src/business/store.js index c536ea0d38..630caf5c4b 100644 --- a/frontend/src/business/store.js +++ b/frontend/src/business/store.js @@ -3,6 +3,36 @@ import Vuex from 'vuex' Vue.use(Vuex); +const Dataset = { + state: { + sceneData: "", + table: "" + }, + mutations: { + setSceneData(state, sceneData) { + state.sceneData = sceneData; + }, + setTable(state, table) { + state.table = table; + } + } +} + +const Chart = { + state: { + chartSceneData: "", + chart: "" + }, + mutations: { + setChartSceneData(state, chartSceneData) { + state.chartSceneData = chartSceneData; + }, + setChart(state, chart) { + state.chart = chart; + } + } +} + const Common = { state: { projectId: "" @@ -56,5 +86,7 @@ export default new Vuex.Store({ common: Common, switch: Switch, isReadOnly: IsReadOnly, + dataset: Dataset, + chart: Chart } }) diff --git a/frontend/src/common/js/constants.js b/frontend/src/common/js/constants.js index 33e7a474a3..17a4eea5b7 100644 --- a/frontend/src/common/js/constants.js +++ b/frontend/src/common/js/constants.js @@ -16,6 +16,7 @@ export const PROJECT_NAME = 'project_name'; export const REFRESH_SESSION_USER_URL = 'user/refresh'; export const WORKSPACE = 'workspace'; export const ORGANIZATION = 'organization'; +export const MENU = 'menu'; export const DEFAULT = 'default'; export const ZH_CN = 'zh_CN'; diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index decf67202e..d17853f012 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -14,6 +14,7 @@ export default { delete_cancelled: 'Delete cancelled', workspace: 'Workspace', organization: 'Organization', + menu: 'Menu', setting: 'Setting', project: 'Project', about_us: 'About Us', @@ -1552,6 +1553,18 @@ export default { sql_data: 'SQL Data', excel_data: 'Excel Data', custom_data: 'Custom Data', - pls_slc_tbl_left:'Please select table from left' + pls_slc_tbl_left:'Please select table from left', + add_db_table:'Add Table', + pls_slc_data_source:'Select Data Source', + table:'Table', + edit: 'Edit', + create_view: 'Create View', + data_preview:'Data Preview', + field_type:'Field Type', + field_name:'Field Name', + field_origin_name:'Origin Name', + field_check:'Checked', + update_info:'Update Info', + join_view: 'Relation View' } }; diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 73eb90acb6..29c513d9b8 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -15,6 +15,7 @@ export default { delete_cancelled: '已取消删除', workspace: '工作空间', organization: '组织', + menu: '菜单', setting: '设置', project: '项目', about_us: '关于', @@ -252,6 +253,11 @@ export default { special_characters_are_not_supported: '格式错误(不支持特殊字符，且不能以\'-\'开头结尾)', delete_warning: '删除该工作空间将同步删除该工作空间下所有项目，以及项目中的所有用例、接口测试、性能测试等,确定要删除吗?', }, + menu: { + create: '创建菜单', + modify: '修改菜单', + delete: '删除菜单', + }, organization: { create: '创建组织', modify: '修改组织', @@ -389,6 +395,8 @@ export default { test_user: '测试人员', test_viewer: '只读用户', add: '添加角色', + delete: '删除角色', + modify: '修改角色', }, report: { api_test_report: '接口测试报告', @@ -1533,6 +1541,37 @@ export default { title: '认证设置', auth_name_valid: '名称不支持特殊字符', }, + chart: { + datalist: '视图列表', + add_group: '添加分组', + add_scene: '添加场景', + group: '分组', + scene: '场景', + delete: '删除', + move_to: '移动到', + rename: '重命名', + tips: '提示', + confirm_delete: '确认删除', + delete_success: '删除成功', + confirm: '确认', + cancel: '取消', + search: '搜索', + back: '返回', + add_table: '添加表', + process: '进度', + add_chart: '添加视图', + db_data: '数据库表', + sql_data: 'SQL数据集', + excel_data: 'Excel数据集', + custom_data: '自助数据集', + pls_slc_tbl_left: '请从左侧选视图', + add_db_table: '添加数据库表', + pls_slc_data_source: '请选择数据库连接', + table: '表', + edit: '编辑', + create_view: '创建试图', + data_preview:'数据预览' + }, dataset: { datalist: '数据列表', add_group: '添加分组', @@ -1556,7 +1595,19 @@ export default { sql_data: 'SQL数据集', excel_data: 'Excel数据集', custom_data: '自助数据集', - pls_slc_tbl_left:'请从左侧选择表' + pls_slc_tbl_left: '请从左侧选择表', + add_db_table: '添加数据库表', + pls_slc_data_source: '请选择数据库连接', + table: '表', + edit: '编辑', + create_view: '创建视图', + data_preview: '数据预览', + field_type: '字段类型', + field_name: '字段名', + field_origin_name: '原始名', + field_check: '选中', + update_info: '更新信息', + join_view: '关联视图' }, datasource: { create: '新建数据连接', @@ -1583,7 +1634,7 @@ export default { special_characters_are_not_supported: '格式错误(不支持特殊字符，且不能以\'-\'开头结尾)', none: '无组织', select: '选择组织', - delete_warning: '删除该组织将同步删除该组织下所有相关工作空间和相关工作空间下的所有项目，以及项目中的所有用例、接口测试、性能测试等,确定要删除吗?', + delete_warning: '删除该数据连接将同步删除该数据连接下所有相关的数据集, 确定要删除吗?', service_integration: '服务集成', defect_manage: '缺陷管理平台', message_settings: '消息设置', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index ca12cd3c06..2446028fc3 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -15,6 +15,7 @@ export default { delete_cancelled: '已取消刪除', workspace: '工作空間', organization: '組織', + menu: '菜單', setting: '設置', project: '項目', about_us: '關於', @@ -1553,6 +1554,18 @@ export default { sql_data: 'SQL數據集', excel_data: 'Excel數據集', custom_data: '自助數據集', - pls_slc_tbl_left:'請從左側選擇表' + pls_slc_tbl_left:'請從左側選擇表', + add_db_table:'添加數據庫表', + pls_slc_data_source:'請選擇數據庫連接', + table:'表', + edit: '編輯', + create_view: '創建視圖', + data_preview:'數據預覽', + field_type:'字段類型', + field_name:'字段名', + field_origin_name:'原始名', + field_check:'選中', + update_info:'更新信息', + join_view: '關聯視圖' } }; diff --git a/frontend/src/utils/validate.js b/frontend/src/utils/validate.js new file mode 100644 index 0000000000..6e21835108 --- /dev/null +++ b/frontend/src/utils/validate.js @@ -0,0 +1,169 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) + } + + /** + * @param {string} str + * @returns {Boolean} + */ + export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 + } + + /** + * @param {string} url + * @returns {Boolean} + */ + export function validURL(url) { + const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/ + return reg.test(url) + } + + /** + * @param {string} str + * @returns {Boolean} + */ + export function validLowerCase(str) { + const reg = /^[a-z]+$/ + return reg.test(str) + } + + /** + * @param {string} str + * @returns {Boolean} + */ + export function validUpperCase(str) { + const reg = /^[A-Z]+$/ + return reg.test(str) + } + + /** + * @param {string} str + * @returns {Boolean} + */ + export function validAlphabets(str) { + const reg = /^[A-Za-z]+$/ + return reg.test(str) + } + + /** + * @param {string} email + * @returns {Boolean} + */ + export function validEmail(email) { + const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/ + return reg.test(email) + } + + export function isvalidPhone(phone) { + const reg = /^1[3|4|5|7|8][0-9]\d{8}$/ + return reg.test(phone) + } + + /** + * @param {string} str + * @returns {Boolean} + */ + export function isString(str) { + if (typeof str === 'string' || str instanceof String) { + return true + } + return false + } + + /** + * @param {Array} arg + * @returns {Boolean} + */ + export function isArray(arg) { + if (typeof Array.isArray === 'undefined') { + return Object.prototype.toString.call(arg) === '[object Array]' + } + return Array.isArray(arg) + } + + /** + * 是否合法IP地址 + * @param rule + * @param value + * @param callback + */ + export function validateIP(rule, value, callback) { + if (value === '' || value === undefined || value == null) { + callback() + } else { + const reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/ + if ((!reg.test(value)) && value !== '') { + callback(new Error('请输入正确的IP地址')) + } else { + callback() + } + } + } + + /* 是否手机号码或者固话*/ + export function validatePhoneTwo(rule, value, callback) { + const reg = /^((0\d{2,3}-\d{7,8})|(1[34578]\d{9}))$/ + if (value === '' || value === undefined || value == null) { + callback() + } else { + if ((!reg.test(value)) && value !== '') { + callback(new Error('请输入正确的电话号码或者固话号码')) + } else { + callback() + } + } + } + + /* 是否固话*/ + export function validateTelephone(rule, value, callback) { + const reg = /0\d{2}-\d{7,8}/ + if (value === '' || value === undefined || value == null) { + callback() + } else { + if ((!reg.test(value)) && value !== '') { + callback(new Error('请输入正确的固话（格式：区号+号码,如010-1234567）')) + } else { + callback() + } + } + } + + /* 是否手机号码*/ + export function validatePhone(rule, value, callback) { + const reg = /^[1][3,4,5,7,8][0-9]{9}$/ + if (value === '' || value === undefined || value == null) { + callback() + } else { + if ((!reg.test(value)) && value !== '') { + callback(new Error('请输入正确的电话号码')) + } else { + callback() + } + } + } + + /* 是否身份证号码*/ + export function validateIdNo(rule, value, callback) { + const reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/ + if (value === '' || value === undefined || value == null) { + callback() + } else { + if ((!reg.test(value)) && value !== '') { + callback(new Error('请输入正确的身份证号码')) + } else { + callback() + } + } + } + + \ No newline at end of file diff --git a/frontend/vue.config.js b/frontend/vue.config.js index 747e0670bb..71d623e8f6 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -38,5 +38,21 @@ module.exports = { }, chainWebpack(config) { config.plugins.delete('prefetch') + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/assets/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/assets/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() } };