diff --git a/report-core/pom.xml b/report-core/pom.xml
index 534e70407b20a4f2a1bad78d93d9810a0c97bacb..0f5926e88782e913bd4b2ed9a62a7d51c0d71141 100644
--- a/report-core/pom.xml
+++ b/report-core/pom.xml
@@ -178,6 +178,30 @@
5.5.13
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-redis
+
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.12
+
+
+
+ redis.clients
+ jedis
+ 3.1.0
+
+
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/ReportApplication.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/ReportApplication.java
index c0b5a0d16c892f9c9c2e4f3810ac153ae24a4c69..6c45b116cc9d1056a431f141486db28fdc6d9518 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/ReportApplication.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/ReportApplication.java
@@ -2,10 +2,15 @@ package com.anjiplus.template.gaea.business;
import com.anji.plus.gaea.annotation.enabled.EnabledGaeaConfiguration;
import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ApplicationContext;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import java.util.Arrays;
+
/**
* 业务模板
* @author lr
@@ -14,7 +19,10 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnabledGaeaConfiguration
@SpringBootApplication(scanBasePackages = {
"com.anjiplus.template.gaea",
- "com.anji.plus"
+ "com.anji.plus",
+ "com.anjiplus.template.gaea.business.config",
+ "com.anjiplus.template.gaea.business.util",
+ "com.anjiplus.template.gaea.business.websocket"
})
@MapperScan(basePackages = {
"com.anjiplus.template.gaea.business.modules.*.dao",
@@ -22,8 +30,22 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
"com.anji.plus.gaea.*.module.*.dao"
})
@EnableSwagger2
-public class ReportApplication {
+public class ReportApplication implements CommandLineRunner {
+
+ @Autowired
+ private ApplicationContext appContext;
+
public static void main( String[] args ) {
SpringApplication.run(ReportApplication.class);
}
+
+ @Override
+ public void run(String... args) throws Exception {
+ String[] beans = appContext.getBeanDefinitionNames();
+ Arrays.sort(beans);
+ for (String bean : beans) {
+ System.out.println("bean==>"+bean);
+ }
+
+ }
}
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/config/WebSocketConfig.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/config/WebSocketConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..ec85a0a598fca9becd2a8e28d5d800e64ccbce91
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/config/WebSocketConfig.java
@@ -0,0 +1,26 @@
+package com.anjiplus.template.gaea.business.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+import org.springframework.web.socket.server.standard.ServerEndpointRegistration;
+
+
+/***
+ * 配置ServerEndpointExporter，配置后会自动注册所有“@ServerEndpoint”注解声明的Websocket Endpoint
+ */
+@Configuration
+public class WebSocketConfig {
+
+ /**
+ * 这个bean的注册,用于扫描带有@ServerEndpoint的注解成为websocket ,如果你使用外置的tomcat就
+ * 不需要该配置文件
+ */
+ @Bean
+ public ServerEndpointExporter serverEndpointExporter() {
+ return new ServerEndpointExporter();
+ }
+
+}
\ No newline at end of file
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/enums/SetTypeEnum.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/enums/SetTypeEnum.java
index a0242f3763cec4e717bae9023b9a0f49431a85e5..5d056aaad4af515989ef7356e4c275a87cdea79b 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/enums/SetTypeEnum.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/enums/SetTypeEnum.java
@@ -2,6 +2,7 @@ package com.anjiplus.template.gaea.business.enums;
public enum SetTypeEnum {
SQL("sql", "sql"),
+ NOSQL("redis","redis"),
HTTP("http", "http"),
;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java
index b9214f6f6103f2de85850dac704b2b816bf8dbda..7706c0e2914246685886e280db54377d7f0ad7f1 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/filter/TokenFilter.java
@@ -85,6 +85,11 @@ public class TokenFilter implements Filter {
return;
}
+ // websocket相关的直接放行
+ if (uri.contains("websocket")) {
+ filterChain.doFilter(request, response);
+ return;
+ }
if (SLASH.equals(uri) || SLASH.concat(BusinessConstant.SLASH).equals(uri)) {
if (BusinessConstant.SLASH.equals(uri)) {
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
index d669254b010faaef8f09349918e4efd91e41274a..ee232d2beeb136d05595c5f7cef862423ca5ddee 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
@@ -372,7 +372,7 @@ public class DataSetServiceImpl implements DataSetService {
@Override
public List queryAllDataSet() {
LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.select(DataSet::getSetCode, DataSet::getSetName, DataSet::getSetDesc, DataSet::getId)
+ wrapper.select(DataSet::getSetCode,DataSet::getSetType, DataSet::getSetName, DataSet::getSetDesc, DataSet::getId)
.eq(DataSet::getEnableFlag, Enabled.YES.getValue());
wrapper.orderByDesc(DataSet::getUpdateTime);
return dataSetMapper.selectList(wrapper);
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java
index e22eea62a54cda9fc7bc552218e3c2ff29324258..00987f8e42396a28a197f9e6c0fb0df367f662ca 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java
@@ -41,6 +41,9 @@ public class DataSourceDto extends GaeaBaseDTO implements Serializable {
/**关系型数据库jdbcUrl */
private String jdbcUrl;
+ /**RedisUrl */
+ private String redisUrl;
+
/** 关系型数据库用户名 */
private String username;
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
index 0485a2945f8039f61fe895b05adb5cf1a415d254..c844c75a4b37b43777353b3269d0daf0cd89bd43 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
@@ -20,6 +20,7 @@ import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSou
import com.anjiplus.template.gaea.business.modules.datasource.service.DataSourceService;
import com.anjiplus.template.gaea.business.modules.datasource.service.JdbcService;
import com.anjiplus.template.gaea.business.util.JdbcConstants;
+import com.anjiplus.template.gaea.business.util.RedisConstants;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.extern.slf4j.Slf4j;
@@ -31,6 +32,8 @@ import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
import javax.annotation.Resource;
import java.sql.*;
@@ -65,6 +68,8 @@ public class DataSourceServiceImpl implements DataSourceService {
return dataSourceMapper;
}
+ @Autowired
+ private RedisServiceImpl redisServiceImpl;
/**
* 获取所有数据源
@@ -73,7 +78,7 @@ public class DataSourceServiceImpl implements DataSourceService {
@Override
public List queryAllDataSource() {
LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.select(DataSource::getSourceCode, DataSource::getSourceName)
+ wrapper.select(DataSource::getSourceCode, DataSource::getSourceName,DataSource::getSourceType)
.eq(DataSource::getEnableFlag, Enabled.YES.getValue());
wrapper.orderByDesc(DataSource::getUpdateTime);
return dataSourceMapper.selectList(wrapper);
@@ -106,6 +111,9 @@ public class DataSourceServiceImpl implements DataSourceService {
case JdbcConstants.HTTP:
testHttp(dto);
break;
+ case JdbcConstants.REDIS:
+ testRedis(dto);
+ break;
default:
throw BusinessExceptionBuilder.build(ResponseCode.DATA_SOURCE_TYPE_DOES_NOT_MATCH_TEMPORARILY);
}
@@ -129,6 +137,8 @@ public class DataSourceServiceImpl implements DataSourceService {
return executeRelationalDb(dto);
case JdbcConstants.HTTP:
return executeHttp(dto);
+ case JdbcConstants.REDIS:
+ return executeRedis(dto);
default:
throw BusinessExceptionBuilder.build(ResponseCode.DATA_SOURCE_TYPE_DOES_NOT_MATCH_TEMPORARILY);
}
@@ -288,6 +298,10 @@ public class DataSourceServiceImpl implements DataSourceService {
return result;
}
+ private List executeRedis(DataSourceDto dto) {
+ return redisServiceImpl.queryRedisValue(dto);
+ }
+
/**
* http 执行获取数据
*
@@ -346,6 +360,37 @@ public class DataSourceServiceImpl implements DataSourceService {
}
}
+ /**
+ * redis缓存 测试连接
+ *
+ * @param dto
+ */
+ private void testRedis(DataSourceDto dto) {
+ analysisRedisConfig(dto);
+ try (JedisPool jedisPool = new JedisPool(dto.getRedisUrl().split(":")[0], Integer.parseInt(dto.getRedisUrl().split(":")[1]));
+ Jedis jedis = jedisPool.getResource()) {
+ log.info("redis连接成功: " + jedis.info());
+ } catch (Exception e) {
+ log.error("error", e);
+ if (e.getCause() instanceof ClassNotFoundException) {
+ throw BusinessExceptionBuilder.build(ResponseCode.CLASS_NOT_FOUND, e.getCause().getMessage());
+ } else {
+ throw BusinessExceptionBuilder.build(ResponseCode.DATA_SOURCE_CONNECTION_FAILED, e.getMessage());
+ }
+ }
+ }
+
+ public void analysisRedisConfig(DataSourceDto dto) {
+ JSONObject json = JSONObject.parseObject(dto.getSourceConfig());
+ GaeaAssert.isFalse(json.containsKey("redisUrl"), ResponseCode.PARAM_IS_NULL,"redisUrl not empty");
+ String redisUrl = json.getString("redisUrl");
+ String username = json.getString("username");
+ String password = json.getString("password");
+ dto.setRedisUrl(redisUrl);
+ dto.setUsername(username);
+ dto.setPassword(password);
+ }
+
/**
* http 测试连接
*
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/RedisServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/RedisServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..98f2d355dc7a817bf70b8ef0227f72703ba51f45
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/RedisServiceImpl.java
@@ -0,0 +1,212 @@
+package com.anjiplus.template.gaea.business.modules.datasource.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONException;
+import com.alibaba.fastjson.JSONObject;
+import com.anjiplus.template.gaea.business.constant.BusinessConstant;
+import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
+import com.anjiplus.template.gaea.business.util.RedisConstants;
+import io.micrometer.core.instrument.util.StringEscapeUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Service
+@Slf4j
+public class RedisServiceImpl {
+ @Autowired
+ private DataSourceServiceImpl dataSourceServiceImpl;
+
+ private Map jedisPoolmap = new ConcurrentHashMap<>();
+ private Object lock = new Object();
+
+
+ public List queryRedisValue(DataSourceDto dto) {
+ dataSourceServiceImpl.analysisRedisConfig(dto);
+
+ // 获取键的数据类型
+ String type;
+ try (Jedis jedis = getRedisConnection(dto)) {
+ // 选择指定的 Redis 数据库
+ int dbIndex;
+ String[] redisProperties = dto.getDynSentence().split("-");
+ dbIndex = Integer.parseInt(redisProperties[0]);
+ jedis.select(dbIndex);
+ // dynSentence在这里的拼装格式为 dbIndex-key 所以分割后的数组中非hash键的长度为2 hash键的长度为3
+ if (dto.getDynSentence().split("-").length != 3) {
+ type = jedis.type(redisProperties[1]);
+ } else {
+ type = RedisConstants.HASH;
+ }
+ // 根据数据类型选择相应的查询方法和封装逻辑
+ switch (type) {
+ case RedisConstants.STRING:
+ return executeString(dto,jedis);
+
+ case RedisConstants.LIST:
+ return executeList(dto,jedis);
+
+ case RedisConstants.HASH:
+ return executeHash(dto,jedis);
+
+ case RedisConstants.SET:
+ return executeSet(dto,jedis);
+
+ case RedisConstants.ZSET:
+ return executeZset(dto,jedis);
+
+ default:
+ // 如果类型无法识别或者其他处理逻辑
+ return null;
+ }
+ }
+
+ }
+ /*redis连接测试*/
+ public JedisPool getRedisConnectionPool(DataSourceDto dataSource) {
+ if (jedisPoolmap.containsKey(dataSource.getId())) {
+ return jedisPoolmap.get(dataSource.getId());
+ } else {
+ try {
+ synchronized (lock) {
+ if (!jedisPoolmap.containsKey(dataSource.getId())) {
+ JedisPool jedisPool=new JedisPool(dataSource.getRedisUrl().split(":")[0], Integer.parseInt(dataSource.getRedisUrl().split(":")[1]));
+ jedisPoolmap.put(dataSource.getId(), jedisPool);
+ log.info("创建连接池成功：{}", dataSource.getRedisUrl());
+ }
+ }
+ return jedisPoolmap.get(dataSource.getId());
+ } finally {
+ }
+ }
+ }
+ public Jedis getRedisConnection(DataSourceDto dto) {
+ return getRedisConnectionPool(dto).getResource();
+ }
+
+ public List executeString(DataSourceDto dto,Jedis jedis) {
+ dataSourceServiceImpl.analysisRedisConfig(dto);
+ String jsonValue = jedis.get(dto.getDynSentence().split("-")[1]);
+ List result = new ArrayList<>();
+ //
+ if (StringUtils.isEmpty(jsonValue)) {
+ return result;
+ }
+ log.info(jsonValue);
+ if (jsonValue.trim().startsWith(BusinessConstant.LEFT_BIG_BOAST) && jsonValue.trim().endsWith(BusinessConstant.RIGTH_BIG_BOAST)) {
+ //JSONObject
+ result.add(JSONObject.parseObject(jsonValue));
+ } else if (jsonValue.trim().startsWith(BusinessConstant.LEFT_MIDDLE_BOAST) && jsonValue.trim().endsWith(BusinessConstant.RIGHT_MIDDLE_BOAST)) {
+ //List
+ result = JSONArray.parseArray(jsonValue, JSONObject.class);
+ } else {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put(dto.getDynSentence().split("-")[1], jsonValue);
+ result.add(jsonObject);
+ }
+ return result;
+ }
+
+ public List executeList(DataSourceDto dto,Jedis jedis) {
+ List jsonValueList = jedis.lrange(dto.getDynSentence().split("-")[1], 0, -1);
+ List result = new ArrayList<>();
+
+ if (CollectionUtils.isEmpty(jsonValueList)){
+ return result;
+ }
+
+ JSONArray jsonArray = new JSONArray();
+
+ for (String jsonValue : jsonValueList) {
+ if (jsonValue.trim().startsWith(BusinessConstant.LEFT_BIG_BOAST) && jsonValue.trim().endsWith(BusinessConstant.RIGTH_BIG_BOAST)) {
+ jsonArray.add(jsonValue);
+ } else if (jsonValue.trim().startsWith(BusinessConstant.LEFT_MIDDLE_BOAST) && jsonValue.trim().endsWith(BusinessConstant.RIGHT_MIDDLE_BOAST)) {
+ jsonArray.addAll(JSONArray.parseArray(jsonValue, JSONObject.class));
+ }
+ }
+
+ result.addAll(jsonArray.toJavaList(JSONObject.class));
+ return result;
+ }
+
+ public List executeHash(DataSourceDto dto,Jedis jedis) {
+ String dynSentence = dto.getDynSentence();
+ String[] splitResult = dynSentence.split("-");
+ String jsonValue=jedis.hget(splitResult[1],splitResult[2]);
+ List result = new ArrayList<>();
+ if(StringUtils.isEmpty(jsonValue)){
+ return result;
+ }
+ log.info(jsonValue);
+ if (jsonValue.trim().startsWith(BusinessConstant.LEFT_BIG_BOAST) && jsonValue.trim().endsWith(BusinessConstant.RIGTH_BIG_BOAST)) {
+ //JSONObject
+ result.add(JSONObject.parseObject(jsonValue));
+ } else if (jsonValue.trim().startsWith(BusinessConstant.LEFT_MIDDLE_BOAST) && jsonValue.trim().endsWith(BusinessConstant.RIGHT_MIDDLE_BOAST)) {
+ //List
+ result = JSONArray.parseArray(jsonValue, JSONObject.class);
+ } else {
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put(dto.getDynSentence().split("-")[1]+ "-" + dto.getDynSentence().split("-")[2], jsonValue);
+ result.add(jsonObject);
+ }
+ return result;
+ }
+ public List executeSet(DataSourceDto dto,Jedis jedis) {
+ Set jsonValueSet = jedis.smembers(dto.getDynSentence().split("-")[1]);
+ List result = new ArrayList<>();
+
+ if (CollectionUtils.isEmpty(jsonValueSet)) {
+ return result;
+ }
+
+ log.info(JSON.toJSONString(jsonValueSet));
+
+ for (String jsonValue : jsonValueSet) {
+ String trimmedValue = jsonValue.trim();
+ if (trimmedValue.startsWith(BusinessConstant.LEFT_BIG_BOAST) && trimmedValue.endsWith(BusinessConstant.RIGTH_BIG_BOAST)) {
+ // JSONObject
+ result.add(JSONObject.parseObject(trimmedValue));
+ } else if (trimmedValue.startsWith(BusinessConstant.LEFT_MIDDLE_BOAST) && trimmedValue.endsWith(BusinessConstant.RIGHT_MIDDLE_BOAST)) {
+ // List
+ result.addAll(JSONArray.parseArray(trimmedValue, JSONObject.class));
+ } else {
+ result.add(new JSONObject());
+ }
+ }
+ return result;
+ }
+
+ public List executeZset(DataSourceDto dto,Jedis jedis) {
+ Set jsonValueSet = jedis.zrange(dto.getDynSentence().split("-")[1], 0, -1);
+ List result = new ArrayList<>();
+
+ if (CollectionUtils.isEmpty(jsonValueSet)) {
+ return result;
+ }
+
+ log.info(JSON.toJSONString(jsonValueSet));
+
+ for (String jsonValue : jsonValueSet) {
+ String trimmedValue = jsonValue.trim();
+
+ if (trimmedValue.startsWith(BusinessConstant.LEFT_BIG_BOAST) && trimmedValue.endsWith(BusinessConstant.RIGTH_BIG_BOAST)) {
+ // JSONObject
+ result.add(JSONObject.parseObject(trimmedValue));
+ } else if (trimmedValue.startsWith(BusinessConstant.LEFT_MIDDLE_BOAST) && trimmedValue.endsWith(BusinessConstant.RIGHT_MIDDLE_BOAST)) {
+ // List
+ result.addAll(JSONArray.parseArray(trimmedValue, JSONObject.class));
+ } else {
+ result.add(new JSONObject());
+ }
+ }
+ return result;
+ }
+}
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/ApplicationContextUtil.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/ApplicationContextUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..1be80e41ba7d9ef4087daea17492f17ed7a0b37f
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/ApplicationContextUtil.java
@@ -0,0 +1,24 @@
+package com.anjiplus.template.gaea.business.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ApplicationContextUtil implements ApplicationContextAware {
+ private static ApplicationContext context;
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ context = applicationContext;
+ }
+
+ public static ApplicationContext getApplicationContext() {
+ return context;
+ }
+
+ public static Object getBean(String name) {
+ return getApplicationContext().getBean(name);
+ }
+}
\ No newline at end of file
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/IdLockUtil.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/IdLockUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..e9ad98f206a746e2e64fb422c48f8cdf0e7ff42e
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/IdLockUtil.java
@@ -0,0 +1,54 @@
+package com.anjiplus.template.gaea.business.util;
+
+import java.util.HashMap;
+
+public class IdLockUtil {
+
+ private static HashMap mMapId = new HashMap<>();
+ private static HashMap mMapIdCache = new HashMap<>();
+
+ /**
+ * 缓存切换的开始时间，等待{@link #M_CACHE_DELETE_TIME}时间后将清空切换数据
+ */
+ private static long mCacheCreatTime;
+
+ /**
+ * 最大缓存数(当超出这一数值时，会自动清空)，缓存切换等待时间
+ */
+ private static final int M_MAX_CACHE = 1000;
+ private static final int M_CACHE_DELETE_TIME = 10000;
+
+ public static synchronized String getLock(String oldId) {
+ String returnSt;
+ if (mMapId.size() < M_MAX_CACHE) {
+ //数据比较少，普通的返回锁
+ if (!mMapId.containsKey(oldId)) {
+ mMapId.put(oldId, oldId);
+ }
+ returnSt = mMapId.get(oldId);
+ } else {
+ //累加的残留数据太多，切换至缓存
+
+ //缓存开始时间
+ long nowMills = System.currentTimeMillis();
+ if (mMapIdCache.size() == 0) {
+ mCacheCreatTime = nowMills;
+ }
+ if (!mMapIdCache.containsKey(oldId)) {
+ mMapIdCache.put(oldId, mMapId.getOrDefault(oldId, oldId));
+ }
+ returnSt = mMapIdCache.get(oldId);
+
+ //等待mCacheChangeTime时间后清除原始数据
+ if (nowMills - mCacheCreatTime > M_CACHE_DELETE_TIME) {
+ mMapId.clear();
+ //原始和缓存对调即可实现切换
+ HashMap change = mMapId;
+ mMapId = mMapIdCache;
+ mMapIdCache = change;
+ }
+ }
+ return returnSt;
+ }
+}
+
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java
index 0d2febe58a8693945cb54447c4a89066ac7da29b..96bafca5a7da5f60e859abf921d8f0cdb790be35 100644
--- a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/JdbcConstants.java
@@ -16,6 +16,7 @@ public class JdbcConstants {
public final static String JDBC = "jdbc";
public final static String POSTGRESQL = "postgresql";
+ public final static String REDIS="redis";
public final static String JTDS = "jtds";
public final static String MOCK = "mock";
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/util/RedisConstants.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/RedisConstants.java
new file mode 100644
index 0000000000000000000000000000000000000000..3ac29a3fde48e44d8e4f2c1797e41f546e4253a1
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/util/RedisConstants.java
@@ -0,0 +1,10 @@
+
+package com.anjiplus.template.gaea.business.util;
+
+public class RedisConstants {
+ public final static String STRING = "string";
+ public final static String LIST = "list";
+ public final static String HASH = "hash";
+ public final static String SET = "set";
+ public final static String ZSET = "zset";
+}
\ No newline at end of file
diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/websocket/TestWebsocket.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/websocket/TestWebsocket.java
new file mode 100644
index 0000000000000000000000000000000000000000..12c762569d471a01cedede10c5e1ebcbcb8d9190
--- /dev/null
+++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/websocket/TestWebsocket.java
@@ -0,0 +1,146 @@
+package com.anjiplus.template.gaea.business.websocket;
+
+import cn.hutool.core.map.MapUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
+import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.DataSetDto;
+import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.OriginalDataDto;
+import com.anjiplus.template.gaea.business.modules.dataset.service.DataSetService;
+import com.anjiplus.template.gaea.business.util.ApplicationContextUtil;
+import com.anjiplus.template.gaea.business.util.IdLockUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.Trigger;
+import org.springframework.scheduling.support.CronTrigger;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+
+import javax.websocket.*;
+import javax.websocket.server.ServerEndpoint;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+@ServerEndpoint(value = "/websocket/RealTimeWebsocket")
+@Component
+public class TestWebsocket {
+ private static Logger logger = LoggerFactory.getLogger(TestWebsocket.class);
+ /**
+ * 记录当前在线连接数
+ */
+ private static final AtomicInteger ONLINE_COUNT = new AtomicInteger(0);
+
+ /**
+ * 存放所有在线的客户端
+ */
+ private static final Map CLIENTS = new ConcurrentHashMap<>();
+
+
+ /**
+ * 存放最近信息
+ */
+ private static final Queue MESSAGES = new LinkedList<>();
+
+ /**
+ * 最近信息容量
+ */
+ private static final int ALARM_CAPACITY = 1;
+
+ /**
+ * 定时任务集合
+ */
+ Map> stringScheduledFutureMap = new ConcurrentHashMap<>();
+
+ /**
+ * taskScheduler
+ */
+ private TaskScheduler taskScheduler;
+ private RedisTemplate redisTemplate;
+ private static final Integer zero = 0;
+
+ private DataSetService dataSetService;
+
+ /**
+ * 连接建立成功调用的方法
+ */
+ @OnOpen
+ public void onOpen(Session session) {
+ this.dataSetService = (DataSetService) ApplicationContextUtil.getBean("dataSetServiceImpl");
+
+ ONLINE_COUNT.incrementAndGet(); // 在线数加1
+ CLIENTS.put(session.getId(), session);
+ logger.info("有新连接加入：{}，当前在线人数为：{}", session.getId(), ONLINE_COUNT.get());
+ }
+
+ /**
+ * 连接关闭调用的方法
+ */
+ @OnClose
+ public void onClose(Session session) {
+ ONLINE_COUNT.decrementAndGet(); // 在线数减1
+ CLIENTS.remove(session.getId());
+ logger.info("有一连接关闭：{}，当前在线人数为：{}", session.getId(), ONLINE_COUNT.get());
+ }
+
+ /**
+ * 收到客户端消息后调用的方法
+ *
+ * @param message 客户端发送过来的消息
+ */
+ @OnMessage
+ public void onMessage(String message, Session session) {
+ //做自己的业务
+ logger.info("messgae==>" + message + ",客户端id为: " + session.getId());
+ this.sendMessage(session.getId(), message);
+ }
+
+ @OnError
+ public void onError(Session session, Throwable error) {
+ logger.error("发生错误" + (null == session ? "" : ",客户端id为: " + session.getId()));
+ error.printStackTrace();
+ }
+
+ /**
+ * 发送消息给指定客户端
+ */
+ public void sendMessage(String sessionId, String message) {
+ if (sessionId == null || message == null) {
+ return;
+ }
+ ChartDto dto = JSON.parseObject(message, ChartDto.class);
+ DataSetDto setDto = new DataSetDto();
+ setDto.setSetCode(dto.getSetCode());
+ setDto.setContextData(dto.getContextData());
+ OriginalDataDto result = dataSetService.getData(setDto);
+ Map> dataListMap = new HashMap<>();
+ List data = result.getData();
+ dataListMap.put(message,data);
+ synchronized (IdLockUtil.getLock("WebSocket:send" + sessionId)) {
+ logger.info("服务端给客户端[{}]发送消息", sessionId);
+ try {
+ Session session = CLIENTS.get(sessionId);
+ if (!ObjectUtils.isEmpty(session)) {
+ String dataListMapJson = JSON.toJSONString(dataListMap);
+ session.getBasicRemote().sendText(dataListMapJson);
+ }
+ } catch (Exception e) {
+ logger.error("服务端发送消息给客户端[{}]失败：{}", sessionId, e);
+ }
+ }
+ }
+
+
+
+
+
+
+}
+
diff --git a/report-core/src/main/resources/db/migration/V1.1.0__update.sql b/report-core/src/main/resources/db/migration/V1.1.0__update.sql
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..77d6e58774b00d8c9e3d901b2ecee4314e35350a 100644
--- a/report-core/src/main/resources/db/migration/V1.1.0__update.sql
+++ b/report-core/src/main/resources/db/migration/V1.1.0__update.sql
@@ -0,0 +1,731 @@
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+CREATE DATABASE IF NOT EXISTS aj_report DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;
+
+use aj_report;
+-- ----------------------------
+-- Table structure for access_authority
+-- ----------------------------
+DROP TABLE IF EXISTS `access_authority`;
+CREATE TABLE `access_authority` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `parent_target` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '父ID',
+ `target` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '菜单代码',
+ `target_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '菜单名称',
+ `action` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '按钮代码',
+ `action_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '按钮名称',
+ `sort` int(8) NULL DEFAULT NULL,
+ `enable_flag` int(1) NOT NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT ' 0--未删除 1--已删除 DIC_NAME=DEL_FLAG',
+ `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '创建人',
+ `create_time` datetime NOT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '修改人',
+ `update_time` datetime NOT NULL COMMENT '修改时间',
+ `version` tinyint(8) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `TA_uniq_index`(`target`, `action`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 330 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '运营权限表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of access_authority
+-- ----------------------------
+INSERT INTO `access_authority` VALUES (1, NULL, 'access', '用户权限', '', '', 1, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (2, NULL, 'report', '报表设计', '', '', 2, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (3, NULL, 'system', '系统设置', '', '', 3, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (101, 'access', 'authorityManage', '权限管理', 'insert', '新增权限', 101, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (102, 'access', 'authorityManage', '权限管理', 'update', '修改权限', 102, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (103, 'access', 'authorityManage', '权限管理', 'delete', '删除权限', 103, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (104, 'access', 'authorityManage', '权限管理', 'query', '查询权限', 104, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (105, 'access', 'roleManage', '角色管理', 'insert', '新建角色', 105, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2021-07-17 20:41:46', 2);
+INSERT INTO `access_authority` VALUES (106, 'access', 'roleManage', '角色管理', 'update', '修改角色', 106, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (107, 'access', 'roleManage', '角色管理', 'delete', '删除角色', 107, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (108, 'access', 'roleManage', '角色管理', 'query', '查询角色', 108, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (109, 'access', 'roleManage', '角色管理', 'grantAuthority', '分配权限', 109, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (110, 'access', 'userManage', '用户管理', 'insert', '新增用户', 110, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (111, 'access', 'userManage', '用户管理', 'update', '修改用户', 111, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (112, 'access', 'userManage', '用户管理', 'delete', '删除用户', 112, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (113, 'access', 'userManage', '用户管理', 'query', '查询用户', 113, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (114, 'access', 'userManage', '用户管理', 'resetPassword', '重置密码', 114, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (115, 'access', 'userManage', '用户管理', 'grantRole', '分配角色', 115, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (200, 'report', 'datasourceManage', '数据源管理', 'insert', '新建数据源', 200, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (201, 'report', 'datasourceManage', '数据源管理', 'update', '修改数据源', 201, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (202, 'report', 'datasourceManage', '数据源管理', 'delete', '删除数据源', 202, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (203, 'report', 'datasourceManage', '数据源管理', 'query', '查询数据源', 203, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (204, 'report', 'resultsetManage', '数据集管理', 'insert', '新建数据集', 204, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (205, 'report', 'resultsetManage', '数据集管理', 'update', '修改数据集', 205, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (206, 'report', 'resultsetManage', '数据集管理', 'delete', '删除数据集', 206, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (207, 'report', 'resultsetManage', '数据集管理', 'query', '查询数据集', 207, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (221, 'report', 'reportManage', '报表管理', 'insert', '新建报表', 221, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (222, 'report', 'reportManage', '报表管理', 'update', '修改报表', 222, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (223, 'report', 'reportManage', '报表管理', 'delete', '删除报表', 223, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (224, 'report', 'reportManage', '报表管理', 'query', '查询报表', 224, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (231, 'report', 'bigScreenManage', '大屏报表', 'share', '分享报表', 231, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (232, 'report', 'bigScreenManage', '大屏报表', 'view', '查看大屏', 232, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (233, 'report', 'bigScreenManage', '大屏报表', 'design', '设计大屏', 233, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (234, 'report', 'bigScreenManage', '大屏报表', 'export', '导出大屏', 234, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (235, 'report', 'bigScreenManage', '大屏报表', 'import', '导入大屏', 235, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (236, 'report', 'excelManage', '表格报表', 'query', '查询报表', 236, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (237, 'report', 'excelManage', '表格报表', 'insert', '新建表格', 237, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (238, 'report', 'excelManage', '表格报表', 'update', '更新表格', 238, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (239, 'report', 'excelManage', '表格报表', 'view', '查看表格', 239, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (240, 'report', 'excelManage', '表格报表', 'export', '导出表格', 240, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (300, 'system', 'fileManage', '文件管理', 'query', '查询文件', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (301, 'system', 'fileManage', '文件管理', 'upload', '上传文件', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (302, 'system', 'fileManage', '文件管理', 'update', '更新文件', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (303, 'system', 'fileManage', '文件管理', 'delete', '删除文件', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (304, 'system', 'dictManage', '数据字典', 'query', '数据字典查询', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (305, 'system', 'dictManage', '数据字典', 'insert', '数据字典新增', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (306, 'system', 'dictManage', '数据字典', 'update', '更新数据字典', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (307, 'system', 'dictManage', '数据字典', 'delete', '删除数据字典', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (308, 'system', 'dictManage', '数据字典', 'fresh', '刷新数据字典', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (309, 'system', 'dictItemManage', '数据字典项', 'query', '查询数据字典项', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (310, 'system', 'dictItemManage', '数据字典项', 'insert', '新增数据字典项', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (311, 'system', 'dictItemManage', '数据字典项', 'update', '更新数据字典项', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (312, 'system', 'dictItemManage', '数据字典项', 'delete', '删除数据字典项', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (313, 'access', 'authorityManage', '权限管理', 'detail', '权限明细', 101, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (314, 'access', 'roleManage', '角色管理', 'detail', '角色明细', 105, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2021-07-17 20:41:46', 2);
+INSERT INTO `access_authority` VALUES (315, 'access', 'userManage', '用户管理', 'detail', '用户明细', 110, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (316, 'report', 'datasourceManage', '数据源管理', 'detail', '数据源明细', 200, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (317, 'report', 'resultsetManage', '数据集管理', 'detail', '数据集明细', 204, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (318, 'report', 'reportManage', '报表管理', 'detail', '报表明细', 221, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (319, 'report', 'bigScreenManage', '大屏报表', 'detail', '大屏明细', 231, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (320, 'report', 'excelManage', '表格报表', 'detail', 'excel明细', 234, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (321, 'system', 'fileManage', '文件管理', 'detail', '文件明细', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (322, 'system', 'dictManage', '数据字典', 'detail', '数据字典明细', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (323, 'system', 'dictItemManage', '数据字典项', 'detail', '数据字典项明细', 300, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (324, 'report', 'bigScreenManage', '大屏报表', 'copy', '复制大屏', 236, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (325, 'report', 'reportShareManage', '报表分享', 'query', '查询报表分享', 231, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (326, 'report', 'reportShareManage', '报表分享', 'detail', '查询明细', 232, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (327, 'report', 'reportShareManage', '报表分享', 'shareDelay', '分享延期', 233, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (328, 'report', 'reportShareManage', '报表分享', 'delete', '删除分享', 234, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+INSERT INTO `access_authority` VALUES (329, 'report', 'excelManage', '表格报表', 'share', '分享报表', 231, 1, 0, 'admin', '2023-01-10 07:31:06', 'admin', '2023-01-10 07:31:06', 1);
+
+-- ----------------------------
+-- Table structure for access_role
+-- ----------------------------
+DROP TABLE IF EXISTS `access_role`;
+CREATE TABLE `access_role` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `role_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '角色编码',
+ `role_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '角色名称',
+ `enable_flag` int(1) NOT NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT ' 0--未删除 1--已删除 DIC_NAME=DEL_FLAG',
+ `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '创建人',
+ `create_time` datetime NOT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` tinyint(4) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '运营角色表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of access_role
+-- ----------------------------
+INSERT INTO `access_role` VALUES (1, 'root', '超级管理员', 1, 0, 'root', '2019-07-23 16:00:33', 'root', '2019-07-23 16:00:33', 1);
+INSERT INTO `access_role` VALUES (2, 'designer', '设计员', 1, 0, 'root', '2019-07-23 16:00:33', 'root', '2019-07-23 16:00:33', 1);
+INSERT INTO `access_role` VALUES (3, 'viewer', '查看员', 1, 0, 'root', '2019-07-23 16:00:33', 'root', '2019-07-23 16:00:33', 1);
+
+-- ----------------------------
+-- Table structure for access_role_authority
+-- ----------------------------
+DROP TABLE IF EXISTS `access_role_authority`;
+CREATE TABLE `access_role_authority` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `role_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '角色名称',
+ `target` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '权限目标',
+ `action` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 622 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '运营角色权限表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of access_role_authority
+-- ----------------------------
+INSERT INTO `access_role_authority` VALUES (460, 'viewer', 'datasourceManage', 'query');
+INSERT INTO `access_role_authority` VALUES (461, 'viewer', 'resultsetManage', 'query');
+INSERT INTO `access_role_authority` VALUES (462, 'viewer', 'reportManage', 'query');
+INSERT INTO `access_role_authority` VALUES (463, 'viewer', 'bigScreenManage', 'share');
+INSERT INTO `access_role_authority` VALUES (464, 'viewer', 'bigScreenManage', 'view');
+INSERT INTO `access_role_authority` VALUES (465, 'designer', 'datasourceManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (466, 'designer', 'datasourceManage', 'update');
+INSERT INTO `access_role_authority` VALUES (467, 'designer', 'datasourceManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (468, 'designer', 'datasourceManage', 'query');
+INSERT INTO `access_role_authority` VALUES (469, 'designer', 'resultsetManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (470, 'designer', 'resultsetManage', 'update');
+INSERT INTO `access_role_authority` VALUES (471, 'designer', 'resultsetManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (472, 'designer', 'resultsetManage', 'query');
+INSERT INTO `access_role_authority` VALUES (473, 'designer', 'reportManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (474, 'designer', 'reportManage', 'update');
+INSERT INTO `access_role_authority` VALUES (475, 'designer', 'reportManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (476, 'designer', 'reportManage', 'query');
+INSERT INTO `access_role_authority` VALUES (477, 'designer', 'bigScreenManage', 'share');
+INSERT INTO `access_role_authority` VALUES (478, 'designer', 'bigScreenManage', 'view');
+INSERT INTO `access_role_authority` VALUES (479, 'designer', 'bigScreenManage', 'design');
+INSERT INTO `access_role_authority` VALUES (555, 'root', 'authorityManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (556, 'root', 'authorityManage', 'update');
+INSERT INTO `access_role_authority` VALUES (557, 'root', 'authorityManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (558, 'root', 'authorityManage', 'query');
+INSERT INTO `access_role_authority` VALUES (559, 'root', 'roleManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (560, 'root', 'roleManage', 'update');
+INSERT INTO `access_role_authority` VALUES (561, 'root', 'roleManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (562, 'root', 'roleManage', 'query');
+INSERT INTO `access_role_authority` VALUES (563, 'root', 'roleManage', 'grantAuthority');
+INSERT INTO `access_role_authority` VALUES (564, 'root', 'userManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (565, 'root', 'userManage', 'update');
+INSERT INTO `access_role_authority` VALUES (566, 'root', 'userManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (567, 'root', 'userManage', 'query');
+INSERT INTO `access_role_authority` VALUES (568, 'root', 'userManage', 'resetPassword');
+INSERT INTO `access_role_authority` VALUES (569, 'root', 'userManage', 'grantRole');
+INSERT INTO `access_role_authority` VALUES (570, 'root', 'datasourceManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (571, 'root', 'datasourceManage', 'update');
+INSERT INTO `access_role_authority` VALUES (572, 'root', 'datasourceManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (573, 'root', 'datasourceManage', 'query');
+INSERT INTO `access_role_authority` VALUES (574, 'root', 'resultsetManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (575, 'root', 'resultsetManage', 'update');
+INSERT INTO `access_role_authority` VALUES (576, 'root', 'resultsetManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (577, 'root', 'resultsetManage', 'query');
+INSERT INTO `access_role_authority` VALUES (578, 'root', 'reportManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (579, 'root', 'reportManage', 'update');
+INSERT INTO `access_role_authority` VALUES (580, 'root', 'reportManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (581, 'root', 'reportManage', 'query');
+INSERT INTO `access_role_authority` VALUES (582, 'root', 'bigScreenManage', 'share');
+INSERT INTO `access_role_authority` VALUES (583, 'root', 'bigScreenManage', 'view');
+INSERT INTO `access_role_authority` VALUES (584, 'root', 'bigScreenManage', 'design');
+INSERT INTO `access_role_authority` VALUES (585, 'root', 'bigScreenManage', 'export');
+INSERT INTO `access_role_authority` VALUES (586, 'root', 'bigScreenManage', 'import');
+INSERT INTO `access_role_authority` VALUES (587, 'root', 'excelManage', 'query');
+INSERT INTO `access_role_authority` VALUES (588, 'root', 'excelManage', 'view');
+INSERT INTO `access_role_authority` VALUES (589, 'root', 'excelManage', 'export');
+INSERT INTO `access_role_authority` VALUES (590, 'root', 'fileManage', 'query');
+INSERT INTO `access_role_authority` VALUES (591, 'root', 'fileManage', 'upload');
+INSERT INTO `access_role_authority` VALUES (592, 'root', 'fileManage', 'update');
+INSERT INTO `access_role_authority` VALUES (593, 'root', 'fileManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (594, 'root', 'dictManage', 'query');
+INSERT INTO `access_role_authority` VALUES (595, 'root', 'dictManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (596, 'root', 'dictManage', 'update');
+INSERT INTO `access_role_authority` VALUES (597, 'root', 'dictManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (598, 'root', 'dictManage', 'fresh');
+INSERT INTO `access_role_authority` VALUES (599, 'root', 'dictItemManage', 'query');
+INSERT INTO `access_role_authority` VALUES (600, 'root', 'dictItemManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (601, 'root', 'dictItemManage', 'update');
+INSERT INTO `access_role_authority` VALUES (602, 'root', 'dictItemManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (603, 'root', 'excelManage', 'insert');
+INSERT INTO `access_role_authority` VALUES (604, 'root', 'excelManage', 'update');
+INSERT INTO `access_role_authority` VALUES (605, 'root', 'authorityManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (606, 'root', 'roleManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (607, 'root', 'userManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (608, 'root', 'datasourceManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (609, 'root', 'resultsetManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (610, 'root', 'reportManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (611, 'root', 'bigScreenManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (612, 'root', 'bigScreenManage', 'copy');
+INSERT INTO `access_role_authority` VALUES (613, 'root', 'excelManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (614, 'root', 'fileManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (615, 'root', 'dictManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (616, 'root', 'dictItemManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (617, 'root', 'reportShareManage', 'query');
+INSERT INTO `access_role_authority` VALUES (618, 'root', 'reportShareManage', 'detail');
+INSERT INTO `access_role_authority` VALUES (619, 'root', 'reportShareManage', 'shareDelay');
+INSERT INTO `access_role_authority` VALUES (620, 'root', 'reportShareManage', 'delete');
+INSERT INTO `access_role_authority` VALUES (621, 'root', 'excelManage', 'share');
+
+-- ----------------------------
+-- Table structure for access_user
+-- ----------------------------
+DROP TABLE IF EXISTS `access_user`;
+CREATE TABLE `access_user` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `login_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT ' 登录名',
+ `real_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '真实用户',
+ `password` varchar(128) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '密码',
+ `phone` varchar(16) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '手机号码',
+ `email` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '用户邮箱',
+ `remark` varchar(512) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '备注',
+ `last_login_time` datetime NULL DEFAULT NULL COMMENT '最后一次登陆时间',
+ `last_login_ip` varchar(16) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '最后一次登录IP',
+ `enable_flag` int(1) NOT NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NOT NULL DEFAULT 0 COMMENT ' 0--未删除 1--已删除 DIC_NAME=DEL_FLAG',
+ `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` tinyint(4) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `IDX1`(`login_name`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 308 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '运营用户表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of access_user
+-- ----------------------------
+INSERT INTO `access_user` VALUES (1, 'admin', '管理员', 'afbc19467fbff0690b5eba5209d0e966', '18019216253', 'admin1@admin.com', NULL, '2018-08-20 22:04:02', '172.30.16.129', 1, 0, 'admin', '2019-07-23 16:00:38', 'admin', '2019-07-23 16:00:38', 1);
+INSERT INTO `access_user` VALUES (2, 'guest', '访客', '5632ad5d163ccaf1ecc305315a1a8e16', '18019214578', 'admin1@admin.com', NULL, '2018-08-20 22:04:02', '172.30.16.129', 1, 0, 'guest', '2019-07-23 16:00:38', 'admin', '2019-07-23 16:00:38', 1);
+
+-- ----------------------------
+-- Table structure for access_user_role
+-- ----------------------------
+DROP TABLE IF EXISTS `access_user_role`;
+CREATE TABLE `access_user_role` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+ `login_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '权限目标',
+ `role_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '角色名称',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = '运营角色权限表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of access_user_role
+-- ----------------------------
+INSERT INTO `access_user_role` VALUES (13, 'guest', 'viewer');
+INSERT INTO `access_user_role` VALUES (14, 'admin', 'root');
+INSERT INTO `access_user_role` VALUES (15, 'admin', 'designer');
+INSERT INTO `access_user_role` VALUES (16, 'admin', 'viewer');
+
+-- ----------------------------
+-- Table structure for flyway_schema_history
+-- ----------------------------
+DROP TABLE IF EXISTS `flyway_schema_history`;
+CREATE TABLE `flyway_schema_history` (
+ `installed_rank` int(11) NOT NULL,
+ `version` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `description` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+ `type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+ `script` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+ `checksum` int(11) NULL DEFAULT NULL,
+ `installed_by` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+ `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ `execution_time` int(11) NOT NULL,
+ `success` tinyint(1) NOT NULL,
+ PRIMARY KEY (`installed_rank`) USING BTREE,
+ INDEX `flyway_schema_history_s_idx`(`success`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for gaea_dict
+-- ----------------------------
+DROP TABLE IF EXISTS `gaea_dict`;
+CREATE TABLE `gaea_dict` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `dict_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典名称',
+ `dict_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典编码',
+ `remark` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述',
+ `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新用户',
+ `update_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(11) NULL DEFAULT NULL COMMENT '版本',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数组字典' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of gaea_dict
+-- ----------------------------
+INSERT INTO `gaea_dict` VALUES (1, '删除状态', 'DELETE_FLAG', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict` VALUES (2, '是否启用', 'ENABLE_FLAG', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict` VALUES (3, '文件状态', 'FILE_STATUS', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict` VALUES (4, '是否启用', 'FILTER_FLAG', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict` VALUES (5, '数据过滤类型', 'FILTER_TYPE', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict` VALUES (6, '指标类型', 'ITEM_TYPE', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict` VALUES (7, '国际化标识', 'LOCALE', 'ssssss', 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-27 22:20:00', 2);
+INSERT INTO `gaea_dict` VALUES (8, '数据源类型', 'SOURCE_TYPE', '', 'admin', '2021-03-23 13:16:58', 'admin', '2021-04-13 16:43:30', 4);
+INSERT INTO `gaea_dict` VALUES (9, '数据转换类型', 'TRANSFORM_TYPE', NULL, 'admin', '2021-03-23 13:24:28', 'admin', '2021-03-23 13:24:32', 1);
+INSERT INTO `gaea_dict` VALUES (10, '是否必填', 'REQUIRED_FLAG', NULL, 'admin', '2021-03-23 13:25:50', 'admin', '2021-03-23 13:25:53', 1);
+INSERT INTO `gaea_dict` VALUES (11, '行业类型', 'SYS_CATA_TYPE', '系统所属行业类型', 'admin', '2021-03-25 13:07:38', 'admin', '2021-03-25 13:07:38', 1);
+INSERT INTO `gaea_dict` VALUES (12, '报表类型', 'REPORT_TYPE', '报表类型', 'admin', '2021-03-26 11:48:06', 'admin', '2021-03-26 11:48:11', NULL);
+INSERT INTO `gaea_dict` VALUES (13, '菜单国际化', 'MENU_LANGUAGE', '菜单国际化配置', 'admin', '2021-04-06 16:33:33', 'admin', '2021-04-06 16:33:33', 1);
+INSERT INTO `gaea_dict` VALUES (14, '报表分组', 'REPORT_GROUP', '报表分组', 'admin', '2021-04-07 09:36:40', 'admin', '2021-04-07 09:36:42', 1);
+INSERT INTO `gaea_dict` VALUES (15, '报表组件类型', 'DASHBOARD_PANEL_TYPE', '报表组件类型', 'admin', '2021-04-12 10:42:50', 'admin', '2021-04-12 10:42:55', 1);
+INSERT INTO `gaea_dict` VALUES (16, '图表属性', 'CHART_PROPERTIES', '报表属性', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 3);
+INSERT INTO `gaea_dict` VALUES (17, '分享有效期', 'SHARE_VAILD', '报表分享', 'admin', '2021-08-18 13:29:19', 'admin', '2021-08-18 13:29:24', 1);
+INSERT INTO `gaea_dict` VALUES (18, '柱状图属性', 'BAR_PROPERTIES', '柱状图属性', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 1);
+INSERT INTO `gaea_dict` VALUES (19, '折线图属性', 'LINE_PROPERTIES', '折线图属性', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 1);
+INSERT INTO `gaea_dict` VALUES (20, '柱线图属性', 'BAR_LINE_PROPERTIES', '柱线图属性', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 1);
+INSERT INTO `gaea_dict` VALUES (21, '饼图属性', 'PIE_PROPERTIES', '饼图、漏斗图', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 1);
+INSERT INTO `gaea_dict` VALUES (22, '单文本图属性', 'TEXT_PROPERTIES', '仪表盘、百分比、文本框、滚动文本', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 1);
+INSERT INTO `gaea_dict` VALUES (23, '堆叠图属性', 'STACK_PROPERTIES', '堆叠图属性', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 1);
+INSERT INTO `gaea_dict` VALUES (24, '地图属性', 'MAP_PROPERTIES', '地图属性', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 1);
+INSERT INTO `gaea_dict` VALUES (25, '数据集类型', 'SET_TYPE', '数据集类型', 'admin', '2021-11-16 14:43:12', 'admin', '2021-11-16 14:43:12', 1);
+INSERT INTO `gaea_dict` VALUES (26, 'XY坐标属性', 'COORD_PROPERTIES', 'XY坐标属性', 'admin', '2023-01-10 07:31:04', 'admin', '2023-01-10 07:31:04', 1);
+INSERT INTO `gaea_dict` VALUES (27, '源端目标端属性', 'SOUTAR_PROPERTIES', '源端目标端属性', 'admin', '2023-01-10 07:31:05', 'admin', '2023-01-10 07:31:05', 1);
+INSERT INTO `gaea_dict` VALUES (28, '雷达属性', 'RADAR_PROPERTIES', '雷达属性', 'admin', '2023-01-10 07:31:07', 'admin', '2023-01-10 07:31:07', 1);
+INSERT INTO `gaea_dict` VALUES (29, '下拉框属性', 'SELECT_PROPERTIES', '下拉框属性', 'admin', '2023-01-10 07:31:07', 'admin', '2023-01-10 07:31:07', 1);
+
+-- ----------------------------
+-- Table structure for gaea_dict_item
+-- ----------------------------
+DROP TABLE IF EXISTS `gaea_dict_item`;
+CREATE TABLE `gaea_dict_item` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `dict_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据字典编码',
+ `item_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典项名称',
+ `item_value` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典项值',
+ `item_extend` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '字典扩展项',
+ `enabled` int(1) NULL DEFAULT 1 COMMENT '1:启用 0:禁用',
+ `locale` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '语言标识',
+ `remark` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '描述',
+ `sort` int(11) NULL DEFAULT NULL COMMENT '排序',
+ `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` timestamp NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新用户',
+ `update_time` timestamp NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(11) NULL DEFAULT NULL COMMENT '版本',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 327 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据字典项' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of gaea_dict_item
+-- ----------------------------
+INSERT INTO `gaea_dict_item` VALUES (1, 'AUDIT_FLAG', '待审核', 'waiting', NULL, 1, 'zh', '待审核', 1, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (2, 'AUDIT_FLAG', '审核中', 'ongoing', NULL, 1, 'zh', '审核中', 2, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (3, 'AUDIT_FLAG', '通过', 'approved', NULL, 1, 'zh', '通过', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (4, 'AUDIT_FLAG', '拒绝', 'rejected', NULL, 1, 'zh', '拒绝', 4, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (5, 'DELETE_FLAG', '已删除', '1', NULL, 1, 'zh', '已删除', 5, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-31 12:04:26', 2);
+INSERT INTO `gaea_dict_item` VALUES (6, 'DELETE_FLAG', '未删除', '0', NULL, 1, 'zh', '未删除', 6, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-31 12:04:49', 3);
+INSERT INTO `gaea_dict_item` VALUES (7, 'ENABLE_FLAG', '禁用', '0', NULL, 1, 'zh', '已禁用', 2, 'admin', '2021-03-09 16:43:09', 'admin', '2021-04-08 14:41:13', 3);
+INSERT INTO `gaea_dict_item` VALUES (8, 'ENABLE_FLAG', '启用', '1', NULL, 1, 'zh', '已启用', 1, 'admin', '2021-03-09 16:43:09', 'admin', '2021-04-08 14:41:18', 3);
+INSERT INTO `gaea_dict_item` VALUES (9, 'SYSTEM_CODE', 'CTS电脑端', 'CTS-PC', NULL, 1, 'zh', 'CTS电脑端', 9, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (10, 'SYSTEM_CODE', 'CTS App端', 'CTS-APP', NULL, 1, 'zh', 'CTS App端', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (11, 'FILTER_FLAG', '已禁用', '0', NULL, 1, 'zh', '已禁用', 7, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (12, 'FILTER_FLAG', '已启用', '1', NULL, 1, 'zh', '已启用', 8, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (13, 'FILTER_TYPE', 'js脚本', 'jsCalc', NULL, 1, 'zh', 'js脚本', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (14, 'FILTER_TYPE', '新增字段', 'addField', NULL, 1, 'zh', '新增字段', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (15, 'FILTER_TYPE', '替换字段', 'replaceField', NULL, 1, 'zh', '替换字段', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (16, 'FILTER_TYPE', 'ip解析java处理', 'ipTransform', NULL, 1, 'zh', 'ip解析java处理', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (17, 'FILTER_TYPE', 'vpn在线时长java处理', 'vpnTransform', NULL, 1, 'zh', 'vpn在线时长java处理', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (18, 'SETTING_TYPE', '字符串', 'input', NULL, 1, 'zh', '字符串', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (19, 'SETTING_TYPE', '数字', 'input-number', NULL, 1, 'zh', '数字', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (20, 'SETTING_TYPE', '文本区域', 'textarea', NULL, 1, 'zh', '文本区域', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (21, 'SETTING_TYPE', '数据字典', 'code-select', NULL, 1, 'zh', '数据字典', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (22, 'SETTING_TYPE', '下拉列表', 'select', NULL, 1, 'zh', '下拉列表', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (23, 'SETTING_TYPE', '单选按钮', 'radio-group', NULL, 1, 'zh', '单选按钮', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (24, 'SETTING_TYPE', '多选按钮', 'checkbox-group', NULL, 1, 'zh', '多选按钮', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (25, 'SETTING_TYPE', '自定义表单', 'custom-form', NULL, 1, 'zh', '自定义表单', 10, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (26, 'FILE_STATUS', '生成中', 'creating', NULL, 1, 'zh', '生成中', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (27, 'FILE_STATUS', '生成成功', 'success', NULL, 1, 'zh', '生成成功', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (28, 'FILE_STATUS', '生成失败', 'failed', NULL, 1, 'zh', '生成失败', 3, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (29, 'LOCALE', '中文', 'zh', NULL, 1, 'zh', '中文', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (30, 'LOCALE', '英文', 'en', NULL, 1, 'zh', '英文', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (31, 'LOCALE', 'Chinese', 'zh', NULL, 1, 'en', 'Chinese', NULL, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (32, 'LOCALE', 'English', 'en', NULL, 1, 'en', 'English', 1, 'admin', '2021-03-09 16:43:09', 'admin', '2021-03-09 16:43:09', 1);
+INSERT INTO `gaea_dict_item` VALUES (33, 'REQUIRED_FLAG', '必填', '1', NULL, 1, 'zh', NULL, 2, 'admin', '2021-03-23 10:54:08', 'admin', '2021-03-23 10:54:08', 1);
+INSERT INTO `gaea_dict_item` VALUES (34, 'REQUIRED_FLAG', '非必填', '0', NULL, 1, 'zh', NULL, 2, 'admin', '2021-03-23 10:54:08', 'admin', '2021-03-23 10:54:08', 1);
+INSERT INTO `gaea_dict_item` VALUES (35, 'TRANSFORM_TYPE', 'js脚本', 'js', NULL, 1, 'zh', NULL, 2, 'admin', '2021-03-23 10:54:08', 'admin', '2021-03-23 10:54:08', 1);
+INSERT INTO `gaea_dict_item` VALUES (36, 'TRANSFORM_TYPE', 'java脚本', 'javaBean', NULL, 1, 'zh', NULL, 2, 'admin', '2021-03-23 10:54:08', 'admin', '2021-03-23 10:54:08', 1);
+INSERT INTO `gaea_dict_item` VALUES (37, 'TRANSFORM_TYPE', '字典翻译', 'dict', '{\"dict1\": {\"1\": \"男\",\"0\": \"女\"},\"dict2\": {\"mysql\": \"mysql\",\"sqlserver\": \"sqlserver\"}}', 1, 'zh', NULL, 2, 'admin', '2021-03-23 10:54:08', 'admin', '2021-03-23 10:54:08', 1);
+INSERT INTO `gaea_dict_item` VALUES (38, 'SYS_CATA_TYPE', '行业01', '1001', NULL, 1, 'zh', NULL, 1, 'admin', '2021-03-25 13:10:32', 'admin', '2021-03-25 13:10:32', 1);
+INSERT INTO `gaea_dict_item` VALUES (39, 'SYS_CATA_TYPE', '行业02', '1002', NULL, 1, 'zh', NULL, 2, 'admin', '2021-03-25 13:11:01', 'admin', '2021-03-25 13:11:01', 1);
+INSERT INTO `gaea_dict_item` VALUES (40, 'REPORT_TYPE', 'excel报表', 'report_excel', NULL, 1, 'zh', NULL, NULL, 'admin', '2021-03-26 11:49:28', 'admin', '2021-03-26 11:50:19', NULL);
+INSERT INTO `gaea_dict_item` VALUES (41, 'REPORT_TYPE', '大屏报表', 'report_screen', NULL, 1, 'zh', NULL, NULL, 'admin', '2021-03-26 11:50:25', 'admin', '2021-03-26 11:50:21', NULL);
+INSERT INTO `gaea_dict_item` VALUES (42, 'REPORT_GROUP', '分组1', 'group_1', NULL, 1, 'zh', NULL, 1, 'admin', '2021-04-07 09:39:45', 'admin', '2021-04-13 16:44:31', 2);
+INSERT INTO `gaea_dict_item` VALUES (43, 'REPORT_GROUP', '分组2', 'group_2', NULL, 1, 'zh', NULL, 1, 'admin', '2021-04-07 09:40:55', 'admin', '2021-04-07 09:40:52', 1);
+INSERT INTO `gaea_dict_item` VALUES (44, 'INF_STATUS', '审核通过', '5', NULL, 1, 'zh', NULL, 25, 'admin', '2021-04-07 11:02:42', 'admin', '2021-04-07 15:01:35', 3);
+INSERT INTO `gaea_dict_item` VALUES (45, 'RULE_PARAM_TYPE', 'int', 'int', NULL, 1, 'zh', NULL, 3, 'zouya', '2021-04-09 09:43:22', 'zouya', '2021-04-09 09:43:22', 1);
+INSERT INTO `gaea_dict_item` VALUES (46, 'PUSH_TYPE', 'APP端', 'appsp', NULL, 1, 'zh', 'App端推送采用推送平台Appsp', 4, 'admin', '2021-04-09 10:13:33', 'admin', '2021-04-09 10:14:11', 3);
+INSERT INTO `gaea_dict_item` VALUES (47, 'DASHBOARD_PANEL_TYPE', '文本', 'text', NULL, 1, 'zh', 'App端推送采用推送平台Appsp', 4, 'admin', '2021-04-09 10:13:33', 'admin', '2021-04-09 10:14:11', 3);
+INSERT INTO `gaea_dict_item` VALUES (48, 'DASHBOARD_PANEL_TYPE', '滚动文本', '\r\nscrollingText', NULL, 1, 'zh', 'App端推送采用推送平台Appsp', 4, 'admin', '2021-04-09 10:13:33', 'admin', '2021-04-09 10:14:11', 3);
+INSERT INTO `gaea_dict_item` VALUES (49, 'DASHBOARD_PANEL_TYPE', '超链接', 'hyperlinks', NULL, 1, 'zh', 'App端推送采用推送平台Appsp', 4, 'admin', '2021-04-09 10:13:33', 'admin', '2021-04-09 10:14:11', 3);
+INSERT INTO `gaea_dict_item` VALUES (50, 'DASHBOARD_PANEL_TYPE', '当前时间', 'currentTime', NULL, 1, 'zh', 'App端推送采用推送平台Appsp', 4, 'admin', '2021-04-09 10:13:33', 'admin', '2021-04-09 10:14:11', 3);
+INSERT INTO `gaea_dict_item` VALUES (51, 'DASHBOARD_PANEL_TYPE', '图片', 'picture', NULL, 1, 'zh', 'App端推送采用推送平台Appsp', 4, 'admin', '2021-04-09 10:13:33', 'admin', '2021-04-09 10:14:11', 3);
+INSERT INTO `gaea_dict_item` VALUES (52, 'DASHBOARD_PANEL_TYPE', '轮播图片', 'rotatePictures', NULL, 1, 'zh', 'App端推送采用推送平台Appsp', 4, 'admin', '2021-04-09 10:13:33', 'admin', '2021-04-09 10:14:11', 3);
+INSERT INTO `gaea_dict_item` VALUES (53, 'MENU_LANGUAGE', '图标库', 'SvgDemo', '', 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (54, 'MENU_LANGUAGE', '代码生成', 'Generator', NULL, 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (55, 'MENU_LANGUAGE', '项目列表', 'Project', '', 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (56, 'MENU_LANGUAGE', '生成示例-单表', 'AlipayConfig', '', 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (57, 'MENU_LANGUAGE', '设备信息-主表', 'DeviceInfo', '', 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (58, 'MENU_LANGUAGE', '设备类型-子表', 'DeviceModel', '', 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (59, 'MENU_LANGUAGE', '设备日志-子表', 'DeviceLogDetail', '', 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (60, 'MENU_LANGUAGE', 'API文档', 'API', '', 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (61, 'MENU_LANGUAGE', '系统通告', 'Announcement', '', 1, 'zh', '', 1, 'admin', '2021-04-06 16:34:10', 'admin', '2021-04-06 16:34:10', 1);
+INSERT INTO `gaea_dict_item` VALUES (62, 'REPORT_GROUP', '分组3', 'group_3', NULL, 1, 'zh', NULL, 3, 'admin', '2021-04-13 16:45:28', 'admin', '2021-04-13 16:45:28', 1);
+INSERT INTO `gaea_dict_item` VALUES (63, 'MENU_LANGUAGE', '文件管理', 'FileManagement', NULL, 1, 'zh', NULL, 1, 'admin', '2021-04-27 13:57:58', 'admin', '2021-04-27 13:57:58', 1);
+INSERT INTO `gaea_dict_item` VALUES (64, 'CHART_PROPERTIES', 'x轴字段', 'xAxis', NULL, 1, 'zh', NULL, 1, 'admin', '2023-01-10 07:31:00', 'admin', '2023-01-10 07:31:00', 1);
+INSERT INTO `gaea_dict_item` VALUES (65, 'CHART_PROPERTIES', '柱状', 'bar', NULL, 1, 'zh', NULL, 6, 'admin', '2021-04-29 10:48:43', 'admin', '2021-04-29 10:48:50', 1);
+INSERT INTO `gaea_dict_item` VALUES (66, 'CHART_PROPERTIES', '折线', 'line', NULL, 1, 'zh', NULL, 7, 'admin', '2021-04-29 10:48:43', 'admin', '2021-04-29 10:48:50', 1);
+INSERT INTO `gaea_dict_item` VALUES (67, 'CHART_PROPERTIES', '饼图/仪表盘/气泡地图name', 'name', NULL, 1, 'zh', NULL, 8, 'admin', '2021-04-29 10:48:43', 'admin', '2021-04-29 10:48:50', 1);
+INSERT INTO `gaea_dict_item` VALUES (68, 'CHART_PROPERTIES', '饼图/仪表盘/气泡地图value', 'value', NULL, 1, 'zh', NULL, 9, 'admin', '2021-04-29 10:48:43', 'admin', '2021-04-29 10:48:50', 1);
+INSERT INTO `gaea_dict_item` VALUES (69, 'CHART_PROPERTIES', '时间轴-时', 'xAxis-hour', NULL, 1, 'zh', NULL, 2, 'admin', '2021-04-29 10:48:43', 'admin', '2021-04-29 10:48:50', 1);
+INSERT INTO `gaea_dict_item` VALUES (70, 'CHART_PROPERTIES', '时间轴-天', 'xAxis-day', NULL, 1, 'zh', NULL, 3, 'admin', '2021-04-29 10:48:43', 'admin', '2021-04-29 10:48:50', 1);
+INSERT INTO `gaea_dict_item` VALUES (71, 'CHART_PROPERTIES', '时间轴-月', 'xAxis-month', NULL, 1, 'zh', NULL, 4, 'admin', '2021-04-29 10:48:43', 'admin', '2021-04-29 10:48:50', 1);
+INSERT INTO `gaea_dict_item` VALUES (72, 'CHART_PROPERTIES', '时间轴-年', 'xAxis-year', NULL, 1, 'zh', NULL, 5, 'admin', '2021-04-29 10:48:43', 'admin', '2021-04-29 10:48:50', 1);
+INSERT INTO `gaea_dict_item` VALUES (73, 'CHART_PROPERTIES', '文本数字', 'text', NULL, 1, 'zh', NULL, 10, 'admin', '2023-01-10 07:30:55', 'admin', '2023-01-10 07:30:55', 1);
+INSERT INTO `gaea_dict_item` VALUES (74, 'SOURCE_TYPE', 'mysql', 'mysql', '[{\"label\":\"driverName\",\"value\":\"com.mysql.cj.jdbc.Driver\",\"labelValue\":\"驱动类\"},{\"label\":\"jdbcUrl\",\"value\":\"jdbc:mysql://127.0.0.1:3306/test_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8\",\"labelValue\":\"连接串\"},{\"label\":\"username\",\"value\":\"root\",\"labelValue\":\"用户名\"},{\"label\":\"password\",\"value\":\"root\",\"labelValue\":\"密码\"}]', 1, 'zh', NULL, 1, '管理员', '2021-03-23 10:54:08', 'lixiaoyan', '2021-03-26 13:22:05', 3);
+INSERT INTO `gaea_dict_item` VALUES (75, 'SOURCE_TYPE', 'oracle', 'oracle', '[{\"label\":\"driverName\",\"value\":\"oracle.jdbc.driver.OracleDriver\",\"labelValue\":\"驱动类\"},{\"label\":\"jdbcUrl\",\"value\":\"jdbc:oracle:thin:@//localhost:1521/orcl\",\"labelValue\":\"连接串\"},{\"label\":\"username\",\"value\":\"root\",\"labelValue\":\"用户名\"},{\"label\":\"password\",\"value\":\"root\",\"labelValue\":\"密码\"}]', 1, 'zh', NULL, 2, 'admin', '2021-03-23 10:54:08', 'admin', '2021-03-23 10:54:08', 1);
+INSERT INTO `gaea_dict_item` VALUES (76, 'SOURCE_TYPE', 'mssqlserver', 'mssqlserver', '[{\"label\":\"driverName\",\"value\":\"com.microsoft.sqlserver.jdbc.SQLServerDriver\",\"labelValue\":\"驱动类\"},{\"label\":\"jdbcUrl\",\"value\":\"jdbc:sqlserver://127.0.0.1:1433;DatabaseName=test_db\",\"labelValue\":\"连接串\"},{\"label\":\"username\",\"value\":\"root\",\"labelValue\":\"用户名\"},{\"label\":\"password\",\"value\":\"root\",\"labelValue\":\"密码\"}]', 1, 'zh', NULL, 3, 'admin', '2021-03-23 10:54:08', 'admin', '2021-03-23 10:54:08', 1);
+INSERT INTO `gaea_dict_item` VALUES (77, 'SOURCE_TYPE', 'elasticsearch_sql', 'elasticsearch_sql', '[{\"label\":\"apiUrl\",\"value\":\"http://10.108.26.164:9200/_xpack/sql?format=json\",\"labelValue\":\"请求路径\"},{\"label\":\"method\",\"value\":\"POST\",\"labelValue\":\"请求方式\"},{\"label\":\"header\",\"value\":\"{\\\"Content-Type\\\":\\\"application/json\\\"}\",\"labelValue\":\"请求头\"},{\"label\":\"body\",\"value\":\"{\\\"query\\\":\\\"select 1\\\"}\",\"labelValue\":\"请求体\"}]', 1, 'zh', NULL, 11, '管理员', '2021-03-23 10:54:08', 'admin', '2021-04-13 13:12:33', 9);
+INSERT INTO `gaea_dict_item` VALUES (78, 'SOURCE_TYPE', 'kudu impala', 'kudu_impala', '[{\"label\":\"driverName\",\"value\":\"com.cloudera.impala.jdbc41.Driver\",\"labelValue\":\"驱动类\"},{\"label\":\"jdbcUrl\",\"value\":\"jdbc:impala://10.108.3.111:21050/ods\",\"labelValue\":\"连接串\"},{\"label\":\"username\",\"value\":\"\",\"labelValue\":\"用户名\"},{\"label\":\"password\",\"value\":\"\",\"labelValue\":\"密码\"}]', 1, 'zh', NULL, 12, 'admin', '2021-03-23 10:54:08', 'admin', '2021-04-01 09:18:09', 3);
+INSERT INTO `gaea_dict_item` VALUES (79, 'SOURCE_TYPE', 'jdbc', 'jdbc', '[{\"label\":\"driverName\",\"value\":\"com.mysql.cj.jdbc.Driver\",\"labelValue\":\"驱动类\"},{\"label\":\"jdbcUrl\",\"value\":\"jdbc:mysql://127.0.0.1:3306/test_db?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8\",\"labelValue\":\"连接串\"},{\"label\":\"username\",\"value\":\"root\",\"labelValue\":\"用户名\"},{\"label\":\"password\",\"value\":\"root\",\"labelValue\":\"密码\"}]', 1, 'zh', NULL, 21, '管理员', '2021-04-13 17:26:38', 'admin', '2021-04-13 17:26:38', 1);
+INSERT INTO `gaea_dict_item` VALUES (80, 'SOURCE_TYPE', 'http', 'http', '[{\"label\":\"apiUrl\",\"value\":\"https://gateway.test.com/api/getdata\",\"labelValue\":\"请求路径\"},{\"label\":\"method\",\"value\":\"POST\",\"labelValue\":\"请求方式\"},{\"label\":\"header\",\"value\":\"{\\\"Content-Type\\\":\\\"application/json;charset=UTF-8\\\"}\",\"labelValue\":\"请求头\"},{\"label\":\"body\",\"value\":\"{\\\"username\\\":\\\"admin\\\",\\\"password\\\":\\\"de12878c0ef5beb7d8848c3af8f54afb\\\",\\\"verifyCode\\\":\\\"\\\"}\",\"labelValue\":\"请求体\"}]', 1, 'zh', NULL, 29, '管理员', '2021-04-13 17:26:38', 'admin', '2021-04-13 17:26:38', 1);
+INSERT INTO `gaea_dict_item` VALUES (81, 'CHART_PROPERTIES', 'y轴字段', 'yAxis', NULL, 1, 'zh', NULL, 11, 'admin', '2021-07-05 15:33:59', 'admin', '2021-07-05 15:33:59', 1);
+INSERT INTO `gaea_dict_item` VALUES (82, 'SHARE_VAILD', '永久有效', '0', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-18 13:30:21', 'admin', '2021-08-18 13:30:21', 1);
+INSERT INTO `gaea_dict_item` VALUES (83, 'SHARE_VAILD', '1天', '1', NULL, 1, 'zh', NULL, 2, 'admin', '2021-08-18 13:30:39', 'admin', '2021-08-18 13:30:39', 1);
+INSERT INTO `gaea_dict_item` VALUES (84, 'SHARE_VAILD', '7天', '7', NULL, 1, 'zh', NULL, 3, 'admin', '2021-08-18 13:30:51', 'admin', '2021-08-18 13:30:56', 2);
+INSERT INTO `gaea_dict_item` VALUES (85, 'SHARE_VAILD', '30天', '30', NULL, 1, 'zh', NULL, 4, 'admin', '2021-08-18 13:31:11', 'admin', '2021-08-18 13:31:11', 1);
+INSERT INTO `gaea_dict_item` VALUES (86, 'BAR_PROPERTIES', 'x轴字段', 'xAxis', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-20 10:19:35', 'admin', '2021-08-20 10:19:35', 1);
+INSERT INTO `gaea_dict_item` VALUES (87, 'BAR_PROPERTIES', '柱状', 'bar', NULL, 1, 'zh', NULL, 2, 'admin', '2021-08-20 10:19:56', 'admin', '2021-08-20 10:19:56', 1);
+INSERT INTO `gaea_dict_item` VALUES (88, 'LINE_PROPERTIES', 'x轴字段', 'xAxis', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-20 10:27:39', 'admin', '2021-08-20 10:27:39', 1);
+INSERT INTO `gaea_dict_item` VALUES (89, 'LINE_PROPERTIES', '折线', 'line', NULL, 1, 'zh', NULL, 2, 'admin', '2021-08-20 10:27:49', 'admin', '2021-08-20 10:27:49', 1);
+INSERT INTO `gaea_dict_item` VALUES (90, 'BAR_LINE_PROPERTIES', 'x轴字段', 'xAxis', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-20 10:31:51', 'admin', '2021-08-20 10:31:51', 1);
+INSERT INTO `gaea_dict_item` VALUES (91, 'BAR_LINE_PROPERTIES', 'x轴时间轴-时', 'xAxis-hour', NULL, 1, 'zh', NULL, 2, 'admin', '2021-08-20 10:32:11', 'admin', '2021-08-20 10:32:11', 1);
+INSERT INTO `gaea_dict_item` VALUES (92, 'BAR_LINE_PROPERTIES', 'x轴时间轴-天', 'xAxis-day', NULL, 1, 'zh', NULL, 3, 'admin', '2021-08-20 10:32:25', 'admin', '2021-08-20 10:32:25', 1);
+INSERT INTO `gaea_dict_item` VALUES (93, 'BAR_LINE_PROPERTIES', 'x轴时间轴-月', 'xAxis-month', NULL, 1, 'zh', NULL, 4, 'admin', '2021-08-20 10:32:38', 'admin', '2021-08-20 10:32:38', 1);
+INSERT INTO `gaea_dict_item` VALUES (94, 'BAR_LINE_PROPERTIES', '时间轴-年', 'xAxis-year', NULL, 1, 'zh', NULL, 5, 'admin', '2021-08-20 10:32:52', 'admin', '2021-08-20 10:32:52', 1);
+INSERT INTO `gaea_dict_item` VALUES (95, 'BAR_LINE_PROPERTIES', '柱状', 'bar', NULL, 1, 'zh', NULL, 6, 'admin', '2021-08-20 10:33:02', 'admin', '2021-08-20 10:33:02', 1);
+INSERT INTO `gaea_dict_item` VALUES (96, 'BAR_LINE_PROPERTIES', '折线', 'line', NULL, 1, 'zh', NULL, 7, 'admin', '2021-08-20 10:33:11', 'admin', '2021-08-20 10:33:11', 1);
+INSERT INTO `gaea_dict_item` VALUES (97, 'PIE_PROPERTIES', '名称name', 'name', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-20 10:35:27', 'admin', '2021-08-20 10:35:27', 1);
+INSERT INTO `gaea_dict_item` VALUES (98, 'PIE_PROPERTIES', '数值value', 'value', NULL, 1, 'zh', NULL, 2, 'admin', '2021-08-20 10:35:38', 'admin', '2021-08-20 10:35:38', 1);
+INSERT INTO `gaea_dict_item` VALUES (99, 'TEXT_PROPERTIES', '文本数字', 'text', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-20 10:36:04', 'admin', '2021-08-20 10:36:04', 1);
+INSERT INTO `gaea_dict_item` VALUES (100, 'STACK_PROPERTIES', 'x轴字段', 'xAxis', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-20 10:31:51', 'admin', '2021-08-20 10:31:51', 1);
+INSERT INTO `gaea_dict_item` VALUES (101, 'STACK_PROPERTIES', 'x轴时间轴-时', 'xAxis-hour', NULL, 1, 'zh', NULL, 2, 'admin', '2021-08-20 10:32:11', 'admin', '2021-08-20 10:32:11', 1);
+INSERT INTO `gaea_dict_item` VALUES (102, 'STACK_PROPERTIES', 'x轴时间轴-天', 'xAxis-day', NULL, 1, 'zh', NULL, 3, 'admin', '2021-08-20 10:32:25', 'admin', '2021-08-20 10:32:25', 1);
+INSERT INTO `gaea_dict_item` VALUES (103, 'STACK_PROPERTIES', 'x轴时间轴-月', 'xAxis-month', NULL, 1, 'zh', NULL, 4, 'admin', '2021-08-20 10:32:38', 'admin', '2021-08-20 10:32:38', 1);
+INSERT INTO `gaea_dict_item` VALUES (104, 'STACK_PROPERTIES', '时间轴-年', 'xAxis-year', NULL, 1, 'zh', NULL, 5, 'admin', '2021-08-20 10:32:52', 'admin', '2021-08-20 10:32:52', 1);
+INSERT INTO `gaea_dict_item` VALUES (105, 'STACK_PROPERTIES', 'y轴字段', 'yAxis', NULL, 1, 'zh', NULL, 6, 'admin', '2021-08-20 10:32:52', 'admin', '2021-08-20 10:32:52', 1);
+INSERT INTO `gaea_dict_item` VALUES (106, 'STACK_PROPERTIES', '柱状', 'bar', NULL, 1, 'zh', NULL, 7, 'admin', '2021-08-20 10:33:02', 'admin', '2021-08-20 10:33:02', 1);
+INSERT INTO `gaea_dict_item` VALUES (107, 'STACK_PROPERTIES', '折线', 'line', NULL, 1, 'zh', NULL, 8, 'admin', '2021-08-20 10:33:11', 'admin', '2021-08-20 10:33:11', 1);
+INSERT INTO `gaea_dict_item` VALUES (108, 'MAP_PROPERTIES', '名称name', 'name', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-20 10:41:00', 'admin', '2021-08-20 10:41:00', 1);
+INSERT INTO `gaea_dict_item` VALUES (109, 'MAP_PROPERTIES', '数值value', 'value', NULL, 1, 'zh', NULL, 2, 'admin', '2021-08-20 10:41:11', 'admin', '2021-08-20 10:41:11', 1);
+INSERT INTO `gaea_dict_item` VALUES (110, 'SET_TYPE', 'sql', 'sql', NULL, 1, 'zh', NULL, NULL, 'admin', '2021-11-16 14:43:42', 'admin', '2021-11-16 14:43:42', 1);
+INSERT INTO `gaea_dict_item` VALUES (111, 'SET_TYPE', 'http', 'http', NULL, 1, 'zh', NULL, NULL, 'admin', '2021-11-16 14:43:51', 'admin', '2021-11-16 14:43:51', 1);
+INSERT INTO `gaea_dict_item` VALUES (112, 'COORD_PROPERTIES', '数据', 'series', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:04', 'admin', '2023-01-10 07:31:04', 1);
+INSERT INTO `gaea_dict_item` VALUES (113, 'COORD_PROPERTIES', 'X轴', 'xAxis', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:04', 'admin', '2023-01-10 07:31:04', 1);
+INSERT INTO `gaea_dict_item` VALUES (114, 'COORD_PROPERTIES', 'Y轴', 'yAxis', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:04', 'admin', '2023-01-10 07:31:04', 1);
+INSERT INTO `gaea_dict_item` VALUES (115, 'SOUTAR_PROPERTIES', '源端', 'source', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:05', 'admin', '2023-01-10 07:31:05', 1);
+INSERT INTO `gaea_dict_item` VALUES (116, 'SOUTAR_PROPERTIES', '目标端', 'target', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:05', 'admin', '2023-01-10 07:31:05', 1);
+INSERT INTO `gaea_dict_item` VALUES (117, 'SOUTAR_PROPERTIES', '数值', 'value', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:05', 'admin', '2023-01-10 07:31:05', 1);
+INSERT INTO `gaea_dict_item` VALUES (118, 'RADAR_PROPERTIES', '名称', 'name', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:07', 'admin', '2023-01-10 07:31:07', 1);
+INSERT INTO `gaea_dict_item` VALUES (119, 'RADAR_PROPERTIES', '雷达顶点', 'radar', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:07', 'admin', '2023-01-10 07:31:07', 1);
+INSERT INTO `gaea_dict_item` VALUES (120, 'SELECT_PROPERTIES', '显示值', 'label', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:07', 'admin', '2023-01-10 07:31:07', 1);
+INSERT INTO `gaea_dict_item` VALUES (121, 'SELECT_PROPERTIES', '提交值', 'value', NULL, 1, 'zh', NULL, NULL, 'admin', '2023-01-10 07:31:07', 'admin', '2023-01-10 07:31:07', 1);
+INSERT INTO `gaea_dict_item` (id, dict_code, item_name, item_value, item_extend, enabled, locale, remark, sort, create_by, create_time, update_by, update_time, version)
+VALUES(122, 'SOURCE_TYPE', 'redis', 'redis', '[{"label":"redisUrl","value":"127.0.0.1:6379","labelValue":"连接串"},{"label":"username","value":"","labelValue":"用户名"},{"label":"password","value":"","labelValue":"密码"}]', 1, 'zh', NULL, NULL, 'admin', '2023-02-24 16:30:33.0', 'admin', '2023-02-24 16:30:38.0', 2);
+
+-- ----------------------------
+-- Table structure for gaea_file
+-- ----------------------------
+DROP TABLE IF EXISTS `gaea_file`;
+CREATE TABLE `gaea_file` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `file_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '生成的唯一uuid',
+ `file_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件类型，字典FILE_TYPE',
+ `file_path` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件在linux中的完整目录，比如/app/dist/export/excel/${fileid}.xlsx',
+ `url_path` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '通过接口的下载完整http路径',
+ `file_instruction` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '文件内容说明，比如 对账单(202001~202012)',
+ `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+ `create_time` timestamp NULL DEFAULT NULL,
+ `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
+ `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
+ `version` int(11) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 830 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for gaea_report
+-- ----------------------------
+DROP TABLE IF EXISTS `gaea_report`;
+CREATE TABLE `gaea_report` (
+ `id` bigint(11) NOT NULL AUTO_INCREMENT,
+ `report_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
+ `report_code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报表编码',
+ `report_group` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分组',
+ `report_type` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报表类型',
+ `report_image` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报表缩略图',
+ `report_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报表描述',
+ `report_author` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报表作者',
+ `download_count` bigint(11) NULL DEFAULT NULL COMMENT '报表下载次数',
+ `enable_flag` int(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
+ `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(8) NULL DEFAULT NULL COMMENT '版本号',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `UNIQUE_REPORT_CODE`(`report_code`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 194 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for gaea_report_dashboard
+-- ----------------------------
+DROP TABLE IF EXISTS `gaea_report_dashboard`;
+CREATE TABLE `gaea_report_dashboard` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '看板id',
+ `report_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '报表编码',
+ `title` varchar(254) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '看板标题',
+ `width` bigint(20) NULL DEFAULT NULL COMMENT '宽度px',
+ `height` bigint(20) NULL DEFAULT NULL COMMENT '高度px',
+ `background_color` varchar(24) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '背景色',
+ `background_image` varchar(254) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '背景图片',
+ `preset_line` varchar(4096) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '工作台中的辅助线',
+ `refresh_seconds` int(11) NULL DEFAULT NULL COMMENT '自动刷新间隔秒',
+ `enable_flag` int(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT ' 0--未删除 1--已删除 DIC_NAME=DEL_FLAG',
+ `sort` int(11) NULL DEFAULT 0 COMMENT '排序，降序',
+ `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `create_time` datetime NULL DEFAULT NULL,
+ `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `update_time` datetime NULL DEFAULT NULL,
+ `version` int(8) NULL DEFAULT NULL COMMENT '版本号',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `UNIQUE_REPORT_CODE`(`report_code`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 276 CHARACTER SET = utf8 COLLATE = utf8_general_ci 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(20) NOT NULL AUTO_INCREMENT COMMENT '组件id',
+ `report_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '报表编码',
+ `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '组件类型参考字典DASHBOARD_PANEL_TYPE',
+ `setup` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '组件的渲染属性json',
+ `data` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '组件的数据属性json',
+ `collapse` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '组件的配置属性json',
+ `position` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '组件的大小位置属性json',
+ `options` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'options配置项',
+ `refresh_seconds` int(11) NULL DEFAULT NULL COMMENT '自动刷新间隔秒',
+ `enable_flag` int(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT ' 0--未删除 1--已删除 DIC_NAME=DEL_FLAG',
+ `sort` bigint(20) NULL DEFAULT 0 COMMENT '排序，图层的概念',
+ `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `create_time` datetime NULL DEFAULT NULL,
+ `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ `update_time` datetime NULL DEFAULT NULL,
+ `version` int(8) NULL DEFAULT NULL COMMENT '版本号',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 8712 CHARACTER SET = utf8 COLLATE = utf8_general_ci 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(20) NOT NULL AUTO_INCREMENT,
+ `set_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据集编码',
+ `set_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据集名称',
+ `set_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据集描述',
+ `source_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据源编码',
+ `dyn_sentence` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '动态查询sql或者接口中的请求体',
+ `case_result` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '结果案例',
+ `enable_flag` int(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
+ `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(8) NULL DEFAULT NULL,
+ `set_type` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `unique_set_code`(`set_code`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 73 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据集管理' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 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(20) NOT NULL AUTO_INCREMENT,
+ `set_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据集编码',
+ `param_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参数名',
+ `param_desc` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参数描述',
+ `param_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参数类型，字典=',
+ `sample_item` varchar(1080) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '参数示例项',
+ `required_flag` int(1) NULL DEFAULT 1 COMMENT '0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG',
+ `validation_rules` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'js校验字段值规则，满足校验返回 true',
+ `order_num` int(11) NULL DEFAULT NULL COMMENT '排序',
+ `enable_flag` int(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
+ `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(8) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 60 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据集查询参数' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- 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(20) NOT NULL AUTO_INCREMENT,
+ `set_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据集编码',
+ `transform_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据转换类型，DIC_NAME=TRANSFORM_TYPE; js，javaBean，字典转换',
+ `transform_script` varchar(10800) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据转换script,处理逻辑',
+ `order_num` int(2) NULL DEFAULT NULL COMMENT '排序,执行数据转换顺序',
+ `enable_flag` int(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
+ `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(8) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 37 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据集数据转换' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for gaea_report_data_source
+-- ----------------------------
+DROP TABLE IF EXISTS `gaea_report_data_source`;
+CREATE TABLE `gaea_report_data_source` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `source_code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据源编码',
+ `source_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据源名称',
+ `source_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据源描述',
+ `source_type` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据源类型 DIC_NAME=SOURCE_TYPE; mysql，orace，sqlserver，elasticsearch，接口，javaBean，数据源类型字典中item-extend动态生成表单',
+ `source_config` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL 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(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
+ `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(8) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `unique_source_code`(`source_code`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '数据源管理' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for gaea_report_excel
+-- ----------------------------
+DROP TABLE IF EXISTS `gaea_report_excel`;
+CREATE TABLE `gaea_report_excel` (
+ `id` bigint(11) NOT NULL AUTO_INCREMENT,
+ `report_code` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报表编码',
+ `set_codes` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据集编码，以|分割',
+ `set_param` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '数据集查询参数',
+ `json_str` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '报表json串',
+ `enable_flag` int(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
+ `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(8) NULL DEFAULT NULL COMMENT '版本号',
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `UNIQUE_REPORT_CODE`(`report_code`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 215 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for gaea_report_share
+-- ----------------------------
+DROP TABLE IF EXISTS `gaea_report_share`;
+CREATE TABLE `gaea_report_share` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
+ `share_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分享编码，系统生成，默认UUID',
+ `share_valid_type` int(2) NULL DEFAULT NULL COMMENT '分享有效期类型，DIC_NAME=SHARE_VAILD',
+ `share_valid_time` datetime NULL DEFAULT NULL COMMENT '分享有效期',
+ `share_token` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分享token',
+ `share_url` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分享url',
+ `share_password` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '分享码',
+ `report_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '报表编码',
+ `enable_flag` int(1) NULL DEFAULT 1 COMMENT '0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG',
+ `delete_flag` int(1) NULL DEFAULT 0 COMMENT '0--未删除 1--已删除 DIC_NAME=DELETE_FLAG',
+ `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+ `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+ `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
+ `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+ `version` int(8) NULL DEFAULT NULL,
+ PRIMARY KEY (`id`) USING BTREE,
+ UNIQUE INDEX `UNIQUE_SHARE_CODE`(`share_code`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '报表分享' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/report-ui/src/api/socket.js b/report-ui/src/api/socket.js
new file mode 100644
index 0000000000000000000000000000000000000000..f6b5a3ccf4bd35ed284a915531c76342f0e68325
--- /dev/null
+++ b/report-ui/src/api/socket.js
@@ -0,0 +1,108 @@
+import {reportAdd, reportDeleteBatch, reportDetail, reportList, reportUpdate} from "./reportmanage";
+
+var websock = null;
+
+var serverPort = "9095"; // webSocket连接端口
+var wsuri = "ws://" + window.location.hostname + ":" + serverPort + "/websocket/RealTimeWebsocket";
+
+import store from '@/store';
+
+export function createWebSocket() {
+ if (websock == null || typeof websock !== WebSocket) {
+ initWebSocket();
+ }
+}
+
+function initWebSocket() {
+ // console.log("开始了")
+ // 初始化websocket
+ websock = new WebSocket(wsuri);
+ websock.onmessage = function (e) {
+ websocketonmessage(e);
+ };
+ websock.onclose = function (e) {
+ websocketclose(e);
+ };
+ websock.onopen = function () {
+ websocketOpen();
+ };
+
+ // 连接发生错误的回调方法
+ websock.onerror = function () {
+ console.log("WebSocket连接发生错误");
+ //createWebSocket();啊，发现这样写会创建多个连接，加延时也不行
+ };
+}
+
+// 实际调用的方法
+export function sendSock(agentData) {
+ if (websock.readyState === websock.OPEN) {
+ // 若是ws开启状态
+ websocketsend(agentData);
+ } else if (websock.readyState === websock.CONNECTING) {
+ // 若是 正在开启状态，则等待1s后重新调用
+ setTimeout(function () {
+ sendSock(agentData);
+ }, 1000);
+ } else {
+ // 若未开启 ，则等待1s后重新调用
+ setTimeout(function () {
+ sendSock(agentData);
+ }, 1000);
+ }
+}
+
+export function closeSock() {
+ // console.log("关闭了")
+ if (websock) {
+ websock.close(); // 关闭socket连接
+ websock = null;
+ }
+}
+
+function websocketsend(agentData) {
+ websock.send(JSON.stringify(agentData));
+
+ // 创建一个 Promise 对象
+ const promise = new Promise((resolve, reject) => {
+ // 设置回调函数
+ websock.onmessage = (event) => {
+ const jsonData = JSON.parse(event.data);
+
+ // 解析包含键值对的 JSON 对象
+ const map = parseMapJSON(jsonData);
+
+ for (const [key, value] of map.entries()) {
+ setValue(key, value);
+ }
+
+ // 回调函数执行完后，使用 resolve() 完成 Promise
+ resolve();
+ };
+ });
+
+ // 返回 Promise 对象
+ return promise;
+}
+
+// 解析包含键值对的 JSON 对象为 Map
+function parseMapJSON(json) {
+ const entries = Object.entries(json);
+ const map = new Map(entries);
+ return map;
+}
+
+function setValue(key, value) {
+ store.dispatch('SET_KEYVALUEPAIR', {key, value});
+}
+
+// 关闭
+function websocketclose(e) {
+ // console.log("connection closed (" + e.code + ")");
+}
+
+function websocketOpen(e) {
+ // console.log("连接打开");
+}
+
+export default {createWebSocket, closeSock, sendSock}
diff --git a/report-ui/src/main.js b/report-ui/src/main.js
index 2fc0e97df555b7534c85f281b3d0a2a8263069a9..8ca2c82379f721b7e30b42979414b652cb0dc07f 100644
--- a/report-ui/src/main.js
+++ b/report-ui/src/main.js
@@ -19,6 +19,7 @@ import echarts from 'echarts';
import ECharts from 'vue-echarts'
import 'echarts/lib/chart/bar'
import 'echarts/lib/component/tooltip'
+import socket from "@/api/socket";
//import 'echarts-liquidfill'
// import 'echarts-gl'
Vue.component('v-chart', ECharts)
@@ -58,6 +59,8 @@ Vue.mixin(mixins)
// 分页的全局size配置;
Vue.prototype.$pageSizeAll = [10, 50, 100, 200, 500]
+Vue.prototype.socket = socket;
+
Vue.config.productionTip = false
// create the app instance.
diff --git a/report-ui/src/store/getters.js b/report-ui/src/store/getters.js
index 4b53b4800eb6e8b07159610d35a31b0c4d3dd806..ca4536e8d0508c1958f06200cffb69b7b47ed080 100644
--- a/report-ui/src/store/getters.js
+++ b/report-ui/src/store/getters.js
@@ -5,6 +5,7 @@ const getters = {
device: state => state.app.device,
token: state => state.user.token,
accessUser: state => state.user.accessUser,
- cacheViews: state => state.cacheView.cacheViews
+ cacheViews: state => state.cacheView.cacheViews,
+ websocket: state => state.websocket.keyValuePairs
}
export default getters
diff --git a/report-ui/src/store/index.js b/report-ui/src/store/index.js
index 89cec40ac16d4d92e4c2b251d5bd1baea107400a..8dca8bf3dfbb998fc61586c885a06cbe07c426e0 100644
--- a/report-ui/src/store/index.js
+++ b/report-ui/src/store/index.js
@@ -8,7 +8,7 @@ import user from './modules/user'
import cacheView from './modules/cachaView'
import help from './modules/help'
import designer from './modules/designer'
-
+import websocket from './modules/websocket'
Vue.use(Vuex)
const initPlugin = store => {
@@ -20,7 +20,8 @@ const store = new Vuex.Store({
user,
cacheView,
help,
- designer
+ designer,
+ websocket
},
state: { },
plugins: [initPlugin],
diff --git a/report-ui/src/store/modules/websocket.js b/report-ui/src/store/modules/websocket.js
new file mode 100644
index 0000000000000000000000000000000000000000..e56bfa3b5fed5a6844734f07836d3b0fe7cf1316
--- /dev/null
+++ b/report-ui/src/store/modules/websocket.js
@@ -0,0 +1,17 @@
+const websocket = {
+ state: {
+ keyValuePairs: {}
+ },
+ mutations: {
+ UPDATE_KEYVALUEPAIR(state, { key, value }) {
+ Vue.set(state.keyValuePairs, key, value);
+ }
+ },
+ actions: {
+ SET_KEYVALUEPAIR({ commit }, { key, value }) {
+ commit('UPDATE_KEYVALUEPAIR', { key, value });
+ }
+ }
+};
+
+export default websocket;
diff --git a/report-ui/src/views/bigscreenDesigner/designer/components/dynamicComponents.vue b/report-ui/src/views/bigscreenDesigner/designer/components/dynamicComponents.vue
index 684f53f6c95f37a262e95b56f303045a2430dced..f73173691a83f6533d6fb5bfd063bb11e1befac7 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/components/dynamicComponents.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/components/dynamicComponents.vue
@@ -87,6 +87,15 @@ export default {
}
});
return code;
+ },
+ setType() {
+ let type = "";
+ this.dataSet.forEach(el => {
+ if (el.id == this.dataSetValue) {
+ type = el.setType;
+ }
+ });
+ return type;
}
},
mounted() {
@@ -115,6 +124,7 @@ export default {
const params = {
chartType: this.chartType,
setCode: this.setCode,
+ setType: this.setType,
chartProperties: this.chartProperties,
contextData
};
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
index 3558d62950764b8c197a0cf08a06d5300d25c40c..cf304f478f214aad374de64c339166d24ade7d6e 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/texts/widgetText.vue
@@ -8,8 +8,9 @@
{{ styleColor.text }}