diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetGroup.java b/backend/src/main/java/io/dataease/base/domain/DatasetGroup.java new file mode 100644 index 0000000000..243fdb6bde --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DatasetGroup.java @@ -0,0 +1,21 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class DatasetGroup implements Serializable { + private String id; + + private String name; + + private String pid; + + private Integer level; + + 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/DatasetGroupExample.java b/backend/src/main/java/io/dataease/base/domain/DatasetGroupExample.java new file mode 100644 index 0000000000..1f3b2f4440 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DatasetGroupExample.java @@ -0,0 +1,600 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class DatasetGroupExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public DatasetGroupExample() { + 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 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/DatasetScene.java b/backend/src/main/java/io/dataease/base/domain/DatasetScene.java new file mode 100644 index 0000000000..9d860e998a --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DatasetScene.java @@ -0,0 +1,19 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class DatasetScene implements Serializable { + private String id; + + private String name; + + private String groupId; + + 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/DatasetSceneExample.java b/backend/src/main/java/io/dataease/base/domain/DatasetSceneExample.java new file mode 100644 index 0000000000..df9477381e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DatasetSceneExample.java @@ -0,0 +1,540 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class DatasetSceneExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public DatasetSceneExample() { + 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 andGroupIdIsNull() { + addCriterion("group_id is null"); + return (Criteria) this; + } + + public Criteria andGroupIdIsNotNull() { + addCriterion("group_id is not null"); + return (Criteria) this; + } + + public Criteria andGroupIdEqualTo(String value) { + addCriterion("group_id =", value, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdNotEqualTo(String value) { + addCriterion("group_id <>", value, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdGreaterThan(String value) { + addCriterion("group_id >", value, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdGreaterThanOrEqualTo(String value) { + addCriterion("group_id >=", value, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdLessThan(String value) { + addCriterion("group_id <", value, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdLessThanOrEqualTo(String value) { + addCriterion("group_id <=", value, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdLike(String value) { + addCriterion("group_id like", value, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdNotLike(String value) { + addCriterion("group_id not like", value, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdIn(List values) { + addCriterion("group_id in", values, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdNotIn(List values) { + addCriterion("group_id not in", values, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdBetween(String value1, String value2) { + addCriterion("group_id between", value1, value2, "groupId"); + return (Criteria) this; + } + + public Criteria andGroupIdNotBetween(String value1, String value2) { + addCriterion("group_id not between", value1, value2, "groupId"); + 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/SysDept.java b/backend/src/main/java/io/dataease/base/domain/SysDept.java new file mode 100644 index 0000000000..cc233df9a2 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysDept.java @@ -0,0 +1,32 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +@Data +public class SysDept implements Serializable { + private Long deptId; + + private Long pid; + + private Integer subCount; + + private String name; + + private Integer level; + + private Integer deptSort; + + private Boolean enabled; + + private String createBy; + + private String updateBy; + + private Date createTime; + + private Date updateTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java b/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java new file mode 100644 index 0000000000..3fdf2350d2 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java @@ -0,0 +1,891 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SysDeptExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public SysDeptExample() { + 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 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 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 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 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 andDeptSortIsNull() { + addCriterion("dept_sort is null"); + return (Criteria) this; + } + + public Criteria andDeptSortIsNotNull() { + addCriterion("dept_sort is not null"); + return (Criteria) this; + } + + public Criteria andDeptSortEqualTo(Integer value) { + addCriterion("dept_sort =", value, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortNotEqualTo(Integer value) { + addCriterion("dept_sort <>", value, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortGreaterThan(Integer value) { + addCriterion("dept_sort >", value, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortGreaterThanOrEqualTo(Integer value) { + addCriterion("dept_sort >=", value, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortLessThan(Integer value) { + addCriterion("dept_sort <", value, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortLessThanOrEqualTo(Integer value) { + addCriterion("dept_sort <=", value, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortIn(List values) { + addCriterion("dept_sort in", values, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortNotIn(List values) { + addCriterion("dept_sort not in", values, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortBetween(Integer value1, Integer value2) { + addCriterion("dept_sort between", value1, value2, "deptSort"); + return (Criteria) this; + } + + public Criteria andDeptSortNotBetween(Integer value1, Integer value2) { + addCriterion("dept_sort not between", value1, value2, "deptSort"); + 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(Boolean value) { + addCriterion("enabled =", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotEqualTo(Boolean value) { + addCriterion("enabled <>", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledGreaterThan(Boolean value) { + addCriterion("enabled >", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledGreaterThanOrEqualTo(Boolean value) { + addCriterion("enabled >=", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledLessThan(Boolean value) { + addCriterion("enabled <", value, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledLessThanOrEqualTo(Boolean 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(Boolean value1, Boolean value2) { + addCriterion("enabled between", value1, value2, "enabled"); + return (Criteria) this; + } + + public Criteria andEnabledNotBetween(Boolean value1, Boolean 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 andCreateTimeIsNull() { + addCriterion("create_time is null"); + return (Criteria) this; + } + + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date 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(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeNotBetween(Date value1, Date 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(Date value) { + addCriterion("update_time =", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeLessThanOrEqualTo(Date 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(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.java b/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.java new file mode 100644 index 0000000000..025628b86a --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.DatasetGroup; +import io.dataease.base.domain.DatasetGroupExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface DatasetGroupMapper { + long countByExample(DatasetGroupExample example); + + int deleteByExample(DatasetGroupExample example); + + int deleteByPrimaryKey(String id); + + int insert(DatasetGroup record); + + int insertSelective(DatasetGroup record); + + List selectByExample(DatasetGroupExample example); + + DatasetGroup selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") DatasetGroup record, @Param("example") DatasetGroupExample example); + + int updateByExample(@Param("record") DatasetGroup record, @Param("example") DatasetGroupExample example); + + int updateByPrimaryKeySelective(DatasetGroup record); + + int updateByPrimaryKey(DatasetGroup record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.xml new file mode 100644 index 0000000000..536a853c73 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.xml @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, `name`, pid, `level`, create_by, create_time + + + + + delete from dataset_group + where id = #{id,jdbcType=VARCHAR} + + + delete from dataset_group + + + + + + insert into dataset_group (id, `name`, pid, + `level`, create_by, create_time + ) + values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pid,jdbcType=VARCHAR}, + #{level,jdbcType=INTEGER}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT} + ) + + + insert into dataset_group + + + id, + + + `name`, + + + pid, + + + `level`, + + + create_by, + + + create_time, + + + + + #{id,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{pid,jdbcType=VARCHAR}, + + + #{level,jdbcType=INTEGER}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + + + + update dataset_group + + + id = #{record.id,jdbcType=VARCHAR}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + pid = #{record.pid,jdbcType=VARCHAR}, + + + `level` = #{record.level,jdbcType=INTEGER}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + + + + + + update dataset_group + set id = #{record.id,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + pid = #{record.pid,jdbcType=VARCHAR}, + `level` = #{record.level,jdbcType=INTEGER}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT} + + + + + + update dataset_group + + + `name` = #{name,jdbcType=VARCHAR}, + + + pid = #{pid,jdbcType=VARCHAR}, + + + `level` = #{level,jdbcType=INTEGER}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=VARCHAR} + + + update dataset_group + set `name` = #{name,jdbcType=VARCHAR}, + pid = #{pid,jdbcType=VARCHAR}, + `level` = #{level,jdbcType=INTEGER}, + 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/DatasetSceneMapper.java b/backend/src/main/java/io/dataease/base/mapper/DatasetSceneMapper.java new file mode 100644 index 0000000000..a2c7a66299 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetSceneMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.DatasetScene; +import io.dataease.base.domain.DatasetSceneExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface DatasetSceneMapper { + long countByExample(DatasetSceneExample example); + + int deleteByExample(DatasetSceneExample example); + + int deleteByPrimaryKey(String id); + + int insert(DatasetScene record); + + int insertSelective(DatasetScene record); + + List selectByExample(DatasetSceneExample example); + + DatasetScene selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") DatasetScene record, @Param("example") DatasetSceneExample example); + + int updateByExample(@Param("record") DatasetScene record, @Param("example") DatasetSceneExample example); + + int updateByPrimaryKeySelective(DatasetScene record); + + int updateByPrimaryKey(DatasetScene record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetSceneMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DatasetSceneMapper.xml new file mode 100644 index 0000000000..1636b95066 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DatasetSceneMapper.xml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, `name`, group_id, create_by, create_time + + + + + delete from dataset_scene + where id = #{id,jdbcType=VARCHAR} + + + delete from dataset_scene + + + + + + insert into dataset_scene (id, `name`, group_id, + create_by, create_time) + values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, + #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}) + + + insert into dataset_scene + + + id, + + + `name`, + + + group_id, + + + create_by, + + + create_time, + + + + + #{id,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{groupId,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=BIGINT}, + + + + + + update dataset_scene + + + id = #{record.id,jdbcType=VARCHAR}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + group_id = #{record.groupId,jdbcType=VARCHAR}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=BIGINT}, + + + + + + + + update dataset_scene + set id = #{record.id,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, + group_id = #{record.groupId,jdbcType=VARCHAR}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=BIGINT} + + + + + + update dataset_scene + + + `name` = #{name,jdbcType=VARCHAR}, + + + group_id = #{groupId,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=BIGINT}, + + + where id = #{id,jdbcType=VARCHAR} + + + update dataset_scene + set `name` = #{name,jdbcType=VARCHAR}, + group_id = #{groupId,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/SysDeptMapper.java b/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.java new file mode 100644 index 0000000000..ce5994b57a --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.SysDept; +import io.dataease.base.domain.SysDeptExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface SysDeptMapper { + long countByExample(SysDeptExample example); + + int deleteByExample(SysDeptExample example); + + int deleteByPrimaryKey(Long deptId); + + int insert(SysDept record); + + int insertSelective(SysDept record); + + List selectByExample(SysDeptExample example); + + SysDept selectByPrimaryKey(Long deptId); + + int updateByExampleSelective(@Param("record") SysDept record, @Param("example") SysDeptExample example); + + int updateByExample(@Param("record") SysDept record, @Param("example") SysDeptExample example); + + int updateByPrimaryKeySelective(SysDept record); + + int updateByPrimaryKey(SysDept record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.xml new file mode 100644 index 0000000000..0047e3b26e --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/SysDeptMapper.xml @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + dept_id, pid, sub_count, `name`, `level`, dept_sort, enabled, create_by, update_by, + create_time, update_time + + + + + delete from sys_dept + where dept_id = #{deptId,jdbcType=BIGINT} + + + delete from sys_dept + + + + + + insert into sys_dept (dept_id, pid, sub_count, + `name`, `level`, dept_sort, + enabled, create_by, update_by, + create_time, update_time) + values (#{deptId,jdbcType=BIGINT}, #{pid,jdbcType=BIGINT}, #{subCount,jdbcType=INTEGER}, + #{name,jdbcType=VARCHAR}, #{level,jdbcType=INTEGER}, #{deptSort,jdbcType=INTEGER}, + #{enabled,jdbcType=BIT}, #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) + + + insert into sys_dept + + + dept_id, + + + pid, + + + sub_count, + + + `name`, + + + `level`, + + + dept_sort, + + + enabled, + + + create_by, + + + update_by, + + + create_time, + + + update_time, + + + + + #{deptId,jdbcType=BIGINT}, + + + #{pid,jdbcType=BIGINT}, + + + #{subCount,jdbcType=INTEGER}, + + + #{name,jdbcType=VARCHAR}, + + + #{level,jdbcType=INTEGER}, + + + #{deptSort,jdbcType=INTEGER}, + + + #{enabled,jdbcType=BIT}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + + + + update sys_dept + + + dept_id = #{record.deptId,jdbcType=BIGINT}, + + + pid = #{record.pid,jdbcType=BIGINT}, + + + sub_count = #{record.subCount,jdbcType=INTEGER}, + + + `name` = #{record.name,jdbcType=VARCHAR}, + + + `level` = #{record.level,jdbcType=INTEGER}, + + + dept_sort = #{record.deptSort,jdbcType=INTEGER}, + + + enabled = #{record.enabled,jdbcType=BIT}, + + + create_by = #{record.createBy,jdbcType=VARCHAR}, + + + update_by = #{record.updateBy,jdbcType=VARCHAR}, + + + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + + + update_time = #{record.updateTime,jdbcType=TIMESTAMP}, + + + + + + + + update sys_dept + set dept_id = #{record.deptId,jdbcType=BIGINT}, + pid = #{record.pid,jdbcType=BIGINT}, + sub_count = #{record.subCount,jdbcType=INTEGER}, + `name` = #{record.name,jdbcType=VARCHAR}, + `level` = #{record.level,jdbcType=INTEGER}, + dept_sort = #{record.deptSort,jdbcType=INTEGER}, + enabled = #{record.enabled,jdbcType=BIT}, + create_by = #{record.createBy,jdbcType=VARCHAR}, + update_by = #{record.updateBy,jdbcType=VARCHAR}, + create_time = #{record.createTime,jdbcType=TIMESTAMP}, + update_time = #{record.updateTime,jdbcType=TIMESTAMP} + + + + + + update sys_dept + + + pid = #{pid,jdbcType=BIGINT}, + + + sub_count = #{subCount,jdbcType=INTEGER}, + + + `name` = #{name,jdbcType=VARCHAR}, + + + `level` = #{level,jdbcType=INTEGER}, + + + dept_sort = #{deptSort,jdbcType=INTEGER}, + + + enabled = #{enabled,jdbcType=BIT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where dept_id = #{deptId,jdbcType=BIGINT} + + + update sys_dept + set pid = #{pid,jdbcType=BIGINT}, + sub_count = #{subCount,jdbcType=INTEGER}, + `name` = #{name,jdbcType=VARCHAR}, + `level` = #{level,jdbcType=INTEGER}, + dept_sort = #{deptSort,jdbcType=INTEGER}, + enabled = #{enabled,jdbcType=BIT}, + create_by = #{createBy,jdbcType=VARCHAR}, + update_by = #{updateBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where dept_id = #{deptId,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/commons/exception/DEException.java b/backend/src/main/java/io/dataease/commons/exception/DEException.java new file mode 100644 index 0000000000..2888dcc7c3 --- /dev/null +++ b/backend/src/main/java/io/dataease/commons/exception/DEException.java @@ -0,0 +1,24 @@ +package io.dataease.commons.exception; + +public class DEException extends RuntimeException { + + private DEException(String message) { + super(message); + } + + private DEException(Throwable t) { + super(t); + } + + public static void throwException(String message) { + throw new DEException(message); + } + + public static DEException getException(String message) { + throw new DEException(message); + } + + public static void throwException(Throwable t) { + throw new DEException(t); + } +} diff --git a/backend/src/main/java/io/dataease/commons/exception/MSException.java b/backend/src/main/java/io/dataease/commons/exception/MSException.java deleted file mode 100644 index c3d8d1e7ad..0000000000 --- a/backend/src/main/java/io/dataease/commons/exception/MSException.java +++ /dev/null @@ -1,24 +0,0 @@ -package io.dataease.commons.exception; - -public class MSException extends RuntimeException { - - private MSException(String message) { - super(message); - } - - private MSException(Throwable t) { - super(t); - } - - public static void throwException(String message) { - throw new MSException(message); - } - - public static MSException getException(String message) { - throw new MSException(message); - } - - public static void throwException(Throwable t) { - throw new MSException(t); - } -} diff --git a/backend/src/main/java/io/dataease/commons/utils/FileUtils.java b/backend/src/main/java/io/dataease/commons/utils/FileUtils.java index 06b32daadf..0fafee6333 100644 --- a/backend/src/main/java/io/dataease/commons/utils/FileUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/FileUtils.java @@ -1,6 +1,6 @@ package io.dataease.commons.utils; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.i18n.Translator; import org.apache.commons.collections.CollectionUtils; import org.aspectj.util.FileUtil; @@ -26,7 +26,7 @@ public class FileUtils { FileUtil.copyStream(in, out); } catch (IOException e) { LogUtil.error(e); - MSException.throwException(Translator.get("upload_fail")); + DEException.throwException(Translator.get("upload_fail")); } } } diff --git a/backend/src/main/java/io/dataease/commons/utils/ServiceUtils.java b/backend/src/main/java/io/dataease/commons/utils/ServiceUtils.java index b5a888c59f..b564ad7a1f 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ServiceUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/ServiceUtils.java @@ -1,6 +1,6 @@ package io.dataease.commons.utils; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.controller.request.BaseQueryRequest; import io.dataease.controller.request.OrderRequest; @@ -44,7 +44,7 @@ public class ServiceUtils { setIds.invoke(batchRequest, ids); } catch (Exception e) { LogUtil.error(e.getMessage(), e); - MSException.throwException("请求没有setIds方法"); + DEException.throwException("请求没有setIds方法"); } } } diff --git a/backend/src/main/java/io/dataease/controller/I18nController.java b/backend/src/main/java/io/dataease/controller/I18nController.java index 2eca9a39d3..baad032ed2 100644 --- a/backend/src/main/java/io/dataease/controller/I18nController.java +++ b/backend/src/main/java/io/dataease/controller/I18nController.java @@ -2,7 +2,7 @@ package io.dataease.controller; import io.dataease.commons.constants.I18nConstants; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.LogUtil; import io.dataease.i18n.Lang; import io.dataease.i18n.Translator; @@ -37,7 +37,7 @@ public class I18nController { if (targetLang == null) { response.setStatus(HttpServletResponse.SC_NOT_ACCEPTABLE); LogUtil.error("Invalid parameter: " + lang); - MSException.throwException(Translator.get("error_lang_invalid")); + DEException.throwException(Translator.get("error_lang_invalid")); } userService.setLanguage(targetLang.getDesc()); Cookie cookie = new Cookie(I18nConstants.LANG_COOKIE_NAME, targetLang.getDesc()); diff --git a/backend/src/main/java/io/dataease/controller/UserController.java b/backend/src/main/java/io/dataease/controller/UserController.java index 3a18c0fe3f..9e02948b08 100644 --- a/backend/src/main/java/io/dataease/controller/UserController.java +++ b/backend/src/main/java/io/dataease/controller/UserController.java @@ -4,7 +4,7 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import io.dataease.base.domain.User; import io.dataease.commons.constants.RoleConstants; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.commons.user.SessionUser; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; @@ -138,7 +138,7 @@ public class UserController { public UserDTO updateCurrentUser(@RequestBody User user) { String currentUserId = SessionUtils.getUserId(); if (!StringUtils.equals(currentUserId, user.getId())) { - MSException.throwException(Translator.get("not_authorized")); + DEException.throwException(Translator.get("not_authorized")); } userService.updateUser(user); UserDTO userDTO = userService.getUserDTO(user.getId()); @@ -169,7 +169,7 @@ public class UserController { @GetMapping("/info/{userId}") public UserDTO getUserInfo(@PathVariable(value = "userId") String userId) { if (!StringUtils.equals(userId, SessionUtils.getUserId())) { - MSException.throwException(Translator.get("not_authorized")); + DEException.throwException(Translator.get("not_authorized")); } return userService.getUserInfo(userId); } @@ -215,7 +215,7 @@ public class UserController { workspaceService.checkWorkspaceOwner(workspaceId); String currentUserId = SessionUtils.getUser().getId(); if (StringUtils.equals(userId, currentUserId)) { - MSException.throwException(Translator.get("cannot_remove_current")); + DEException.throwException(Translator.get("cannot_remove_current")); } userService.deleteMember(workspaceId, userId); } @@ -239,7 +239,7 @@ public class UserController { organizationService.checkOrgOwner(organizationId); String currentUserId = SessionUtils.getUser().getId(); if (StringUtils.equals(userId, currentUserId)) { - MSException.throwException(Translator.get("cannot_remove_current")); + DEException.throwException(Translator.get("cannot_remove_current")); } userService.delOrganizationMember(organizationId, userId); } diff --git a/backend/src/main/java/io/dataease/controller/handler/RestControllerExceptionHandler.java b/backend/src/main/java/io/dataease/controller/handler/RestControllerExceptionHandler.java index f421cafcb0..56d69cb900 100644 --- a/backend/src/main/java/io/dataease/controller/handler/RestControllerExceptionHandler.java +++ b/backend/src/main/java/io/dataease/controller/handler/RestControllerExceptionHandler.java @@ -1,7 +1,7 @@ package io.dataease.controller.handler; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.controller.ResultHolder; import org.apache.shiro.ShiroException; import org.apache.shiro.authz.UnauthorizedException; @@ -32,13 +32,13 @@ public class RestControllerExceptionHandler { @ExceptionHandler(SQLException.class) - public ResultHolder sqlExceptionHandler(HttpServletRequest request, HttpServletResponse response, MSException e) { + public ResultHolder sqlExceptionHandler(HttpServletRequest request, HttpServletResponse response, DEException e) { response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); return ResultHolder.error("SQL error happened, please check logs."); } - @ExceptionHandler(MSException.class) - public ResultHolder msExceptionHandler(HttpServletRequest request, HttpServletResponse response, MSException e) { + @ExceptionHandler(DEException.class) + public ResultHolder msExceptionHandler(HttpServletRequest request, HttpServletResponse response, DEException e) { response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value()); return ResultHolder.error(e.getMessage()); } diff --git a/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java new file mode 100644 index 0000000000..5b62ec3c03 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java @@ -0,0 +1,38 @@ +package io.dataease.controller.sys; + +import io.dataease.base.domain.SysDept; +import io.dataease.service.sys.DeptService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequiredArgsConstructor +@Api(tags = "系统：部门管理") +@RequestMapping("/api/dept") +public class SysDeptController { + + + @Resource + private DeptService deptService; + + @ApiOperation("查询部门") + @PostMapping("/root") + public List rootData(){ + List root = deptService.root(); + return root; + } + + @ApiOperation("新增部门") + @PostMapping("/create") + public void create(@RequestBody SysDept dept){ + deptService.add(dept); + } + +} diff --git a/backend/src/main/java/io/dataease/controller/sys/request/DeptCreateRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/DeptCreateRequest.java new file mode 100644 index 0000000000..b4fcdb8f79 --- /dev/null +++ b/backend/src/main/java/io/dataease/controller/sys/request/DeptCreateRequest.java @@ -0,0 +1,6 @@ +package io.dataease.controller.sys.request; + +public class DeptCreateRequest { + + +} 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 48e195fcd3..6e37a346e1 100644 --- a/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java +++ b/backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java @@ -19,13 +19,13 @@ public class DatasourceController { private DatasourceService datasourceService; @PostMapping("/add") - public Datasource addDatasource(@RequestBody Datasource Datasource) { - return datasourceService.addDatasource(Datasource); + public Datasource addDatasource(@RequestBody Datasource datasource) { + return datasourceService.addDatasource(datasource); } @PostMapping("/validate") - public void validate(@RequestBody Datasource Datasource) throws Exception{ - datasourceService.validate(Datasource); + public void validate(@RequestBody Datasource datasource) throws Exception{ + datasourceService.validate(datasource); } @GetMapping("/list") diff --git a/backend/src/main/java/io/dataease/datasource/provider/DatasourceProvider.java b/backend/src/main/java/io/dataease/datasource/provider/DatasourceProvider.java index 2258400264..6654c40741 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/DatasourceProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/DatasourceProvider.java @@ -1,11 +1,15 @@ package io.dataease.datasource.provider; +import io.dataease.base.domain.Datasource; + import java.util.List; public abstract class DatasourceProvider { - protected String dataSourceConfigration; - protected String type; + protected String query; + private int resultLimit = 30000; + protected Datasource datasource; + public String getQuery() { return query; @@ -15,27 +19,14 @@ public abstract class DatasourceProvider { this.query = query; } - protected String query; - private int resultLimit = 30000; - - public String getDataSourceConfigration() { - return dataSourceConfigration; + public Datasource getDatasource() { + return datasource; } - public void setDataSourceConfigration(String dataSourceConfigration) { - this.dataSourceConfigration = dataSourceConfigration; + public void setDatasource(Datasource datasource) { + this.datasource = datasource; } - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - - abstract public List getData() throws Exception; abstract public List getTables() throws Exception; 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 68d4c4e596..fe8cb0efa4 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java @@ -80,10 +80,10 @@ public class JdbcProvider extends DatasourceProvider{ String password = null; String driver = null; String jdbcurl = null; - DatasourceTypes datasourceType = DatasourceTypes.valueOf(getType()); + DatasourceTypes datasourceType = DatasourceTypes.valueOf(getDatasource().getType()); switch (datasourceType){ case mysql: - MysqlConfigrationDTO mysqlConfigrationDTO = new Gson().fromJson(getDataSourceConfigration(), MysqlConfigrationDTO.class); + MysqlConfigrationDTO mysqlConfigrationDTO = new Gson().fromJson(getDatasource().getConfiguration(), MysqlConfigrationDTO.class); username = mysqlConfigrationDTO.getUsername(); password = mysqlConfigrationDTO.getPassword(); driver = mysqlConfigrationDTO.getDriver(); 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 8c9f7269da..1866664756 100644 --- a/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java +++ b/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java @@ -19,7 +19,9 @@ 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); 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 de19c05a31..f347cce465 100644 --- a/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java +++ b/backend/src/main/java/io/dataease/datasource/service/DatasourceService.java @@ -3,10 +3,12 @@ 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 org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,6 +27,11 @@ public class DatasourceService { private DatasourceMapper datasourceMapper; public Datasource addDatasource(Datasource datasource) { + DatasourceExample example = new DatasourceExample(); + example.createCriteria().andNameEqualTo(datasource.getName()); + if(CollectionUtils.isNotEmpty(datasourceMapper.selectByExample(example))){ + DEException.throwException("Exist data connection with the same name "); + } long currentTimeMillis = System.currentTimeMillis(); datasource.setId(UUID.randomUUID().toString()); datasource.setUpdateTime(currentTimeMillis); @@ -43,7 +50,7 @@ public class DatasourceService { criteria.andTypeEqualTo(request.getType()); } example.setOrderByClause("update_time desc"); - return datasourceMapper.selectByExample(example); + return datasourceMapper.selectByExampleWithBLOBs(example); } public void deleteDatasource(String datasourceId) { @@ -58,7 +65,7 @@ public class DatasourceService { public void validate(Datasource datasource)throws Exception { DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType()); - datasourceProvider.setDataSourceConfigration(datasource.getConfiguration()); + datasourceProvider.setDatasource(datasource); datasourceProvider.test(); } diff --git a/backend/src/main/java/io/dataease/security/UserModularRealmAuthenticator.java b/backend/src/main/java/io/dataease/security/UserModularRealmAuthenticator.java index c9993ac7cc..6b06ab34c7 100644 --- a/backend/src/main/java/io/dataease/security/UserModularRealmAuthenticator.java +++ b/backend/src/main/java/io/dataease/security/UserModularRealmAuthenticator.java @@ -1,6 +1,6 @@ package io.dataease.security; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; @@ -35,7 +35,7 @@ public class UserModularRealmAuthenticator extends ModularRealmAuthenticator { } if (typeRealms.size() == 0) { - MSException.throwException("No realm"); + DEException.throwException("No realm"); } // 判断是单Realm还是多Realm if (typeRealms.size() == 1) { diff --git a/backend/src/main/java/io/dataease/service/FileService.java b/backend/src/main/java/io/dataease/service/FileService.java index 3a978556aa..da799316cc 100644 --- a/backend/src/main/java/io/dataease/service/FileService.java +++ b/backend/src/main/java/io/dataease/service/FileService.java @@ -6,7 +6,7 @@ import io.dataease.base.mapper.FileMetadataMapper; import io.dataease.base.mapper.LoadTestFileMapper; import io.dataease.base.mapper.TestCaseFileMapper; import io.dataease.commons.constants.FileType; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import org.springframework.web.multipart.MultipartFile; @@ -100,7 +100,7 @@ public class FileService { try { fileContent.setFile(file.getBytes()); } catch (IOException e) { - MSException.throwException(e); + DEException.throwException(e); } fileContentMapper.insert(fileContent); diff --git a/backend/src/main/java/io/dataease/service/NodeResourcePoolService.java b/backend/src/main/java/io/dataease/service/NodeResourcePoolService.java index 82c2f17cd0..82e9a5ef31 100644 --- a/backend/src/main/java/io/dataease/service/NodeResourcePoolService.java +++ b/backend/src/main/java/io/dataease/service/NodeResourcePoolService.java @@ -5,7 +5,7 @@ import io.dataease.base.domain.TestResource; import io.dataease.base.domain.TestResourceExample; import io.dataease.base.mapper.TestResourceMapper; import io.dataease.commons.constants.ResourceStatusEnum; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.LogUtil; import io.dataease.dto.NodeDTO; import io.dataease.dto.TestResourcePoolDTO; @@ -36,7 +36,7 @@ public class NodeResourcePoolService { public boolean validate(TestResourcePoolDTO testResourcePool) { if (CollectionUtils.isEmpty(testResourcePool.getResources())) { - MSException.throwException(Translator.get("no_nodes_message")); + DEException.throwException(Translator.get("no_nodes_message")); } deleteTestResource(testResourcePool.getId()); @@ -48,7 +48,7 @@ public class NodeResourcePoolService { .distinct() .collect(Collectors.toList()); if (Ip_Port.size() < testResourcePool.getResources().size()) { - MSException.throwException(Translator.get("duplicate_node_ip_port")); + DEException.throwException(Translator.get("duplicate_node_ip_port")); } testResourcePool.setStatus(VALID.name()); boolean isValid = true; diff --git a/backend/src/main/java/io/dataease/service/OrganizationService.java b/backend/src/main/java/io/dataease/service/OrganizationService.java index d8ed35dce8..4e85574f45 100644 --- a/backend/src/main/java/io/dataease/service/OrganizationService.java +++ b/backend/src/main/java/io/dataease/service/OrganizationService.java @@ -8,7 +8,7 @@ import io.dataease.base.mapper.WorkspaceMapper; import io.dataease.base.mapper.ext.ExtOrganizationMapper; import io.dataease.base.mapper.ext.ExtUserRoleMapper; import io.dataease.commons.constants.RoleConstants; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.commons.user.SessionUser; import io.dataease.commons.utils.SessionUtils; import io.dataease.controller.request.OrganizationRequest; @@ -69,7 +69,7 @@ public class OrganizationService { private void checkOrganization(Organization organization) { if (StringUtils.isBlank(organization.getName())) { - MSException.throwException(Translator.get("organization_name_is_null")); + DEException.throwException(Translator.get("organization_name_is_null")); } OrganizationExample example = new OrganizationExample(); @@ -80,7 +80,7 @@ public class OrganizationService { } if (organizationMapper.countByExample(example) > 0) { - MSException.throwException(Translator.get("organization_name_already_exists")); + DEException.throwException(Translator.get("organization_name_already_exists")); } } @@ -175,7 +175,7 @@ public class OrganizationService { .map(UserRole::getSourceId) .collect(Collectors.toList()); if (!collect.contains(organizationId)) { - MSException.throwException(Translator.get("organization_does_not_belong_to_user")); + DEException.throwException(Translator.get("organization_does_not_belong_to_user")); } } } diff --git a/backend/src/main/java/io/dataease/service/UserKeyService.java b/backend/src/main/java/io/dataease/service/UserKeyService.java index b102c10217..44a8bf27f9 100644 --- a/backend/src/main/java/io/dataease/service/UserKeyService.java +++ b/backend/src/main/java/io/dataease/service/UserKeyService.java @@ -4,7 +4,7 @@ import io.dataease.base.domain.UserKey; import io.dataease.base.domain.UserKeyExample; import io.dataease.base.mapper.UserKeyMapper; import io.dataease.commons.constants.ApiKeyConstants; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.i18n.Translator; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.stereotype.Service; @@ -32,14 +32,14 @@ public class UserKeyService { public UserKey generateUserKey(String userId) { if (userService.getUserDTO(userId) == null) { - MSException.throwException(Translator.get("user_not_exist") + userId); + DEException.throwException(Translator.get("user_not_exist") + userId); } UserKeyExample userKeysExample = new UserKeyExample(); userKeysExample.createCriteria().andUserIdEqualTo(userId); List userKeysList = userKeyMapper.selectByExample(userKeysExample); if (!CollectionUtils.isEmpty(userKeysList) && userKeysList.size() >= 5) { - MSException.throwException(Translator.get("user_apikey_limit")); + DEException.throwException(Translator.get("user_apikey_limit")); } UserKey userKeys = new UserKey(); diff --git a/backend/src/main/java/io/dataease/service/UserService.java b/backend/src/main/java/io/dataease/service/UserService.java index 6509d0d9a6..40cbed9078 100644 --- a/backend/src/main/java/io/dataease/service/UserService.java +++ b/backend/src/main/java/io/dataease/service/UserService.java @@ -7,7 +7,7 @@ import io.dataease.base.mapper.ext.ExtUserRoleMapper; import io.dataease.commons.constants.RoleConstants; import io.dataease.commons.constants.UserSource; import io.dataease.commons.constants.UserStatus; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.commons.user.SessionUser; import io.dataease.commons.utils.CodingUtil; import io.dataease.commons.utils.CommonBeanFactory; @@ -69,7 +69,7 @@ public class UserService { String id = user.getId(); User user1 = userMapper.selectByPrimaryKey(id); if (user1 != null) { - MSException.throwException(Translator.get("user_id_already_exists")); + DEException.throwException(Translator.get("user_id_already_exists")); } else { createUser(user); } @@ -130,15 +130,15 @@ public class UserService { private void checkUserParam(User user) { if (StringUtils.isBlank(user.getId())) { - MSException.throwException(Translator.get("user_id_is_null")); + DEException.throwException(Translator.get("user_id_is_null")); } if (StringUtils.isBlank(user.getName())) { - MSException.throwException(Translator.get("user_name_is_null")); + DEException.throwException(Translator.get("user_name_is_null")); } if (StringUtils.isBlank(user.getEmail())) { - MSException.throwException(Translator.get("user_email_is_null")); + DEException.throwException(Translator.get("user_email_is_null")); } // password } @@ -182,7 +182,7 @@ public class UserService { criteria.andEmailEqualTo(email); List userList = userMapper.selectByExample(userExample); if (!CollectionUtils.isEmpty(userList)) { - MSException.throwException(Translator.get("user_email_already_exists")); + DEException.throwException(Translator.get("user_email_already_exists")); } } @@ -267,7 +267,7 @@ public class UserService { public void deleteUser(String userId) { SessionUser user = SessionUtils.getUser(); if (StringUtils.equals(user.getId(), userId)) { - MSException.throwException(Translator.get("cannot_delete_current_user")); + DEException.throwException(Translator.get("cannot_delete_current_user")); } UserRoleExample example = new UserRoleExample(); @@ -303,7 +303,7 @@ public class UserService { criteria.andEmailEqualTo(user.getEmail()); criteria.andIdNotEqualTo(user.getId()); if (userMapper.countByExample(example) > 0) { - MSException.throwException(Translator.get("user_email_already_exists")); + DEException.throwException(Translator.get("user_email_already_exists")); } user.setUpdateTime(System.currentTimeMillis()); @@ -318,7 +318,7 @@ public class UserService { criteria.andEmailEqualTo(user.getEmail()); criteria.andIdNotEqualTo(user.getId()); if (userMapper.countByExample(example) > 0) { - MSException.throwException(Translator.get("user_email_already_exists")); + DEException.throwException(Translator.get("user_email_already_exists")); } } user.setPassword(null); @@ -371,7 +371,7 @@ public class UserService { userRoleExample.createCriteria().andUserIdEqualTo(userId).andSourceIdEqualTo(request.getWorkspaceId()); List userRoles = userRoleMapper.selectByExample(userRoleExample); if (userRoles.size() > 0) { - MSException.throwException(Translator.get("user_already_exists")); + DEException.throwException(Translator.get("user_already_exists")); } else { for (String roleId : request.getRoleIds()) { UserRole userRole = new UserRole(); @@ -410,7 +410,7 @@ public class UserService { userRoleExample.createCriteria().andUserIdEqualTo(userId).andSourceIdEqualTo(request.getOrganizationId()); List userRoles = userRoleMapper.selectByExample(userRoleExample); if (userRoles.size() > 0) { - MSException.throwException(Translator.get("user_already_exists") + ": " + userId); + DEException.throwException(Translator.get("user_already_exists") + ": " + userId); } else { for (String roleId : request.getRoleIds()) { UserRole userRole = new UserRole(); @@ -451,10 +451,10 @@ public class UserService { public boolean checkUserPassword(String userId, String password) { if (StringUtils.isBlank(userId)) { - MSException.throwException(Translator.get("user_name_is_null")); + DEException.throwException(Translator.get("user_name_is_null")); } if (StringUtils.isBlank(password)) { - MSException.throwException(Translator.get("password_is_null")); + DEException.throwException(Translator.get("password_is_null")); } UserExample example = new UserExample(); example.createCriteria().andIdEqualTo(userId).andPasswordEqualTo(CodingUtil.md5(password)); @@ -511,7 +511,7 @@ public class UserService { user.setUpdateTime(System.currentTimeMillis()); return user; } - MSException.throwException(Translator.get("password_modification_failed")); + DEException.throwException(Translator.get("password_modification_failed")); return null; } diff --git a/backend/src/main/java/io/dataease/service/WorkspaceService.java b/backend/src/main/java/io/dataease/service/WorkspaceService.java index 5bc9f369e1..c5a0e3b280 100644 --- a/backend/src/main/java/io/dataease/service/WorkspaceService.java +++ b/backend/src/main/java/io/dataease/service/WorkspaceService.java @@ -9,7 +9,7 @@ import io.dataease.base.mapper.ext.ExtOrganizationMapper; import io.dataease.base.mapper.ext.ExtUserRoleMapper; import io.dataease.base.mapper.ext.ExtWorkspaceMapper; import io.dataease.commons.constants.RoleConstants; -import io.dataease.commons.exception.MSException; +import io.dataease.commons.exception.DEException; import io.dataease.commons.user.SessionUser; import io.dataease.commons.utils.SessionUtils; import io.dataease.controller.request.WorkspaceRequest; @@ -51,7 +51,7 @@ public class WorkspaceService { public Workspace saveWorkspace(Workspace workspace) { if (StringUtils.isBlank(workspace.getName())) { - MSException.throwException(Translator.get("workspace_name_is_null")); + DEException.throwException(Translator.get("workspace_name_is_null")); } // set organization id String currentOrgId = SessionUtils.getCurrentOrganizationId(); @@ -128,7 +128,7 @@ public class WorkspaceService { .andOrganizationIdIn(orgIds) .andIdEqualTo(workspaceId); if (workspaceMapper.countByExample(example) == 0) { - MSException.throwException(Translator.get("workspace_does_not_belong_to_user")); + DEException.throwException(Translator.get("workspace_does_not_belong_to_user")); } } @@ -154,7 +154,7 @@ public class WorkspaceService { .collect(Collectors.toList()); boolean contains = wsIds.contains(workspaceId); if (size == 0 && !contains) { - MSException.throwException(Translator.get("workspace_does_not_belong_to_user")); + DEException.throwException(Translator.get("workspace_does_not_belong_to_user")); } } @@ -162,7 +162,7 @@ public class WorkspaceService { WorkspaceExample example = new WorkspaceExample(); example.createCriteria().andIdEqualTo(workspaceId); if (workspaceMapper.countByExample(example) == 0) { - MSException.throwException(Translator.get("workspace_not_exists")); + DEException.throwException(Translator.get("workspace_not_exists")); } } @@ -257,10 +257,10 @@ public class WorkspaceService { private void checkWorkspace(Workspace workspace) { if (StringUtils.isBlank(workspace.getName())) { - MSException.throwException(Translator.get("workspace_name_is_null")); + DEException.throwException(Translator.get("workspace_name_is_null")); } if (StringUtils.isBlank(workspace.getOrganizationId())) { - MSException.throwException(Translator.get("organization_id_is_null")); + DEException.throwException(Translator.get("organization_id_is_null")); } WorkspaceExample example = new WorkspaceExample(); @@ -272,7 +272,7 @@ public class WorkspaceService { } if (workspaceMapper.countByExample(example) > 0) { - MSException.throwException(Translator.get("workspace_name_already_exists")); + DEException.throwException(Translator.get("workspace_name_already_exists")); } } diff --git a/backend/src/main/java/io/dataease/service/sys/DeptService.java b/backend/src/main/java/io/dataease/service/sys/DeptService.java new file mode 100644 index 0000000000..a3190aea3c --- /dev/null +++ b/backend/src/main/java/io/dataease/service/sys/DeptService.java @@ -0,0 +1,48 @@ +package io.dataease.service.sys; + +import io.dataease.base.domain.SysDept; +import io.dataease.base.domain.SysDeptExample; +import io.dataease.base.mapper.SysDeptMapper; +import org.apache.commons.lang3.ObjectUtils; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +@Service +public class DeptService { + + private final static Integer DEPT_ROOT_LEVEL = 0; + + @Resource + private SysDeptMapper sysDeptMapper; + + public List root(){ + SysDeptExample example = new SysDeptExample(); + example.createCriteria().andLevelEqualTo(DEPT_ROOT_LEVEL); + example.setOrderByClause("dept_sort"); + List sysDepts = sysDeptMapper.selectByExample(example); + return sysDepts; + } + + public boolean add(SysDept sysDept){ + if (ObjectUtils.isEmpty(sysDept.getLevel())){ + sysDept.setLevel(DEPT_ROOT_LEVEL); + } + Date now = new Date(); + sysDept.setCreateTime(now); + sysDept.setUpdateTime(now); + sysDept.setCreateBy(null); + sysDept.setUpdateBy(null); + try { + int insert = sysDeptMapper.insert(sysDept); + if (insert == 1){ + return true; + } + }catch (Exception e){ + return false; + } + return false; + } + +} diff --git a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql index df787a2b62..1743b2210b 100644 --- a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql +++ b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql @@ -334,5 +334,25 @@ CREATE TABLE IF NOT EXISTS `test_case_report` ( -- track end +-- dataset start +CREATE TABLE IF NOT EXISTS `dataset_group` ( + `id` varchar(50) NOT NULL COMMENT 'ID', + `name` varchar(64) NOT NULL COMMENT '名称', + `pid` varchar(50) COMMENT '父级ID', + `level` int(10) 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_scene` ( + `id` varchar(50) NOT NULL COMMENT 'ID', + `name` varchar(64) NOT NULL COMMENT '名称', + `group_id` varchar(50) COMMENT 'DataSet Group ID', + `create_by` varchar(50) COMMENT '创建人ID', + `create_time` bigint(13) COMMENT '创建时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- dataset end diff --git a/frontend/src/business/App.vue b/frontend/src/business/App.vue index 6362aa95bd..5d5e6938a6 100644 --- a/frontend/src/business/App.vue +++ b/frontend/src/business/App.vue @@ -27,7 +27,7 @@ import MsTopMenus from "./components/common/head/HeaderTopMenus"; import MsView from "./components/common/router/View"; import MsUser from "./components/common/head/HeaderUser"; -import MsHeaderOrgWs from "./components/common/head/HeaderOrgWs"; +// import MsHeaderOrgWs from "./components/common/head/HeaderOrgWs"; import MsLanguageSwitch from "./components/common/head/LanguageSwitch"; import {saveLocalStorage} from "@/common/js/utils"; @@ -80,7 +80,7 @@ export default { MsUser, MsView, MsTopMenus, - MsHeaderOrgWs, + // MsHeaderOrgWs, "LicenseMessage": header.default } } diff --git a/frontend/src/business/components/common/components/MsDialogFooter.vue b/frontend/src/business/components/common/components/MsDialogFooter.vue index 8f86fd508b..d28cb3dc0f 100644 --- a/frontend/src/business/components/common/components/MsDialogFooter.vue +++ b/frontend/src/business/components/common/components/MsDialogFooter.vue @@ -2,7 +2,8 @@
{{$t('commons.cancel')}} - {{$t('commons.confirm')}} + {{$t('commons.validate')}} + {{$t('commons.confirm')}} {{title}}
@@ -16,12 +17,23 @@ type: Boolean, default: false, }, + isShowValidate: { + type: Boolean, + default: false, + }, + disabled: { + type: Boolean, + default: false, + }, title:String, }, methods: { cancel() { this.$emit("cancel"); }, + validate() { + this.$emit("validate"); + }, confirm() { this.$emit("confirm"); }, diff --git a/frontend/src/business/components/common/head/AboutUs.vue b/frontend/src/business/components/common/head/AboutUs.vue index 29172a6eca..f3adf27d12 100644 --- a/frontend/src/business/components/common/head/AboutUs.vue +++ b/frontend/src/business/components/common/head/AboutUs.vue @@ -57,9 +57,10 @@ this.dialogVisible = true; }, getVersion() { - this.$get('/system/version', response => { - this.version = response.data; - }); + // this.$get('/system/version', response => { + // this.version = response.data; + // }); + this.version = "1.0" } } } diff --git a/frontend/src/business/components/common/head/HeaderTopMenus.vue b/frontend/src/business/components/common/head/HeaderTopMenus.vue index 8864d8df1e..aab3357a99 100644 --- a/frontend/src/business/components/common/head/HeaderTopMenus.vue +++ b/frontend/src/business/components/common/head/HeaderTopMenus.vue @@ -14,9 +14,9 @@ {{ $t('commons.api') }} - - {{ $t('commons.performance') }} + {{ $t('commons.dataset') }} {{ $t('commons.system_setting') }} diff --git a/frontend/src/business/components/common/router/router.js b/frontend/src/business/components/common/router/router.js index a7dbdbce6f..47cfe18eda 100644 --- a/frontend/src/business/components/common/router/router.js +++ b/frontend/src/business/components/common/router/router.js @@ -3,7 +3,8 @@ import VueRouter from 'vue-router' import RouterSidebar from "./RouterSidebar"; import Setting from "@/business/components/settings/router"; import API from "@/business/components/api/router"; -import Performance from "@/business/components/performance/router"; +// import Performance from "@/business/components/performance/router"; +import DataSet from "@/business/components/dataset/router"; import Track from "@/business/components/track/router"; Vue.use(VueRouter); @@ -19,7 +20,8 @@ const router = new VueRouter({ }, Setting, API, - Performance, + // Performance, + DataSet, Track, ] }); diff --git a/frontend/src/business/components/dataset/DataSet.vue b/frontend/src/business/components/dataset/DataSet.vue new file mode 100644 index 0000000000..20dda22ca0 --- /dev/null +++ b/frontend/src/business/components/dataset/DataSet.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/frontend/src/business/components/dataset/group/Group.vue b/frontend/src/business/components/dataset/group/Group.vue new file mode 100644 index 0000000000..e570ce94a9 --- /dev/null +++ b/frontend/src/business/components/dataset/group/Group.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/frontend/src/business/components/dataset/router.js b/frontend/src/business/components/dataset/router.js new file mode 100644 index 0000000000..ea2324d7cd --- /dev/null +++ b/frontend/src/business/components/dataset/router.js @@ -0,0 +1,66 @@ + +const DataSet = () => import('@/business/components/dataset/DataSet'); +// const PerformanceTestHome = () => import('@/business/components/performance/home/PerformanceTestHome') +// const EditPerformanceTest = () => import('@/business/components/performance/test/EditPerformanceTest') +// const PerformanceTestList = () => import('@/business/components/performance/test/PerformanceTestList') +// const PerformanceTestReport = () => import('@/business/components/performance/report/PerformanceTestReport') +// const PerformanceChart = () => import('@/business/components/performance/report/components/PerformanceChart') +// const PerformanceReportView = () => import('@/business/components/performance/report/PerformanceReportView') + +export default { + path: "/dataset", + name: "dataset", + // redirect: "/dataset/home", + components: { + content: DataSet + }, + children: [ + // { + // path: 'home', + // name: 'datasetHome', + // component: PerformanceTestHome, + // }, + // { + // path: 'test/create', + // name: "createPerTest", + // component: EditPerformanceTest, + // }, + // { + // path: "test/edit/:testId", + // name: "editPerTest", + // component: EditPerformanceTest, + // props: { + // content: (route) => { + // return { + // ...route.params + // } + // } + // } + // }, + // { + // path: "test/:projectId", + // name: "perPlan", + // component: PerformanceTestList + // }, + // { + // path: "project/:type", + // name: "perProject", + // component: MsProject + // }, + // { + // path: "report/:type", + // name: "perReport", + // component: PerformanceTestReport + // }, + // { + // path: "chart", + // name: "perChart", + // component: PerformanceChart + // }, + // { + // path: "report/view/:reportId", + // name: "perReportView", + // component: PerformanceReportView + // } + ] +} diff --git a/frontend/src/business/components/settings/SettingMenu.vue b/frontend/src/business/components/settings/SettingMenu.vue index e9a6b423c3..6c3bf5df7e 100644 --- a/frontend/src/business/components/settings/SettingMenu.vue +++ b/frontend/src/business/components/settings/SettingMenu.vue @@ -10,7 +10,7 @@ - + @@ -212,7 +149,6 @@ import MsTableOperatorButton from "../../common/components/MsTableOperatorButton"; import MsDialogFooter from "../../common/components/MsDialogFooter"; import { - getCurrentOrganizationId, getCurrentUser, listenGoBack, refreshSessionAndCookies, @@ -222,7 +158,7 @@ import MsDeleteConfirm from "../../common/components/MsDeleteConfirm"; export default { - name: "DeDatasource", + name: "DEDatasource", components: { MsDeleteConfirm, MsCreateBox, @@ -239,6 +175,7 @@ deletePath: '/datasource/delete/', createPath: '/datasource/add', updatePath: '/datasource/update', + validatePath: '/datasource/validate', result: {}, dialogDatasourceAddVisible: false, dialogDatasourceUpdateVisible: false, @@ -288,17 +225,6 @@ this.dialogDatasourceAddVisible = true; listenGoBack(this.closeFunc); }, - addMember() { - this.dialogDatasourceMemberAddVisible = true; - this.memberForm = {}; - this.result = this.$get('/user/list/', response => { - this.$set(this.memberForm, "userList", response.data); - this.$set(this.memberForm, "copyUserList", response.data); - }); - this.result = this.$get('/role/list/org', response => { - this.$set(this.memberForm, "roles", response.data); - }) - }, dataFilter(val) { if (val) { this.memberForm.userList = this.memberForm.copyUserList.filter((item) => { @@ -313,17 +239,7 @@ edit(row) { this.dialogDatasourceUpdateVisible = true; this.form = Object.assign({}, row); - listenGoBack(this.closeFunc); - }, - editMember(row) { - this.dialogDatasourceMemberUpdateVisible = true; - this.memberForm = Object.assign({}, row); - let roleIds = this.memberForm.roles.map(r => r.id); - this.result = this.$get('/role/list/org', response => { - this.$set(this.memberForm, "allroles", response.data); - }) - // 编辑时填充角色信息 - this.$set(this.memberForm, 'roleIds', roleIds); + this.form.configuration = JSON.parse(this.form.configuration); listenGoBack(this.closeFunc); }, cellClick(row) { @@ -368,21 +284,16 @@ this.dialogTotal = data.itemCount; }); }, - handleDelete(organization) { - this.$refs.deleteConfirm.open(organization); + handleDelete(datasource) { + this.$refs.deleteConfirm.open(datasource); }, - _handleDelete(organization) { - this.$confirm(this.$t('organization.delete_confirm'), '', { + _handleDelete(datasource) { + this.$confirm(this.$t('datasource.delete_confirm'), '', { confirmButtonText: this.$t('commons.confirm'), cancelButtonText: this.$t('commons.cancel'), type: 'warning' }).then(() => { - this.result = this.$get(this.deletePath + organization.id, () => { - let lastOrganizationId = getCurrentOrganizationId(); - let sourceId = organization.id; - if (lastOrganizationId === sourceId) { - refreshSessionAndCookies(DEFAULT, sourceId); - } + this.result = this.$get(this.deletePath + datasource.id, () => { this.$success(this.$t('commons.delete_success')); this.initTableData(); }); @@ -393,46 +304,25 @@ }); }); }, - delMember(row) { - this.$confirm(this.$t('member.remove_member'), '', { - confirmButtonText: this.$t('commons.confirm'), - cancelButtonText: this.$t('commons.cancel'), - type: 'warning' - }).then(() => { - this.result = this.$get('/user/special/org/member/delete/' + this.currentRow.id + '/' + encodeURIComponent(row.id), () => { - let sourceId = this.currentRow.id; - let currentUser = getCurrentUser(); - let userId = row.id; - if (currentUser.id === userId) { - refreshSessionAndCookies(ORGANIZATION, sourceId); - } - this.$success(this.$t('commons.remove_success')) - this.cellClick(this.currentRow); - }); - }).catch(() => { - this.$info(this.$t('commons.remove_cancel')); - }); - }, createDatasource(createDatasourceForm) { this.$refs[createDatasourceForm].validate(valid => { if (valid) { this.form.configuration = JSON.stringify(this.form.configuration); this.result = this.$post(this.createPath, this.form, () => { - console.log('aaaaa'); this.$success(this.$t('commons.save_success')); this.initTableData(); this.dialogDatasourceAddVisible = false; }, ()=>{ console.log('bbbb');}); - console.log(this.result); this.dialogDatasourceAddVisible = false; } else { return false; } }) }, - updateOrganization(updateOrganizationForm) { - this.$refs[updateOrganizationForm].validate(valid => { + updateDatasource(updateDatasourceForm) { + this.$refs[updateDatasourceForm].validate(valid => { if (valid) { + this.form.configuration = JSON.stringify(this.form.configuration); this.result = this.$post(this.updatePath, this.form, () => { this.$success(this.$t('commons.modify_success')); this.dialogDatasourceUpdateVisible = false; @@ -443,6 +333,19 @@ } }) }, + validaDatasource(datasourceForm) { + this.$refs[datasourceForm].validate(valid => { + if (valid) { + let data = JSON.parse(JSON.stringify(this.form)); + data.configuration = JSON.stringify(data.configuration); + this.result = this.$post(this.validatePath, data, () => { + this.$success(this.$t('datasource.validate_success')); + }); + } else { + return false; + } + }) + }, initTableData() { this.result = this.$post(this.queryPath + "/" + this.currentPage + "/" + this.pageSize, this.condition, response => { let data = response.data; @@ -464,45 +367,6 @@ handleSelectionChange(val) { this.multipleSelection = val; }, - submitForm(formName) { - this.$refs[formName].validate((valid) => { - if (valid) { - let param = { - userIds: this.memberForm.userIds, - roleIds: this.memberForm.roleIds, - organizationId: this.currentRow.id - }; - this.result = this.$post("user/special/org/member/add", param, () => { - let sign = "other"; - let sourceId = this.currentRow.id; - refreshSessionAndCookies(sign, sourceId); - this.cellClick(this.currentRow); - this.dialogDatasourceMemberAddVisible = false; - }) - } else { - return false; - } - }); - }, - updateOrgMember(formName) { - let param = { - id: this.memberForm.id, - name: this.memberForm.name, - email: this.memberForm.email, - phone: this.memberForm.phone, - roleIds: this.memberForm.roleIds, - organizationId: this.currentRow.id - } - this.$refs[formName].validate((valid) => { - if (valid) { - this.result = this.$post("/organization/member/update", param, () => { - this.$success(this.$t('commons.modify_success')); - this.dialogDatasourceMemberUpdateVisible = false; - this.cellClick(this.currentRow); - }); - } - }); - }, } } diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 423905fd6f..9fcaadd8f9 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -60,7 +60,7 @@ export default { test_resource_pool: 'Resource Pool', system_setting: 'Settings', api: 'API', - performance: 'Performance', + dataset: 'DataSet', functional: 'Functional test', input_content: 'Please enter content', create: 'Create', @@ -1518,5 +1518,10 @@ export default { delete_prompt: 'This operation will delete the authentication source, do you want to continue? ', title: 'Auth Source', auth_name_valid: 'Name does not support special characters', + }, + dataset:{ + datalist:'Data List', + add_group:'Add Group', + add_scene:'Add Scene' } }; diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 14cb737e8d..31a9cc3a6f 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -61,7 +61,7 @@ export default { test_resource_pool: '測試資源池', system_setting: '系統設置', api: '接口測試', - performance: '性能測試', + dataset: '數據', functional: '功能測試', input_content: '請輸入內容', create: '新建', @@ -1519,5 +1519,10 @@ export default { delete_prompt: '此操作會刪除認證源，是否繼續？ ', title: '認證設置', auth_name_valid: '名稱不支持特殊字符', + }, + dataset:{ + datalist:'數據列表', + add_group:'添加分組', + add_scene:'添加場景' } };