Merge branch 'lisb_dev' of codeup.aliyun.com:pig/pigx/pigx into leng_dev

pigx-common/pigx-common-sequence/pom.xml

@@ -23,5 +23,10 @@
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-core</artifactId>
 		</dependency>
+		<!--mybatis plus-->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-extension</artifactId>
+		</dependency>
 	</dependencies>
 </project>

pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/BaseDbHelper.java

@@ -1,7 +1,10 @@
 package com.pig4cloud.pigx.common.sequence.range.impl.db;
 
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
 import com.pig4cloud.pigx.common.sequence.exception.SeqException;
+import com.pig4cloud.pigx.common.sequence.range.impl.db.provider.SqlProviderFactory;
 
 import javax.sql.DataSource;
 import java.sql.*;
@@ -13,21 +16,10 @@ import java.sql.*;
  */
 abstract class BaseDbHelper {
 
+	private static final SqlProviderFactory SQL_PROVIDER_FACTORY = SpringUtil.getBean(SqlProviderFactory.class);
+
 	private static final long DELTA = 100000000L;
 
-	private final static String SQL_CREATE_TABLE = "CREATE TABLE IF NOT EXISTS #tableName("
-			+ "id bigint(20) NOT NULL AUTO_INCREMENT," + "value bigint(20) NOT NULL," + "name varchar(32) NOT NULL,"
-			+ "gmt_create DATETIME NOT NULL," + "gmt_modified DATETIME NOT NULL,"
-			+ "PRIMARY KEY (`id`),UNIQUE uk_name (`name`)" + ")";
-
-	private final static String SQL_INSERT_RANGE = "INSERT IGNORE INTO #tableName(id,name,value,gmt_create,gmt_modified)"
-			+ " VALUE(?,?,?,?,?)";
-
-	private final static String SQL_UPDATE_RANGE = "UPDATE #tableName SET value=?,gmt_modified=? WHERE name=? AND "
-			+ "value=?";
-
-	private final static String SQL_SELECT_RANGE = "SELECT value FROM #tableName WHERE name=?";
-
 	/**
 	 * 创建表
 	 * @param dataSource DB来源
@@ -41,7 +33,7 @@ abstract class BaseDbHelper {
 		try {
 			conn = dataSource.getConnection();
 			stmt = conn.createStatement();
-			stmt.executeUpdate(SQL_CREATE_TABLE.replace("#tableName", tableName));
+			stmt.executeUpdate(SQL_PROVIDER_FACTORY.getCreateTableSql().replace("#tableName", tableName));
 		}
 		catch (SQLException e) {
 			throw new SeqException(e);
@@ -66,7 +58,7 @@ abstract class BaseDbHelper {
 
 		try {
 			conn = dataSource.getConnection();
-			stmt = conn.prepareStatement(SQL_INSERT_RANGE.replace("#tableName", tableName));
+			stmt = conn.prepareStatement(SQL_PROVIDER_FACTORY.getInsertRangeSql().replace("#tableName", tableName));
 			stmt.setLong(1, RandomUtil.randomLong());
 			stmt.setString(2, name);
 			stmt.setLong(3, stepStart);
@@ -99,7 +91,7 @@ abstract class BaseDbHelper {
 
 		try {
 			conn = dataSource.getConnection();
-			stmt = conn.prepareStatement(SQL_UPDATE_RANGE.replace("#tableName", tableName));
+			stmt = conn.prepareStatement(SQL_PROVIDER_FACTORY.getUpdateRangeSql().replace("#tableName", tableName));
 			stmt.setLong(1, newValue);
 			stmt.setTimestamp(2, new Timestamp(System.currentTimeMillis()));
 			stmt.setString(3, name);
@@ -132,7 +124,7 @@ abstract class BaseDbHelper {
 
 		try {
 			conn = dataSource.getConnection();
-			stmt = conn.prepareStatement(SQL_SELECT_RANGE.replace("#tableName", tableName));
+			stmt = conn.prepareStatement(SQL_PROVIDER_FACTORY.getSelectRangeSql().replace("#tableName", tableName));
 			stmt.setString(1, name);
 
 			rs = stmt.executeQuery();

pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/MysqlSqlProvider.java

@@ -0,0 +1,29 @@
+package com.pig4cloud.pigx.common.sequence.range.impl.db.provider;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import org.springframework.stereotype.Component;
+
+/**
+ * 数据源提供者
+ *
+ * @author lishangbu
+ * @date 2021/12/29
+ */
+@Component
+public class MysqlSqlProvider implements SqlProvider {
+
+	/**
+	 * 获取插入范围语句
+	 * @return
+	 */
+	@Override
+	public String getInsertRangeSql() {
+		return "INSERT IGNORE INTO #tableName(id,name,value,gmt_create,gmt_modified)" + " VALUE(?,?,?,?,?)";
+	}
+
+	@Override
+	public Boolean support(DbType dbType) {
+		return DbType.MYSQL.equals(dbType);
+	}
+
+}

pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/OracleSqlProvider.java

@@ -0,0 +1,25 @@
+package com.pig4cloud.pigx.common.sequence.range.impl.db.provider;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import org.springframework.stereotype.Component;
+
+/**
+ * oracle数据源
+ *
+ * @author lishangbu
+ * @date 2021/12/29
+ */
+@Component
+public class OracleSqlProvider implements SqlProvider {
+
+	@Override
+	public String getInsertRangeSql() {
+		return "INSERT INTO #tableName(id,name,value,gmt_create,gmt_modified)" + " VALUE(?,?,?,?,?)";
+	}
+
+	@Override
+	public Boolean support(DbType dbType) {
+		return DbType.ORACLE.equals(dbType);
+	}
+
+}

pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/SqlProvider.java

@@ -0,0 +1,47 @@
+package com.pig4cloud.pigx.common.sequence.range.impl.db.provider;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+
+/**
+ * 数据源提供者
+ *
+ * @author lishangbu
+ * @date 2021/12/29
+ */
+public interface SqlProvider {
+
+	/**
+	 * 获取建表语句
+	 * @return
+	 */
+	default String getCreateTableSql() {
+		return "CREATE TABLE IF NOT EXISTS #tableName(" + "id bigint(20) NOT NULL AUTO_INCREMENT,"
+				+ "value bigint(20) NOT NULL," + "name varchar(32) NOT NULL," + "gmt_create DATETIME NOT NULL,"
+				+ "gmt_modified DATETIME NOT NULL," + "PRIMARY KEY (`id`),UNIQUE uk_name (`name`)" + ")";
+	}
+
+	/**
+	 * 获取插入范围语句
+	 * @return
+	 */
+	String getInsertRangeSql();
+
+	/**
+	 * 获取更新范围语句
+	 * @return
+	 */
+	default String getUpdateRangeSql() {
+		return "UPDATE #tableName SET value=?,gmt_modified=? WHERE name=? AND " + "value=?";
+	}
+
+	/**
+	 * 获取查询范围语句
+	 * @return
+	 */
+	default String getSelectRangeSql() {
+		return "SELECT value FROM #tableName WHERE name=?";
+	}
+
+	Boolean support(DbType dbType);
+
+}

pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/SqlProviderFactory.java

@@ -0,0 +1,75 @@
+package com.pig4cloud.pigx.common.sequence.range.impl.db.provider;
+
+import cn.hutool.db.DbUtil;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.toolkit.JdbcUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * sql语句提供工厂
+ *
+ * @author lishangbu
+ * @date 2021/12/29
+ */
+@Lazy(value = false)
+@Component
+@RequiredArgsConstructor
+public class SqlProviderFactory {
+
+	private final List<SqlProvider> sqlProviders;
+
+	private final DataSourceProperties dataSourceProperties;
+
+	public SqlProvider getSqlProvider() {
+		String url = dataSourceProperties.getUrl();
+		DbType dbType = JdbcUtils.getDbType(url);
+		for (SqlProvider sqlProvider : sqlProviders) {
+			if (sqlProvider.support(dbType)) {
+				return sqlProvider;
+			}
+		}
+		throw new UnsupportedOperationException("不支持的数据源");
+	}
+
+	/**
+	 * 获取插入范围语句
+	 * @return 插入范围语句
+	 */
+	public String getCreateTableSql() {
+		SqlProvider sqlProvider = getSqlProvider();
+		return sqlProvider.getCreateTableSql();
+	}
+
+	/**
+	 * 获取插入范围语句
+	 * @return 插入范围语句
+	 */
+	public String getInsertRangeSql() {
+		SqlProvider sqlProvider = getSqlProvider();
+		return sqlProvider.getInsertRangeSql();
+	}
+
+	/**
+	 * 获取查询范围语句
+	 * @return
+	 */
+	public String getSelectRangeSql() {
+		SqlProvider sqlProvider = getSqlProvider();
+		return sqlProvider.getSelectRangeSql();
+	}
+
+	/**
+	 * 获取更新范围语句
+	 * @return 更新范围语句
+	 */
+	public String getUpdateRangeSql() {
+		SqlProvider sqlProvider = getSqlProvider();
+		return sqlProvider.getUpdateRangeSql();
+	}
+
+}

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java

@@ -55,7 +55,7 @@ public class SysDictItem extends Model<SysDictItem> {
 	 * 数据值
 	 */
 	@ApiModelProperty(value = "数据值")
-	private String value;
+	private String itemValue;
 
 	/**
 	 * 标签名
@@ -67,7 +67,7 @@ public class SysDictItem extends Model<SysDictItem> {
 	 * 类型
 	 */
 	@ApiModelProperty(value = "类型")
-	private String type;
+	private String dictType;
 
 	/**
 	 * 描述

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java

@@ -84,7 +84,7 @@ public class SysDictController {
 	@GetMapping("/type/{type}")
 	@Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result.data.isEmpty()")
 	public R getDictByType(@PathVariable String type) {
-		return R.ok(sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getType, type)));
+		return R.ok(sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getDictType, type)));
 	}
 
 	/**

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysTenantServiceImpl.java

@@ -172,7 +172,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
 			dictService.saveBatch(dictList.stream().peek(d -> d.setId(null)).collect(Collectors.toList()));
 			// 处理字典项最新关联的字典ID
 			List<SysDictItem> itemList = dictList.stream().flatMap(dict -> dictItemList.stream()
-					.filter(item -> item.getType().equals(dict.getDictType())).peek(item -> {
+					.filter(item -> item.getDictType().equals(dict.getDictType())).peek(item -> {
 						item.setDictId(dict.getId());
 						item.setId(null);
 					})).collect(Collectors.toList());

pigx-visual/pigx-oa-platform/src/main/java/com/pig4cloud/pigx/act/config/ActivitiConfig.java

@@ -17,6 +17,7 @@
 
 package com.pig4cloud.pigx.act.config;
 
+import com.alibaba.druid.util.DruidDataSourceUtils;
 import lombok.AllArgsConstructor;
 import org.activiti.spring.SpringProcessEngineConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -50,7 +51,6 @@ public class ActivitiConfig {
 
 		config.setDataSource(dataSource);
 		config.setTransactionManager(transactionManager);
-		config.setDatabaseType("mysql");
 		config.setDatabaseSchemaUpdate("true");
 		return config;
 	}

pigx-visual/pigx-pay-platform/pom.xml

@@ -37,6 +37,12 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.oracle.database.jdbc</groupId>
+			<artifactId>ojdbc8</artifactId>
+		</dependency>
+
 		<!-- druid 连接池 -->
 		<dependency>
 			<groupId>com.alibaba</groupId>

pigx-visual/pigx-report-platform/pom.xml

@@ -35,6 +35,11 @@
 			<version>3.3.2</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.oracle.database.jdbc</groupId>
+			<artifactId>ojdbc8</artifactId>
+		</dependency>
+
 		<!-- mysql -->
 		<dependency>
 			<groupId>mysql</groupId>

pigx-visual/pigx-report-platform/src/main/java/com/anji/plus/gaea/curd/entity/GaeaBaseEntity.java

@@ -0,0 +1,101 @@
+package com.anji.plus.gaea.curd.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.util.Date;
+
+/**
+ * 基础数据库实体
+ *
+ * @author lr
+ * @since 2021-01-12
+ */
+public class GaeaBaseEntity extends BaseEntity {
+
+	/**
+	 * 数据ID
+	 */
+	@TableId(value = "id", type = IdType.ASSIGN_ID)
+	private Long id;
+
+	/**
+	 * 创建人
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private String createBy;
+
+	/**
+	 * 创建时间
+	 */
+	@TableField(fill = FieldFill.INSERT)
+	private Date createTime;
+
+	/**
+	 * 修改人
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private String updateBy;
+
+	/**
+	 * 修改时间
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Date updateTime;
+
+	/**
+	 * 版本号
+	 * @Version:乐观锁,，需要添加mybatis plus插件optimisticLockerInterceptor
+	 */
+	@TableField(fill = FieldFill.INSERT_UPDATE, update = "%s+1")
+	@Version
+	private Integer version;
+
+	public String getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Integer getVersion() {
+		return version;
+	}
+
+	public void setVersion(Integer version) {
+		this.version = version;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+}

pigx-visual/pigx-report-platform/src/main/resources/db/schema-h2.sql

@@ -1,453 +0,0 @@
--- ----------------------------
--- Table structure for gaea_dict
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_dict`;
-CREATE TABLE `gaea_dict`
-(
-    `id`          int         NOT NULL AUTO_INCREMENT,
-    `dict_name`   varchar(64) NOT NULL COMMENT '字典名称',
-    `dict_code`   varchar(64) NOT NULL COMMENT '字典编码',
-    `remark`      varchar(64) DEFAULT NULL COMMENT '描述',
-    `create_by`   varchar(64) DEFAULT NULL COMMENT '创建人',
-    `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-    `update_by`   varchar(64) DEFAULT NULL COMMENT '更新用户',
-    `update_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
-    `version`     int         DEFAULT NULL COMMENT '版本',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='数组字典';
-
--- ----------------------------
--- Table structure for gaea_dict_item
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_dict_item`;
-CREATE TABLE `gaea_dict_item`
-(
-    `id`          int         NOT NULL AUTO_INCREMENT,
-    `dict_code`   varchar(64)   DEFAULT NULL COMMENT '数据字典编码',
-    `item_name`   varchar(64) NOT NULL COMMENT '字典项名称',
-    `item_value`  varchar(64) NOT NULL COMMENT '字典项值',
-    `item_extend` varchar(2048) DEFAULT NULL COMMENT '字典扩展项',
-    `enabled`     int           DEFAULT '1' COMMENT '1:启用 0:禁用',
-    `locale`      varchar(16)   DEFAULT NULL COMMENT '语言标识',
-    `remark`      varchar(64)   DEFAULT NULL COMMENT '描述',
-    `sort`        int           DEFAULT NULL COMMENT '排序',
-    `create_by`   varchar(64)   DEFAULT NULL COMMENT '创建人',
-    `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
-    `update_by`   varchar(64)   DEFAULT NULL COMMENT '更新用户',
-    `update_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
-    `version`     int           DEFAULT NULL COMMENT '版本',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=319 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='数据字典项';
-
--- ----------------------------
--- Table structure for gaea_file
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_file`;
-CREATE TABLE `gaea_file`
-(
-    `id`               bigint NOT NULL AUTO_INCREMENT,
-    `file_id`          varchar(64)   DEFAULT NULL COMMENT '生成的唯一uuid',
-    `file_type`        varchar(20)   DEFAULT NULL COMMENT '文件类型，字典FILE_TYPE',
-    `file_path`        varchar(1024) DEFAULT NULL COMMENT '文件在linux中的完整目录，比如/app/dist/export/excel/${fileid}.xlsx',
-    `url_path`         varchar(1024) DEFAULT NULL COMMENT '通过接口的下载完整http路径',
-    `file_instruction` varchar(1024) DEFAULT NULL COMMENT '文件内容说明，比如 对账单(202001~202012)',
-    `create_by`        varchar(64)   DEFAULT NULL,
-    `create_time`      timestamp NULL DEFAULT NULL,
-    `update_by`        varchar(64)   DEFAULT NULL,
-    `update_time`      timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
-    `version`          int           DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for gaea_report
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_report`;
-CREATE TABLE `gaea_report`
-(
-    `id`           bigint NOT NULL AUTO_INCREMENT,
-    `report_name`  varchar(100) DEFAULT NULL COMMENT '名称',
-    `report_code`  varchar(100) DEFAULT NULL COMMENT '报表编码',
-    `report_group` varchar(100) DEFAULT NULL COMMENT '分组',
-    `report_type`  varchar(20)  DEFAULT NULL COMMENT '报表类型',
-    `report_image` varchar(512) DEFAULT NULL COMMENT '报表缩略图',
-    `report_desc`  varchar(255) DEFAULT NULL COMMENT '报表描述',
-    `enable_flag`  int          DEFAULT '1' COMMENT '0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG',
-    `delete_flag`  int          DEFAULT '0' COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
-    `create_by`    varchar(255) DEFAULT NULL COMMENT '创建人',
-    `create_time`  datetime     DEFAULT NULL COMMENT '创建时间',
-    `update_by`    varchar(255) DEFAULT NULL COMMENT '更新人',
-    `update_time`  datetime     DEFAULT NULL COMMENT '更新时间',
-    `version`      int          DEFAULT NULL COMMENT '版本号',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `UNIQUE_REPORT_CODE` (`report_code`)
-) ENGINE=InnoDB  AUTO_INCREMENT=195 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for gaea_report_dashboard
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_report_dashboard`;
-CREATE TABLE `gaea_report_dashboard`
-(
-    `id`               bigint      NOT NULL AUTO_INCREMENT COMMENT '看板id',
-    `report_code`      varchar(50) NOT NULL COMMENT '报表编码',
-    `title`            varchar(254)  DEFAULT NULL COMMENT '看板标题',
-    `width`            bigint        DEFAULT NULL COMMENT '宽度px',
-    `height`           bigint        DEFAULT NULL COMMENT '高度px',
-    `background_color` varchar(24)   DEFAULT NULL COMMENT '背景色',
-    `background_image` varchar(254)  DEFAULT NULL COMMENT '背景图片',
-    `preset_line`      varchar(4096) DEFAULT NULL COMMENT '工作台中的辅助线',
-    `refresh_seconds`  int           DEFAULT NULL COMMENT '自动刷新间隔秒',
-    `enable_flag`      int           DEFAULT '1' COMMENT '0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG',
-    `delete_flag`      int           DEFAULT '0' COMMENT ' 0--未删除 1--已删除 DIC_NAME=DEL_FLAG',
-    `sort`             int           DEFAULT '0' COMMENT '排序，降序',
-    `create_by`        varchar(64)   DEFAULT NULL,
-    `create_time`      datetime      DEFAULT NULL,
-    `update_by`        varchar(64)   DEFAULT NULL,
-    `update_time`      datetime      DEFAULT NULL,
-    `version`          int           DEFAULT NULL COMMENT '版本号',
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `UNIQUE_DASHBOARD_REPORT_CODE` (`report_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=277 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for gaea_report_dashboard_widget
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_report_dashboard_widget`;
-CREATE TABLE `gaea_report_dashboard_widget`
-(
-    `id`              bigint      NOT NULL AUTO_INCREMENT COMMENT '组件id',
-    `report_code`     varchar(50) NOT NULL COMMENT '报表编码',
-    `type`            varchar(50)   DEFAULT NULL COMMENT '组件类型参考字典DASHBOARD_PANEL_TYPE',
-    `setup`           varchar(4096) DEFAULT NULL COMMENT '组件的渲染属性json',
-    `data`            varchar(4096) DEFAULT NULL COMMENT '组件的数据属性json',
-    `collapse`        varchar(4096) DEFAULT NULL COMMENT '组件的配置属性json',
-    `position`        varchar(4096) DEFAULT NULL COMMENT '组件的大小位置属性json',
-    `options`         text COMMENT 'options配置项',
-    `refresh_seconds` int           DEFAULT NULL COMMENT '自动刷新间隔秒',
-    `enable_flag`     int           DEFAULT '1' COMMENT '0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG',
-    `delete_flag`     int           DEFAULT '0' COMMENT ' 0--未删除 1--已删除 DIC_NAME=DEL_FLAG',
-    `sort`            bigint        DEFAULT '0' COMMENT '排序，图层的概念',
-    `create_by`       varchar(64)   DEFAULT NULL,
-    `create_time`     datetime      DEFAULT NULL,
-    `update_by`       varchar(64)   DEFAULT NULL,
-    `update_time`     datetime      DEFAULT NULL,
-    `version`         int           DEFAULT NULL COMMENT '版本号',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8713 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for gaea_report_data_set
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_report_data_set`;
-CREATE TABLE `gaea_report_data_set`
-(
-    `id`           bigint NOT NULL AUTO_INCREMENT,
-    `set_code`     varchar(50)   DEFAULT NULL COMMENT '数据集编码',
-    `set_name`     varchar(100)  DEFAULT NULL COMMENT '数据集名称',
-    `set_desc`     varchar(255)  DEFAULT NULL COMMENT '数据集描述',
-    `source_code`  varchar(50)   DEFAULT NULL COMMENT '数据源编码',
-    `dyn_sentence` varchar(2048) DEFAULT NULL COMMENT '动态查询sql或者接口中的请求体',
-    `case_result`  text COMMENT '结果案例',
-    `enable_flag`  int           DEFAULT '1' COMMENT '0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG',
-    `delete_flag`  int           DEFAULT '0' COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
-    `create_by`    varchar(255)  DEFAULT NULL COMMENT '创建人',
-    `create_time`  datetime      DEFAULT NULL COMMENT '创建时间',
-    `update_by`    varchar(255)  DEFAULT NULL COMMENT '更新人',
-    `update_time`  datetime      DEFAULT NULL COMMENT '更新时间',
-    `version`      int           DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `unique_set_code` (`set_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=76 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='数据集管理';
-
--- ----------------------------
--- Table structure for gaea_report_data_set_param
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_report_data_set_param`;
-CREATE TABLE `gaea_report_data_set_param`
-(
-    `id`               bigint NOT NULL AUTO_INCREMENT,
-    `set_code`         varchar(50)   DEFAULT NULL COMMENT '数据集编码',
-    `param_name`       varchar(50)   DEFAULT NULL COMMENT '参数名',
-    `param_desc`       varchar(100)  DEFAULT NULL COMMENT '参数描述',
-    `param_type`       varchar(255)  DEFAULT NULL COMMENT '参数类型，字典=',
-    `sample_item`      varchar(1080) DEFAULT NULL COMMENT '参数示例项',
-    `required_flag`    int           DEFAULT '1' COMMENT '0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG',
-    `validation_rules` varchar(2048) DEFAULT NULL COMMENT 'js校验字段值规则，满足校验返回 true',
-    `order_num`        int           DEFAULT NULL COMMENT '排序',
-    `enable_flag`      int           DEFAULT '1' COMMENT '0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG',
-    `delete_flag`      int           DEFAULT '0' COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
-    `create_by`        varchar(255)  DEFAULT NULL COMMENT '创建人',
-    `create_time`      datetime      DEFAULT NULL COMMENT '创建时间',
-    `update_by`        varchar(255)  DEFAULT NULL COMMENT '更新人',
-    `update_time`      datetime      DEFAULT NULL COMMENT '更新时间',
-    `version`          int           DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='数据集查询参数';
-
-
--- ----------------------------
--- Table structure for gaea_report_data_set_transform
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_report_data_set_transform`;
-CREATE TABLE `gaea_report_data_set_transform`
-(
-    `id`               bigint NOT NULL AUTO_INCREMENT,
-    `set_code`         varchar(50)    DEFAULT NULL COMMENT '数据集编码',
-    `transform_type`   varchar(50)    DEFAULT NULL COMMENT '数据转换类型，DIC_NAME=TRANSFORM_TYPE; js，javaBean，字典转换',
-    `transform_script` varchar(10800) DEFAULT NULL COMMENT '数据转换script,处理逻辑',
-    `order_num`        int            DEFAULT NULL COMMENT '排序,执行数据转换顺序',
-    `enable_flag`      int            DEFAULT '1' COMMENT '0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG',
-    `delete_flag`      int            DEFAULT '0' COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
-    `create_by`        varchar(255)   DEFAULT NULL COMMENT '创建人',
-    `create_time`      datetime       DEFAULT NULL COMMENT '创建时间',
-    `update_by`        varchar(255)   DEFAULT NULL COMMENT '更新人',
-    `update_time`      datetime       DEFAULT NULL COMMENT '更新时间',
-    `version`          int            DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='数据集数据转换';
-
--- ----------------------------
--- Table structure for gaea_report_data_source
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_report_data_source`;
-CREATE TABLE `gaea_report_data_source`
-(
-    `id`            bigint NOT NULL AUTO_INCREMENT,
-    `source_code`   varchar(100)  DEFAULT NULL COMMENT '数据源编码',
-    `source_name`   varchar(100)  DEFAULT NULL COMMENT '数据源名称',
-    `source_desc`   varchar(255)  DEFAULT NULL COMMENT '数据源描述',
-    `source_type`   varchar(50)   DEFAULT NULL COMMENT '数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单',
-    `source_config` varchar(2048) DEFAULT NULL COMMENT '数据源连接配置json：关系库{ jdbcUrl:'''', username:'''', password:'''' } ES{ hostList:''ip1:9300,ip2:9300,ip3:9300'', clusterName:''elasticsearch_cluster'' }  接口{ apiUrl:''http://ip:port/url'', method:'''' } javaBean{ beanNamw:''xxx'' }',
-    `enable_flag`   int           DEFAULT '1' COMMENT '0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG',
-    `delete_flag`   int           DEFAULT '0' COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
-    `create_by`     varchar(255)  DEFAULT NULL COMMENT '创建人',
-    `create_time`   datetime      DEFAULT NULL COMMENT '创建时间',
-    `update_by`     varchar(255)  DEFAULT NULL COMMENT '更新人',
-    `update_time`   datetime      DEFAULT NULL COMMENT '更新时间',
-    `version`       int           DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `unique_source_code` (`source_code`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='数据源管理';
-
--- ----------------------------
--- Table structure for gaea_report_share
--- ----------------------------
-DROP TABLE IF EXISTS `gaea_report_share`;
-CREATE TABLE `gaea_report_share`
-(
-    `id`               bigint NOT NULL AUTO_INCREMENT,
-    `share_code`       varchar(50)  DEFAULT NULL COMMENT '分享编码，系统生成，默认UUID',
-    `share_valid_type` int          DEFAULT NULL COMMENT '分享有效期类型，DIC_NAME=SHARE_VAILD',
-    `share_valid_time` datetime     DEFAULT NULL COMMENT '分享有效期',
-    `share_token`      varchar(255) DEFAULT NULL COMMENT '分享token',
-    `share_url`        varchar(100) DEFAULT NULL COMMENT '分享url',
-    `report_code`      varchar(50)  DEFAULT NULL COMMENT '报表编码',
-    `enable_flag`      int          DEFAULT '1' COMMENT '0--已禁用 1--已启用  DIC_NAME=ENABLE_FLAG',
-    `delete_flag`      int          DEFAULT '0' COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
-    `create_by`        varchar(255) DEFAULT NULL COMMENT '创建人',
-    `create_time`      datetime     DEFAULT NULL COMMENT '创建时间',
-    `update_by`        varchar(255) DEFAULT NULL COMMENT '更新人',
-    `update_time`      datetime     DEFAULT NULL COMMENT '更新时间',
-    `version`          int          DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `UNIQUE_SHARE_CODE` (`share_code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='报表分享';
-
--- ----------------------------
--- Table structure for aj_report_access
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_access`;
-CREATE TABLE `aj_report_access`
-(
-    `datetime` date NOT NULL,
-    `access`   int DEFAULT NULL COMMENT '访问量',
-    `register` int DEFAULT NULL COMMENT '注册量',
-    PRIMARY KEY (`datetime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for aj_report_barstack
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_barstack`;
-CREATE TABLE `aj_report_barstack`
-(
-    `id`   int NOT NULL AUTO_INCREMENT,
-    `time` date         DEFAULT NULL,
-    `type` varchar(255) DEFAULT NULL,
-    `nums` int          DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
-
--- ----------------------------
--- Table structure for aj_report_common1
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_common1`;
-CREATE TABLE `aj_report_common1`
-(
-    `id`   int NOT NULL AUTO_INCREMENT,
-    `name` varchar(255) DEFAULT NULL,
-    `nums` int          DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for aj_report_common2
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_common2`;
-CREATE TABLE `aj_report_common2`
-(
-    `id`   int NOT NULL AUTO_INCREMENT,
-    `name` varchar(255) DEFAULT NULL,
-    `nums` int          DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
-
--- ----------------------------
--- Table structure for aj_report_common3
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_common3`;
-CREATE TABLE `aj_report_common3`
-(
-    `id`      int NOT NULL AUTO_INCREMENT,
-    `time`    varchar(255) DEFAULT NULL,
-    `collect` int          DEFAULT NULL,
-    `start`   int          DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=25 DEFAULT CHARSET=utf8;
-
--- ----------------------------
--- Table structure for aj_report_comparestack
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_comparestack`;
-CREATE TABLE `aj_report_comparestack`
-(
-    `id`   int NOT NULL AUTO_INCREMENT,
-    `time` date         DEFAULT NULL,
-    `type` varchar(255) DEFAULT NULL,
-    `nums` bigint       DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
-
-
--- ----------------------------
--- Table structure for aj_report_devices
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_devices`;
-CREATE TABLE `aj_report_devices`
-(
-    `device_id`        varchar(255) NOT NULL COMMENT '设备编号',
-    `device_name`      varchar(255) DEFAULT NULL COMMENT '设备名称',
-    `device_type`      varchar(255) DEFAULT NULL COMMENT '设备类型',
-    `device_type_code` int          DEFAULT NULL COMMENT '设备类型编号',
-    `online_time`      datetime     DEFAULT NULL COMMENT '上线日期',
-    `device_state`     int          DEFAULT NULL COMMENT '1上线，0下线',
-    PRIMARY KEY (`device_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for aj_report_exper
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_exper`;
-CREATE TABLE `aj_report_exper`
-(
-    `datetime` date NOT NULL,
-    `rt`       double DEFAULT NULL,
-    `qps`      bigint DEFAULT NULL,
-    `error`    int    DEFAULT NULL,
-    PRIMARY KEY (`datetime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for aj_report_fireacl
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_fireacl`;
-CREATE TABLE `aj_report_fireacl`
-(
-    `id`          int NOT NULL AUTO_INCREMENT,
-    `acl_type`    varchar(255) DEFAULT NULL COMMENT 'acl类型',
-    `create_time` datetime     DEFAULT NULL COMMENT '创建时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=203 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for aj_report_fireattack
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_fireattack`;
-CREATE TABLE `aj_report_fireattack`
-(
-    `id`          int          NOT NULL AUTO_INCREMENT COMMENT '事件编号',
-    `attack_type` varchar(255) NOT NULL COMMENT '攻击类型',
-    `create_time` datetime DEFAULT NULL COMMENT '事件创建时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
-
--- ----------------------------
--- Table structure for aj_report_mail
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_mail`;
-CREATE TABLE `aj_report_mail`
-(
-    `id`          int NOT NULL AUTO_INCREMENT COMMENT '事件id',
-    `username`    varchar(255) DEFAULT NULL COMMENT '登陆用户',
-    `status`      int          DEFAULT NULL COMMENT '1成功，0失败',
-    `create_time` datetime     DEFAULT NULL COMMENT '事件时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=245 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for aj_report_manus
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_manus`;
-CREATE TABLE `aj_report_manus`
-(
-    `id`       int NOT NULL AUTO_INCREMENT,
-    `datetime` date         DEFAULT NULL COMMENT '日期',
-    `brand`    varchar(255) DEFAULT NULL COMMENT '系列',
-    `manus`    int          DEFAULT NULL COMMENT '生产量',
-    `sales`    int          DEFAULT NULL COMMENT '销售量',
-    `unsales`  int          DEFAULT NULL COMMENT '滞销量',
-    `rework`   int          DEFAULT NULL COMMENT '返修量',
-    `return`   int          DEFAULT NULL COMMENT '退货量',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-
--- ----------------------------
--- Table structure for aj_report_nums
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_nums`;
-CREATE TABLE `aj_report_nums`
-(
-    `id`    int NOT NULL AUTO_INCREMENT,
-    `inter` int    DEFAULT NULL,
-    `doub`  double DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8;
-
-
--- ----------------------------
--- Table structure for aj_report_table
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_table`;
-CREATE TABLE `aj_report_table`
-(
-    `id`      int NOT NULL AUTO_INCREMENT,
-    `date`    date         DEFAULT NULL,
-    `name`    varchar(255) DEFAULT NULL,
-    `code`    varchar(255) DEFAULT NULL,
-    `address` varchar(255) DEFAULT NULL,
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
-
--- ----------------------------
--- Table structure for aj_report_wifiamount
--- ----------------------------
-DROP TABLE IF EXISTS `aj_report_wifiamount`;
-CREATE TABLE `aj_report_wifiamount`
-(
-    `datetime` date NOT NULL,
-    `success`  int DEFAULT NULL COMMENT '成功次数',
-    `fail`     int DEFAULT NULL COMMENT '失败次数',
-    PRIMARY KEY (`datetime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;

pom.xml

@@ -43,7 +43,7 @@
 		<spring.checkstyle.version>0.0.28</spring.checkstyle.version>
 		<git.commit.version>2.2.5</git.commit.version>
 		<spring-boot-admin.version>2.5.5</spring-boot-admin.version>
-		<hutool.version>5.7.16</hutool.version>
+		<hutool.version>5.7.18</hutool.version>
 		<captcha.version>1.2.7</captcha.version>
 		<swagger.fox.version>3.0.0</swagger.fox.version>
 		<knife4j.version>2.0.9</knife4j.version>