From b29c00627d198cf5a0ba9d677071a96aa8e57fef Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 24 Feb 2022 21:54:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=B0=86=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=9D=BF=E8=A7=86=E5=9B=BE=E9=83=BD?= =?UTF-8?q?=E5=BD=92=E5=B1=9E=E4=BB=AA=E8=A1=A8=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/domain/DataeaseCodeVersion.java | 18 + .../domain/DataeaseCodeVersionExample.java | 451 ++++++++++++++++++ .../mapper/DataeaseCodeVersionMapper.java | 30 ++ .../base/mapper/DataeaseCodeVersionMapper.xml | 196 ++++++++ .../base/mapper/ext/DEVersionMapper.java | 10 + .../base/mapper/ext/DEVersionMapper.xml | 12 + .../base/mapper/ext/ExtPanelGroupMapper.java | 2 + .../base/mapper/ext/ExtPanelGroupMapper.xml | 4 + .../base/mapper/ext/ExtPanelViewMapper.java | 1 + .../base/mapper/ext/ExtVAuthModelMapper.xml | 1 - .../dataease/listener/SystemInitListener.java | 56 +++ .../service/panel/PanelGroupService.java | 92 +++- .../service/panel/PanelViewService.java | 4 +- .../main/resources/db/migration/V32__1.8.sql | 19 +- .../src/main/resources/generatorConfig.xml | 15 +- 15 files changed, 876 insertions(+), 35 deletions(-) create mode 100644 backend/src/main/java/io/dataease/base/domain/DataeaseCodeVersion.java create mode 100644 backend/src/main/java/io/dataease/base/domain/DataeaseCodeVersionExample.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/DataeaseCodeVersionMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/DataeaseCodeVersionMapper.xml create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/DEVersionMapper.java create mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/DEVersionMapper.xml create mode 100644 backend/src/main/java/io/dataease/listener/SystemInitListener.java diff --git a/backend/src/main/java/io/dataease/base/domain/DataeaseCodeVersion.java b/backend/src/main/java/io/dataease/base/domain/DataeaseCodeVersion.java new file mode 100644 index 0000000000..e966b96e15 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DataeaseCodeVersion.java @@ -0,0 +1,18 @@ +package io.dataease.base.domain; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +@Data +public class DataeaseCodeVersion implements Serializable { + private Integer installedRank; + + private String description; + + private Date installedOn; + + private Boolean success; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/domain/DataeaseCodeVersionExample.java b/backend/src/main/java/io/dataease/base/domain/DataeaseCodeVersionExample.java new file mode 100644 index 0000000000..baa8776c04 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/domain/DataeaseCodeVersionExample.java @@ -0,0 +1,451 @@ +package io.dataease.base.domain; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class DataeaseCodeVersionExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public DataeaseCodeVersionExample() { + 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 andInstalledRankIsNull() { + addCriterion("installed_rank is null"); + return (Criteria) this; + } + + public Criteria andInstalledRankIsNotNull() { + addCriterion("installed_rank is not null"); + return (Criteria) this; + } + + public Criteria andInstalledRankEqualTo(Integer value) { + addCriterion("installed_rank =", value, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankNotEqualTo(Integer value) { + addCriterion("installed_rank <>", value, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankGreaterThan(Integer value) { + addCriterion("installed_rank >", value, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankGreaterThanOrEqualTo(Integer value) { + addCriterion("installed_rank >=", value, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankLessThan(Integer value) { + addCriterion("installed_rank <", value, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankLessThanOrEqualTo(Integer value) { + addCriterion("installed_rank <=", value, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankIn(List values) { + addCriterion("installed_rank in", values, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankNotIn(List values) { + addCriterion("installed_rank not in", values, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankBetween(Integer value1, Integer value2) { + addCriterion("installed_rank between", value1, value2, "installedRank"); + return (Criteria) this; + } + + public Criteria andInstalledRankNotBetween(Integer value1, Integer value2) { + addCriterion("installed_rank not between", value1, value2, "installedRank"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNull() { + addCriterion("description is null"); + return (Criteria) this; + } + + public Criteria andDescriptionIsNotNull() { + addCriterion("description is not null"); + return (Criteria) this; + } + + public Criteria andDescriptionEqualTo(String value) { + addCriterion("description =", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotEqualTo(String value) { + addCriterion("description <>", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThan(String value) { + addCriterion("description >", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionGreaterThanOrEqualTo(String value) { + addCriterion("description >=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThan(String value) { + addCriterion("description <", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLessThanOrEqualTo(String value) { + addCriterion("description <=", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionLike(String value) { + addCriterion("description like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotLike(String value) { + addCriterion("description not like", value, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionIn(List values) { + addCriterion("description in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotIn(List values) { + addCriterion("description not in", values, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionBetween(String value1, String value2) { + addCriterion("description between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andDescriptionNotBetween(String value1, String value2) { + addCriterion("description not between", value1, value2, "description"); + return (Criteria) this; + } + + public Criteria andInstalledOnIsNull() { + addCriterion("installed_on is null"); + return (Criteria) this; + } + + public Criteria andInstalledOnIsNotNull() { + addCriterion("installed_on is not null"); + return (Criteria) this; + } + + public Criteria andInstalledOnEqualTo(Date value) { + addCriterion("installed_on =", value, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnNotEqualTo(Date value) { + addCriterion("installed_on <>", value, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnGreaterThan(Date value) { + addCriterion("installed_on >", value, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnGreaterThanOrEqualTo(Date value) { + addCriterion("installed_on >=", value, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnLessThan(Date value) { + addCriterion("installed_on <", value, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnLessThanOrEqualTo(Date value) { + addCriterion("installed_on <=", value, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnIn(List values) { + addCriterion("installed_on in", values, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnNotIn(List values) { + addCriterion("installed_on not in", values, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnBetween(Date value1, Date value2) { + addCriterion("installed_on between", value1, value2, "installedOn"); + return (Criteria) this; + } + + public Criteria andInstalledOnNotBetween(Date value1, Date value2) { + addCriterion("installed_on not between", value1, value2, "installedOn"); + return (Criteria) this; + } + + public Criteria andSuccessIsNull() { + addCriterion("success is null"); + return (Criteria) this; + } + + public Criteria andSuccessIsNotNull() { + addCriterion("success is not null"); + return (Criteria) this; + } + + public Criteria andSuccessEqualTo(Boolean value) { + addCriterion("success =", value, "success"); + return (Criteria) this; + } + + public Criteria andSuccessNotEqualTo(Boolean value) { + addCriterion("success <>", value, "success"); + return (Criteria) this; + } + + public Criteria andSuccessGreaterThan(Boolean value) { + addCriterion("success >", value, "success"); + return (Criteria) this; + } + + public Criteria andSuccessGreaterThanOrEqualTo(Boolean value) { + addCriterion("success >=", value, "success"); + return (Criteria) this; + } + + public Criteria andSuccessLessThan(Boolean value) { + addCriterion("success <", value, "success"); + return (Criteria) this; + } + + public Criteria andSuccessLessThanOrEqualTo(Boolean value) { + addCriterion("success <=", value, "success"); + return (Criteria) this; + } + + public Criteria andSuccessIn(List values) { + addCriterion("success in", values, "success"); + return (Criteria) this; + } + + public Criteria andSuccessNotIn(List values) { + addCriterion("success not in", values, "success"); + return (Criteria) this; + } + + public Criteria andSuccessBetween(Boolean value1, Boolean value2) { + addCriterion("success between", value1, value2, "success"); + return (Criteria) this; + } + + public Criteria andSuccessNotBetween(Boolean value1, Boolean value2) { + addCriterion("success not between", value1, value2, "success"); + 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/DataeaseCodeVersionMapper.java b/backend/src/main/java/io/dataease/base/mapper/DataeaseCodeVersionMapper.java new file mode 100644 index 0000000000..b39f1f3cc5 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DataeaseCodeVersionMapper.java @@ -0,0 +1,30 @@ +package io.dataease.base.mapper; + +import io.dataease.base.domain.DataeaseCodeVersion; +import io.dataease.base.domain.DataeaseCodeVersionExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface DataeaseCodeVersionMapper { + long countByExample(DataeaseCodeVersionExample example); + + int deleteByExample(DataeaseCodeVersionExample example); + + int deleteByPrimaryKey(Integer installedRank); + + int insert(DataeaseCodeVersion record); + + int insertSelective(DataeaseCodeVersion record); + + List selectByExample(DataeaseCodeVersionExample example); + + DataeaseCodeVersion selectByPrimaryKey(Integer installedRank); + + int updateByExampleSelective(@Param("record") DataeaseCodeVersion record, @Param("example") DataeaseCodeVersionExample example); + + int updateByExample(@Param("record") DataeaseCodeVersion record, @Param("example") DataeaseCodeVersionExample example); + + int updateByPrimaryKeySelective(DataeaseCodeVersion record); + + int updateByPrimaryKey(DataeaseCodeVersion record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/DataeaseCodeVersionMapper.xml b/backend/src/main/java/io/dataease/base/mapper/DataeaseCodeVersionMapper.xml new file mode 100644 index 0000000000..0ef4188509 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/DataeaseCodeVersionMapper.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + installed_rank, description, installed_on, success + + + + + delete from dataease_code_version + where installed_rank = #{installedRank,jdbcType=INTEGER} + + + delete from dataease_code_version + + + + + + insert into dataease_code_version (installed_rank, description, installed_on, + success) + values (#{installedRank,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR}, #{installedOn,jdbcType=TIMESTAMP}, + #{success,jdbcType=BIT}) + + + insert into dataease_code_version + + + installed_rank, + + + description, + + + installed_on, + + + success, + + + + + #{installedRank,jdbcType=INTEGER}, + + + #{description,jdbcType=VARCHAR}, + + + #{installedOn,jdbcType=TIMESTAMP}, + + + #{success,jdbcType=BIT}, + + + + + + update dataease_code_version + + + installed_rank = #{record.installedRank,jdbcType=INTEGER}, + + + description = #{record.description,jdbcType=VARCHAR}, + + + installed_on = #{record.installedOn,jdbcType=TIMESTAMP}, + + + success = #{record.success,jdbcType=BIT}, + + + + + + + + update dataease_code_version + set installed_rank = #{record.installedRank,jdbcType=INTEGER}, + description = #{record.description,jdbcType=VARCHAR}, + installed_on = #{record.installedOn,jdbcType=TIMESTAMP}, + success = #{record.success,jdbcType=BIT} + + + + + + update dataease_code_version + + + description = #{description,jdbcType=VARCHAR}, + + + installed_on = #{installedOn,jdbcType=TIMESTAMP}, + + + success = #{success,jdbcType=BIT}, + + + where installed_rank = #{installedRank,jdbcType=INTEGER} + + + update dataease_code_version + set description = #{description,jdbcType=VARCHAR}, + installed_on = #{installedOn,jdbcType=TIMESTAMP}, + success = #{success,jdbcType=BIT} + where installed_rank = #{installedRank,jdbcType=INTEGER} + + \ No newline at end of file diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/DEVersionMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/DEVersionMapper.java new file mode 100644 index 0000000000..d78bd2d447 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/DEVersionMapper.java @@ -0,0 +1,10 @@ +package io.dataease.base.mapper.ext; + +public interface DEVersionMapper { + + Integer lastSuccessDataEaseVersion(); + + Integer lastDataEaseCodeVersion(); + + +} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/DEVersionMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/DEVersionMapper.xml new file mode 100644 index 0000000000..31fdbf7c88 --- /dev/null +++ b/backend/src/main/java/io/dataease/base/mapper/ext/DEVersionMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java index 1abad5be54..d03e7e7e06 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java @@ -22,4 +22,6 @@ public interface ExtPanelGroupMapper { //移除未使用的视图 void removeUselessViews(@Param("panelId") String panelId); + List panelGroupInit(); + } diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml index 756ff29ef4..defc52803c 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml @@ -16,6 +16,10 @@ select panel_group.*,panel_group.name as label from panel_group where id =#{id} + +