diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml
deleted file mode 100644
index a1f4e6f70..000000000
--- a/pigx-common/pigx-common-transaction/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
- 4.0.0
-
- com.pig4cloud
- pigx-common
- 4.3.0
-
-
- pigx-common-transaction
- jar
-
- pigx lcn transaction
-
-
-
- com.pig4cloud
- pigx-common-core
-
-
-
- com.codingapi
- tx-client
- ${lcn.version}
-
-
- org.slf4j
- *
-
-
-
-
- com.codingapi
- tx-plugins-db
- ${lcn.version}
-
-
- org.slf4j
- *
-
-
-
-
-
- org.springframework.cloud
- spring-cloud-starter-openfeign
-
-
-
-
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/TransactionConfiguration.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/TransactionConfiguration.java
deleted file mode 100755
index cdec744b7..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/TransactionConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction;
-
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author LCN on 2017/6/26.
- * @author LCN
- * @since 4.1.0
- */
-
-@Configuration
-@ComponentScan({ "com.codingapi.tx", "com.pig4cloud.pigx.common.transaction" })
-public class TransactionConfiguration {
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/pack-info.md b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/pack-info.md
deleted file mode 100644
index d48381f67..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/pack-info.md
+++ /dev/null
@@ -1,6 +0,0 @@
-由于LCN 暂未发布适配 2.0 版本
-当前包是根据TCN transaction-springcloud 模块修改而来
-解决LCN 不兼容 Spring Cloud Finchley 问题
-
-关于LCN
-https://github.com/codingapi/tx-lcn
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/rewrite/TxManagerHttpRequestServiceImpl.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/rewrite/TxManagerHttpRequestServiceImpl.java
deleted file mode 100644
index 325594aac..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/rewrite/TxManagerHttpRequestServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.rewrite;
-
-import com.codingapi.tx.netty.service.TxManagerHttpRequestService;
-import com.lorne.core.framework.utils.http.HttpUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * @author lengleng
- * @date 2018/8/19 请求tx-manager接口实现
- */
-@Slf4j
-@Service
-public class TxManagerHttpRequestServiceImpl implements TxManagerHttpRequestService {
-
- @Override
- public String httpGet(String url) {
- String res = HttpUtils.get(url);
- log.debug("请求接口 {},响应报文:{}", url, res);
- return res;
- }
-
- @Override
- public String httpPost(String url, String params) {
- String res = HttpUtils.post(url, params);
- log.debug("请求接口 {},响应报文:{}", url, res);
- return res;
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/rewrite/TxManagerTxUrlServiceImpl.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/rewrite/TxManagerTxUrlServiceImpl.java
deleted file mode 100644
index 84f2e1461..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/rewrite/TxManagerTxUrlServiceImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.rewrite;
-
-import com.codingapi.tx.config.service.TxManagerTxUrlService;
-import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
-import org.springframework.stereotype.Service;
-
-/**
- * @author lengleng
- * @date 2018/8/19 使用服务发现重写 Txmanager 获取规则
- */
-@Slf4j
-@Service
-@AllArgsConstructor
-public class TxManagerTxUrlServiceImpl implements TxManagerTxUrlService {
-
- private final LoadBalancerClient loadBalancerClient;
-
- @Override
- public String getTxUrl() {
- ServiceInstance serviceInstance = loadBalancerClient.choose(ServiceNameConstants.TX_MANAGER);
- String host = serviceInstance.getHost();
- Integer port = serviceInstance.getPort();
- String url = String.format("http://%s:%s/tx/manager/", host, port);
- log.info("tm.manager.url -> {}", url);
- return url;
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/RequestInterceptorConfiguration.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/RequestInterceptorConfiguration.java
deleted file mode 100755
index c61f3d0a1..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/RequestInterceptorConfiguration.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.tx;
-
-import com.pig4cloud.pigx.common.transaction.tx.springcloud.feign.TransactionRestTemplateInterceptor;
-import feign.RequestInterceptor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author LCN on 2018/1/18
- * @author LCN
- * @since 4.1.0
- */
-@Configuration
-public class RequestInterceptorConfiguration {
-
- @Bean
- public RequestInterceptor requestInterceptor() {
- return new TransactionRestTemplateInterceptor();
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/init/ApplicationTxInitializer.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/init/ApplicationTxInitializer.java
deleted file mode 100644
index 670a7ddd8..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/init/ApplicationTxInitializer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.pig4cloud.pigx.common.transaction.tx.init;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.env.EnvironmentPostProcessor;
-import org.springframework.core.Ordered;
-import org.springframework.core.env.ConfigurableEnvironment;
-
-/**
- * @author lengleng
- * @date 22022-02-17
- *
- * 通过环境变量的形式注入 允许循环依赖
- */
-public class ApplicationTxInitializer implements EnvironmentPostProcessor, Ordered {
-
- @Override
- public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
- System.setProperty("spring.main.allow-circular-references", "true");
- }
-
- @Override
- public int getOrder() {
- return Ordered.LOWEST_PRECEDENCE;
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/feign/TransactionRestTemplateInterceptor.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/feign/TransactionRestTemplateInterceptor.java
deleted file mode 100755
index 91985a294..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/feign/TransactionRestTemplateInterceptor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.tx.springcloud.feign;
-
-import com.codingapi.tx.aop.bean.TxTransactionLocal;
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @author LCN on 2017/6/26.
- * @author LCN
- * @since 4.1.0
- */
-@Slf4j
-public class TransactionRestTemplateInterceptor implements RequestInterceptor {
-
- @Override
- public void apply(RequestTemplate requestTemplate) {
-
- TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
- String groupId = txTransactionLocal == null ? null : txTransactionLocal.getGroupId();
-
- log.info("LCN-SpringCloud TxGroup info -> groupId:" + groupId);
-
- if (txTransactionLocal != null) {
- requestTemplate.header("tx-group", groupId);
- }
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/http/TransactionHttpRequestInterceptor.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/http/TransactionHttpRequestInterceptor.java
deleted file mode 100755
index 5842f6d9d..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/http/TransactionHttpRequestInterceptor.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.tx.springcloud.http;
-
-import com.codingapi.tx.aop.bean.TxTransactionLocal;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpRequest;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.ClientHttpResponse;
-
-/**
- * @author LCN on 2017/7/3.
- * @author LCN
- * @since 4.1.0
- */
-@Slf4j
-public class TransactionHttpRequestInterceptor implements ClientHttpRequestInterceptor {
-
- @Override
- @SneakyThrows
- public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) {
-
- TxTransactionLocal txTransactionLocal = TxTransactionLocal.current();
- String groupId = txTransactionLocal == null ? null : txTransactionLocal.getGroupId();
-
- log.info("LCN-SpringCloud TxGroup info -> groupId:" + groupId);
-
- if (txTransactionLocal != null) {
- request.getHeaders().add("tx-group", groupId);
- }
- return execution.execute(request, body);
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/interceptor/TransactionAspect.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/interceptor/TransactionAspect.java
deleted file mode 100755
index 4636d0d39..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/interceptor/TransactionAspect.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.tx.springcloud.interceptor;
-
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.Ordered;
-import org.springframework.stereotype.Component;
-
-/**
- * LCN 事务拦截器
- *
- * @author LCN on 2018/1/5
- * @author LCN
- * @since 4.1.0
- */
-
-@Slf4j
-@Aspect
-@Component
-public class TransactionAspect implements Ordered {
-
- @Autowired
- private TxManagerInterceptor txManagerInterceptor;
-
- @SneakyThrows
- @Around("@annotation(com.codingapi.tx.annotation.TxTransaction)")
- public Object transactionRunning(ProceedingJoinPoint point) {
- log.debug("annotation-TransactionRunning-start---->");
- Object obj = txManagerInterceptor.around(point);
- log.debug("annotation-TransactionRunning-end---->");
- return obj;
- }
-
- @SneakyThrows
- @Around("this(com.codingapi.tx.annotation.ITxTransaction) && execution( * *(..))")
- public Object around(ProceedingJoinPoint point) {
- log.debug("interface-ITransactionRunning-start---->");
- Object obj = txManagerInterceptor.around(point);
- log.debug("interface-ITransactionRunning-end---->");
- return obj;
- }
-
- @Override
- public int getOrder() {
- return HIGHEST_PRECEDENCE;
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/interceptor/TxManagerInterceptor.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/interceptor/TxManagerInterceptor.java
deleted file mode 100755
index c7a5ffd77..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/interceptor/TxManagerInterceptor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.tx.springcloud.interceptor;
-
-import com.codingapi.tx.aop.service.AspectBeforeService;
-import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.springframework.stereotype.Component;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * @author LCN on 2017/6/7.
- * @author LCN
- * @since 4.1.0
- */
-
-@Slf4j
-@Component
-@AllArgsConstructor
-public class TxManagerInterceptor {
-
- private final AspectBeforeService aspectBeforeService;
-
- @SneakyThrows
- public Object around(ProceedingJoinPoint point) {
- RequestAttributes requestAttributes;
- String groupId = null;
- try {
- requestAttributes = RequestContextHolder.currentRequestAttributes();
- HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
- groupId = request.getHeader("tx-group");
- }
- catch (IllegalStateException e) {
- log.info("非web 环境调用 不包含请求上下文");
- }
- return aspectBeforeService.around(groupId, point);
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/listener/ServerListener.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/listener/ServerListener.java
deleted file mode 100755
index 0df8fbeeb..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/listener/ServerListener.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.tx.springcloud.listener;
-
-import com.codingapi.tx.listener.service.InitService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.context.WebServerInitializedEvent;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @author LCN
- * @since 4.1.0
- */
-@Component
-public class ServerListener implements ApplicationListener {
-
- private Logger logger = LoggerFactory.getLogger(ServerListener.class);
-
- private int serverPort;
-
- @Autowired
- private InitService initService;
-
- @Override
- public void onApplicationEvent(WebServerInitializedEvent event) {
- logger.info("onApplicationEvent -> onApplicationEvent. " + event.getWebServer());
- this.serverPort = event.getWebServer().getPort();
- initService.start();
- }
-
- public int getPort() {
- return this.serverPort;
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/service/impl/ModelNameServiceImpl.java b/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/service/impl/ModelNameServiceImpl.java
deleted file mode 100755
index 11c0d268b..000000000
--- a/pigx-common/pigx-common-transaction/src/main/java/com/pig4cloud/pigx/common/transaction/tx/springcloud/service/impl/ModelNameServiceImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2018-2025, lengleng All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the pig4cloud.com developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: lengleng (wangiegie@gmail.com)
- */
-
-package com.pig4cloud.pigx.common.transaction.tx.springcloud.service.impl;
-
-import com.codingapi.tx.listener.service.ModelNameService;
-import com.lorne.core.framework.utils.encode.MD5Util;
-import com.pig4cloud.pigx.common.transaction.tx.springcloud.listener.ServerListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Service;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-/**
- * @author LCN on 2017/7/12.
- * @author LCN
- * @since 4.1.0
- */
-@Service
-@Configuration
-public class ModelNameServiceImpl implements ModelNameService {
-
- @Value("${spring.application.name}")
- private String modelName;
-
- @Autowired
- private ServerListener serverListener;
-
- private String host = null;
-
- @Override
- public String getModelName() {
- return modelName;
- }
-
- private String getIp() {
- if (host == null) {
- try {
- host = InetAddress.getLocalHost().getHostAddress();
- }
- catch (UnknownHostException e) {
- e.printStackTrace();
- }
- }
- return host;
- }
-
- private int getPort() {
- int port = serverListener.getPort();
- int count = 0;
- while (port == 0) {
- try {
- Thread.sleep(10);
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
- port = serverListener.getPort();
- count++;
-
- if (count == 2000) {
- throw new RuntimeException("get server port error.");
- }
- }
-
- return port;
- }
-
- @Override
- public String getUniqueKey() {
- String address = getIp() + getPort();
- return MD5Util.md5(address.getBytes());
- }
-
- @Override
- public String getIpAddress() {
- String address = getIp() + ":" + getPort();
- return address;
- }
-
-}
diff --git a/pigx-common/pigx-common-transaction/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-transaction/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index b4aa57cf6..000000000
--- a/pigx-common/pigx-common-transaction/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.pig4cloud.pigx.common.transaction.TransactionConfiguration
-org.springframework.boot.env.EnvironmentPostProcessor=\
- com.pig4cloud.pigx.common.transaction.tx.init.ApplicationTxInitializer
diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml
index 6c376a0e2..005cf5c7f 100644
--- a/pigx-common/pom.xml
+++ b/pigx-common/pom.xml
@@ -51,7 +51,6 @@
pigx-common-sequence
pigx-common-swagger
pigx-common-test
- pigx-common-transaction
pigx-common-websocket
pigx-common-xss
diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteLogService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteLogService.java
index 7c9af4f0d..1963ab1df 100644
--- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteLogService.java
+++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteLogService.java
@@ -21,9 +21,9 @@ package com.pig4cloud.pigx.admin.api.feign;
import com.pig4cloud.pigx.admin.api.dto.SysLogDTO;
import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
-import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants;
import com.pig4cloud.pigx.common.core.util.R;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
* @author lengleng
* @date 2018/6/28
*/
-@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.UPMS_SERVICE)
+@FeignClient(contextId = "remoteLogService", value = "pigx-codegen")
public interface RemoteLogService {
/**
@@ -44,4 +44,7 @@ public interface RemoteLogService {
@PostMapping("/log/save")
R saveLog(@RequestBody SysLogDTO sysLog, @RequestHeader(SecurityConstants.FROM) String from);
+ @GetMapping("/form/tx")
+ R tx(@RequestHeader(SecurityConstants.FROM) String from);
+
}
diff --git a/pigx-visual/pigx-report-platform/Dockerfile b/pigx-visual/pigx-report-platform/Dockerfile
deleted file mode 100644
index 4fbc2749b..000000000
--- a/pigx-visual/pigx-report-platform/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM pig4cloud/java:8-jre
-
-MAINTAINER wangiegie@gmail.com
-
-ENV TZ=Asia/Shanghai
-ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
-
-RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN mkdir -p /pigx-report-platform
-
-WORKDIR /pigx-report-platform
-
-EXPOSE 9095
-
-ADD ./target/pigx-report-platform.jar ./
-
-CMD sleep 180;java $JAVA_OPTS -jar pigx-report-platform.jar
diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml
deleted file mode 100644
index 24319e150..000000000
--- a/pigx-visual/pigx-report-platform/pom.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
- com.pig4cloud
- pigx-visual
- 4.3.0
-
-
- pigx-report-platform
- 4.0.0
-
- jar
-
- 基于 aj-report 的大屏设计系统
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
- com.anji-plus
- spring-boot-gaea
- 2.0.3.RELEASE
-
-
-
- com.baomidou
- mybatis-plus-boot-starter
- 3.3.2
-
-
-
- com.oracle.database.jdbc
- ojdbc8
-
-
-
-
- mysql
- mysql-connector-java
-
-
-
- com.oracle.database.jdbc
- ojdbc8
-
-
-
-
- org.postgresql
- postgresql
-
-
-
- jakarta.servlet
- jakarta.servlet-api
-
-
-
- org.apache.httpcomponents
- httpclient
-
-
-
- com.itextpdf
- itextpdf
- 5.5.13.2
-
-
- com.itextpdf
- itext-asian
- 5.2.0
-
-
-
- org.apache.poi
- poi
- 4.1.2
-
-
- org.apache.poi
- poi-ooxml
- 4.1.2
-
-
- org.apache.poi
- poi-ooxml-schemas
- 4.1.2
-
-
-
-
- org.springframework.boot
- spring-boot-starter-undertow
-
-
-
-
- com.alibaba.cloud
- spring-cloud-starter-alibaba-nacos-config
-
-
-
-
- com.alibaba
- druid-spring-boot-starter
-
-
-
-
-
-
- com.baomidou
- mybatis-plus-extension
- 3.3.2
-
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
- io.fabric8
- docker-maven-plugin
-
- false
-
-
-
-
-
- src/main/resources
- true
-
- **/*.woff
- **/*.woff2
- **/*.ttf
-
-
-
- src/main/resources
- false
-
- **/*.woff
- **/*.woff2
- **/*.ttf
-
-
-
-
-
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anji/plus/gaea/curd/entity/GaeaBaseEntity.java b/pigx-visual/pigx-report-platform/src/main/java/com/anji/plus/gaea/curd/entity/GaeaBaseEntity.java
deleted file mode 100644
index 9ffadc83d..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anji/plus/gaea/curd/entity/GaeaBaseEntity.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.anji.plus.gaea.curd.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.util.Date;
-
-/**
- * 基础数据库实体
- *
- * @author lr
- * @since 2021-01-12
- */
-public class GaeaBaseEntity extends BaseEntity {
-
- /**
- * 数据ID
- */
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private Long id;
-
- /**
- * 创建人
- */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /**
- * 创建时间
- */
- @TableField(fill = FieldFill.INSERT)
- private Date createTime;
-
- /**
- * 修改人
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /**
- * 修改时间
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
-
- /**
- * 版本号
- * @Version:乐观锁,,需要添加mybatis plus插件optimisticLockerInterceptor
- */
- @TableField(fill = FieldFill.INSERT_UPDATE, update = "%s+1")
- @Version
- private Integer version;
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Integer getVersion() {
- return version;
- }
-
- public void setVersion(Integer version) {
- this.version = version;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/PigxReportPlatformApplication.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/PigxReportPlatformApplication.java
deleted file mode 100644
index dd6e41e93..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/PigxReportPlatformApplication.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.anjiplus.template.gaea.business;
-
-import com.anji.plus.gaea.annotation.enabled.EnabledGaeaConfiguration;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * 业务模板
- *
- * @author lr
- * @since 2021-02-03
- */
-@EnabledGaeaConfiguration
-@SpringBootApplication(scanBasePackages = { "com.anjiplus.template.gaea", "com.anji.plus" })
-@MapperScan(basePackages = { "com.anjiplus.template.gaea.business.modules.*.dao",
- "com.anjiplus.template.gaea.business.modules.*.**.dao", "com.anji.plus.gaea.*.module.*.dao" })
-public class PigxReportPlatformApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(PigxReportPlatformApplication.class);
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/BaseController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/BaseController.java
deleted file mode 100644
index 2f27486b7..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/BaseController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.anjiplus.template.gaea.business.base;
-
-import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anji.plus.gaea.curd.dto.BaseDTO;
-import com.anji.plus.gaea.curd.entity.BaseEntity;
-import com.anji.plus.gaea.curd.params.PageParam;
-import org.springframework.context.i18n.LocaleContextHolder;
-
-/**
- * 项目级的Controller公共处理基类
- *
- * @author WongBin
- * @date 2021/3/26
- */
-public abstract class BaseController
- extends GaeaBaseController
{
-
- /**
- * 获取当前语言类型
- * @return
- */
- public String getI18nLang() {
- return LocaleContextHolder.getLocale().getLanguage();
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/BaseService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/BaseService.java
deleted file mode 100644
index aab90bf7c..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/BaseService.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.anjiplus.template.gaea.business.base;
-
-import com.anji.plus.gaea.curd.entity.BaseEntity;
-import com.anji.plus.gaea.curd.params.PageParam;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-
-/**
- * 项目级的Service公共处理基类
- *
- * @author WongBin
- * @date 2021/3/26
- */
-public interface BaseService
extends GaeaBaseService
{
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/HealthController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/HealthController.java
deleted file mode 100644
index 3a00b9575..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/base/HealthController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.anjiplus.template.gaea.business.base;
-
-import com.anji.plus.gaea.bean.ResponseBean;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @desc 用户管理 controller
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@RestController
-public class HealthController {
-
- @GetMapping("health")
- public ResponseBean health() {
- return ResponseBean.builder().build();
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/cache/ReportCacheHelper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/cache/ReportCacheHelper.java
deleted file mode 100644
index 625881c0a..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/cache/ReportCacheHelper.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.anjiplus.template.gaea.business.cache;
-
-import com.anji.plus.gaea.cache.CacheHelper;
-import com.google.common.collect.Maps;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-public class ReportCacheHelper implements CacheHelper, ApplicationContextAware {
-
- @Autowired
- private Cache cache;
-
- @Override
- public String stringGet(String key) {
- Cache.ValueWrapper valueWrapper = cache.get(key);
- if (valueWrapper != null) {
- return (String) valueWrapper.get();
- }
- return CacheHelper.super.stringGet(key);
- }
-
- @Override
- public Boolean setIfAbsent(String key, String value) {
- cache.putIfAbsent(key, value);
- return true;
- }
-
- @Override
- public boolean exist(String key) {
- String cacheHoldTime = stringGet(key + "_HoldTime");
- if (cacheHoldTime != null && Long.parseLong(cacheHoldTime) > 0) {
- if (Long.parseLong(cacheHoldTime) < System.currentTimeMillis()) {
- delete(key + "_HoldTime");
- delete(key);
- return false;
- }
- }
- return cache.get(key) != null;
- }
-
- @Override
- public void stringSet(String key, String value) {
- cache.put(key, value);
- }
-
- @Override
- public String regKey(String key) {
- return CacheHelper.super.regKey(key);
- }
-
- @Override
- public void stringSetExpire(String key, String value, long seconds) {
- stringSet(key, value);
- if (seconds > 0) {
- // 缓存失效时间
- stringSet(key + "_HoldTime", String.valueOf(System.currentTimeMillis() + seconds * 1000));
- }
- }
-
- @Override
- public Map hashGet(String key) {
- Cache.ValueWrapper t = cache.get(key);
- if (t != null) {
- return (Map) t.get();
- }
- return Maps.newHashMap();
- }
-
- @Override
- public String hashGetString(String key, String hashKey) {
- Map stringStringMap = hashGet(key);
- return stringStringMap.get(hashKey);
- }
-
- @Override
- public void hashDel(String key, String hashKey) {
- Map stringStringMap = hashGet(key);
- stringStringMap.remove(hashKey);
- }
-
- @Override
- public void hashBatchDel(String key, Set hashKeys) {
- Map stringStringMap = hashGet(key);
- hashKeys.forEach(stringStringMap::remove);
- }
-
- @Override
- public boolean hashExist(String key, String hashKey) {
- if (exist(key)) {
- Map map = hashGet(key);
- return map.containsKey(hashKey);
- }
- return false;
- }
-
- @Override
- public boolean hashAnyExist(String key, String[] hashKeys) {
- return CacheHelper.super.hashAnyExist(key, hashKeys);
- }
-
- @Override
- public void hashSet(String key, String hashKey, String hashValue) {
- Map map;
- if (exist(key)) {
- map = hashGet(key);
- }
- else {
- map = new HashMap<>();
- }
- map.put(hashKey, hashValue);
- hashSet(key, map);
- }
-
- @Override
- public void hashSet(String key, Map hash) {
- cache.put(key, hash);
- }
-
- @Override
- public boolean delete(String key) {
- if (exist(key)) {
- cache.evict(key);
- }
- return true;
- }
-
- @Override
- public boolean delete(List keys) {
- keys.forEach(this::delete);
- return true;
- }
-
- @Override
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- /* 基于内存的本地缓存 */
- cache = (Cache) applicationContext.getBean("ehCacheCache");
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/code/ResponseCode.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/code/ResponseCode.java
deleted file mode 100644
index 6752e32c9..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/code/ResponseCode.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package com.anjiplus.template.gaea.business.code;
-
-/**
- * 响应码
- *
- * @author lr
- * @since 2021-02-22
- */
-public interface ResponseCode {
-
- String NOT_NULL = "field.not.null";
-
- String NOT_EMPTY = "field.not.empty";
-
- String MIN = "field.min";
-
- String MAX = "field.max";
-
- String DICT_ERROR = "field.dict.error";
-
- String USER_PASSWORD_ERROR = "User.password.error";
-
- /**
- * 用户名或者密码不正确
- */
- String LOGIN_ERROR = "login.error";
-
- /**
- * 新密码不能和原密码一致
- */
- String USER_PASSWORD_CONFIG_PASSWORD_CANOT_EQUAL = "user.password.config.password.canot.equal";
-
- /**
- * 密码和确认密码不一致
- */
- String USER_INCONSISTENT_PASSWORD_ERROR = "user.inconsistent.password.error";
-
- /**
- * 旧密码不正确
- */
- String USER_OLD_PASSWORD_ERROR = "user.old.password.error";
-
- /**
- * 用户token过期
- */
- String USER_TOKEN_EXPIRED = "User.token.expired";
-
- /**
- * 字典项重复
- */
- String DICT_ITEM_REPEAT = "Dict.item.code.exist";
-
- /**
- * 数字字典国际化标识不能为null
- */
- String DICT_CODE_LOCALE_NULL = "500-00002";
-
- /**
- * 参数为空
- */
- String PARAM_IS_NULL = "Rule.execute.param.null";
-
- /**
- * 规则编译不通过
- */
- String RULE_CONTENT_COMPILE_ERROR = "Rule.content.compile.error";
-
- /**
- * 规则执行不通过
- */
- String RULE_CONTENT_EXECUTE_ERROR = "Rule.content.execute.error";
-
- /**
- * 规则编码已存在
- */
- String RULE_CODE_EXIST = "Rule.code.exist";
-
- /**
- * 对应规则内容不存在
- */
- String RULE_CONTENT_NOT_EXIST = "Rule.content.not.exist";
-
- /**
- * 对应规则字段值不存在
- */
- String RULE_FIELDS_NOT_EXIST = "Rule.fields.not.exist";
-
- /**
- * 规则字段必填
- */
- String RULE_FIELD_VALUE_IS_REQUIRED = "Rule.field.value.is.required";
-
- /**
- * 规则字段值类型错误
- */
- String RULE_FIELD_VALUE_TYPE_ERROR = "Rule.field.value.type.error";
-
- /**
- * 规则参数校验不通过
- */
- String RULE_FIELDS_CHECK_ERROR = "Rule.fields.check.error";
-
- /**
- * 组件未加载
- */
- String COMPONENT_NOT_LOAD = "Component.load.check.error";
-
- String AUTH_PASSWORD_NOTSAME = "1001";
-
- String OLD_PASSWORD_ERROR = "1003";
-
- String USER_ONTEXIST_ORGINFO = "1004";
-
- String USER_ONTEXIST_ROLEINFO = "1005";
-
- String MENU_TABLE_CODE_EXIST = "1006";
-
- String USER_CODE_ISEXIST = "1007";
-
- String ROLE_CODE_ISEXIST = "1008";
-
- String MENU_CODE_ISEXIST = "1009";
-
- String ORG_CODE_ISEXIST = "1010";
-
- String SEARCHNAME_ISEXIST = "1011";
-
- String SETTINGNAME_ISEXIST = "1012";
-
- String DICCODE_ISEXIST = "1013";
-
- String DEVICEID_LENGTH = "1014";
-
- String USERINFO_EMPTY = "1015";
-
- String FILE_EMPTY_FILENAME = "2001";
-
- String FILE_SUFFIX_UNSUPPORTED = "2002";
-
- String FILE_UPLOAD_ERROR = "2003";
-
- String FILE_ONT_EXSIT = "2004";
-
- String LIST_IS_EMPTY = "2005";
-
- String PUSHCODE_NEED_UNIQUE = "3001";
-
- String RECEIVER_IS_EMPTY = "3002";
-
- String DATA_SOURCE_CONNECTION_FAILED = "4001";
-
- String DATA_SOURCE_TYPE_DOES_NOT_MATCH_TEMPORARILY = "4002";
-
- String EXECUTE_SQL_ERROR = "4003";
-
- String INCOMPLETE_PARAMETER_REPLACEMENT_VALUES = "4004";
-
- String EXECUTE_JS_ERROR = "4005";
-
- String ANALYSIS_DATA_ERROR = "4006";
-
- String REPORT_CODE_ISEXIST = "4007";
-
- String SET_CODE_ISEXIST = "4008";
-
- String SOURCE_CODE_ISEXIST = "4009";
-
- String CLASS_NOT_FOUND = "4010";
-
- String REPORT_SHARE_LINK_INVALID = "report.share.link.invalid";
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/DruidProperties.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/DruidProperties.java
deleted file mode 100644
index d7f19289f..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/DruidProperties.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.anjiplus.template.gaea.business.config;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by raodeming on 2021/8/6.
- */
-@Component
-@ConfigurationProperties(prefix = "spring.druid")
-@Data
-public class DruidProperties {
-
- /**
- * 初始化时建立物理连接的个数。初始化发生在显示调用init方法,或者第一次getConnection时
- */
- private int initialSize;
-
- /**
- * 最小连接池数量
- */
- private int minIdle;
-
- /**
- * 最大连接池数量
- */
- private int maxActive;
-
- /**
- * 获取连接时最大等待时间,单位毫秒。配置了maxWait之后,缺省启用公平锁,并发效率会有所下降,如果需要可以通过配置
- */
- private int maxWait;
-
- /**
- * 关闭空闲连接的检测时间间隔.Destroy线程会检测连接的间隔时间,如果连接空闲时间大于等于minEvictableIdleTimeMillis则关闭物理连接。
- */
- private int timeBetweenEvictionRunsMillis;
-
- /**
- * 连接的最小生存时间.连接保持空闲而不被驱逐的最小时间
- */
- private int minEvictableIdleTimeMillis;
-
- /**
- * 申请连接时检测空闲时间,根据空闲时间再检测连接是否有效.建议配置为true,不影响性能,并且保证安全性。申请连接的时候检测,如果空闲时间大于timeBetweenEvictionRun
- */
- private boolean testWhileIdle;
-
- /**
- * 开启PSCache
- */
- private boolean poolPreparedStatements;
-
- /**
- * 设置PSCache值
- */
- private int maxPoolPreparedStatementPerConnectionSize;
-
- /**
- * 连接出错后再尝试连接三次
- */
- private int connectionErrorRetryAttempts;
-
- /**
- * 数据库服务宕机自动重连机制
- */
- private boolean breakAfterAcquireFailure;
-
- /**
- * 连接出错后重试时间间隔
- */
- private int timeBetweenConnectErrorMillis;
-
- public DruidDataSource dataSource(String url, String username, String password, String driverClassName) {
- DruidDataSource datasource = new DruidDataSource();
- datasource.setUrl(url);
- datasource.setUsername(username);
- datasource.setPassword(password);
- datasource.setDriverClassName(driverClassName);
- return datasource;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/JacksonConfiguration.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/JacksonConfiguration.java
deleted file mode 100644
index a009f3cd2..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/config/JacksonConfiguration.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.anjiplus.template.gaea.business.config;
-
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
- * @author lengleng
- * @date 2022/2/13
- */
-@Configuration
-public class JacksonConfiguration {
-
- private static final String ASIA_SHANGHAI = "Asia/Shanghai";
-
- @Bean
- public Jackson2ObjectMapperBuilderCustomizer customizer() {
- return builder -> {
- builder.locale(Locale.CHINA);
- builder.timeZone(TimeZone.getTimeZone(ASIA_SHANGHAI));
- builder.simpleDateFormat("yyyy-MM-dd HH:mm:ss");
- builder.serializerByType(Long.class, ToStringSerializer.instance);
- };
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/constant/BusinessConstant.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/constant/BusinessConstant.java
deleted file mode 100644
index 1a29822c2..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/constant/BusinessConstant.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.anjiplus.template.gaea.business.constant;
-
-/**
- * 常量
- *
- * @author lr
- * @since 2021-03-26
- */
-public interface BusinessConstant {
-
- String LEFT_BIG_BOAST = "{";
-
- String RIGTH_BIG_BOAST = "}";
-
- String LEFT_MIDDLE_BOAST = "[";
-
- String RIGHT_MIDDLE_BOAST = "]";
-
- /**
- * 字典项重复
- */
- String DICT_ITEM_EXIST_GROUP = "dictItemExist";
-
- /**
- * 所有url的权限码缓存key
- */
- String GAEA_SECURITY_AUTHORITIES = "gaea:security:authorities:all";
-
- /**
- * 用户登录的token缓存key
- */
- String GAEA_SECURITY_LOGIN_TOKEN = "gaea:security:login:token:%s";
-
- /**
- * 用户登录的主信息缓存信息
- */
- String GAEA_SECURITY_LOGIN_USER = "gaea:security:login:user:%s";
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/DeleteFlagEnum.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/DeleteFlagEnum.java
deleted file mode 100644
index 5e69b708b..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/DeleteFlagEnum.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.anjiplus.template.gaea.business.enums;
-
-public enum DeleteFlagEnum {
-
- DELETED(1, "已删除"), UNDELETED(0, "未删除"),;
-
- private int codeValue;
-
- private String codeDesc;
-
- private DeleteFlagEnum(int codeValue, String codeDesc) {
- this.codeValue = codeValue;
- this.codeDesc = codeDesc;
- }
-
- public int getCodeValue() {
- return this.codeValue;
- }
-
- public String getCodeDesc() {
- return this.codeDesc;
- }
-
- // 根据codeValue获取枚举
- public static DeleteFlagEnum parseFromCodeValue(int codeValue) {
- for (DeleteFlagEnum e : DeleteFlagEnum.values()) {
- if (e.codeValue == codeValue) {
- return e;
- }
- }
- return null;
- }
-
- // 根据codeValue获取描述
- public static String getCodeDescByCodeValue(int codeValue) {
- DeleteFlagEnum enumItem = parseFromCodeValue(codeValue);
- return enumItem == null ? "" : enumItem.getCodeDesc();
- }
-
- // 验证codeValue是否有效
- public static boolean validateCodeValue(int codeValue) {
- return parseFromCodeValue(codeValue) != null;
- }
-
- // 列出所有值字符串
- public static String getString() {
- StringBuffer buffer = new StringBuffer();
- for (DeleteFlagEnum e : DeleteFlagEnum.values()) {
- buffer.append(e.codeValue).append("--").append(e.getCodeDesc()).append(", ");
- }
- buffer.deleteCharAt(buffer.lastIndexOf(","));
- return buffer.toString().trim();
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/EnableFlagEnum.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/EnableFlagEnum.java
deleted file mode 100644
index b410ca21e..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/EnableFlagEnum.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.anjiplus.template.gaea.business.enums;
-
-public enum EnableFlagEnum {
-
- ENABLE(1, "启用"), DISABLE(0, "禁用"),;
-
- private int codeValue;
-
- private String codeDesc;
-
- private EnableFlagEnum(int codeValue, String codeDesc) {
- this.codeValue = codeValue;
- this.codeDesc = codeDesc;
- }
-
- public int getCodeValue() {
- return this.codeValue;
- }
-
- public String getCodeDesc() {
- return this.codeDesc;
- }
-
- // 根据codeValue获取枚举
- public static EnableFlagEnum parseFromCodeValue(int codeValue) {
- for (EnableFlagEnum e : EnableFlagEnum.values()) {
- if (e.codeValue == codeValue) {
- return e;
- }
- }
- return null;
- }
-
- // 根据codeValue获取描述
- public static String getCodeDescByCodeBalue(int codeValue) {
- EnableFlagEnum enumItem = parseFromCodeValue(codeValue);
- return enumItem == null ? "" : enumItem.getCodeDesc();
- }
-
- // 验证codeValue是否有效
- public static boolean validateCodeValue(int codeValue) {
- return parseFromCodeValue(codeValue) != null;
- }
-
- // 列出所有值字符串
- public static String getString() {
- StringBuffer buffer = new StringBuffer();
- for (EnableFlagEnum e : EnableFlagEnum.values()) {
- buffer.append(e.codeValue).append("--").append(e.getCodeDesc()).append(", ");
- }
- buffer.deleteCharAt(buffer.lastIndexOf(","));
- return buffer.toString().trim();
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/ExcelCenterStyleEnum.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/ExcelCenterStyleEnum.java
deleted file mode 100644
index 945157a95..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/ExcelCenterStyleEnum.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.anjiplus.template.gaea.business.enums;
-
-/**
- * @author zhouhang
- * @description EXCEL居中方式
- * @date 2021/4/26
- */
-public enum ExcelCenterStyleEnum {
-
- /**
- * 左对齐
- */
- LEFT((short) 1, 1, "左对齐"),
- /**
- * 右对齐
- */
- RIGHT((short) 3, 2, "右对齐"),
- /**
- * 居中
- */
- CENTER((short) 2, 0, "居中"),;
-
- /**
- * excel居中code
- */
- private final short excelCode;
-
- /**
- * 在线文档居中code
- */
- private final Integer onlineExcelCode;
-
- /**
- * 名称
- */
- private final String name;
-
- public Integer getOnlineExcelCode() {
- return onlineExcelCode;
- }
-
- public String getName() {
- return name;
- }
-
- public short getExcelCode() {
- return excelCode;
- }
-
- ExcelCenterStyleEnum(short excelCode, Integer onlineExcelCode, String name) {
- this.excelCode = excelCode;
- this.onlineExcelCode = onlineExcelCode;
- this.name = name;
- }
-
- /**
- * @param code excel居中样式code
- * @return Enum_ExcelCenterStyle
- * @description 根据excel居中样式获取在线文档居中样式
- * @author zhouhang
- * @date 2021/4/26
- */
- public static ExcelCenterStyleEnum getExcelCenterStyleByExcelCenterCode(short code) {
- for (ExcelCenterStyleEnum value : ExcelCenterStyleEnum.values()) {
- if (code == value.getExcelCode()) {
- return value;
- }
- }
- return CENTER;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/ExportTypeEnum.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/ExportTypeEnum.java
deleted file mode 100644
index b08ead076..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/ExportTypeEnum.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.anjiplus.template.gaea.business.enums;
-
-/**
- * Created by raodeming on 2021/9/3.
- */
-public enum ExportTypeEnum {
-
- /** gaea_excel */
- GAEA_TEMPLATE_EXCEL("gaea_template_excel", "gaea_template_excel"),
- /** gaea_pdf */
- GAEA_TEMPLATE_PDF("gaea_template_pdf", "gaea_template_pdf"),;
-
- private String codeValue;
-
- private String codeDesc;
-
- private ExportTypeEnum(String codeValue, String codeDesc) {
- this.codeValue = codeValue;
- this.codeDesc = codeDesc;
- }
-
- public String getCodeValue() {
- return this.codeValue;
- }
-
- public String getCodeDesc() {
- return this.codeDesc;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/SetTypeEnum.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/SetTypeEnum.java
deleted file mode 100644
index 2f0dd1fc8..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/enums/SetTypeEnum.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.anjiplus.template.gaea.business.enums;
-
-public enum SetTypeEnum {
-
- SQL("sql", "sql"), HTTP("http", "http"),;
-
- private String codeValue;
-
- private String codeDesc;
-
- private SetTypeEnum(String codeValue, String codeDesc) {
- this.codeValue = codeValue;
- this.codeDesc = codeDesc;
- }
-
- public String getCodeValue() {
- return this.codeValue;
- }
-
- public String getCodeDesc() {
- return this.codeDesc;
- }
-
- // 根据codeValue获取枚举
- public static SetTypeEnum parseFromCodeValue(String codeValue) {
- for (SetTypeEnum e : SetTypeEnum.values()) {
- if (e.codeValue == codeValue) {
- return e;
- }
- }
- return null;
- }
-
- // 根据codeValue获取描述
- public static String getCodeDescByCodeBalue(String codeValue) {
- SetTypeEnum enumItem = parseFromCodeValue(codeValue);
- return enumItem == null ? "" : enumItem.getCodeDesc();
- }
-
- // 验证codeValue是否有效
- public static boolean validateCodeValue(String codeValue) {
- return parseFromCodeValue(codeValue) != null;
- }
-
- // 列出所有值字符串
- public static String getString() {
- StringBuffer buffer = new StringBuffer();
- for (SetTypeEnum e : SetTypeEnum.values()) {
- buffer.append(e.codeValue).append("--").append(e.getCodeDesc()).append(", ");
- }
- buffer.deleteCharAt(buffer.lastIndexOf(","));
- return buffer.toString().trim();
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/filter/CorsFilter.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/filter/CorsFilter.java
deleted file mode 100644
index 0f75d2311..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/filter/CorsFilter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.anjiplus.template.gaea.business.filter;
-
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * Created by raodeming on 2021/6/24.
- */
-@Component
-@Order(Ordered.HIGHEST_PRECEDENCE)
-public class CorsFilter implements Filter {
-
- @Override
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException {
- HttpServletRequest req = (HttpServletRequest) request;
- HttpServletResponse res = (HttpServletResponse) response;
- // 设置允许Cookie
- res.addHeader("Access-Control-Allow-Credentials", "true");
- // 允许http://www.xxx.com域(自行设置,这里只做示例)发起跨域请求
- res.addHeader("Access-Control-Allow-Origin", req.getHeader("Origin"));
- // 设置允许跨域请求的方法
- res.addHeader("Access-Control-Allow-Methods", "*");
- // 允许跨域请求包含content-type
- res.addHeader("Access-Control-Allow-Headers", "*");
- res.addHeader("Access-Control-Expose-Headers", "*");
- chain.doFilter(req, res);
- }
-
- @Override
- public void destroy() {
- }
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/AccessAuthorityController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/AccessAuthorityController.java
deleted file mode 100755
index 36c34ed52..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/AccessAuthorityController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessauthority.controller;
-
-import com.anji.plus.gaea.annotation.Permission;
-import com.anji.plus.gaea.bean.ResponseBean;
-import com.anji.plus.gaea.bean.TreeNode;
-import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anji.plus.gaea.holder.UserContentHolder;
-import com.anjiplus.template.gaea.business.modules.accessauthority.controller.dto.AccessAuthorityDto;
-import com.anjiplus.template.gaea.business.modules.accessauthority.controller.param.AccessAuthorityParam;
-import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
-import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @desc 权限管理 controller
- * @author 木子李·De
- * @date 2019-02-17 08:50:10.009
- **/
-@RestController
-@Api(tags = "权限管理管理")
-@RequestMapping("/accessAuthority")
-@Permission(code = "authorityManage", name = "权限管理")
-public class AccessAuthorityController
- extends GaeaBaseController {
-
- @Autowired
- private AccessAuthorityService accessAuthorityService;
-
- @Override
- public GaeaBaseService getService() {
- return accessAuthorityService;
- }
-
- @Override
- public AccessAuthority getEntity() {
- return new AccessAuthority();
- }
-
- @Override
- public AccessAuthorityDto getDTO() {
- return new AccessAuthorityDto();
- }
-
- /**
- * 获取一二级菜单
- * @return
- */
- @Permission(code = "query", name = "查询")
- @GetMapping("/menuTree")
- public ResponseBean menuTree() {
- String username = UserContentHolder.getContext().getUsername();
- List parentTreeList = accessAuthorityService.getAuthorityTree(username, false);
- return responseSuccessWithData(parentTreeList);
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/dto/AccessAuthorityDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/dto/AccessAuthorityDto.java
deleted file mode 100755
index ad736a28a..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/dto/AccessAuthorityDto.java
+++ /dev/null
@@ -1,56 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessauthority.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @description 权限管理 dto
- * @author 木子李·De
- * @date 2019-02-17 08:50:10.009
- **/
-@Data
-public class AccessAuthorityDto extends GaeaBaseDTO implements Serializable {
-
- /** 父菜单代码 */
- @ApiModelProperty(value = "父菜单代码")
- private String parentTarget;
-
- /** 目标菜单 */
- @ApiModelProperty(value = "菜单代码")
- @NotEmpty(message = "6002")
- private String target;
-
- /** 目标菜单名称 */
- @ApiModelProperty(value = "菜单名称")
- @NotEmpty(message = "6002")
- private String targetName;
-
- /** 目标按钮 */
- @ApiModelProperty(value = "按钮代码")
- @NotEmpty(message = "6002")
- private String action;
-
- /** 目标按钮名称 */
- @ApiModelProperty(value = "按钮名称")
- @NotEmpty(message = "6002")
- private String actionName;
-
- /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
- @ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
- private Integer deleteFlag;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- @NotNull(message = "6002")
- private Integer enableFlag;
-
- @ApiModelProperty(value = "sort")
- private Integer sort;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/param/AccessAuthorityParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/param/AccessAuthorityParam.java
deleted file mode 100755
index 95b84a7e4..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/controller/param/AccessAuthorityParam.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.accessauthority.controller.param;
-
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc AccessAuthority 权限管理查询输入类
- * @author 木子李·De
- * @date 2019-02-17 08:50:10.009
- **/
-@Data
-public class AccessAuthorityParam extends PageParam implements Serializable {
-
- /** 父菜单代码 */
- @Query(value = QueryEnum.LIKE)
- private String parentTarget;
-
- /** 菜单代码 */
- @Query(value = QueryEnum.LIKE)
- private String target;
-
- /** 菜单名称 */
- @Query(value = QueryEnum.LIKE)
- private String targetName;
-
- /** 按钮代码 */
- @Query(value = QueryEnum.LIKE)
- private String action;
-
- /** 按钮名称 */
- @Query(value = QueryEnum.LIKE)
- private String actionName;
-
- // 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG
- @Query
- private Integer enableFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/dao/AccessAuthorityMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/dao/AccessAuthorityMapper.java
deleted file mode 100755
index 3b8c8d58e..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/dao/AccessAuthorityMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.accessauthority.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * AccessAuthority Mapper
- *
- * @author 木子李·De
- * @date 2019-02-17 08:50:10.009
- **/
-@Mapper
-public interface AccessAuthorityMapper extends GaeaBaseMapper {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/dao/entity/AccessAuthority.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/dao/entity/AccessAuthority.java
deleted file mode 100755
index 15392054b..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/dao/entity/AccessAuthority.java
+++ /dev/null
@@ -1,40 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity;
-
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * @description 权限管理 entity
- * @author 木子李·De
- * @date 2019-02-17 08:50:10.009
- **/
-@TableName(keepGlobalPrefix = true, value = "access_authority")
-@Data
-public class AccessAuthority extends GaeaBaseEntity {
-
- /** 父菜单代码 */
- private String parentTarget;
-
- /** 菜单代码 */
- private String target;
-
- /** 菜单名称 */
- private String targetName;
-
- /** 按钮代码 */
- private String action;
-
- /** 按钮名称 */
- private String actionName;
-
- /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
- private Integer deleteFlag;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
- private Integer sort;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/service/AccessAuthorityService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/service/AccessAuthorityService.java
deleted file mode 100755
index d44b83d60..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/service/AccessAuthorityService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessauthority.service;
-
-import com.anji.plus.gaea.bean.TreeNode;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.accessauthority.controller.param.AccessAuthorityParam;
-import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
-
-import java.util.List;
-
-/**
- * @desc AccessAuthority 权限管理服务接口
- * @author 木子李·De
- * @date 2019-02-17 08:50:10.009
- **/
-public interface AccessAuthorityService extends GaeaBaseService {
-
- /**
- * @param loginName 当前登录的用户名
- * @param withActionNode 带第三层的按钮节点
- * @return
- */
- List getAuthorityTree(String loginName, boolean withActionNode);
-
- /**
- * 扫描所有mvc url的需要权限码,建立拦截体系
- */
- void scanGaeaSecurityAuthorities();
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/service/impl/AccessAuthorityServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/service/impl/AccessAuthorityServiceImpl.java
deleted file mode 100755
index b155b32b5..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessauthority/service/impl/AccessAuthorityServiceImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessauthority.service.impl;
-
-import com.anji.plus.gaea.bean.TreeNode;
-import com.anji.plus.gaea.cache.CacheHelper;
-import com.anji.plus.gaea.constant.Enabled;
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anji.plus.gaea.init.InitRequestUrlMappings;
-import com.anjiplus.template.gaea.business.constant.BusinessConstant;
-import com.anjiplus.template.gaea.business.modules.accessauthority.dao.AccessAuthorityMapper;
-import com.anjiplus.template.gaea.business.modules.accessauthority.dao.entity.AccessAuthority;
-import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @desc AccessAuthority 权限管理服务实现
- * @author 木子李·De
- * @date 2019-02-17 08:50:10.009
- **/
-@Service
-public class AccessAuthorityServiceImpl implements AccessAuthorityService {
-
- @Autowired
- private InitRequestUrlMappings initRequestUrlMappings;
-
- @Autowired
- private CacheHelper cacheHelper;
-
- @Autowired
- private AccessAuthorityMapper accessAuthorityMapper;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return accessAuthorityMapper;
- }
-
- @Override
- public List getAuthorityTree(String loginName, boolean withActionNode) {
- // 查询出所有的菜单记录
- LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.select(AccessAuthority::getParentTarget, AccessAuthority::getTarget, AccessAuthority::getTargetName,
- AccessAuthority::getAction, AccessAuthority::getActionName).eq(AccessAuthority::getEnableFlag, 1)
- .eq(AccessAuthority::getDeleteFlag, 0).orderByAsc(AccessAuthority::getSort);
- // 按operator去筛选 后面再加where
- List accessAuthorityList = getMapper().selectList(wrapper);
-
- // 筛选出一级菜单
- List parentNodes = accessAuthorityList.stream()
- .filter(accessAuthority -> StringUtils.isBlank(accessAuthority.getParentTarget())).map(item -> {
- TreeNode treeNode = new TreeNode();
- treeNode.setId(item.getTarget());
- treeNode.setLabel(item.getTargetName());
- return treeNode;
- }).collect(Collectors.toList());
-
- // 菜单-按钮的map
- Map> targetActionsMap = accessAuthorityList.stream()
- .filter(accessAuthority -> StringUtils.isNoneBlank(accessAuthority.getParentTarget()))
- .collect(Collectors.groupingBy(AccessAuthority::getTarget));
-
- // 设置每个一级菜单的二菜单
- parentNodes.stream().forEach(parentNode -> {
- List alreadyTargets = new ArrayList<>();
-
- accessAuthorityList.stream().forEach(authority -> {
- if (!StringUtils.equals(parentNode.getId(), authority.getParentTarget())
- || alreadyTargets.contains(authority.getTarget())) {
- return;
- }
- // 找到一级菜单对应的二级菜单
-
- // 初始化二级菜单节点
- TreeNode levelTwoMenuNode = new TreeNode();
- levelTwoMenuNode.setId(authority.getTarget());
- levelTwoMenuNode.setLabel(authority.getTargetName());
- levelTwoMenuNode.setChildren(new ArrayList());
-
- // 初始化二级菜单的按钮
- if (withActionNode) {
- List actionList = targetActionsMap.get(authority.getTarget());
- if (actionList != null && !actionList.isEmpty()) {
- actionList.stream().forEach(action -> {
- TreeNode buttonNode = new TreeNode();
- buttonNode.setId(String.format("%s_%s", action.getTarget(), action.getAction()));
- buttonNode.setLabel(action.getActionName());
- levelTwoMenuNode.getChildren().add(buttonNode);
- });
- }
- }
-
- // 将上面找到的二级菜单加入到一菜单的子树中去
- List children = parentNode.getChildren();
- if (children == null) {
- children = new ArrayList();
- }
- children.add(levelTwoMenuNode);
- parentNode.setChildren(children);
-
- // 已经找过的二级菜单,后面不在重复添加
- alreadyTargets.add(authority.getTarget());
- });
- });
-
- return parentNodes;
- }
-
- @Override
- public void scanGaeaSecurityAuthorities() {
- /*
- * 获取当前应用中所有的请求信息 { "applicationName": "aj-report", "authCode":
- * "authorityManage:query", "authName": "权限管理查询", "beanName":
- * "accessAuthorityController", "menuCode": "authorityManage", "path":
- * "GET#/accessAuthority/menuTree" }
- */
- List requestInfos = initRequestUrlMappings
- .getRequestInfos(Enabled.YES.getValue());
-
- // key="GET#/accessAuthority/menuTree" value="authorityManage:query"
- Map securityAuthorityMap = new HashMap();
- requestInfos.stream().forEach(requestInfo -> {
- securityAuthorityMap.put(requestInfo.getPath(), requestInfo.getAuthCode());
- });
-
- // 将key存入到缓存中
- cacheHelper.hashSet(BusinessConstant.GAEA_SECURITY_AUTHORITIES, securityAuthorityMap);
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/AccessRoleController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/AccessRoleController.java
deleted file mode 100755
index 2cc256104..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/AccessRoleController.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessrole.controller;
-
-import com.anji.plus.gaea.annotation.Permission;
-import com.anji.plus.gaea.bean.ResponseBean;
-import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anji.plus.gaea.holder.UserContentHolder;
-import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.AccessRoleDto;
-import com.anjiplus.template.gaea.business.modules.accessrole.controller.param.AccessRoleParam;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
-import com.anjiplus.template.gaea.business.modules.accessrole.service.AccessRoleService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @desc 角色管理 controller
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-@RestController
-@Api(tags = "角色管理管理")
-@RequestMapping("/accessRole")
-@Permission(code = "roleManage", name = "角色管理")
-public class AccessRoleController extends GaeaBaseController {
-
- @Autowired
- private AccessRoleService accessRoleService;
-
- @Override
- public GaeaBaseService getService() {
- return accessRoleService;
- }
-
- @Override
- public AccessRole getEntity() {
- return new AccessRole();
- }
-
- @Override
- public AccessRoleDto getDTO() {
- return new AccessRoleDto();
- }
-
- /**
- * 获取角色的 菜单按钮树 一级菜单 二级菜单 三级按钮
- * @return
- */
- @Permission(code = "grantAuthority", name = "分配权限")
- @GetMapping("/authorityTree/{roleCode}")
- public ResponseBean authorityTree(@PathVariable("roleCode") String roleCode) {
- String operator = UserContentHolder.getContext().getUsername();
- Map map = accessRoleService.getAuthorityTree(roleCode, operator);
- return responseSuccessWithData(map);
- }
-
- /**
- * 保存角色的权限
- * @return
- */
- @Permission(code = "grantAuthority", name = "分配权限")
- @PostMapping("/saveAuthorityTree")
- public ResponseBean saveAuthorityTree(@RequestBody AccessRoleDto dto) {
- Boolean data = accessRoleService.saveAuthorityTree(dto);
- return responseSuccessWithData(data);
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/dto/AccessRoleDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/dto/AccessRoleDto.java
deleted file mode 100755
index 9f5b849e7..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/dto/AccessRoleDto.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessrole.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @description 角色管理 dto
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-@Data
-public class AccessRoleDto extends GaeaBaseDTO implements Serializable {
-
- /** 角色编码 */
- @ApiModelProperty(value = "角色编码")
- @NotEmpty(message = "6002")
- private String roleCode;
-
- /** 角色名称 */
- @ApiModelProperty(value = "角色名称")
- @NotEmpty(message = "6002")
- private String roleName;
-
- /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
- @ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
- private Integer deleteFlag;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- @NotNull(message = "6002")
- private Integer enableFlag;
-
- /** 角色保存的权限 */
- private List authorityList;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/param/AccessRoleParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/param/AccessRoleParam.java
deleted file mode 100755
index 60642990e..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/controller/param/AccessRoleParam.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.accessrole.controller.param;
-
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc AccessRole 角色管理查询输入类
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-@Data
-public class AccessRoleParam extends PageParam implements Serializable {
-
- /** 角色编码 */
- @Query(value = QueryEnum.LIKE)
- private String roleCode;
-
- // 角色名称
- @Query(value = QueryEnum.LIKE)
- private String roleName;
-
- // 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG
- @Query
- private Integer enableFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/AccessRoleAuthorityMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/AccessRoleAuthorityMapper.java
deleted file mode 100755
index bf810efa5..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/AccessRoleAuthorityMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.accessrole.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRoleAuthority;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * AccessRoleAuthority Mapper
- *
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-@Mapper
-public interface AccessRoleAuthorityMapper extends GaeaBaseMapper {
-
-}
\ No newline at end of file
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/AccessRoleMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/AccessRoleMapper.java
deleted file mode 100755
index c2fc8d55b..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/AccessRoleMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.accessrole.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * AccessRole Mapper
- *
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-@Mapper
-public interface AccessRoleMapper extends GaeaBaseMapper {
-
- List checkedAuthoritys(@Param("roleCode") String roleCode);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/entity/AccessRole.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/entity/AccessRole.java
deleted file mode 100755
index 165ff4de3..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/entity/AccessRole.java
+++ /dev/null
@@ -1,29 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessrole.dao.entity;
-
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * @description 角色管理 entity
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-@TableName(keepGlobalPrefix = true, value = "access_role")
-@Data
-public class AccessRole extends GaeaBaseEntity {
-
- /** 角色编码 */
- private String roleCode;
-
- /** 角色名称 */
- private String roleName;
-
- /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
- private Integer deleteFlag;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/entity/AccessRoleAuthority.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/entity/AccessRoleAuthority.java
deleted file mode 100644
index 31aa551d2..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/dao/entity/AccessRoleAuthority.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.accessrole.dao.entity;
-
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @description 角色--菜单--按钮关联关系 entity
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-@TableName(keepGlobalPrefix = true, value = "access_role_authority")
-@Data
-public class AccessRoleAuthority extends GaeaBaseEntity {
-
- /** 角色编码 */
- private String roleCode;
-
- /** 菜单代码 */
- private String target;
-
- /** 按钮代码 */
- private String action;
-
- @TableField(exist = false)
- private String createBy;
-
- @TableField(exist = false)
- private Date createTime;
-
- @TableField(exist = false)
- private String updateBy;
-
- @TableField(exist = false)
- private Date updateTime;
-
- @TableField(exist = false)
- private Integer version;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/service/AccessRoleService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/service/AccessRoleService.java
deleted file mode 100755
index f4aa02eba..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/service/AccessRoleService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessrole.service;
-
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.AccessRoleDto;
-import com.anjiplus.template.gaea.business.modules.accessrole.controller.param.AccessRoleParam;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
-
-import java.util.Map;
-
-/**
- * @desc AccessRole 角色管理服务接口
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-public interface AccessRoleService extends GaeaBaseService {
-
- /**
- * 查询某角色的权限树
- * @param roleCode 被操作的对象
- * @param operator 当前登录者
- * @return
- */
- Map getAuthorityTree(String roleCode, String operator);
-
- /**
- * 保存角色的权限
- * @param accessRoleDto
- * @return
- */
- Boolean saveAuthorityTree(AccessRoleDto accessRoleDto);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/service/impl/AccessRoleServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/service/impl/AccessRoleServiceImpl.java
deleted file mode 100755
index b0f347732..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessrole/service/impl/AccessRoleServiceImpl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessrole.service.impl;
-
-import com.anji.plus.gaea.bean.TreeNode;
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.modules.accessauthority.service.AccessAuthorityService;
-import com.anjiplus.template.gaea.business.modules.accessrole.controller.dto.AccessRoleDto;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.AccessRoleAuthorityMapper;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.AccessRoleMapper;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRoleAuthority;
-import com.anjiplus.template.gaea.business.modules.accessrole.service.AccessRoleService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @desc AccessRole 角色管理服务实现
- * @author 木子李·De
- * @date 2019-02-17 08:50:14.136
- **/
-@Service
-public class AccessRoleServiceImpl implements AccessRoleService {
-
- @Autowired
- private AccessRoleMapper accessRoleMapper;
-
- @Autowired
- private AccessRoleAuthorityMapper accessRoleAuthorityMapper;
-
- @Autowired
- private AccessAuthorityService accessAuthorityService;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return accessRoleMapper;
- }
-
- @Override
- public Map getAuthorityTree(String roleCode, String operator) {
- Map result = new HashMap();
-
- // 菜单按钮树
- List treeData = accessAuthorityService.getAuthorityTree(operator, true);
-
- // 该角色已选中的菜单及按钮
- // List checkedKeys = accessRoleMapper.checkedAuthoritys(roleCode);
-
- LambdaQueryWrapper accessRoleAuthorityWrapper = Wrappers.lambdaQuery();
- accessRoleAuthorityWrapper.select(AccessRoleAuthority::getTarget, AccessRoleAuthority::getAction);
- accessRoleAuthorityWrapper.eq(AccessRoleAuthority::getRoleCode, roleCode);
- List accessRoleAuthorities = accessRoleAuthorityMapper
- .selectList(accessRoleAuthorityWrapper);
- List checkedKeys = accessRoleAuthorities.stream().map(accessRoleAuthority -> accessRoleAuthority
- .getTarget().concat("_").concat(accessRoleAuthority.getAction())).distinct()
- .collect(Collectors.toList());
-
- result.put("treeData", treeData);
- result.put("checkedKeys", checkedKeys);
- return result;
- }
-
- @Override
- public Boolean saveAuthorityTree(AccessRoleDto accessRoleDto) {
- // 校验
- String roleCode = accessRoleDto.getRoleCode();
- List authorityList = accessRoleDto.getAuthorityList();
- if (StringUtils.isBlank(roleCode)) {
- throw BusinessExceptionBuilder.build(ResponseCode.NOT_EMPTY, roleCode);
- }
- if (authorityList == null || authorityList.isEmpty()) {
- throw BusinessExceptionBuilder.build(ResponseCode.NOT_EMPTY, authorityList);
- }
-
- // 先清除该角色已保存的权限
- LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.eq(AccessRoleAuthority::getRoleCode, roleCode);
- accessRoleAuthorityMapper.delete(wrapper);
-
- // 保存勾选的权限(菜单和按钮)
- authorityList.stream().forEach(authorityStr -> {
- if (!authorityStr.contains("_")) {
- return;
- }
- String[] array = authorityStr.split("_");
- AccessRoleAuthority accessRoleAuthority = new AccessRoleAuthority();
- accessRoleAuthority.setRoleCode(roleCode);
- accessRoleAuthority.setTarget(array[0].trim());
- accessRoleAuthority.setAction(array[1].trim());
- accessRoleAuthorityMapper.insert(accessRoleAuthority);
- });
- return true;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/AccessUserController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/AccessUserController.java
deleted file mode 100755
index 9997f8bce..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/AccessUserController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessuser.controller;
-
-import com.anji.plus.gaea.annotation.Permission;
-import com.anji.plus.gaea.bean.ResponseBean;
-import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anji.plus.gaea.holder.UserContentHolder;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.AccessUserDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.GaeaUserDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.UpdatePasswordDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.param.AccessUserParam;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
-import com.anjiplus.template.gaea.business.modules.accessuser.service.AccessUserService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * @desc 用户管理 controller
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@RestController
-@Api(tags = "用户管理管理")
-@RequestMapping("/accessUser")
-@Permission(code = "userManage", name = "用户管理")
-public class AccessUserController extends GaeaBaseController {
-
- @Autowired
- private AccessUserService accessUserService;
-
- @Override
- public GaeaBaseService getService() {
- return accessUserService;
- }
-
- @Override
- public AccessUser getEntity() {
- return new AccessUser();
- }
-
- @Override
- public AccessUserDto getDTO() {
- return new AccessUserDto();
- }
-
- /**
- * 获取用户的角色树
- * @return
- */
- @Permission(code = "grantRole", name = "分配角色")
- @GetMapping("/roleTree/{loginName}")
- public ResponseBean getRoleTree(@PathVariable("loginName") String loginName) {
- String operator = UserContentHolder.getContext().getUsername();
- Map map = accessUserService.getRoleTree(loginName, operator);
- return responseSuccessWithData(map);
- }
-
- /**
- * 保存用户的角色树
- * @return
- */
- @Permission(code = "grantRole", name = "分配角色")
- @PostMapping("/saveRoleTree")
- public ResponseBean saveRoleTree(@RequestBody AccessUserDto dto) {
- Boolean data = accessUserService.saveRoleTree(dto);
- return responseSuccessWithData(data);
- }
-
- /**
- * 重置密码
- * @param dto
- * @return
- */
- @Permission(code = "resetPassword", name = "重置密码")
- @PostMapping({ "/resetPassword" })
- public ResponseBean resetPassword(@RequestBody @Validated GaeaUserDto dto) {
- Boolean data = accessUserService.resetPassword(dto);
- return responseSuccessWithData(data);
- }
-
- /**
- * 简单实现登录
- * @param dto
- * @return
- */
- @PostMapping({ "/login" })
- public ResponseBean login(@RequestBody @Validated GaeaUserDto dto) {
- return responseSuccessWithData(accessUserService.login(dto));
- }
-
- /**
- * 修改自己的密码
- * @param dto
- * @return
- */
- @PostMapping("/updatePassword")
- public ResponseBean updatePassword(@RequestBody UpdatePasswordDto dto) {
- return responseSuccessWithData(accessUserService.updatePassword(dto));
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/AccessUserDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/AccessUserDto.java
deleted file mode 100755
index fd3dee914..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/AccessUserDto.java
+++ /dev/null
@@ -1,64 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @description 用户管理 dto
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@Data
-public class AccessUserDto extends GaeaBaseDTO implements Serializable {
-
- /** 登录名 */
- @ApiModelProperty(value = " 登录名")
- @NotEmpty(message = "6002")
- private String loginName;
-
- /** 真实用户 */
- @ApiModelProperty(value = "真实用户")
- @NotEmpty(message = "6002")
- private String realName;
-
- /** 手机号码 */
- @ApiModelProperty(value = "手机号码")
- private String phone;
-
- /** 用户邮箱 */
- @ApiModelProperty(value = "用户邮箱")
- private String email;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- @NotNull(message = "6002")
- private Integer enableFlag;
-
- /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
- @ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
- private Integer deleteFlag;
-
- /** 最后一次登录IP */
- @ApiModelProperty(value = "最后一次登录IP")
- private String lastLoginIp;
-
- /** 最后一次登陆时间 */
- @ApiModelProperty(value = "最后一次登陆时间")
- private Date lastLoginTime;
-
- /** 备注 */
- @ApiModelProperty(value = "备注")
- private String remark;
-
- /** 用户勾选的角色 */
- private List roleCodeList;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java
deleted file mode 100644
index 1da9381dc..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/GaeaUserDto.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.List;
-
-@ApiModel(value = "用户登录")
-@Data
-public class GaeaUserDto {
-
- @ApiModelProperty(value = "登录名")
- @NotBlank
- private String loginName;
-
- @ApiModelProperty(value = "密码")
- @NotBlank
- private String password;
-
- /** 真实用户 */
- private String realName;
-
- /** 登录成功后的 */
- private String token;
-
- /** 用户所拥有的权限合集 */
- private List authorities;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/UpdatePasswordDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/UpdatePasswordDto.java
deleted file mode 100644
index 4dec1569d..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/dto/UpdatePasswordDto.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.accessuser.controller.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-
-@ApiModel(value = "修改密码")
-@Data
-public class UpdatePasswordDto {
-
- @ApiModelProperty(value = "旧密码密码")
- @NotBlank
- private String oldPassword;
-
- @ApiModelProperty(value = "密码")
- @NotBlank
- private String password;
-
- @ApiModelProperty(value = "密码")
- @NotBlank
- private String confirmPassword;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/param/AccessUserParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/param/AccessUserParam.java
deleted file mode 100755
index 763be8e9e..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/controller/param/AccessUserParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.accessuser.controller.param;
-
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc AccessUser 用户管理查询输入类
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@Data
-public class AccessUserParam extends PageParam implements Serializable {
-
- // 登录名
- @Query(value = QueryEnum.LIKE)
- private String loginName;
-
- // 真实用户
- @Query(value = QueryEnum.LIKE)
- private String realName;
-
- // 手机号码
- @Query(value = QueryEnum.LIKE)
- private String phone;
-
- // 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG
- @Query
- private Integer enableFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/AccessUserMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/AccessUserMapper.java
deleted file mode 100755
index 47e8e57d4..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/AccessUserMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.accessuser.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * AccessUser Mapper
- *
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@Mapper
-public interface AccessUserMapper extends GaeaBaseMapper {
-
- /**
- * 查询用户所拥有的所有角色下的权限
- * @param loginName
- * @return
- */
- List queryAuthoritiesByLoginName(@Param("loginName") String loginName);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/AccessUserRoleMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/AccessUserRoleMapper.java
deleted file mode 100755
index 088d8fac9..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/AccessUserRoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.accessuser.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUserRole;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * AccessUser Mapper
- *
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@Mapper
-public interface AccessUserRoleMapper extends GaeaBaseMapper {
-
-}
\ No newline at end of file
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUser.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUser.java
deleted file mode 100755
index 66c1c9fa5..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUser.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessuser.dao.entity;
-
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @description 用户管理 entity
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@TableName(keepGlobalPrefix = true, value = "access_user")
-@Data
-public class AccessUser extends GaeaBaseEntity {
-
- /** 登录名 */
- private String loginName;
-
- /** 密码 */
- private String password;
-
- /** 真实用户 */
- private String realName;
-
- /** 手机号码 */
- private String phone;
-
- /** 用户邮箱 */
- private String email;
-
- /** 备注 */
- private String remark;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
- /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
- private Integer deleteFlag;
-
- /** 最后一次登录IP */
- private String lastLoginIp;
-
- /** 最后一次登陆时间 */
- private Date lastLoginTime;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUserRole.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUserRole.java
deleted file mode 100755
index b2050f836..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/dao/entity/AccessUserRole.java
+++ /dev/null
@@ -1,41 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessuser.dao.entity;
-
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @description 用户--角色关联关系 entity
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@TableName(keepGlobalPrefix = true, value = "access_user_role")
-@Data
-public class AccessUserRole extends GaeaBaseEntity {
-
- /** 登录名 */
- private String loginName;
-
- /** 角色编码 */
- private String roleCode;
-
- @TableField(exist = false)
- private String createBy;
-
- @TableField(exist = false)
- private Date createTime;
-
- @TableField(exist = false)
- private String updateBy;
-
- @TableField(exist = false)
- private Date updateTime;
-
- @TableField(exist = false)
- private Integer version;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/AccessUserService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/AccessUserService.java
deleted file mode 100755
index 021f34da0..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/AccessUserService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessuser.service;
-
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.AccessUserDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.GaeaUserDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.UpdatePasswordDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.param.AccessUserParam;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
-
-import java.util.Map;
-
-/**
- * @desc AccessUser 用户管理服务接口
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-public interface AccessUserService extends GaeaBaseService {
-
- /**
- * 获取用户的角色树
- * @param loginName 被操作的对象
- * @param operator 当前登录者
- * @return
- */
- Map getRoleTree(String loginName, String operator);
-
- /**
- * 保存用户的角色树
- * @param accessUserDto
- * @return
- */
- Boolean saveRoleTree(AccessUserDto accessUserDto);
-
- /**
- * 重置密码
- * @param gaeaUserDto
- * @return
- */
- Boolean resetPassword(GaeaUserDto gaeaUserDto);
-
- /**
- * 用户登录
- * @param gaeaUserDto
- * @return
- */
- GaeaUserDto login(GaeaUserDto gaeaUserDto);
-
- /**
- * 修改密码
- * @param dto
- * @return
- */
- Boolean updatePassword(UpdatePasswordDto dto);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java
deleted file mode 100755
index ebe584478..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/accessuser/service/impl/AccessUserServiceImpl.java
+++ /dev/null
@@ -1,264 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.accessuser.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anji.plus.gaea.bean.TreeNode;
-import com.anji.plus.gaea.cache.CacheHelper;
-import com.anji.plus.gaea.constant.BaseOperationEnum;
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anji.plus.gaea.exception.BusinessException;
-import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anji.plus.gaea.holder.UserContentHolder;
-import com.anji.plus.gaea.utils.GaeaUtils;
-import com.anji.plus.gaea.utils.JwtBean;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.constant.BusinessConstant;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.AccessRoleAuthorityMapper;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.AccessRoleMapper;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRole;
-import com.anjiplus.template.gaea.business.modules.accessrole.dao.entity.AccessRoleAuthority;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.AccessUserDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.GaeaUserDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.controller.dto.UpdatePasswordDto;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.AccessUserMapper;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.AccessUserRoleMapper;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUser;
-import com.anjiplus.template.gaea.business.modules.accessuser.dao.entity.AccessUserRole;
-import com.anjiplus.template.gaea.business.modules.accessuser.service.AccessUserService;
-import com.anjiplus.template.gaea.business.util.MD5Util;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @desc AccessUser 用户管理服务实现
- * @author 木子李·De
- * @date 2019-02-17 08:50:11.902
- **/
-@Service
-public class AccessUserServiceImpl implements AccessUserService {
-
- @Autowired
- private AccessRoleMapper accessRoleMapper;
-
- @Autowired
- private AccessUserMapper accessUserMapper;
-
- @Autowired
- private AccessUserRoleMapper accessUserRoleMapper;
-
- @Autowired
- private AccessRoleAuthorityMapper accessRoleAuthorityMapper;
-
- @Value("${customer.user.default.password:'123456'}")
- private String defaultPassword;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return accessUserMapper;
- }
-
- @Autowired
- private JwtBean jwtBean;
-
- @Autowired
- private CacheHelper cacheHelper;
-
- @Override
- public Map getRoleTree(String loginName, String operator) {
- Map result = new HashMap();
- List treeData = new ArrayList<>();
- List checkedKeys = new ArrayList();
-
- // 角色树
- LambdaQueryWrapper roleQuery = Wrappers.lambdaQuery();
- roleQuery.select(AccessRole::getRoleCode, AccessRole::getRoleName);
- // 按operator去筛选role 后面再加where
- List roleList = accessRoleMapper.selectList(roleQuery);
- if (roleList == null || roleList.isEmpty()) {
- result.put("treeData", treeData);
- result.put("checkedKeys", checkedKeys);
- return result;
- }
- treeData = roleList.stream().map(role -> {
- TreeNode treeNode = new TreeNode();
- treeNode.setId(role.getRoleCode());
- treeNode.setLabel(role.getRoleName());
- return treeNode;
- }).collect(Collectors.toList());
-
- // 该用户已保存的角色
- LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(AccessUserRole::getRoleCode).eq(AccessUserRole::getLoginName, loginName);
- checkedKeys = accessUserRoleMapper.selectObjs(queryWrapper);
-
- result.put("treeData", treeData);
- result.put("checkedKeys", checkedKeys);
- return result;
- }
-
- @Override
- public Boolean saveRoleTree(AccessUserDto accessUserDto) {
- // 校验
- String loginName = accessUserDto.getLoginName();
- List roleCodeList = accessUserDto.getRoleCodeList();
- if (StringUtils.isBlank(loginName)) {
- throw BusinessExceptionBuilder.build(ResponseCode.NOT_EMPTY, loginName);
- }
- if (roleCodeList == null || roleCodeList.isEmpty()) {
- throw BusinessExceptionBuilder.build(ResponseCode.NOT_EMPTY, roleCodeList);
- }
-
- // 先清除该用户已保存的角色
- LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.eq(AccessUserRole::getLoginName, loginName);
- accessUserRoleMapper.delete(wrapper);
-
- // 保存勾选的角色
- roleCodeList.stream().forEach(roleCode -> {
- AccessUserRole accessUserRole = new AccessUserRole();
- accessUserRole.setLoginName(loginName);
- accessUserRole.setRoleCode(roleCode);
- accessUserRoleMapper.insert(accessUserRole);
- });
- return true;
- }
-
- @Override
- public Boolean resetPassword(GaeaUserDto gaeaUserDto) {
- return false;
- }
-
- @Override
- public GaeaUserDto login(GaeaUserDto gaeaUserDto) {
-
- String loginName = gaeaUserDto.getLoginName();
- String password = gaeaUserDto.getPassword();
-
- // 1.判断用户是否存在
- LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.eq(AccessUser::getLoginName, loginName);
- AccessUser accessUser = accessUserMapper.selectOne(wrapper);
- if (null == accessUser) {
- throw BusinessExceptionBuilder.build(ResponseCode.LOGIN_ERROR);
- }
- // 2.密码错误
- if (!accessUser.getPassword().equals(MD5Util.encrypt(password))) {
- throw BusinessExceptionBuilder.build(ResponseCode.USER_PASSWORD_ERROR);
- }
-
- // 3.如果该用户登录未过期,这里允许一个用户在多个终端登录
- String tokenKey = String.format(BusinessConstant.GAEA_SECURITY_LOGIN_TOKEN, loginName);
- String token = "";
- GaeaUserDto gaeaUser = new GaeaUserDto();
- if (cacheHelper.exist(tokenKey)) {
- token = cacheHelper.stringGet(tokenKey);
- }
- else {
- // 生成用户token
- String uuid = GaeaUtils.UUID();
- token = jwtBean.createToken(loginName, uuid);
- cacheHelper.stringSetExpire(tokenKey, token, 3600);
- }
-
- // 4.读取用户最新人权限主信息
- String userKey = String.format(BusinessConstant.GAEA_SECURITY_LOGIN_USER, loginName);
-
- // 为了兼容底层其他数据库,不再写自定义sql
- // List authorities =
- // accessUserMapper.queryAuthoritiesByLoginName(loginName);
-
- // 当前用户的roleCode集合
- LambdaQueryWrapper accessUserWrapper = Wrappers.lambdaQuery();
- accessUserWrapper.select(AccessUserRole::getRoleCode);
- accessUserWrapper.eq(AccessUserRole::getLoginName, loginName);
- List accessUserRoles = accessUserRoleMapper.selectList(accessUserWrapper);
- Set roleCodeSet = accessUserRoles.stream().map(AccessUserRole::getRoleCode).collect(Collectors.toSet());
- if (roleCodeSet.size() < 1) {
- gaeaUser.setAuthorities(new ArrayList<>());
- }
- else {
- LambdaQueryWrapper accessRoleAuthorityWrapper = Wrappers.lambdaQuery();
- accessRoleAuthorityWrapper.select(AccessRoleAuthority::getTarget, AccessRoleAuthority::getAction);
- accessRoleAuthorityWrapper.in(AccessRoleAuthority::getRoleCode, roleCodeSet);
- List accessRoleAuthorities = accessRoleAuthorityMapper
- .selectList(accessRoleAuthorityWrapper);
- List authorities = accessRoleAuthorities.stream().map(accessRoleAuthority -> accessRoleAuthority
- .getTarget().concat(":").concat(accessRoleAuthority.getAction())).distinct()
- .collect(Collectors.toList());
- gaeaUser.setAuthorities(authorities);
- }
-
- gaeaUser.setLoginName(loginName);
- gaeaUser.setRealName(accessUser.getRealName());
- gaeaUser.setToken(token);
-
- String gaeaUserStr = JSONObject.toJSONString(gaeaUser);
- cacheHelper.stringSetExpire(userKey, gaeaUserStr, 3600);
-
- return gaeaUser;
- }
-
- /**
- * 修改密码
- * @param dto
- * @return
- */
- @Override
- public Boolean updatePassword(UpdatePasswordDto dto) {
- if (!dto.getConfirmPassword().equals(dto.getPassword())) {
- // 密码和确认密码不一致
- throw BusinessExceptionBuilder.build(ResponseCode.USER_INCONSISTENT_PASSWORD_ERROR);
- }
- // 新密码不能与老密码一样
- if (StringUtils.equals(dto.getOldPassword(), dto.getPassword())) {
- throw BusinessExceptionBuilder.build(ResponseCode.USER_PASSWORD_CONFIG_PASSWORD_CANOT_EQUAL);
- }
-
- String username = UserContentHolder.getUsername();
-
- LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.eq(AccessUser::getLoginName, username);
- AccessUser accessUser = selectOne(wrapper);
- String password = accessUser.getPassword();
- if (!MD5Util.encrypt(dto.getOldPassword()).equals(password)) {
- throw BusinessExceptionBuilder.build(ResponseCode.USER_OLD_PASSWORD_ERROR);
- }
- accessUser.setPassword(MD5Util.encrypt(dto.getPassword()));
-
- accessUserMapper.updateById(accessUser);
- return true;
- }
-
- /**
- * 操作前处理
- * @param entity 前端传递的对象
- * @param operationEnum 操作类型
- * @throws BusinessException 阻止程序继续执行或回滚事务
- */
- @Override
- public void processBeforeOperation(AccessUser entity, BaseOperationEnum operationEnum) throws BusinessException {
- // 过滤密码
- switch (operationEnum) {
- case INSERT:
- // gaea是为了和前端加密保持一致
- entity.setPassword(MD5Util.encrypt(MD5Util.encrypt(defaultPassword.concat("gaea"))));
- break;
- case UPDATE:
- // 更新用户不允许修改密码
- entity.setPassword(null);
- break;
- default:
-
- break;
- }
-
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java
deleted file mode 100644
index a1da6fdc7..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/ReportDashboardController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboard.controller;
-
-import com.anji.plus.gaea.annotation.Permission;
-import com.anji.plus.gaea.annotation.log.GaeaAuditLog;
-import com.anji.plus.gaea.bean.ResponseBean;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
-import com.anjiplus.template.gaea.business.modules.reportshare.controller.dto.ReportShareDto;
-import com.anjiplus.template.gaea.business.modules.reportshare.service.ReportShareService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @desc 大屏设计 controller
- * @website https://gitee.com/anji-plus/gaea
- * @author Raod
- * @date 2021-04-12 14:52:21.761
- **/
-@RestController
-@Api(tags = "大屏设计管理")
-@Permission(code = "bigScreenManage", name = "大屏报表")
-@RequestMapping("/reportDashboard")
-public class ReportDashboardController {
-
- @Autowired
- private ReportDashboardService reportDashboardService;
-
- @Autowired
- private ReportShareService reportShareService;
-
- /**
- * 预览、查询大屏详情
- * @param reportCode
- * @return
- */
- @GetMapping({ "/{reportCode}" })
- @Permission(code = "view", name = "查看大屏")
- public ResponseBean detail(@PathVariable("reportCode") String reportCode) {
- return ResponseBean.builder().data(reportDashboardService.getDetail(reportCode)).build();
- }
-
- /**
- * 保存大屏设计
- * @param dto
- * @return
- */
- @PostMapping
- @Permission(code = "design", name = "设计大屏")
- @GaeaAuditLog(pageTitle = "新增")
- public ResponseBean insert(@RequestBody ReportDashboardObjectDto dto) {
- reportDashboardService.insertDashboard(dto);
- return ResponseBean.builder().build();
- }
-
- /**
- * 获取去单个图层数据
- * @param dto
- * @return
- */
- @PostMapping("/getData")
- @Permission(code = "view", name = "查看大屏")
- public ResponseBean getData(@RequestBody ChartDto dto) {
- return ResponseBean.builder().data(reportDashboardService.getChartData(dto)).build();
- }
-
- /**
- * 导出大屏
- * @param reportCode
- * @return
- */
- @GetMapping("/export")
- @Permission(code = "export", name = "导出大屏")
- public ResponseEntity exportDashboard(HttpServletRequest request, HttpServletResponse response,
- @RequestParam("reportCode") String reportCode,
- @RequestParam(value = "showDataSet", required = false, defaultValue = "1") Integer showDataSet) {
- return reportDashboardService.exportDashboard(request, response, reportCode, showDataSet);
- }
-
- /**
- * 导入大屏
- * @param file 导入的zip文件
- * @param reportCode
- * @return
- */
- @PostMapping("/import/{reportCode}")
- @Permission(code = "import", name = "导入大屏")
- public ResponseBean importDashboard(@RequestParam("file") MultipartFile file,
- @PathVariable("reportCode") String reportCode) {
- reportDashboardService.importDashboard(file, reportCode);
- return ResponseBean.builder().build();
- }
-
- @PostMapping("/share")
- @GaeaAuditLog(pageTitle = "分享")
- public ResponseBean share(@Validated @RequestBody ReportShareDto dto) {
- return ResponseBean.builder().data(reportShareService.insertShare(dto)).build();
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ChartDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ChartDto.java
deleted file mode 100644
index 90188c079..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ChartDto.java
+++ /dev/null
@@ -1,48 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * @description 大屏设计 dto
- * @author Raod
- * @date 2021-04-12 14:52:21.761
- **/
-@Data
-public class ChartDto implements Serializable {
-
- private String chartType;
-
- /** 数据集编码 */
- private String setCode;
-
- /** 传入的自定义参数 */
- private Map contextData;
-
- /** 图表属性 */
- private Map chartProperties;
-
- /** 时间字段 */
- private String timeLineFiled;
-
- /** 时间颗粒度 */
- private String particles;
-
- /** 时间格式化 */
- private String dataTimeFormat;
-
- /** 时间展示层 */
- private String timeLineFormat;
-
- private int timeUnit;
-
- /** 时间区间 */
- private String startTime;
-
- /** 时间区间 */
- private String endTime;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java
deleted file mode 100644
index 276761a0f..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardDto.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @description 大屏设计 dto
- * @author Raod
- * @date 2021-04-12 14:52:21.761
- **/
-@Data
-public class ReportDashboardDto extends GaeaBaseDTO implements Serializable {
-
- /** 报表编码 */
- private String reportCode;
-
- /** 看板标题 */
- private String title;
-
- /** 宽度px */
- private Long width;
-
- /** 高度px */
- private Long height;
-
- /** 背景色 */
- private String backgroundColor;
-
- /** 背景图片 */
- private String backgroundImage;
-
- /** 工作台中的辅助线 */
- private String presetLine;
-
- /** 自动刷新间隔秒,数据字典REFRESH_TYPE */
- private Integer refreshSeconds;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
- /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
- private Integer deleteFlag;
-
- /** 排序,降序 */
- private Integer sort;
-
- private List widgets;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardObjectDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardObjectDto.java
deleted file mode 100644
index 60486ea00..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/dto/ReportDashboardObjectDto.java
+++ /dev/null
@@ -1,31 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboard.controller.dto;
-
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @description 大屏设计 dto
- * @author Raod
- * @date 2021-04-12 14:52:21.761
- **/
-@Data
-public class ReportDashboardObjectDto implements Serializable {
-
- /** 报表编码 */
- private String reportCode;
-
- /**
- * 报表编码
- */
- private ReportDashboardDto dashboard;
-
- /**
- * 大屏画布中的组件
- */
- private List widgets;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/param/ReportDashboardParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/param/ReportDashboardParam.java
deleted file mode 100644
index 6b279558b..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/controller/param/ReportDashboardParam.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.dashboard.controller.param;
-
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc ReportDashboard 大屏设计查询输入类
- * @author Raod
- * @date 2021-04-12 14:52:21.761
- **/
-@Data
-public class ReportDashboardParam extends PageParam implements Serializable {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/ReportDashboardMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/ReportDashboardMapper.java
deleted file mode 100644
index 308042800..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/ReportDashboardMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dashboard.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * ReportDashboard Mapper
- *
- * @author Raod
- * @date 2021-04-12 14:52:21.761
- **/
-@Mapper
-public interface ReportDashboardMapper extends GaeaBaseMapper {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java
deleted file mode 100644
index d7eb14ffb..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/dao/entity/ReportDashboard.java
+++ /dev/null
@@ -1,54 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboard.dao.entity;
-
-import com.anji.plus.gaea.annotation.Unique;
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @description 大屏设计 entity
- * @author Raod
- * @date 2021-04-12 14:52:21.761
- **/
-@TableName(keepGlobalPrefix = true, value = "gaea_report_dashboard")
-@Data
-public class ReportDashboard extends GaeaBaseEntity {
-
- @ApiModelProperty(value = "报表编码")
- @Unique(code = ResponseCode.REPORT_CODE_ISEXIST)
- private String reportCode;
-
- @ApiModelProperty(value = "看板标题")
- private String title;
-
- @ApiModelProperty(value = "宽度px")
- private Long width;
-
- @ApiModelProperty(value = "高度px")
- private Long height;
-
- @ApiModelProperty(value = "背景色")
- private String backgroundColor;
-
- @ApiModelProperty(value = "背景图片")
- private String backgroundImage;
-
- @ApiModelProperty(value = "工作台中的辅助线")
- private String presetLine;
-
- @ApiModelProperty(value = "自动刷新间隔秒,数据字典REFRESH_TYPE")
- private Integer refreshSeconds;
-
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- private Integer enableFlag;
-
- @ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
- private Integer deleteFlag;
-
- @ApiModelProperty(value = "排序,降序")
- private Integer sort;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ChartStrategy.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ChartStrategy.java
deleted file mode 100644
index bea7ee643..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ChartStrategy.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dashboard.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
-
-import java.util.List;
-
-/**
- * Created by raodeming on 2021/4/26.
- */
-public interface ChartStrategy {
-
- /**
- * 图表类型
- * @return
- */
- String type();
-
- /**
- * 针对每种图表类型做单独的数据转换解析
- * @param dto
- * @return
- */
- Object transform(ChartDto dto, List data);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ReportDashboardService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ReportDashboardService.java
deleted file mode 100644
index fd6924667..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/ReportDashboardService.java
+++ /dev/null
@@ -1,59 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboard.service;
-
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.param.ReportDashboardParam;
-import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @desc ReportDashboard 大屏设计服务接口
- * @author Raod
- * @date 2021-04-12 14:52:21.761
- **/
-public interface ReportDashboardService extends GaeaBaseService {
-
- /***
- * 查询详情
- * @param reportCode
- */
- ReportDashboardObjectDto getDetail(String reportCode);
-
- /***
- * 保存大屏设计
- * @param dto
- */
- void insertDashboard(ReportDashboardObjectDto dto);
-
- /**
- * 获取单个图表数据
- * @param dto
- * @return
- */
- Object getChartData(ChartDto dto);
-
- /**
- * 导出大屏,zip文件
- * @param request
- * @param response
- * @param reportCode
- * @return
- */
- ResponseEntity exportDashboard(HttpServletRequest request, HttpServletResponse response, String reportCode,
- Integer showDataSet);
-
- /**
- * 导入大屏zip
- * @param file
- * @param reportCode
- * @return
- */
- void importDashboard(MultipartFile file, String reportCode);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarChartServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarChartServiceImpl.java
deleted file mode 100644
index 83656301c..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarChartServiceImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 柱状体或者折线图 Created by raodeming on 2021/4/26.
- */
-@Component
-public class BarChartServiceImpl implements ChartStrategy {
-
- /**
- * 图表类型
- * @return
- */
- @Override
- public String type() {
- return "widget-barchart|widget-linechart";
- }
-
- /**
- * 针对每种图表类型做单独的数据转换解析
- * @param dto
- * @param data
- * @return
- */
- @Override
- public Object transform(ChartDto dto, List data) {
- // JSONObject json = new JSONObject();
- // List xAxis = new ArrayList<>();
- // List series = new ArrayList<>();
- // data.forEach(jsonObject -> {
- // jsonObject.forEach((s, o) -> {
- // if ("xAxis".equals(s)) {
- // xAxis.add(o);
- // } else {
- // series.add(o);
- // }
- // });
- // });
- //
- // json.put("xAxis", xAxis);
- // JSONArray objects = new JSONArray();
- // JSONObject jsonObject = new JSONObject();
- // jsonObject.put("data", series);
- // objects.add(jsonObject);
- // json.put("series", objects);
- // return json.toJSONString();
- return data;
- }
-
- /*
- * { "xAxis": [ "哈哈", "洗洗", "来了", "问问", "天天" ], "series": [ { "data": [ 1, 2, 3, 4, 5
- * ] } ] }
- */
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarLineChartServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarLineChartServiceImpl.java
deleted file mode 100644
index f5641488b..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/BarLineChartServiceImpl.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 折柱图 Created by raodeming on 2021/4/26.
- */
-@Component
-public class BarLineChartServiceImpl implements ChartStrategy {
-
- /**
- * 图表类型
- * @return
- */
- @Override
- public String type() {
- return "widget-barlinechart";
- }
-
- /**
- * 针对每种图表类型做单独的数据转换解析
- * @param dto
- * @param data
- * @return
- */
- @Override
- public Object transform(ChartDto dto, List data) {
- // JSONObject json = new JSONObject();
- // List xAxis = new ArrayList<>();
- // Map> series = new HashMap<>();
- // data.forEach(jsonObject -> {
- // jsonObject.forEach((s, o) -> {
- // if ("xAxis".equals(s)) {
- // xAxis.add(o);
- // } else {
- // List objects;
- // if (series.containsKey(s)) {
- // objects = series.get(s);
- // } else {
- // objects = new ArrayList<>();
- //
- // }
- // objects.add(o);
- // series.put(s, objects);
- //
- // }
- // });
- // });
- //
- // json.put("xAxis", xAxis);
- // List result = new ArrayList<>();
- // series.forEach((s, objects) -> {
- // JSONObject jsonObject = new JSONObject();
- // jsonObject.put("name", s);
- // if (s.endsWith("bar")) {
- // jsonObject.put("type", "bar");
- // } else {
- // jsonObject.put("type", "line");
- // }
- // jsonObject.put("data", objects);
- // result.add(jsonObject);
- // });
- // json.put("series", result);
- // return json.toJSONString();
- return data;
- }
-
- /*
- * { "xAxis": [ "1月", "2月", "3月" ], "series": [ { "name": "指标1", //暂时用不上 "type":
- * "bar", //需要处理 "data": [ 2, 49, 2 ] }, { "name": "指标2", "type": "line",
- * "yAxisIndex": 1, "data": [ 2, 32, 4 ] } ] }
- */
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/GaugeChartServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/GaugeChartServiceImpl.java
deleted file mode 100644
index aead08a51..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/GaugeChartServiceImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 饼图或者空心饼图或者漏斗图 Created by raodeming on 2021/4/26.
- */
-@Component
-public class GaugeChartServiceImpl implements ChartStrategy {
-
- /**
- * 图表类型
- * @return
- */
- @Override
- public String type() {
- return "widget-gauge";
- }
-
- /**
- * 针对每种图表类型做单独的数据转换解析
- * @param dto
- * @param data
- * @return
- */
- @Override
- public Object transform(ChartDto dto, List data) {
-
- // return "{\"value\": 50, \"name\": \"名称1\", \"unit\": \"%\"}";
- return data;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/PieChartServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/PieChartServiceImpl.java
deleted file mode 100644
index 21f018fa3..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/PieChartServiceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 饼图或者空心饼图或者漏斗图 Created by raodeming on 2021/4/26.
- */
-@Component
-public class PieChartServiceImpl implements ChartStrategy {
-
- /**
- * 图表类型
- * @return
- */
- @Override
- public String type() {
- return "widget-piechart|widget-hollow-piechart|widget-funnel";
- }
-
- /**
- * 针对每种图表类型做单独的数据转换解析
- * @param dto
- * @param data
- * @return
- */
- @Override
- public Object transform(ChartDto dto, List data) {
-
- return data;
- }
-
- /*
- * [ { "value": 11, "name": "指标1" }, { "value": 10, "name": "指标2" } ]
- */
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java
deleted file mode 100644
index 55b81e839..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java
+++ /dev/null
@@ -1,567 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboard.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anji.plus.gaea.utils.GaeaAssert;
-import com.anji.plus.gaea.utils.GaeaBeanUtils;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ChartDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.controller.dto.ReportDashboardObjectDto;
-import com.anjiplus.template.gaea.business.modules.dashboard.dao.ReportDashboardMapper;
-import com.anjiplus.template.gaea.business.modules.dashboard.dao.entity.ReportDashboard;
-import com.anjiplus.template.gaea.business.modules.dashboard.service.ChartStrategy;
-import com.anjiplus.template.gaea.business.modules.dashboard.service.ReportDashboardService;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetDto;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto.ReportDashboardWidgetValueDto;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.service.ReportDashboardWidgetService;
-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.modules.file.entity.GaeaFile;
-import com.anjiplus.template.gaea.business.modules.file.service.GaeaFileService;
-import com.anjiplus.template.gaea.business.modules.file.util.FileUtils;
-import com.anjiplus.template.gaea.business.modules.report.service.ReportService;
-import com.anjiplus.template.gaea.business.util.DateUtil;
-import com.anjiplus.template.gaea.business.util.FileUtil;
-import com.anjiplus.template.gaea.business.util.RequestUtil;
-import com.anjiplus.template.gaea.business.util.UuidUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * @author Raod
- * @desc ReportDashboard 大屏设计服务实现
- * @date 2021-04-12 14:52:21.761
- **/
-@Service
-@Slf4j
-// @RequiredArgsConstructor
-public class ReportDashboardServiceImpl implements ReportDashboardService, InitializingBean, ApplicationContextAware {
-
- @Autowired
- private ReportDashboardMapper reportDashboardMapper;
-
- @Autowired
- private ReportDashboardWidgetService reportDashboardWidgetService;
-
- @Autowired
- private DataSetService dataSetService;
-
- @Autowired
- private GaeaFileService gaeaFileService;
-
- @Autowired
- private ReportService reportService;
-
- @Value("${customer.file.downloadPath:''}")
- private String fileDownloadPath;
-
- @Value("${customer.file.dist-path:''}")
- private String dictPath;
-
- private final static String ZIP_PATH = "/zip/";
-
- private final static String JSON_PATH = "dashboard.json";
-
- private Map queryServiceImplMap = new HashMap<>();
-
- private ApplicationContext applicationContext;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return reportDashboardMapper;
- }
-
- @Override
- public ReportDashboardObjectDto getDetail(String reportCode) {
- ReportDashboardObjectDto result = new ReportDashboardObjectDto();
- ReportDashboardDto reportDashboardDto = new ReportDashboardDto();
- ReportDashboard reportDashboard = this.selectOne("report_code", reportCode);
- if (null == reportDashboard) {
- return new ReportDashboardObjectDto();
- }
- GaeaBeanUtils.copyAndFormatter(reportDashboard, reportDashboardDto);
-
- List list = reportDashboardWidgetService.list(
- new QueryWrapper().lambda().eq(ReportDashboardWidget::getReportCode, reportCode)
- .orderByAsc(ReportDashboardWidget::getSort));
- List reportDashboardWidgetDtoList = new ArrayList<>();
- list.forEach(reportDashboardWidget -> {
- ReportDashboardWidgetDto reportDashboardWidgetDto = new ReportDashboardWidgetDto();
- ReportDashboardWidgetValueDto value = new ReportDashboardWidgetValueDto();
- value.setSetup(StringUtils.isNotBlank(reportDashboardWidget.getSetup())
- ? JSONObject.parseObject(reportDashboardWidget.getSetup()) : new JSONObject());
- value.setData(StringUtils.isNotBlank(reportDashboardWidget.getData())
- ? JSONObject.parseObject(reportDashboardWidget.getData()) : new JSONObject());
- value.setPosition(StringUtils.isNotBlank(reportDashboardWidget.getPosition())
- ? JSONObject.parseObject(reportDashboardWidget.getPosition()) : new JSONObject());
- value.setCollapse(StringUtils.isNotBlank(reportDashboardWidget.getCollapse())
- ? JSONObject.parseObject(reportDashboardWidget.getCollapse()) : new JSONObject());
-
- // 实时数据的替换
- analysisData(value);
- reportDashboardWidgetDto.setType(reportDashboardWidget.getType());
- reportDashboardWidgetDto.setValue(value);
- reportDashboardWidgetDto.setOptions(JSONObject.parseObject(reportDashboardWidget.getOptions()));
- reportDashboardWidgetDtoList.add(reportDashboardWidgetDto);
- });
- reportDashboardDto.setWidgets(reportDashboardWidgetDtoList);
- result.setDashboard(reportDashboardDto);
- result.setReportCode(reportCode);
- return result;
- }
-
- /***
- * 保存大屏设计
- * @param dto
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void insertDashboard(ReportDashboardObjectDto dto) {
- String reportCode = dto.getReportCode();
- GaeaAssert.notEmpty(reportCode, ResponseCode.PARAM_IS_NULL, "reportCode");
- // 查询ReportDashboard
- ReportDashboard reportDashboard = this.selectOne("report_code", reportCode);
- ReportDashboard dashboard = new ReportDashboard();
- GaeaBeanUtils.copyAndFormatter(dto.getDashboard(), dashboard);
- BeanUtils.copyProperties(dto.getDashboard(), dashboard);
- dashboard.setReportCode(reportCode);
- if (null == reportDashboard) {
- // 新增
- this.insert(dashboard);
- }
- else {
- // 更新
- dashboard.setId(reportDashboard.getId());
- dashboard.setVersion(null);
- this.update(dashboard);
- }
-
- // 删除reportDashboardWidget
- reportDashboardWidgetService.delete(new QueryWrapper().lambda()
- .eq(ReportDashboardWidget::getReportCode, reportCode));
- List widgets = dto.getWidgets();
-
- // List reportDashboardWidgetList = new ArrayList<>();
- for (int i = 0; i < widgets.size(); i++) {
- ReportDashboardWidget reportDashboardWidget = new ReportDashboardWidget();
- ReportDashboardWidgetDto reportDashboardWidgetDto = widgets.get(i);
- String type = reportDashboardWidgetDto.getType();
- ReportDashboardWidgetValueDto value = reportDashboardWidgetDto.getValue();
- reportDashboardWidget.setReportCode(reportCode);
- reportDashboardWidget.setType(type);
- reportDashboardWidget.setSetup(value.getSetup() != null ? JSONObject.toJSONString(value.getSetup()) : "");
- reportDashboardWidget.setData(value.getData() != null ? JSONObject.toJSONString(value.getData()) : "");
- reportDashboardWidget
- .setPosition(value.getPosition() != null ? JSONObject.toJSONString(value.getPosition()) : "");
- reportDashboardWidget
- .setCollapse(value.getCollapse() != null ? JSONObject.toJSONString(value.getCollapse()) : "");
- reportDashboardWidget.setOptions(reportDashboardWidgetDto.getOptions() != null
- ? JSONObject.toJSONString(reportDashboardWidgetDto.getOptions()) : "");
- reportDashboardWidget.setEnableFlag(1);
- reportDashboardWidget.setDeleteFlag(0);
- reportDashboardWidget.setSort((long) (i + 1));
-
- // 兼容底层,不采用批量插入
- reportDashboardWidgetService.insert(reportDashboardWidget);
-
- // reportDashboardWidgetList.add(reportDashboardWidget);
- }
- // reportDashboardWidgetService.insertBatch(reportDashboardWidgetList);
-
- }
-
- @Override
- public Object getChartData(ChartDto dto) {
- // String chartType = dto.getChartType();
- DataSetDto setDto = new DataSetDto();
- setDto.setSetCode(dto.getSetCode());
- setDto.setContextData(dto.getContextData());
- OriginalDataDto result = dataSetService.getData(setDto);
- List data = result.getData();
- // 处理时间轴
- List resultData = buildTimeLine(data, dto);
- return resultData;
- // return getTarget(chartType).transform(dto, result.getData());
- }
-
- /**
- * 导出大屏,zip文件
- * @param request
- * @param response
- * @param reportCode
- * @return
- */
- @Override
- public ResponseEntity exportDashboard(HttpServletRequest request, HttpServletResponse response,
- String reportCode, Integer showDataSet) {
- String userAgent = request.getHeader("User-Agent");
- boolean isIeBrowser = userAgent.indexOf("MSIE") > 0;
-
- ReportDashboardObjectDto detail = getDetail(reportCode);
- List widgets = detail.getDashboard().getWidgets();
- detail.setWidgets(widgets);
- detail.getDashboard().setWidgets(null);
-
- // 1.组装临时目录,/app/disk/upload/zip/临时文件夹
- String path = dictPath + ZIP_PATH + UuidUtil.generateShortUuid();
-
- // 将涉及到的图片保存下来(1.背景图,2.组件为图片的)
- String backgroundImage = detail.getDashboard().getBackgroundImage();
- zipLoadImage(backgroundImage, path);
- detail.getWidgets().stream()
- .filter(reportDashboardWidgetDto -> "widget-image".equals(reportDashboardWidgetDto.getType()))
- .forEach(reportDashboardWidgetDto -> {
- String imageAddress = reportDashboardWidgetDto.getValue().getSetup().getString("imageAdress");
- zipLoadImage(imageAddress, path);
- });
-
- // showDataSet == 0 代表不包含数据集
- if (0 == showDataSet) {
- detail.getWidgets().forEach(reportDashboardWidgetDto -> {
- ReportDashboardWidgetValueDto value = reportDashboardWidgetDto.getValue();
- JSONObject data = value.getData();
- if (null != data && data.containsKey("dataType")) {
- reportDashboardWidgetDto.getValue().getData().put("dataType", "staticData");
- }
- });
- }
-
- // 2.将大屏设计到的json文件保存
- String jsonPath = path + "/" + JSON_PATH;
- FileUtil.WriteStringToFile(jsonPath, JSONObject.toJSONString(detail));
-
- // 将path文件夹打包zip
- String zipPath = path + ".zip";
- FileUtil.compress(path, zipPath);
-
- File file = new File(zipPath);
- ResponseEntity.BodyBuilder builder = ResponseEntity.ok();
- builder.contentLength(file.length());
- // application/octet-stream 二进制数据流(最常见的文件下载)
- builder.contentType(MediaType.APPLICATION_OCTET_STREAM);
- if (isIeBrowser) {
- builder.header("Content-Disposition", "attachment; filename=" + reportCode + ".zip");
- }
- else {
- builder.header("Content-Disposition", "attacher; filename*=UTF-8''" + reportCode + ".zip");
- }
-
- ResponseEntity body = builder.body(FileUtils.readFileToByteArray(file));
-
- // 删除zip文件
- file.delete();
- // 删除path临时文件夹
- FileUtil.delete(path);
- log.info("删除临时文件:{},{}", zipPath, path);
-
- // 异步统计下载次数
- CompletableFuture.runAsync(() -> {
- log.info("=======>ip:{} 下载模板:{}", RequestUtil.getIpAddr(request), reportCode);
- reportService.downloadStatistics(reportCode);
- });
-
- return body;
- }
-
- /**
- * 导入大屏zip
- * @param file
- * @param reportCode
- * @return
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void importDashboard(MultipartFile file, String reportCode) {
- log.info("导入开始,{}", reportCode);
- // 1.组装临时目录,/app/disk/upload/zip/临时文件夹
- String path = dictPath + ZIP_PATH + UuidUtil.generateShortUuid();
- // 2.解压
- FileUtil.decompress(file, path);
- // path/uuid/
- File parentPath = new File(path);
- // 获取打包的第一层目录
- File firstFile = parentPath.listFiles()[0];
-
- File[] files = firstFile.listFiles();
-
- // 定义map
- Map fileMap = new HashMap<>();
- String content = "";
-
- for (int i = 0; i < files.length; i++) {
- File childFile = files[i];
- if (JSON_PATH.equals(childFile.getName())) {
- // json文件
- content = FileUtil.readFile(childFile);
- }
- else if ("image".equals(childFile.getName())) {
- File[] imageFiles = childFile.listFiles();
- // 所有需要上传的图片
- for (File imageFile : imageFiles) {
- // 查看是否存在此image
- String fileName = imageFile.getName().split("\\.")[0];
- // 根据fileId,从gaea_file中读出filePath
- LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.eq(GaeaFile::getFileId, fileName);
- GaeaFile gaeaFile = gaeaFileService.selectOne(queryWrapper);
- String uploadPath;
- if (null == gaeaFile) {
- GaeaFile upload = gaeaFileService.upload(imageFile, fileName);
- log.info("存入图片: {}", upload.getFilePath());
- uploadPath = upload.getUrlPath();
- }
- else {
- uploadPath = gaeaFile.getUrlPath();
- }
- fileMap.put(fileName, uploadPath);
- }
- }
-
- }
-
- // 解析cotent
- ReportDashboardObjectDto detail = JSONObject.parseObject(content, ReportDashboardObjectDto.class);
- // 将涉及到的图片路径替换(1.背景图,2.组件为图片的)
- String backgroundImage = detail.getDashboard().getBackgroundImage();
- detail.getDashboard().setBackgroundImage(replaceUrl(backgroundImage, fileMap));
- detail.getWidgets().stream()
- .filter(reportDashboardWidgetDto -> "widget-image".equals(reportDashboardWidgetDto.getType()))
- .forEach(reportDashboardWidgetDto -> {
- String imageAddress = reportDashboardWidgetDto.getValue().getSetup().getString("imageAdress");
- String address = replaceUrl(imageAddress, fileMap);
- reportDashboardWidgetDto.getValue().getSetup().put("imageAdress", address);
- reportDashboardWidgetDto.getOptions().getJSONArray("setup").getJSONObject(4).put("value", address);
- });
- // 将新的大屏编码赋值
- detail.setReportCode(reportCode);
-
- // 解析结束,删除临时文件夹
- FileUtil.delete(path);
-
- log.info("解析成功,开始存入数据库...");
- insertDashboard(detail);
- }
-
- private String replaceUrl(String imageAddress, Map fileMap) {
- if (StringUtils.isBlank(imageAddress)) {
- return "";
- }
- String fileId = imageAddress.substring(imageAddress.trim().length() - 36);
- String orDefault = fileMap.getOrDefault(fileId, null);
- if (StringUtils.isBlank(orDefault)) {
- return imageAddress;
- }
- return orDefault;
- }
-
- /**
- * 将大屏涉及到的图片存入指定文件夹
- * @param imageAddress
- * @param path
- */
- private void zipLoadImage(String imageAddress, String path) {
- // http://10.108.26.197:9095/file/download/1d9bcd35-82a1-4f08-9465-b66b930b6a8d
- if (imageAddress.trim().startsWith(fileDownloadPath)) {
- // 以fileDownloadPath为前缀的代表为上传的图片
- String fileName = imageAddress.substring(fileDownloadPath.length() + 1);
- // 根据fileId,从gaea_file中读出filePath
- LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.eq(GaeaFile::getFileId, fileName);
- GaeaFile gaeaFile = gaeaFileService.selectOne(queryWrapper);
- if (null != gaeaFile) {
- String fileType = gaeaFile.getFileType();
- path = path + "/image/" + fileName + "." + fileType;
- // path = /app/disk/upload/zip/UUID/image
-
- // 原始文件的路径
- String filePath = gaeaFile.getFilePath();
- FileUtil.copyFileUsingFileChannels(filePath, path);
- }
- }
-
- }
-
- public ChartStrategy getTarget(String type) {
- for (String s : queryServiceImplMap.keySet()) {
- if (s.contains(type)) {
- return queryServiceImplMap.get(s);
- }
- }
- throw BusinessExceptionBuilder.build(ResponseCode.RULE_CONTENT_NOT_EXIST);
- }
-
- @Override
- public void afterPropertiesSet() {
- Map beanMap = applicationContext.getBeansOfType(ChartStrategy.class);
- // 遍历该接口的所有实现,将其放入map中
- for (ChartStrategy serviceImpl : beanMap.values()) {
- queryServiceImplMap.put(serviceImpl.type(), serviceImpl);
- }
- }
-
- @Override
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- this.applicationContext = applicationContext;
- }
-
- /**
- * 解析图层数据
- * @param dto
- */
- public void analysisData(ReportDashboardWidgetValueDto dto) {
- // if (StringUtils.isBlank(reportDashboardWidgetDto.getSetCode())) {
- // return;
- // }
- // DataSetDto dto = new DataSetDto();
- // dto.setSetCode(reportDashboardWidgetDto.getSetCode());
- // if (reportDashboardWidgetDto.getContextData() != null &&
- // reportDashboardWidgetDto.getContextData().size() > 0) {
- // dto.setContextData(reportDashboardWidgetDto.getContextData());
- // }
- // OriginalDataDto data = dataSetService.getData(dto);
- // reportDashboardWidgetDto.setData(JSONObject.toJSONString(data.getData()));
- }
-
- public List buildTimeLine(List data, ChartDto dto) {
- Map chartProperties = dto.getChartProperties();
- if (null == chartProperties || chartProperties.size() < 1) {
- return data;
- }
- Map contextData = dto.getContextData();
- if (null == contextData || contextData.size() < 1) {
- return data;
- }
- if (contextData.containsKey("startTime") && contextData.containsKey("endTime")) {
- dto.setStartTime(contextData.get("startTime").toString());
- dto.setEndTime(contextData.get("endTime").toString());
- }
- if (StringUtils.isBlank(dto.getStartTime()) || StringUtils.isBlank(dto.getEndTime())) {
- return data;
- }
- // 获取时间轴字段和解析时间颗粒度
-
- for (Map.Entry entry : chartProperties.entrySet()) {
- String key = entry.getKey();
- String value = entry.getValue();
- dto.setParticles(value);
- setTimeLineFormat(dto);
- if (StringUtils.isNotBlank(dto.getDataTimeFormat())) {
- dto.setTimeLineFiled(key);
- break;
- }
-
- }
-
- if (StringUtils.isBlank(dto.getDataTimeFormat())) {
- return data;
- }
-
- Date beginTime = DateUtil.parseHmsTime(dto.getStartTime());
- Date endTime = DateUtil.parseHmsTime(dto.getEndTime());
- SimpleDateFormat showFormat = new SimpleDateFormat(dto.getTimeLineFormat());
- SimpleDateFormat dataFormat = new SimpleDateFormat(dto.getDataTimeFormat());
-
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(beginTime);
-
- Calendar calendarEnd = Calendar.getInstance();
- calendarEnd.setTime(endTime);
-
- List timeLine = new ArrayList<>();
- List dataTimeline = new ArrayList<>();
- timeLine.add(showFormat.format(calendar.getTime()));
- dataTimeline.add(dataFormat.format(calendar.getTime()));
-
- // 添加时间轴数据
- while (true) {
- calendar.add(dto.getTimeUnit(), 1);
- timeLine.add(showFormat.format(calendar.getTime()));
- dataTimeline.add(dataFormat.format(calendar.getTime()));
- if (showFormat.format(calendar.getTime()).equals(showFormat.format(calendarEnd.getTime()))) {
- break;
- }
- }
-
- // 根据时间轴生成对应的时间线,数据不存在,补数据
- List result = new ArrayList<>();
- JSONObject jsonDemo = data.get(0);
- String timeLineFiled = dto.getTimeLineFiled();
- for (String dateFormat : dataTimeline) {
- boolean flag = true;
- for (JSONObject datum : data) {
- if (datum.containsKey(timeLineFiled) && datum.getString(timeLineFiled).equals(dateFormat)) {
- result.add(datum);
- flag = false;
- }
- }
- if (flag) {
- // 补数据
- JSONObject json = new JSONObject();
- jsonDemo.forEach((s, o) -> {
- if (s.equals(timeLineFiled)) {
- json.put(timeLineFiled, dateFormat);
- }
- else {
- json.put(s, 0);
- }
- });
- result.add(json);
- }
-
- }
- return result;
- }
-
- // 设置时间格式
- private void setTimeLineFormat(ChartDto dto) {
- String particles = dto.getParticles();
- if ("xAxis-hour".equals(particles)) {
- dto.setDataTimeFormat("yyyy-MM-dd HH");
- dto.setTimeLineFormat("MM-dd HH");
- dto.setTimeUnit(Calendar.HOUR);
- }
- else if ("xAxis-day".equals(particles)) {
- dto.setDataTimeFormat("yyyy-MM-dd");
- dto.setTimeLineFormat("yyyy-MM-dd");
- dto.setTimeUnit(Calendar.DATE);
- }
- else if ("xAxis-month".equals(particles)) {
- dto.setDataTimeFormat("yyyy-MM");
- dto.setTimeLineFormat("yyyy-MM");
- dto.setTimeUnit(Calendar.MONTH);
- }
- else if ("xAxis-year".equals(particles)) {
- dto.setDataTimeFormat("yyyy");
- dto.setTimeLineFormat("yyyy");
- dto.setTimeUnit(Calendar.YEAR);
- }
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java
deleted file mode 100644
index 707f44c82..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetDto.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @description 大屏看板数据渲染 dto
- * @author Raod
- * @date 2021-04-12 15:12:43.724
- **/
-@Data
-public class ReportDashboardWidgetDto implements Serializable {
-
- /**
- * 组件类型参考字典DASHBOARD_PANEL_TYPE
- */
- private String type;
-
- /**
- * value
- */
- private ReportDashboardWidgetValueDto value;
-
- /**
- * options
- */
- private JSONObject options;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java
deleted file mode 100644
index a246c06a1..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/dto/ReportDashboardWidgetValueDto.java
+++ /dev/null
@@ -1,46 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.dto;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @description 大屏看板数据渲染 dto,已弃用
- * @author Raod
- * @date 2021-04-12 15:12:43.724
- **/
-@Data
-public class ReportDashboardWidgetValueDto implements Serializable {
-
- /** 报表编码 */
- private String reportCode;
-
- /** 组件的渲染属性json */
- private JSONObject setup;
-
- /** 组件的数据属性json */
- private JSONObject data;
-
- /** 组件的配置属性json */
- private JSONObject collapse;
-
- /** 组件的大小位置属性json */
- private JSONObject position;
-
- private String options;
-
- /** 自动刷新间隔秒 */
- private Integer refreshSeconds;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
- /** 0--未删除 1--已删除 DIC_NAME=DEL_FLAG */
- private Integer deleteFlag;
-
- /** 排序,图层的概念 */
- private Long sort;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/param/ReportDashboardWidgetParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/param/ReportDashboardWidgetParam.java
deleted file mode 100644
index 78d82999e..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/controller/param/ReportDashboardWidgetParam.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.param;
-
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc ReportDashboardWidget 大屏看板数据渲染查询输入类
- * @author Raod
- * @date 2021-04-12 15:12:43.724
- **/
-@Data
-public class ReportDashboardWidgetParam extends PageParam implements Serializable {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/ReportDashboardWidgetMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/ReportDashboardWidgetMapper.java
deleted file mode 100644
index becc27780..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/ReportDashboardWidgetMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * ReportDashboardWidget Mapper
- *
- * @author Raod
- * @date 2021-04-12 15:12:43.724
- **/
-@Mapper
-public interface ReportDashboardWidgetMapper extends GaeaBaseMapper {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java
deleted file mode 100644
index c369d3d08..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/dao/entity/ReportDashboardWidget.java
+++ /dev/null
@@ -1,50 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity;
-
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @description 大屏看板数据渲染 entity
- * @author Raod
- * @date 2021-04-12 15:12:43.724
- **/
-@TableName(keepGlobalPrefix = true, value = "gaea_report_dashboard_widget")
-@Data
-public class ReportDashboardWidget extends GaeaBaseEntity {
-
- @ApiModelProperty(value = "报表编码")
- private String reportCode;
-
- @ApiModelProperty(value = "组件类型参考字典DASHBOARD_PANEL_TYPE")
- private String type;
-
- @ApiModelProperty(value = "组件的渲染属性json")
- private String setup;
-
- @ApiModelProperty(value = "组件的数据属性json")
- private String data;
-
- @ApiModelProperty(value = "组件的配置属性json")
- private String collapse;
-
- @ApiModelProperty(value = "组件的大小位置属性json")
- private String position;
-
- private String options;
-
- @ApiModelProperty(value = "自动刷新间隔秒")
- private Integer refreshSeconds;
-
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- private Integer enableFlag;
-
- @ApiModelProperty(value = " 0--未删除 1--已删除 DIC_NAME=DEL_FLAG")
- private Integer deleteFlag;
-
- @ApiModelProperty(value = "排序,图层的概念")
- private Long sort;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/ReportDashboardWidgetService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/ReportDashboardWidgetService.java
deleted file mode 100644
index 54c3b9c6f..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/ReportDashboardWidgetService.java
+++ /dev/null
@@ -1,22 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboardwidget.service;
-
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.controller.param.ReportDashboardWidgetParam;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
-
-/**
- * @desc ReportDashboardWidget 大屏看板数据渲染服务接口
- * @author Raod
- * @date 2021-04-12 15:12:43.724
- **/
-public interface ReportDashboardWidgetService
- extends GaeaBaseService {
-
- /***
- * 查询详情
- * @param id
- */
- ReportDashboardWidget getDetail(Long id);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/impl/ReportDashboardWidgetServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/impl/ReportDashboardWidgetServiceImpl.java
deleted file mode 100644
index bffc0eb99..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dashboardwidget/service/impl/ReportDashboardWidgetServiceImpl.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dashboardwidget.service.impl;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.ReportDashboardWidgetMapper;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.dao.entity.ReportDashboardWidget;
-import com.anjiplus.template.gaea.business.modules.dashboardwidget.service.ReportDashboardWidgetService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @desc ReportDashboardWidget 大屏看板数据渲染服务实现
- * @author Raod
- * @date 2021-04-12 15:12:43.724
- **/
-@Service
-// @RequiredArgsConstructor
-public class ReportDashboardWidgetServiceImpl implements ReportDashboardWidgetService {
-
- @Autowired
- private ReportDashboardWidgetMapper reportDashboardWidgetMapper;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return reportDashboardWidgetMapper;
- }
-
- @Override
- public ReportDashboardWidget getDetail(Long id) {
- ReportDashboardWidget reportDashboardWidget = this.selectOne(id);
- return reportDashboardWidget;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java
deleted file mode 100644
index 21b9b0291..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/DataSetController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dataset.controller;
-
-import com.anji.plus.gaea.annotation.AccessKey;
-import com.anji.plus.gaea.annotation.Permission;
-import com.anji.plus.gaea.annotation.log.GaeaAuditLog;
-import com.anji.plus.gaea.bean.ResponseBean;
-import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anji.plus.gaea.holder.UserContentHolder;
-import com.anji.plus.gaea.utils.GaeaUtils;
-import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.dataset.controller.param.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.dataset.controller.param.DataSetTestTransformParam;
-import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet;
-import com.anjiplus.template.gaea.business.modules.dataset.service.DataSetService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @desc 数据集 controller
- * @website https://gitee.com/anji-plus/gaea
- * @author Raod
- * @date 2021-03-18 12:11:31.150755900
- **/
-@RestController
-@Api(tags = "数据集管理")
-@Permission(code = "resultsetManage", name = "数据集管理")
-@RequestMapping("/dataSet")
-public class DataSetController extends GaeaBaseController {
-
- @Autowired
- private DataSetService dataSetService;
-
- @Override
- public GaeaBaseService getService() {
- return dataSetService;
- }
-
- @Override
- public DataSet getEntity() {
- return new DataSet();
- }
-
- @Override
- public DataSetDto getDTO() {
- return new DataSetDto();
- }
-
- @GetMapping("/detailBysetId/{id}")
- @Permission(code = "query", name = "明细")
- public ResponseBean detailBysetId(@PathVariable("id") Long id) {
- this.logger.info("{}根据ID查询服务开始,id为:{}", this.getClass().getSimpleName(), id);
- ResponseBean responseBean = this.responseSuccessWithData(dataSetService.detailSet(id));
- this.logger.info("{}根据ID查询结束,结果:{}", this.getClass().getSimpleName(), GaeaUtils.toJSONString(responseBean));
- return responseBean;
- }
-
- @GetMapping({ "/detailBysetCode/{setCode}" })
- @Permission(code = "query", name = "明细")
- @AccessKey
- public ResponseBean detailBysetCode(@PathVariable("setCode") String setCode) {
- this.logger.info("{}根据setCode查询服务开始,setCode为:{}", this.getClass().getSimpleName(), setCode);
- ResponseBean responseBean = this.responseSuccessWithData(dataSetService.detailSet(setCode));
- this.logger.info("{}根据setCode查询结束,结果:{}", this.getClass().getSimpleName(),
- GaeaUtils.toJSONString(responseBean));
- return responseBean;
- }
-
- @PostMapping
- @Permission(code = "insert", name = "新增")
- @GaeaAuditLog(pageTitle = "新增")
- @Override
- public ResponseBean insert(@RequestBody DataSetDto dto) {
- this.logger.info("{}新增服务开始,参数:{}", this.getClass().getSimpleName(), GaeaUtils.toJSONString(dto));
- DataSetDto dataSetDto = dataSetService.insertSet(dto);
- this.logger.info("{}新增服务结束,结果:{}", this.getClass().getSimpleName(), GaeaUtils.toJSONString(dataSetDto));
- return ResponseBean.builder().data(dataSetDto).build();
- }
-
- @PutMapping
- @Permission(code = "update", name = "更新")
- @GaeaAuditLog(pageTitle = "修改")
- @Override
- public ResponseBean update(@RequestBody DataSetDto dto) {
- String username = UserContentHolder.getContext().getUsername();
- this.logger.info("{}更新服务开始,更新人:{},参数:{}", this.getClass().getSimpleName(), username,
- GaeaUtils.toJSONString(dto));
- ResponseBean responseBean = this.responseSuccess();
- dataSetService.updateSet(dto);
- this.logger.info("{}更新服务结束,结果:{}", this.getClass().getSimpleName(), GaeaUtils.toJSONString(responseBean));
- return this.responseSuccess();
- }
-
- @DeleteMapping({ "/{id}" })
- @Permission(code = "delete", name = "删除")
- @GaeaAuditLog(pageTitle = "删除")
- @Override
- public ResponseBean deleteById(@PathVariable("id") Long id) {
- this.logger.info("{}删除服务开始,参数ID:{}", this.getClass().getSimpleName(), id);
- dataSetService.deleteSet(id);
- this.logger.info("{}删除服务结束", this.getClass().getSimpleName());
- return this.responseSuccess();
- }
-
- /**
- * 测试 数据转换是否正确
- * @param param
- * @return
- */
- @PostMapping("/testTransform")
- @Permission(code = "query", name = "明细")
- public ResponseBean testTransform(@Validated @RequestBody DataSetTestTransformParam param) {
- DataSetDto dto = new DataSetDto();
- BeanUtils.copyProperties(param, dto);
- return responseSuccessWithData(dataSetService.testTransform(dto));
- }
-
- /**
- * 获取所有数据集
- * @return
- */
- @GetMapping("/queryAllDataSet")
- public ResponseBean queryAllDataSet() {
- return responseSuccessWithData(dataSetService.queryAllDataSet());
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java
deleted file mode 100644
index 6bd520bc3..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/DataSetDto.java
+++ /dev/null
@@ -1,63 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dataset.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @description 数据集 dto
- * @author Raod
- * @date 2021-03-18 12:11:31.150755900
- **/
-@Data
-public class DataSetDto extends GaeaBaseDTO implements Serializable {
-
- /** 数据集编码 */
- private String setCode;
-
- /** 数据集名称 */
- private String setName;
-
- /** 数据集描述 */
- private String setDesc;
-
- /** 数据集类型 */
- private String setType;
-
- /** 数据源编码 */
- private String sourceCode;
-
- /** 动态查询sql或者接口中的请求体 */
- private String dynSentence;
-
- /** 结果案例 */
- private String caseResult;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
- /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
- private Integer deleteFlag;
-
- /** 请求参数集合 */
- private List dataSetParamDtoList;
-
- /** 数据转换集合 */
- private List dataSetTransformDtoList;
-
- /** 传入的自定义参数 */
- private Map contextData;
-
- private Set setParamList;
-
- /** 指定字段 */
- private String fieldLabel;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/OriginalDataDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/OriginalDataDto.java
deleted file mode 100644
index 572f2f01c..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/dto/OriginalDataDto.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dataset.controller.dto;
-
-import com.alibaba.fastjson.JSONObject;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Created by raodeming on 2021/3/26.
- */
-@Data
-public class OriginalDataDto implements Serializable {
-
- /** 总数 */
- private long total;
-
- /** 获取的数据详情 */
- private List data;
-
- public OriginalDataDto(List data) {
- this.data = data;
- }
-
- public OriginalDataDto(long total, List data) {
- this.total = total;
- this.data = data;
- }
-
- public OriginalDataDto() {
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java
deleted file mode 100644
index aeec58425..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetParam.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.dataset.controller.param;
-
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc DataSet 数据集查询输入类
- * @author Raod
- * @date 2021-03-18 12:11:31.150755900
- **/
-@Data
-public class DataSetParam extends PageParam implements Serializable {
-
- /** 数据集编码 */
- @Query(QueryEnum.LIKE)
- private String setCode;
-
- /** 数据集名称 */
- @Query(QueryEnum.LIKE)
- private String setName;
-
- /** 数据源编码 */
- @Query(QueryEnum.EQ)
- private String sourceCode;
-
- /** 数据集类型 */
- @Query(QueryEnum.EQ)
- private String setType;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java
deleted file mode 100644
index 2c047b004..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/controller/param/DataSetTestTransformParam.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.dataset.controller.param;
-
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @desc DataSet 数据集查询输入类
- * @author Raod
- * @date 2021-03-18 12:11:31.150755900
- **/
-@Data
-public class DataSetTestTransformParam implements Serializable {
-
- /** 数据源编码 */
- private String sourceCode;
-
- /** 动态查询sql或者接口中的请求体 */
- private String dynSentence;
-
- /** 数据集类型 */
- private String setType;
-
- /** 请求参数集合 */
- private List dataSetParamDtoList;
-
- /** 数据转换集合 */
- private List dataSetTransformDtoList;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/DataSetMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/DataSetMapper.java
deleted file mode 100644
index 96bdd838d..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/DataSetMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.dataset.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * DataSet Mapper
- *
- * @author Raod
- * @date 2021-03-18 12:11:31.150755900
- **/
-@Mapper
-public interface DataSetMapper extends GaeaBaseMapper {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java
deleted file mode 100644
index 37ac3baad..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/dao/entity/DataSet.java
+++ /dev/null
@@ -1,48 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dataset.dao.entity;
-
-import com.anji.plus.gaea.annotation.Unique;
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @description 数据集 entity
- * @author Raod
- * @date 2021-03-18 12:11:31.150755900
- **/
-@TableName(keepGlobalPrefix = true, value = "gaea_report_data_set")
-@Data
-public class DataSet extends GaeaBaseEntity {
-
- @ApiModelProperty(value = "数据集编码")
- @Unique(code = ResponseCode.SET_CODE_ISEXIST)
- private String setCode;
-
- @ApiModelProperty(value = "数据集名称")
- private String setName;
-
- @ApiModelProperty(value = "数据集描述")
- private String setDesc;
-
- @ApiModelProperty(value = "数据集类型")
- private String setType;
-
- @ApiModelProperty(value = "数据源编码")
- private String sourceCode;
-
- @ApiModelProperty(value = "动态查询sql或者接口中的请求体")
- private String dynSentence;
-
- @ApiModelProperty(value = "结果案例")
- private String caseResult;
-
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- private Integer enableFlag;
-
- @ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
- private Integer deleteFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/DataSetService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/DataSetService.java
deleted file mode 100644
index 73d92e244..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/DataSetService.java
+++ /dev/null
@@ -1,70 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dataset.service;
-
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-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.controller.param.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet;
-
-import java.util.List;
-
-/**
- * @desc DataSet 数据集服务接口
- * @author Raod
- * @date 2021-03-18 12:11:31.150755900
- **/
-public interface DataSetService extends GaeaBaseService {
-
- /**
- * 单条详情
- * @param id
- * @return
- */
- DataSetDto detailSet(Long id);
-
- /**
- * 单条详情
- * @param setCode
- * @return
- */
- DataSetDto detailSet(String setCode);
-
- /**
- * 新增数据集、添加查询参数、数据转换
- * @param dto
- */
- DataSetDto insertSet(DataSetDto dto);
-
- /**
- * 更新数据集、添加查询参数、数据转换
- * @param dto
- */
- void updateSet(DataSetDto dto);
-
- /**
- * 删除数据集、添加查询参数、数据转换
- * @param id
- */
- void deleteSet(Long id);
-
- /**
- * 获取数据
- * @param dto
- * @return
- */
- OriginalDataDto getData(DataSetDto dto);
-
- /**
- * @param dto
- * @return
- */
- OriginalDataDto testTransform(DataSetDto dto);
-
- /**
- * 获取所有数据集
- * @return
- */
- List queryAllDataSet();
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
deleted file mode 100644
index 624f03cbb..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java
+++ /dev/null
@@ -1,382 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.dataset.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.anji.plus.gaea.constant.Enabled;
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anji.plus.gaea.utils.GaeaBeanUtils;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.enums.SetTypeEnum;
-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.dao.DataSetMapper;
-import com.anjiplus.template.gaea.business.modules.dataset.dao.entity.DataSet;
-import com.anjiplus.template.gaea.business.modules.dataset.service.DataSetService;
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.datasetparam.service.DataSetParamService;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform;
-import com.anjiplus.template.gaea.business.modules.datasettransform.service.DataSetTransformService;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
-import com.anjiplus.template.gaea.business.modules.datasource.service.DataSourceService;
-import com.anjiplus.template.gaea.business.util.JdbcConstants;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @desc DataSet 数据集服务实现
- * @author Raod
- * @date 2021-03-18 12:11:31.150755900
- **/
-@Service
-// @RequiredArgsConstructor
-@Slf4j
-public class DataSetServiceImpl implements DataSetService {
-
- @Autowired
- private DataSetMapper dataSetMapper;
-
- @Autowired
- private DataSetParamService dataSetParamService;
-
- @Autowired
- private DataSetTransformService dataSetTransformService;
-
- @Autowired
- private DataSourceService dataSourceService;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return dataSetMapper;
- }
-
- /**
- * 单条详情
- * @param id
- * @return
- */
- @Override
- public DataSetDto detailSet(Long id) {
- DataSetDto dto = new DataSetDto();
- DataSet result = selectOne(id);
- String setCode = result.getSetCode();
- GaeaBeanUtils.copyAndFormatter(result, dto);
- return getDetailSet(dto, setCode);
- }
-
- /**
- * 单条详情
- * @param setCode
- * @return
- */
- @Override
- public DataSetDto detailSet(String setCode) {
- DataSetDto dto = new DataSetDto();
- DataSet result = selectOne("set_code", setCode);
- GaeaBeanUtils.copyAndFormatter(result, dto);
- return getDetailSet(dto, setCode);
- }
-
- public DataSetDto getDetailSet(DataSetDto dto, String setCode) {
- // 查询参数
- List dataSetParamList = dataSetParamService
- .list(new QueryWrapper().lambda().eq(DataSetParam::getSetCode, setCode));
- List dataSetParamDtoList = new ArrayList<>();
- dataSetParamList.forEach(dataSetParam -> {
- DataSetParamDto dataSetParamDto = new DataSetParamDto();
- GaeaBeanUtils.copyAndFormatter(dataSetParam, dataSetParamDto);
- dataSetParamDtoList.add(dataSetParamDto);
- });
- dto.setDataSetParamDtoList(dataSetParamDtoList);
-
- // 数据转换
-
- List dataSetTransformList = dataSetTransformService.list(new QueryWrapper()
- .lambda().eq(DataSetTransform::getSetCode, setCode).orderByAsc(DataSetTransform::getOrderNum));
- List dataSetTransformDtoList = new ArrayList<>();
- dataSetTransformList.forEach(dataSetTransform -> {
- DataSetTransformDto dataSetTransformDto = new DataSetTransformDto();
- GaeaBeanUtils.copyAndFormatter(dataSetTransform, dataSetTransformDto);
- dataSetTransformDtoList.add(dataSetTransformDto);
- });
- dto.setDataSetTransformDtoList(dataSetTransformDtoList);
-
- if (StringUtils.isNotBlank(dto.getCaseResult())) {
- try {
- JSONArray jsonArray = JSONArray.parseArray(dto.getCaseResult());
- JSONObject jsonObject = jsonArray.getJSONObject(0);
- dto.setSetParamList(jsonObject.keySet());
- }
- catch (Exception e) {
- log.error("error", e);
- }
- }
- return dto;
- }
-
- /**
- * 新增数据集、添加查询参数、数据转换
- * @param dto
- */
- @Override
- @Transactional
- public DataSetDto insertSet(DataSetDto dto) {
- List dataSetParamDtoList = dto.getDataSetParamDtoList();
- List dataSetTransformDtoList = dto.getDataSetTransformDtoList();
-
- // 1.新增数据集
- DataSet dataSet = new DataSet();
- BeanUtils.copyProperties(dto, dataSet);
- insert(dataSet);
- // 2.更新查询参数
- dataSetParamBatch(dataSetParamDtoList, dto.getSetCode());
-
- // 3.更新数据转换
- dataSetTransformBatch(dataSetTransformDtoList, dto.getSetCode());
- return dto;
- }
-
- /**
- * 更新数据集、添加查询参数、数据转换
- * @param dto
- */
- @Override
- @Transactional
- public void updateSet(DataSetDto dto) {
- List dataSetParamDtoList = dto.getDataSetParamDtoList();
- List dataSetTransformDtoList = dto.getDataSetTransformDtoList();
- // 1.更新数据集
- DataSet dataSet = new DataSet();
- BeanUtils.copyProperties(dto, dataSet);
- update(dataSet);
-
- // 2.更新查询参数
- dataSetParamBatch(dataSetParamDtoList, dto.getSetCode());
-
- // 3.更新数据转换
- dataSetTransformBatch(dataSetTransformDtoList, dto.getSetCode());
- }
-
- /**
- * 删除数据集、添加查询参数、数据转换
- * @param id
- */
- @Override
- public void deleteSet(Long id) {
- DataSet dataSet = selectOne(id);
- String setCode = dataSet.getSetCode();
- // 1.删除数据集
- deleteById(id);
-
- // 2.删除查询参数
- dataSetParamService.delete(new QueryWrapper().lambda().eq(DataSetParam::getSetCode, setCode));
-
- // 3.删除数据转换
- dataSetTransformService
- .delete(new QueryWrapper().lambda().eq(DataSetTransform::getSetCode, setCode));
- }
-
- /**
- * 获取数据
- * @param dto
- * @return
- */
- @Override
- public OriginalDataDto getData(DataSetDto dto) {
-
- OriginalDataDto originalDataDto = new OriginalDataDto();
- String setCode = dto.getSetCode();
- // 1.获取数据集、参数替换、数据转换
- DataSetDto dataSetDto = detailSet(setCode);
- String dynSentence = dataSetDto.getDynSentence();
- // 2.获取数据源
- DataSource dataSource;
- if (StringUtils.isNotBlank(dataSetDto.getSetType())
- && dataSetDto.getSetType().equals(SetTypeEnum.HTTP.getCodeValue())) {
- // http不需要数据源,兼容已有的逻辑,将http所需要的数据塞进DataSource
- dataSource = new DataSource();
- dataSource.setSourceConfig(dynSentence);
- dataSource.setSourceType(JdbcConstants.HTTP);
- String body = JSONObject.parseObject(dynSentence).getString("body");
- if (StringUtils.isNotBlank(body)) {
- dynSentence = body;
- }
- else {
- dynSentence = "{}";
- }
-
- }
- else {
- dataSource = dataSourceService.selectOne("source_code", dataSetDto.getSourceCode());
- }
-
- // 3.参数替换
- // 3.1参数校验
- log.debug("参数校验替换前:{}", dto.getContextData());
- boolean verification = dataSetParamService.verification(dataSetDto.getDataSetParamDtoList(),
- dto.getContextData());
- if (!verification) {
- throw BusinessExceptionBuilder.build(ResponseCode.RULE_FIELDS_CHECK_ERROR);
- }
- dynSentence = dataSetParamService.transform(dto.getContextData(), dynSentence);
- log.debug("参数校验替换后:{}", dto.getContextData());
- // 4.获取数据
- DataSourceDto dataSourceDto = new DataSourceDto();
- BeanUtils.copyProperties(dataSource, dataSourceDto);
- dataSourceDto.setDynSentence(dynSentence);
- dataSourceDto.setContextData(dto.getContextData());
- // 获取total,判断contextData中是否传入分页参数
- if (null != dto.getContextData() && dto.getContextData().containsKey("pageNumber")
- && dto.getContextData().containsKey("pageSize")) {
- long total = dataSourceService.total(dataSourceDto, dto);
- originalDataDto.setTotal(total);
- }
- List data = dataSourceService.execute(dataSourceDto);
- // 5.数据转换
- List transform = dataSetTransformService.transform(dataSetDto.getDataSetTransformDtoList(), data);
- originalDataDto.setData(transform);
- return originalDataDto;
- }
-
- /**
- * @param dto
- * @return
- */
- @Override
- public OriginalDataDto testTransform(DataSetDto dto) {
- String dynSentence = dto.getDynSentence();
-
- OriginalDataDto originalDataDto = new OriginalDataDto();
- String sourceCode = dto.getSourceCode();
- // 1.获取数据源
- DataSource dataSource;
- if (dto.getSetType().equals(SetTypeEnum.HTTP.getCodeValue())) {
- // http不需要数据源,兼容已有的逻辑,将http所需要的数据塞进DataSource
- dataSource = new DataSource();
- dataSource.setSourceConfig(dynSentence);
- dataSource.setSourceType(JdbcConstants.HTTP);
- String body = JSONObject.parseObject(dynSentence).getString("body");
- if (StringUtils.isNotBlank(body)) {
- dynSentence = body;
- }
- else {
- dynSentence = "{}";
- }
-
- }
- else {
- dataSource = dataSourceService.selectOne("source_code", sourceCode);
- }
-
- // 3.参数替换
- // 3.1参数校验
- boolean verification = dataSetParamService.verification(dto.getDataSetParamDtoList(), null);
- if (!verification) {
- throw BusinessExceptionBuilder.build(ResponseCode.RULE_FIELDS_CHECK_ERROR);
- }
-
- dynSentence = dataSetParamService.transform(dto.getDataSetParamDtoList(), dynSentence);
- // 4.获取数据
- DataSourceDto dataSourceDto = new DataSourceDto();
- BeanUtils.copyProperties(dataSource, dataSourceDto);
- dataSourceDto.setDynSentence(dynSentence);
- dataSourceDto.setContextData(setContextData(dto.getDataSetParamDtoList()));
-
- // 获取total,判断DataSetParamDtoList中是否传入分页参数
- Map collect = dto.getDataSetParamDtoList().stream()
- .collect(Collectors.toMap(DataSetParamDto::getParamName, DataSetParamDto::getSampleItem));
- if (collect.containsKey("pageNumber") && collect.containsKey("pageSize")) {
- dto.setContextData(collect);
- long total = dataSourceService.total(dataSourceDto, dto);
- originalDataDto.setTotal(total);
- }
-
- List data = dataSourceService.execute(dataSourceDto);
- // 5.数据转换
- List transform = dataSetTransformService.transform(dto.getDataSetTransformDtoList(), data);
- originalDataDto.setData(transform);
- return originalDataDto;
- }
-
- /**
- * 获取所有数据集
- * @return
- */
- @Override
- public List queryAllDataSet() {
- LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.select(DataSet::getSetCode, DataSet::getSetName, DataSet::getSetDesc, DataSet::getId)
- .eq(DataSet::getEnableFlag, Enabled.YES.getValue());
- wrapper.orderByDesc(DataSet::getUpdateTime);
- return dataSetMapper.selectList(wrapper);
- }
-
- public void dataSetParamBatch(List dataSetParamDtoList, String setCode) {
- dataSetParamService.delete(new QueryWrapper().lambda().eq(DataSetParam::getSetCode, setCode));
- if (null == dataSetParamDtoList || dataSetParamDtoList.size() <= 0) {
- return;
- }
- // List dataSetParamList = new ArrayList<>();
- dataSetParamDtoList.forEach(dataSetParamDto -> {
- DataSetParam dataSetParam = new DataSetParam();
- BeanUtils.copyProperties(dataSetParamDto, dataSetParam);
- dataSetParam.setSetCode(setCode);
- // 不采用批量
- dataSetParamService.insert(dataSetParam);
- // dataSetParamList.add(dataSetParam);
- });
- // dataSetParamService.insertBatch(dataSetParamList);
-
- }
-
- public void dataSetTransformBatch(List dataSetTransformDtoList, String setCode) {
- dataSetTransformService
- .delete(new QueryWrapper().lambda().eq(DataSetTransform::getSetCode, setCode));
- if (null == dataSetTransformDtoList || dataSetTransformDtoList.size() <= 0) {
- return;
- }
- // List dataSetTransformList = new ArrayList<>();
- for (int i = 0; i < dataSetTransformDtoList.size(); i++) {
- DataSetTransform dataSetTransform = new DataSetTransform();
- BeanUtils.copyProperties(dataSetTransformDtoList.get(i), dataSetTransform);
- dataSetTransform.setOrderNum(i + 1);
- dataSetTransform.setSetCode(setCode);
- // 不采用批量
- dataSetTransformService.insert(dataSetTransform);
- // dataSetTransformList.add(dataSetTransform);
- }
- // dataSetTransformService.insertBatch(dataSetTransformList);
- }
-
- /**
- * dataSetParamDtoList转map
- * @param dataSetParamDtoList
- * @return
- */
- public Map setContextData(List dataSetParamDtoList) {
- Map map = new HashMap<>();
- if (null != dataSetParamDtoList && dataSetParamDtoList.size() > 0) {
- dataSetParamDtoList.forEach(
- dataSetParamDto -> map.put(dataSetParamDto.getParamName(), dataSetParamDto.getSampleItem()));
- }
- return map;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java
deleted file mode 100644
index 9afa3a343..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/DataSetParamController.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasetparam.controller;
-
-import com.anji.plus.gaea.bean.ResponseBean;
-import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.param.DataSetParamParam;
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.param.DataSetParamValidationParam;
-import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.datasetparam.service.DataSetParamService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @desc 数据集动态参数 controller
- * @website https://gitee.com/anji-plus/gaea
- * @author Raod
- * @date 2021-03-18 12:12:33.108033200
- **/
-@RestController
-@Api(tags = "数据集动态参数管理")
-@RequestMapping("/dataSetParam")
-public class DataSetParamController extends GaeaBaseController {
-
- @Autowired
- private DataSetParamService dataSetParamService;
-
- @Override
- public GaeaBaseService getService() {
- return dataSetParamService;
- }
-
- @Override
- public DataSetParam getEntity() {
- return new DataSetParam();
- }
-
- @Override
- public DataSetParamDto getDTO() {
- return new DataSetParamDto();
- }
-
- /**
- * 测试 查询参数是否正确
- * @param param
- * @return
- */
- @PostMapping("/verification")
- public ResponseBean verification(@Validated @RequestBody DataSetParamValidationParam param) {
- DataSetParamDto dto = new DataSetParamDto();
- dto.setSampleItem(param.getSampleItem());
- dto.setValidationRules(param.getValidationRules());
- return responseSuccessWithData(dataSetParamService.verification(dto));
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/dto/DataSetParamDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/dto/DataSetParamDto.java
deleted file mode 100644
index 134e7ec74..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/dto/DataSetParamDto.java
+++ /dev/null
@@ -1,47 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasetparam.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @description 数据集动态参数 dto
- * @author Raod
- * @date 2021-03-18 12:12:33.108033200
- **/
-@Data
-public class DataSetParamDto extends GaeaBaseDTO implements Serializable {
-
- /** 数据集编码 */
- private String setCode;
-
- /** 参数名 */
- private String paramName;
-
- /** 参数描述 */
- private String paramDesc;
-
- /** 参数类型,字典= */
- private String paramType;
-
- /** 参数示例项 */
- private String sampleItem;
-
- /** 0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG */
- private Integer requiredFlag;
-
- /** js校验字段值规则,满足校验返回 true */
- private String validationRules;
-
- /** 排序 */
- private Integer orderNum;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
- /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
- private Integer deleteFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamParam.java
deleted file mode 100644
index 1228f9637..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamParam.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.datasetparam.controller.param;
-
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc DataSetParam 数据集动态参数查询输入类
- * @author Raod
- * @date 2021-03-18 12:12:33.108033200
- **/
-@Data
-public class DataSetParamParam extends PageParam implements Serializable {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamValidationParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamValidationParam.java
deleted file mode 100644
index e9fb4144d..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/controller/param/DataSetParamValidationParam.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasetparam.controller.param;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * Created by raodeming on 2021/3/24.
- */
-@Data
-public class DataSetParamValidationParam implements Serializable {
-
- /** 参数示例项 */
- @NotBlank(message = "sampleItem not empty")
- private String sampleItem;
-
- /** js校验字段值规则,满足校验返回 true */
- @NotBlank(message = "validationRules not empty")
- private String validationRules;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/DataSetParamMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/DataSetParamMapper.java
deleted file mode 100644
index de3c635e8..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/DataSetParamMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasetparam.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * DataSetParam Mapper
- *
- * @author Raod
- * @date 2021-03-18 12:12:33.108033200
- **/
-@Mapper
-public interface DataSetParamMapper extends GaeaBaseMapper {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java
deleted file mode 100644
index 022da663c..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/dao/entity/DataSetParam.java
+++ /dev/null
@@ -1,48 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity;
-
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @description 数据集动态参数 entity
- * @author Raod
- * @date 2021-03-18 12:12:33.108033200
- **/
-@TableName(keepGlobalPrefix = true, value = "gaea_report_data_set_param")
-@Data
-public class DataSetParam extends GaeaBaseEntity {
-
- @ApiModelProperty(value = "数据集编码")
- private String setCode;
-
- @ApiModelProperty(value = "参数名")
- private String paramName;
-
- @ApiModelProperty(value = "参数描述")
- private String paramDesc;
-
- @ApiModelProperty(value = "参数类型,字典=")
- private String paramType;
-
- @ApiModelProperty(value = "参数示例项")
- private String sampleItem;
-
- @ApiModelProperty(value = "0--非必填 1--必填 DIC_NAME=REQUIRED_FLAG")
- private Integer requiredFlag;
-
- @ApiModelProperty(value = "js校验字段值规则,满足校验返回 true")
- private String validationRules;
-
- @ApiModelProperty(value = "排序")
- private Integer orderNum;
-
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- private Integer enableFlag;
-
- @ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
- private Integer deleteFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java
deleted file mode 100644
index 028beab36..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/DataSetParamService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasetparam.service;
-
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.param.DataSetParamParam;
-import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Raod
- * @desc DataSetParam 数据集动态参数服务接口
- * @date 2021-03-18 12:12:33.108033200
- **/
-public interface DataSetParamService extends GaeaBaseService {
-
- /**
- * 参数替换
- * @param contextData
- * @param dynSentence
- * @return
- */
- String transform(Map contextData, String dynSentence);
-
- /**
- * 参数替换
- * @param dataSetParamDtoList
- * @param dynSentence
- * @return
- */
- String transform(List dataSetParamDtoList, String dynSentence);
-
- /**
- * 参数校验 js脚本
- * @param dataSetParamDto
- * @return
- */
- Object verification(DataSetParamDto dataSetParamDto);
-
- /**
- * 参数校验 js脚本
- * @param dataSetParamDtoList
- * @return
- */
- boolean verification(List dataSetParamDtoList, Map contextData);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java
deleted file mode 100644
index a4f98e88b..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/service/impl/DataSetParamServiceImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasetparam.service.impl;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.modules.datasetparam.controller.dto.DataSetParamDto;
-import com.anjiplus.template.gaea.business.modules.datasetparam.dao.DataSetParamMapper;
-import com.anjiplus.template.gaea.business.modules.datasetparam.dao.entity.DataSetParam;
-import com.anjiplus.template.gaea.business.modules.datasetparam.service.DataSetParamService;
-import com.anjiplus.template.gaea.business.modules.datasetparam.util.ParamsResolverHelper;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @desc DataSetParam 数据集动态参数服务实现
- * @author Raod
- * @date 2021-03-18 12:12:33.108033200
- **/
-@Service
-// @RequiredArgsConstructor
-@Slf4j
-public class DataSetParamServiceImpl implements DataSetParamService {
-
- private ScriptEngine engine;
-
- {
- ScriptEngineManager manager = new ScriptEngineManager();
- engine = manager.getEngineByName("JavaScript");
- }
-
- @Autowired
- private DataSetParamMapper dataSetParamMapper;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return dataSetParamMapper;
- }
-
- /**
- * 参数替换
- * @param contextData
- * @param dynSentence
- * @return
- */
- @Override
- public String transform(Map contextData, String dynSentence) {
- if (StringUtils.isBlank(dynSentence)) {
- return dynSentence;
- }
- if (dynSentence.contains("${")) {
- dynSentence = ParamsResolverHelper.resolveParams(contextData, dynSentence);
- }
- if (dynSentence.contains("${")) {
- throw BusinessExceptionBuilder.build(ResponseCode.INCOMPLETE_PARAMETER_REPLACEMENT_VALUES, dynSentence);
- }
- return dynSentence;
- }
-
- /**
- * 参数替换
- * @param dataSetParamDtoList
- * @param dynSentence
- * @return
- */
- @Override
- public String transform(List dataSetParamDtoList, String dynSentence) {
- Map contextData = new HashMap<>();
- if (null == dataSetParamDtoList || dataSetParamDtoList.size() <= 0) {
- return dynSentence;
- }
- dataSetParamDtoList.forEach(dataSetParamDto -> {
- contextData.put(dataSetParamDto.getParamName(), dataSetParamDto.getSampleItem());
- });
- return transform(contextData, dynSentence);
- }
-
- /**
- * 参数校验 js脚本
- * @param dataSetParamDto
- * @return
- */
- @Override
- public Object verification(DataSetParamDto dataSetParamDto) {
-
- String validationRules = dataSetParamDto.getValidationRules();
- if (StringUtils.isNotBlank(validationRules)) {
- try {
- engine.eval(validationRules);
- if (engine instanceof Invocable) {
- Invocable invocable = (Invocable) engine;
- Object exec = invocable.invokeFunction("verification", dataSetParamDto);
- ObjectMapper objectMapper = new ObjectMapper();
- if (exec instanceof Boolean) {
- return objectMapper.convertValue(exec, Boolean.class);
- }
- else {
- return objectMapper.convertValue(exec, String.class);
- }
-
- }
-
- }
- catch (Exception ex) {
- throw BusinessExceptionBuilder.build(ResponseCode.EXECUTE_JS_ERROR, ex.getMessage());
- }
-
- }
- return true;
- }
-
- /**
- * 参数校验 js脚本
- * @param dataSetParamDtoList
- * @return
- */
- @Override
- public boolean verification(List dataSetParamDtoList, Map contextData) {
- if (null == dataSetParamDtoList || dataSetParamDtoList.size() == 0) {
- return true;
- }
-
- for (DataSetParamDto dataSetParamDto : dataSetParamDtoList) {
- if (null != contextData) {
- String value = contextData.getOrDefault(dataSetParamDto.getParamName(), "").toString();
- dataSetParamDto.setSampleItem(value);
- }
-
- Object verification = verification(dataSetParamDto);
- if (verification instanceof Boolean) {
- if (!(Boolean) verification) {
- return false;
- }
- }
- else {
- // 将得到的值重新赋值给contextData
- if (null != contextData) {
- contextData.put(dataSetParamDto.getParamName(), verification);
- }
- dataSetParamDto.setSampleItem(verification.toString());
- }
-
- }
- return true;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/util/ParamsResolverHelper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/util/ParamsResolverHelper.java
deleted file mode 100644
index 73e25443f..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasetparam/util/ParamsResolverHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasetparam.util;
-
-import org.springframework.util.PropertyPlaceholderHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created by raodeming on 2021/3/23.
- */
-public class ParamsResolverHelper {
-
- private static String placeholderPrefix = "${";
-
- private static String placeholderSuffix = "}";
-
- private static PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper(placeholderPrefix,
- placeholderSuffix);
-
- public static String resolveParams(final Map param, String con) {
- con = helper.replacePlaceholders(con, (key -> param.get(key) + ""));
- return con;
- }
-
- private static Pattern key = Pattern.compile("\\$\\{(.*?)\\}");
-
- public static List findParamKeys(String con) {
- Matcher m = key.matcher(con);
- List ret = new ArrayList();
- while (m.find()) {
- ret.add(m.group(1));
- }
- return ret;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java
deleted file mode 100644
index f9b583b13..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/DataSetTransformController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasettransform.controller;
-
-import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.param.DataSetTransformParam;
-import com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform;
-import com.anjiplus.template.gaea.business.modules.datasettransform.service.DataSetTransformService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @desc 数据集数据转换 controller
- * @website https://gitee.com/anji-plus/gaea
- * @author Raod
- * @date 2021-03-18 12:13:15.591309400
- **/
-@RestController
-@Api(tags = "数据集数据转换管理")
-@RequestMapping("/dataSetTransform")
-public class DataSetTransformController
- extends GaeaBaseController {
-
- @Autowired
- private DataSetTransformService dataSetTransformService;
-
- @Override
- public GaeaBaseService getService() {
- return dataSetTransformService;
- }
-
- @Override
- public DataSetTransform getEntity() {
- return new DataSetTransform();
- }
-
- @Override
- public DataSetTransformDto getDTO() {
- return new DataSetTransformDto();
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/dto/DataSetTransformDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/dto/DataSetTransformDto.java
deleted file mode 100644
index f66bdb197..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/dto/DataSetTransformDto.java
+++ /dev/null
@@ -1,35 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @description 数据集数据转换 dto
- * @author Raod
- * @date 2021-03-18 12:13:15.591309400
- **/
-@Data
-public class DataSetTransformDto extends GaeaBaseDTO implements Serializable {
-
- /** 数据集编码 */
- private String setCode;
-
- /** 数据转换类型,DIC_NAME=TRANSFORM_TYPE; js,javaBean,字典转换 */
- private String transformType;
-
- /** 数据转换script,处理逻辑 */
- private String transformScript;
-
- /** 排序,执行数据转换顺序 */
- private Integer orderNum;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
- /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
- private Integer deleteFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/param/DataSetTransformParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/param/DataSetTransformParam.java
deleted file mode 100644
index 8122d26ec..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/controller/param/DataSetTransformParam.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.datasettransform.controller.param;
-
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc DataSetTransform 数据集数据转换查询输入类
- * @author Raod
- * @date 2021-03-18 12:13:15.591309400
- **/
-@Data
-public class DataSetTransformParam extends PageParam implements Serializable {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/DataSetTransformMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/DataSetTransformMapper.java
deleted file mode 100644
index d0be38afd..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/DataSetTransformMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasettransform.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * DataSetTransform Mapper
- *
- * @author Raod
- * @date 2021-03-18 12:13:15.591309400
- **/
-@Mapper
-public interface DataSetTransformMapper extends GaeaBaseMapper {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java
deleted file mode 100644
index a3ef052de..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/dao/entity/DataSetTransform.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity;
-
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @description 数据集数据转换 entity
- * @author Raod
- * @date 2021-03-18 12:13:15.591309400
- **/
-@TableName(keepGlobalPrefix = true, value = "gaea_report_data_set_transform")
-@Data
-public class DataSetTransform extends GaeaBaseEntity {
-
- @ApiModelProperty(value = "数据集编码")
- private String setCode;
-
- @ApiModelProperty(value = "数据转换类型,DIC_NAME=TRANSFORM_TYPE; js,javaBean,字典转换")
- private String transformType;
-
- @ApiModelProperty(value = "数据转换script,处理逻辑")
- private String transformScript;
-
- @ApiModelProperty(value = "排序,执行数据转换顺序")
- private Integer orderNum;
-
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- private Integer enableFlag;
-
- @ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
- private Integer deleteFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/DataSetTransformService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/DataSetTransformService.java
deleted file mode 100644
index 5c8fac9d0..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/DataSetTransformService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasettransform.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.param.DataSetTransformParam;
-import com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform;
-
-import java.util.List;
-
-/**
- * @desc DataSetTransform 数据集数据转换服务接口
- * @author Raod
- * @date 2021-03-18 12:13:15.591309400
- **/
-public interface DataSetTransformService extends GaeaBaseService {
-
- List transform(List dataSetTransformDtoList, List data);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/TransformStrategy.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/TransformStrategy.java
deleted file mode 100644
index a3ba2aed1..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/TransformStrategy.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasettransform.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-
-import java.util.List;
-
-/**
- * Created by raodeming on 2021/3/23.
- */
-public interface TransformStrategy {
-
- /**
- * 数据清洗转换 类型
- * @return
- */
- String type();
-
- /***
- * 清洗转换算法接口
- * @param def
- * @param data
- * @return
- */
- List transform(DataSetTransformDto def, List data);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DataSetTransformServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DataSetTransformServiceImpl.java
deleted file mode 100644
index 1f49dcbf8..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DataSetTransformServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasettransform.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.datasettransform.dao.DataSetTransformMapper;
-import com.anjiplus.template.gaea.business.modules.datasettransform.dao.entity.DataSetTransform;
-import com.anjiplus.template.gaea.business.modules.datasettransform.service.DataSetTransformService;
-import com.anjiplus.template.gaea.business.modules.datasettransform.service.TransformStrategy;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @desc DataSetTransform 数据集数据转换服务实现
- * @author Raod
- * @date 2021-03-18 12:13:15.591309400
- **/
-@Service
-// @RequiredArgsConstructor
-public class DataSetTransformServiceImpl implements DataSetTransformService, InitializingBean, ApplicationContextAware {
-
- private final Map queryServiceImplMap = new HashMap<>();
-
- private ApplicationContext applicationContext;
-
- @Autowired
- private DataSetTransformMapper dataSetTransformMapper;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return dataSetTransformMapper;
- }
-
- public TransformStrategy getTarget(String type) {
- return queryServiceImplMap.get(type);
- }
-
- @Override
- public void afterPropertiesSet() {
- Map beanMap = applicationContext.getBeansOfType(TransformStrategy.class);
- // 遍历该接口的所有实现,将其放入map中
- for (TransformStrategy serviceImpl : beanMap.values()) {
- queryServiceImplMap.put(serviceImpl.type(), serviceImpl);
- }
- }
-
- @Override
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- this.applicationContext = applicationContext;
- }
-
- @Override
- public List transform(List dataSetTransformDtoList, List data) {
- if (dataSetTransformDtoList == null || dataSetTransformDtoList.size() <= 0) {
- return data;
- }
-
- for (DataSetTransformDto dataSetTransformDto : dataSetTransformDtoList) {
- data = getTarget(dataSetTransformDto.getTransformType()).transform(dataSetTransformDto, data);
- }
- return data;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DictTransformServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DictTransformServiceImpl.java
deleted file mode 100644
index f3280abf8..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/DictTransformServiceImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasettransform.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.datasettransform.service.TransformStrategy;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * 字典转换 Created by raodeming on 2021/3/29.
- */
-@Component
-@Slf4j
-public class DictTransformServiceImpl implements TransformStrategy {
-
- /**
- * 数据清洗转换 类型
- * @return
- */
- @Override
- public String type() {
- return "dict";
- }
-
- /***
- * 清洗转换算法接口
- * @param def
- * @param data
- * @return
- */
- @Override
- public List transform(DataSetTransformDto def, List data) {
- String transformScript = def.getTransformScript();
- if (StringUtils.isBlank(transformScript)) {
- return data;
- }
- JSONObject jsonObject = JSONObject.parseObject(transformScript);
- Set keys = jsonObject.keySet();
-
- data.forEach(dataDetail -> dataDetail.forEach((key, value) -> {
- if (keys.contains(key)) {
- String string = jsonObject.getJSONObject(key).getString(value.toString());
- if (StringUtils.isNotBlank(string)) {
- dataDetail.put(key, string);
- }
- }
- }));
- return data;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/JsTransformServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/JsTransformServiceImpl.java
deleted file mode 100644
index 70d939f76..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasettransform/service/impl/JsTransformServiceImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasettransform.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.modules.datasettransform.controller.dto.DataSetTransformDto;
-import com.anjiplus.template.gaea.business.modules.datasettransform.service.TransformStrategy;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.script.Invocable;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import java.util.List;
-
-/**
- * Created by raodeming on 2021/3/23.
- */
-@Component
-@Slf4j
-public class JsTransformServiceImpl implements TransformStrategy {
-
- private ScriptEngine engine;
-
- {
- ScriptEngineManager manager = new ScriptEngineManager();
- engine = manager.getEngineByName("JavaScript");
- }
-
- /**
- * 数据清洗转换 类型
- * @return
- */
- @Override
- public String type() {
- return "js";
- }
-
- /***
- * 清洗转换算法接口
- * @param def
- * @param data
- * @return
- */
- @Override
- public List transform(DataSetTransformDto def, List data) {
- return getValueFromJs(def, data);
- }
-
- private List getValueFromJs(DataSetTransformDto def, List data) {
- String js = def.getTransformScript();
- try {
- engine.eval(js);
- if (engine instanceof Invocable) {
- Invocable invocable = (Invocable) engine;
- return (List) invocable.invokeFunction("dataTransform", data);
- }
-
- }
- catch (Exception ex) {
- throw BusinessExceptionBuilder.build(ResponseCode.EXECUTE_JS_ERROR, ex.getMessage());
- }
- return null;
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientConfig.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientConfig.java
deleted file mode 100644
index 7fa7ad9bb..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientConfig.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasource.config;
-
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.http.Header;
-import org.apache.http.HeaderElement;
-import org.apache.http.HeaderElementIterator;
-import org.apache.http.HttpHost;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.ConnectionKeepAliveStrategy;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.message.BasicHeader;
-import org.apache.http.message.BasicHeaderElementIterator;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.ssl.SSLContextBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.DefaultResponseErrorHandler;
-import org.springframework.web.client.RestTemplate;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLContext;
-import java.nio.charset.Charset;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.util.*;
-
-/**
- * Created by raodeming on 2021/3/24.
- */
-@Configuration
-@Slf4j
-public class HttpClientConfig {
-
- @Autowired
- private HttpClientPoolConfig httpClientPoolConfig;
-
- /**
- * 创建HTTP客户端工厂
- */
- @Bean(name = "clientHttpRequestFactory")
- public ClientHttpRequestFactory clientHttpRequestFactory() {
- /**
- * maxTotalConnection 和 maxConnectionPerRoute 必须要配
- */
- if (httpClientPoolConfig.getMaxTotalConnect() <= 0) {
- throw new IllegalArgumentException(
- "invalid maxTotalConnection: " + httpClientPoolConfig.getMaxTotalConnect());
- }
- if (httpClientPoolConfig.getMaxConnectPerRoute() <= 0) {
- throw new IllegalArgumentException(
- "invalid maxConnectionPerRoute: " + httpClientPoolConfig.getMaxConnectPerRoute());
- }
- HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(
- httpClient());
- // 连接超时
- clientHttpRequestFactory.setConnectTimeout(httpClientPoolConfig.getConnectTimeout());
- // 数据读取超时时间,即SocketTimeout
- clientHttpRequestFactory.setReadTimeout(httpClientPoolConfig.getReadTimeout());
- // 从连接池获取请求连接的超时时间,不宜过长,必须设置,比如连接不够用时,时间过长将是灾难性的
- clientHttpRequestFactory.setConnectionRequestTimeout(httpClientPoolConfig.getConnectionRequestTimout());
- return clientHttpRequestFactory;
- }
-
- /**
- * 初始化RestTemplate,并加入spring的Bean工厂,由spring统一管理
- */
- @Bean(name = "dataSourceRestTemplate")
- public RestTemplate restTemplate(@Qualifier("clientHttpRequestFactory") ClientHttpRequestFactory factory) {
- return createRestTemplate(factory);
- }
-
- /**
- * 配置httpClient
- * @return
- */
- @Bean
- public HttpClient httpClient() {
- HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
- try {
- // 设置信任ssl访问
- SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, (arg0, arg1) -> true).build();
-
- httpClientBuilder.setSSLContext(sslContext);
- HostnameVerifier hostnameVerifier = NoopHostnameVerifier.INSTANCE;
- SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(sslContext,
- hostnameVerifier);
- Registry socketFactoryRegistry = RegistryBuilder.create()
- // 注册http和https请求
- .register("http", PlainConnectionSocketFactory.getSocketFactory())
- .register("https", sslConnectionSocketFactory).build();
-
- // 使用Httpclient连接池的方式配置(推荐),同时支持netty,okHttp以及其他http框架
- PoolingHttpClientConnectionManager poolingHttpClientConnectionManager = new PoolingHttpClientConnectionManager(
- socketFactoryRegistry);
- // 最大连接数
- poolingHttpClientConnectionManager.setMaxTotal(httpClientPoolConfig.getMaxTotalConnect());
- // 同路由并发数
- poolingHttpClientConnectionManager.setDefaultMaxPerRoute(httpClientPoolConfig.getMaxConnectPerRoute());
- // 配置连接池
- httpClientBuilder.setConnectionManager(poolingHttpClientConnectionManager);
- // 重试次数
- httpClientBuilder
- .setRetryHandler(new DefaultHttpRequestRetryHandler(httpClientPoolConfig.getRetryTimes(), true));
-
- // 设置默认请求头
- List headers = getDefaultHeaders();
- httpClientBuilder.setDefaultHeaders(headers);
- // 设置长连接保持策略
- httpClientBuilder.setKeepAliveStrategy(connectionKeepAliveStrategy());
- return httpClientBuilder.build();
- }
- catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException e) {
- log.error("初始化HTTP连接池出错", e);
- }
- return null;
- }
-
- /**
- * 配置长连接保持策略
- * @return
- */
- public ConnectionKeepAliveStrategy connectionKeepAliveStrategy() {
- return (response, context) -> {
- // Honor 'keep-alive' header
- HeaderElementIterator it = new BasicHeaderElementIterator(response.headerIterator(HTTP.CONN_KEEP_ALIVE));
- while (it.hasNext()) {
- HeaderElement he = it.nextElement();
- log.info("HeaderElement:{}", JSON.toJSONString(he));
- String param = he.getName();
- String value = he.getValue();
- if (value != null && "timeout".equalsIgnoreCase(param)) {
- try {
- return Long.parseLong(value) * 1000;
- }
- catch (NumberFormatException ignore) {
- log.error("解析长连接过期时间异常", ignore);
- }
- }
- }
- HttpHost target = (HttpHost) context.getAttribute(HttpClientContext.HTTP_TARGET_HOST);
- // 如果请求目标地址,单独配置了长连接保持时间,使用该配置
- Optional> any = Optional
- .ofNullable(httpClientPoolConfig.getKeepAliveTargetHost()).orElseGet(HashMap::new).entrySet()
- .stream().filter(e -> e.getKey().equalsIgnoreCase(target.getHostName())).findAny();
- // 否则使用默认长连接保持时间
- return any.map(en -> en.getValue() * 1000L).orElse(httpClientPoolConfig.getKeepAliveTime() * 1000L);
- };
- }
-
- /**
- * 设置请求头
- * @return
- */
- private List getDefaultHeaders() {
- List headers = new ArrayList<>();
- headers.add(new BasicHeader("User-Agent",
- "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.16 Safari/537.36"));
- headers.add(new BasicHeader("Accept-Encoding", "gzip,deflate"));
- headers.add(new BasicHeader("Accept-Language", "zh-CN"));
- headers.add(new BasicHeader("Connection", "Keep-Alive"));
- return headers;
- }
-
- private RestTemplate createRestTemplate(ClientHttpRequestFactory factory) {
- RestTemplate restTemplate = new RestTemplate(factory);
-
- // 我们采用RestTemplate内部的MessageConverter
- // 重新设置StringHttpMessageConverter字符集,解决中文乱码问题
- modifyDefaultCharset(restTemplate);
-
- // 设置错误处理器
- restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
-
- return restTemplate;
- }
-
- /**
- * 修改默认的字符集类型为utf-8
- * @param restTemplate
- */
- private void modifyDefaultCharset(RestTemplate restTemplate) {
- List> converterList = restTemplate.getMessageConverters();
- HttpMessageConverter> converterTarget = null;
- for (HttpMessageConverter> item : converterList) {
- if (StringHttpMessageConverter.class == item.getClass()) {
- converterTarget = item;
- break;
- }
- }
- if (null != converterTarget) {
- converterList.remove(converterTarget);
- }
- Charset defaultCharset = Charset.forName(httpClientPoolConfig.getCharset());
- converterList.add(1, new StringHttpMessageConverter(defaultCharset));
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientPoolConfig.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientPoolConfig.java
deleted file mode 100644
index 41c1f9bd3..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/config/HttpClientPoolConfig.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasource.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-/**
- * Created by raodeming on 2021/3/24.
- */
-@Component
-@ConfigurationProperties(prefix = "spring.http-client.pool")
-@Data
-public class HttpClientPoolConfig {
-
- /**
- * java配置的优先级低于yml配置;如果yml配置不存在,会采用java配置
- */
- /**
- * 连接池的最大连接数
- */
- private int maxTotalConnect = 1000;
-
- /**
- * 同路由的并发数
- */
- private int maxConnectPerRoute = 200;
-
- /**
- * 客户端和服务器建立连接超时,默认2s
- */
- private int connectTimeout = 2 * 1000;
-
- /**
- * 指客户端从服务器读取数据包的间隔超时时间,不是总读取时间,默认30s
- */
- private int readTimeout = 30 * 1000;
-
- private String charset = "UTF-8";
-
- /**
- * 重试次数,默认2次
- */
- private int retryTimes = 2;
-
- /**
- * 从连接池获取连接的超时时间,不宜过长,单位ms
- */
- private int connectionRequestTimout = 200;
-
- /**
- * 针对不同的地址,特别设置不同的长连接保持时间
- */
- private Map keepAliveTargetHost;
-
- /**
- * 针对不同的地址,特别设置不同的长连接保持时间,单位 s
- */
- private int keepAliveTime = 60;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java
deleted file mode 100644
index 47db1d24a..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/DataSourceController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasource.controller;
-
-import com.anji.plus.gaea.annotation.Permission;
-import com.anji.plus.gaea.bean.ResponseBean;
-import com.anji.plus.gaea.curd.controller.GaeaBaseController;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.param.ConnectionParam;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.param.DataSourceParam;
-import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
-import com.anjiplus.template.gaea.business.modules.datasource.service.DataSourceService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @desc 数据源 controller
- * @website https://gitee.com/anji-plus/gaea
- * @author Raod
- * @date 2021-03-18 12:09:57.728203200
- **/
-@RestController
-@Api(tags = "数据源管理")
-@Permission(code = "datasourceManage", name = "数据源管理")
-@RequestMapping("/dataSource")
-public class DataSourceController extends GaeaBaseController {
-
- @Autowired
- private DataSourceService dataSourceService;
-
- @Override
- public GaeaBaseService getService() {
- return dataSourceService;
- }
-
- @Override
- public DataSource getEntity() {
- return new DataSource();
- }
-
- @Override
- public DataSourceDto getDTO() {
- return new DataSourceDto();
- }
-
- /**
- * 获取所有数据源
- * @return
- */
- @GetMapping("/queryAllDataSource")
- public ResponseBean queryAllDataSource() {
- return responseSuccessWithData(dataSourceService.queryAllDataSource());
- }
-
- /**
- * 测试 连接
- * @param connectionParam
- * @return
- */
- @Permission(code = "query", name = "测试数据源")
- @PostMapping("/testConnection")
- public ResponseBean testConnection(@Validated @RequestBody ConnectionParam connectionParam) {
- return responseSuccessWithData(dataSourceService.testConnection(connectionParam));
- }
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java
deleted file mode 100644
index 85c9299f6..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/dto/DataSourceDto.java
+++ /dev/null
@@ -1,80 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasource.controller.dto;
-
-import com.anji.plus.gaea.curd.dto.GaeaBaseDTO;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * @description 数据源 dto
- * @author Raod
- * @date 2021-03-18 12:09:57.728203200
- **/
-@Data
-public class DataSourceDto extends GaeaBaseDTO implements Serializable {
-
- /** 数据源编码 */
- private String sourceCode;
-
- /** 数据源名称 */
- private String sourceName;
-
- /** 数据源描述 */
- private String sourceDesc;
-
- /**
- * 数据源类型 DIC_NAME=SOURCE_TYPE;
- * mysql,orace,sqlserver,elasticsearch,接口,javaBean,数据源类型字典中item-extend动态生成表单
- */
- private String sourceType;
-
- /**
- * 数据源连接配置json:关系库{ jdbcUrl:'', username:'', password:'','driverName':''}ES-sql{
- * apiUrl:'http://127.0.0.1:9092/_xpack/sql?format=json','method':'POST','body':'{"query":"select
- * 1"}' } 接口{ apiUrl:'http://ip:port/url', method:'' } javaBean{ beanNamw:'xxx' }
- */
- private String sourceConfig;
-
- /** 0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG */
- private Integer enableFlag;
-
- /** 0--未删除 1--已删除 DIC_NAME=DELETE_FLAG */
- private Integer deleteFlag;
-
- /**************************************************************/
- /** 关系型数据库jdbcUrl */
- private String jdbcUrl;
-
- /** 关系型数据库用户名 */
- private String username;
-
- /** 关系型数据库密码 */
- private String password;
-
- /** 关系型数据库驱动类 */
- private String driverName;
-
- /** 关系型数据库sql */
- private String sql;
-
- /** http requestUrl */
- private String apiUrl;
-
- /** http method */
- private String method;
-
- /** http header */
- private String header;
-
- /** http 请求体 */
- private String body;
-
- /** 动态查询sql或者接口中的请求体 */
- private String dynSentence;
-
- /** 传入的自定义参数,解决url中存在的动态参数 */
- private Map contextData;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/ConnectionParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/ConnectionParam.java
deleted file mode 100644
index 3b6925c59..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/ConnectionParam.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasource.controller.param;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-
-/**
- * Created by raodeming on 2021/3/19.
- */
-@Data
-public class ConnectionParam implements Serializable {
-
- /**
- * 数据源类型 DIC_NAME=SOURCE_TYPE;
- * mysql,orace,sqlserver,elasticsearch,接口,javaBean,数据源类型字典中item-extend动态生成表单
- */
- @NotBlank(message = "sourceType not empty")
- private String sourceType;
-
- /**
- * 数据源连接配置json:关系库{ jdbcUrl:'', username:'', password:'','driverName':''}ES-sql{
- * apiUrl:'http://127.0.0.1:9092/_xpack/sql?format=json','method':'POST','body':'{"query":"select
- * 1"}' } 接口{ apiUrl:'http://ip:port/url', method:'' } javaBean{ beanNamw:'xxx' }
- */
- @NotBlank(message = "sourceConfig not empty")
- private String sourceConfig;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/DataSourceParam.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/DataSourceParam.java
deleted file mode 100644
index 0e2bd1ffe..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/controller/param/DataSourceParam.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**/
-package com.anjiplus.template.gaea.business.modules.datasource.controller.param;
-
-import com.anji.plus.gaea.annotation.Query;
-import com.anji.plus.gaea.constant.QueryEnum;
-import com.anji.plus.gaea.curd.params.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @desc DataSource 数据集查询输入类
- * @author Raod
- * @date 2021-03-18 12:09:57.728203200
- **/
-@Data
-public class DataSourceParam extends PageParam implements Serializable {
-
- /** 数据源名称 */
- @Query(QueryEnum.LIKE)
- private String sourceName;
-
- /** 数据源编码 */
- @Query(QueryEnum.LIKE)
- private String sourceCode;
-
- /**
- * 数据源类型 DIC_NAME=SOURCE_TYPE;
- * mysql,orace,sqlserver,elasticsearch,接口,javaBean,数据源类型字典中item-extend动态生成表单
- */
- @Query(QueryEnum.EQ)
- private String sourceType;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/DataSourceMapper.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/DataSourceMapper.java
deleted file mode 100644
index 19743bb10..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/DataSourceMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasource.dao;
-
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * DataSource Mapper
- *
- * @author Raod
- * @date 2021-03-18 12:09:57.728203200
- **/
-@Mapper
-public interface DataSourceMapper extends GaeaBaseMapper {
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java
deleted file mode 100644
index d2e14d21e..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/dao/entity/DataSource.java
+++ /dev/null
@@ -1,44 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasource.dao.entity;
-
-import com.anji.plus.gaea.annotation.Unique;
-import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @description 数据源 entity
- * @author Raod
- * @date 2021-03-18 12:09:57.728203200
- **/
-@TableName(keepGlobalPrefix = true, value = "gaea_report_data_source")
-@Data
-public class DataSource extends GaeaBaseEntity {
-
- @ApiModelProperty(value = "数据源编码")
- @Unique(code = ResponseCode.SOURCE_CODE_ISEXIST)
- private String sourceCode;
-
- @ApiModelProperty(value = "数据源名称")
- private String sourceName;
-
- @ApiModelProperty(value = "数据源描述")
- private String sourceDesc;
-
- @ApiModelProperty(
- value = "数据源类型 DIC_NAME=SOURCE_TYPE; mysql,orace,sqlserver,elasticsearch,接口,javaBean,数据源类型字典中item-extend动态生成表单")
- private String sourceType;
-
- @ApiModelProperty(
- value = "数据源连接配置json:关系库{ jdbcUrl:'', username:'', password:'','driverName':''}ES-sql{ apiUrl:'http://127.0.0.1:9092/_xpack/sql?format=json','method':'POST','body':'{\"query\":\"select 1\"}' } 接口{ apiUrl:'http://ip:port/url', method:'' } javaBean{ beanNamw:'xxx' }")
- private String sourceConfig;
-
- @ApiModelProperty(value = "0--已禁用 1--已启用 DIC_NAME=ENABLE_FLAG")
- private Integer enableFlag;
-
- @ApiModelProperty(value = "0--未删除 1--已删除 DIC_NAME=DELETE_FLAG")
- private Integer deleteFlag;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/DataSourceService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/DataSourceService.java
deleted file mode 100644
index c72afc640..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/DataSourceService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasource.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.anji.plus.gaea.curd.service.GaeaBaseService;
-import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.param.ConnectionParam;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.param.DataSourceParam;
-import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
-
-import java.util.List;
-
-/**
- * @desc DataSource 数据集服务接口
- * @author Raod
- * @date 2021-03-18 12:09:57.728203200
- **/
-public interface DataSourceService extends GaeaBaseService {
-
- /**
- * 获取所有数据源
- * @return
- */
- List queryAllDataSource();
-
- /**
- * 测试 连接
- * @param connectionParam
- * @return
- */
- Boolean testConnection(ConnectionParam connectionParam);
-
- /**
- * 执行sql
- * @param dto
- * @return
- */
- List execute(DataSourceDto dto);
-
- /**
- * 执行sql,统计数据total
- * @param dataSourceDto
- * @param dto
- * @return
- */
- long total(DataSourceDto dataSourceDto, DataSetDto dto);
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/JdbcService.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/JdbcService.java
deleted file mode 100644
index 65e4cb7c1..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/JdbcService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.anjiplus.template.gaea.business.modules.datasource.service;
-
-import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-/**
- * Created by raodeming on 2021/8/6.
- */
-public interface JdbcService {
-
- /**
- * 删除数据库连接池
- * @param id
- */
- void removeJdbcConnectionPool(Long id);
-
- /**
- * 获取连接
- * @param dataSource
- * @return
- * @throws SQLException
- */
- Connection getPooledConnection(DataSourceDto dataSource) throws SQLException;
-
- /**
- * 测试数据库连接 获取一个连接
- * @param dataSource
- * @return
- * @throws ClassNotFoundException driverName不正确
- * @throws SQLException
- */
- Connection getUnPooledConnection(DataSourceDto dataSource) throws SQLException;
-
-}
diff --git a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java b/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
deleted file mode 100644
index 6e8ec81b2..000000000
--- a/pigx-visual/pigx-report-platform/src/main/java/com/anjiplus/template/gaea/business/modules/datasource/service/impl/DataSourceServiceImpl.java
+++ /dev/null
@@ -1,460 +0,0 @@
-
-package com.anjiplus.template.gaea.business.modules.datasource.service.impl;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.anji.plus.gaea.constant.BaseOperationEnum;
-import com.anji.plus.gaea.constant.Enabled;
-import com.anji.plus.gaea.curd.mapper.GaeaBaseMapper;
-import com.anji.plus.gaea.exception.BusinessException;
-import com.anji.plus.gaea.exception.BusinessExceptionBuilder;
-import com.anji.plus.gaea.utils.GaeaAssert;
-import com.anjiplus.template.gaea.business.code.ResponseCode;
-import com.anjiplus.template.gaea.business.constant.BusinessConstant;
-import com.anjiplus.template.gaea.business.modules.dataset.controller.dto.DataSetDto;
-import com.anjiplus.template.gaea.business.modules.datasetparam.service.DataSetParamService;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.dto.DataSourceDto;
-import com.anjiplus.template.gaea.business.modules.datasource.controller.param.ConnectionParam;
-import com.anjiplus.template.gaea.business.modules.datasource.dao.DataSourceMapper;
-import com.anjiplus.template.gaea.business.modules.datasource.dao.entity.DataSource;
-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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestClientException;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author Raod
- * @desc DataSource 数据集服务实现
- * @date 2021-03-18 12:09:57.728203200
- **/
-@Service
-@Slf4j
-public class DataSourceServiceImpl implements DataSourceService {
-
- @Autowired
- private DataSourceMapper dataSourceMapper;
-
- @Resource(name = "dataSourceRestTemplate")
- private RestTemplate restTemplate;
-
- @Autowired
- private DataSetParamService dataSetParamService;
-
- @Autowired
- private JdbcService jdbcService;
-
- @Override
- public GaeaBaseMapper getMapper() {
- return dataSourceMapper;
- }
-
- /**
- * 获取所有数据源
- * @return
- */
- @Override
- public List queryAllDataSource() {
- LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.select(DataSource::getSourceCode, DataSource::getSourceName).eq(DataSource::getEnableFlag,
- Enabled.YES.getValue());
- wrapper.orderByDesc(DataSource::getUpdateTime);
- return dataSourceMapper.selectList(wrapper);
- }
-
- /**
- * 测试 连接
- * @param connectionParam
- * @return
- */
- @Override
- public Boolean testConnection(ConnectionParam connectionParam) {
- String sourceType = connectionParam.getSourceType();
- String sourceConfig = connectionParam.getSourceConfig();
- DataSourceDto dto = new DataSourceDto();
- dto.setSourceConfig(sourceConfig);
- switch (sourceType) {
- case JdbcConstants.ELASTIC_SEARCH_SQL:
- testElasticsearchSqlConnection(dto);
- break;
- case JdbcConstants.MYSQL:
- case JdbcConstants.KUDU_IMAPLA:
- case JdbcConstants.ORACLE:
- case JdbcConstants.SQL_SERVER:
- case JdbcConstants.JDBC:
- case JdbcConstants.POSTGRESQL:
- testRelationalDb(dto);
- break;
- case JdbcConstants.HTTP:
- testHttp(dto);
- break;
- default:
- throw BusinessExceptionBuilder.build(ResponseCode.DATA_SOURCE_TYPE_DOES_NOT_MATCH_TEMPORARILY);
- }
- log.info("测试连接成功:{}", JSONObject.toJSONString(connectionParam));
- return true;
-
- }
-
- @Override
- public List execute(DataSourceDto dto) {
- String sourceType = dto.getSourceType();
- switch (sourceType) {
- case JdbcConstants.ELASTIC_SEARCH_SQL:
- return executeElasticsearchSql(dto);
- case JdbcConstants.MYSQL:
- case JdbcConstants.KUDU_IMAPLA:
- case JdbcConstants.ORACLE:
- case JdbcConstants.SQL_SERVER:
- case JdbcConstants.JDBC:
- case JdbcConstants.POSTGRESQL:
- return executeRelationalDb(dto);
- case JdbcConstants.HTTP:
- return executeHttp(dto);
- default:
- throw BusinessExceptionBuilder.build(ResponseCode.DATA_SOURCE_TYPE_DOES_NOT_MATCH_TEMPORARILY);
- }
- }
-
- /**
- * 执行sql,统计数据total
- * @param dto
- * @return
- */
- @Override
- public long total(DataSourceDto sourceDto, DataSetDto dto) {
- // 区分数据类型
- String sourceType = sourceDto.getSourceType();
- switch (sourceType) {
- case JdbcConstants.ELASTIC_SEARCH_SQL:
- return 0;
- case JdbcConstants.MYSQL:
- return mysqlTotal(sourceDto, dto);
- default:
- throw BusinessExceptionBuilder.build(ResponseCode.DATA_SOURCE_TYPE_DOES_NOT_MATCH_TEMPORARILY);
- }
-
- }
-
- /**
- * 获取mysql count 和添加limit分页信息
- * @param sourceDto
- * @param dto
- * @return
- */
- public long mysqlTotal(DataSourceDto sourceDto, DataSetDto dto) {
- String dynSentence = sourceDto.getDynSentence();
- String sql = "select count(1) as count from (" + dynSentence + ") as gaeaExecute";
- sourceDto.setDynSentence(sql);
- List result = execute(sourceDto);
-
- // sql 拼接 limit 分页信息
- int pageNumber = Integer.parseInt(dto.getContextData().getOrDefault("pageNumber", "1").toString());
- int pageSize = Integer.parseInt(dto.getContextData().getOrDefault("pageSize", "10").toString());
- String sqlLimit = " limit " + (pageNumber - 1) * pageSize + "," + pageSize;
- sourceDto.setDynSentence(dynSentence.concat(sqlLimit));
- log.info("当前total:{}, 添加分页参数,sql语句:{}", JSONObject.toJSONString(result), sourceDto.getDynSentence());
- return result.get(0).getLongValue("count");
- }
-
- public List