From d50fb937787cb900ec27dfaa0149dbaa3e3e4d83 Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Wed, 15 May 2024 22:33:56 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BF=9C=E7=A8=8B=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=97=A0=E6=9D=83=E9=99=90bug,unit=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/cache/abs/CacheAbs.java | 40 +++++++++---- .../main/java/com/muyu/cache/redis/Cache.java | 2 +- .../muyu/common/core/utils/ip/IpUtils.java | 6 +- muyu-common/muyu-common-etl-scope/pom.xml | 26 +++++++++ .../java/com/muyu}/scope/engine/Engine.java | 2 +- .../scope/engine/action/ActionDiscard.java | 2 +- .../engine/custom/IsNotNullEngineCustom.java | 6 +- .../scope/engine/scope/DataModelEngine.java | 10 ++-- .../scope/engine/scope/DataSetEngine.java | 10 ++-- .../scope/engine/scope/RecordEngine.java | 10 ++-- .../java/com/muyu}/scope/model/DataModel.java | 2 +- .../com/muyu}/scope/model/DataSetModel.java | 3 +- .../com/muyu}/scope/model/DataStandard.java | 2 +- .../com/muyu}/scope/model/RecordModel.java | 2 +- .../muyu}/scope/scope/DataModelContext.java | 4 +- .../com/muyu}/scope/scope/DataSetContext.java | 4 +- .../com/muyu}/scope/scope/RecordContext.java | 4 +- .../com/muyu}/scope/scope/ScopeContext.java | 2 +- .../com/muyu}/scope/scope/TaskContext.java | 2 +- .../scope/scope/model/DataProcessModel.java | 4 +- .../scope/model/DataSetProcessModel.java | 4 +- .../scope/scope/model/RecordProcessModel.java | 4 +- .../common/redis/service/RedisService.java | 16 ++++++ muyu-common/pom.xml | 1 + .../main/java/com/muyu/cache/AssetCache.java | 15 +++-- ...ot.autoconfigure.AutoConfiguration.imports | 1 + muyu-modules/muyu-etl/muyu-etl-client/pom.xml | 11 ++-- .../java/com/muyu/etl/AssetClientRunner.java | 17 ++++-- muyu-modules/muyu-etl/muyu-etl-common/pom.xml | 8 +-- .../scope/test/Engine_custom_email_test.java | 22 -------- .../muyu-etl/muyu-etl-service/pom.xml | 11 ++++ .../java/com/muyu/EtlApplicationRunner.java | 8 +++ .../controller/BasicConfigInfoController.java | 4 +- .../service/impl/AssetImpowerServiceImpl.java | 1 - .../impl/BasicConfigInfoServiceImpl.java | 13 ++--- .../muyu-ruleEngine-service/pom.xml | 6 ++ .../engine_custom_PhotoTest_DATARULE.java | 5 +- .../muyu-unit/muyu-unit-common/pom.xml | 2 + .../muyu-unit/muyu-unit-service/pom.xml | 14 +---- .../com/muyu/controller/UnitController.java | 31 ++++++++++ .../java/com/muyu/service/UnitService.java | 17 ++++++ .../muyu/service/impl/UnitServiceImpl.java | 56 +++++++++++++++++++ pom.xml | 14 +++++ 43 files changed, 301 insertions(+), 123 deletions(-) create mode 100644 muyu-common/muyu-common-etl-scope/pom.xml rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/engine/Engine.java (80%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/engine/action/ActionDiscard.java (75%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/engine/custom/IsNotNullEngineCustom.java (68%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/engine/scope/DataModelEngine.java (76%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/engine/scope/DataSetEngine.java (64%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/engine/scope/RecordEngine.java (67%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/model/DataModel.java (92%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/model/DataSetModel.java (92%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/model/DataStandard.java (78%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/model/RecordModel.java (94%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/scope/DataModelContext.java (83%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/scope/DataSetContext.java (83%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/scope/RecordContext.java (82%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/scope/ScopeContext.java (78%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/scope/TaskContext.java (83%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/scope/model/DataProcessModel.java (69%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/scope/model/DataSetProcessModel.java (70%) rename {muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain => muyu-common/muyu-common-etl-scope/src/main/java/com/muyu}/scope/scope/model/RecordProcessModel.java (73%) create mode 100644 muyu-modules/muyu-etl/muyu-etl-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/test/Engine_custom_email_test.java create mode 100644 muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/controller/UnitController.java create mode 100644 muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/service/UnitService.java create mode 100644 muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/service/impl/UnitServiceImpl.java diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java index 64cb350..bcab592 100644 --- a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java @@ -1,11 +1,9 @@ package com.muyu.cache.abs; -import com.alibaba.fastjson2.JSON; import com.muyu.cache.redis.Cache; import com.muyu.common.redis.service.RedisService; -import org.springframework.beans.factory.annotation.Autowired; -import javax.annotation.Resource; +import java.util.List; /** * @ClassName CacheAbs @@ -13,33 +11,53 @@ import javax.annotation.Resource; * @Author SaiSai.Liu * @Date 2024/5/14 17:05 */ -public abstract class CacheAbs implements Cache { - @Resource + +public abstract class CacheAbs> implements Cache { + + private RedisService redisService; + public RedisService getRedisService() { + return redisService; + } + + public CacheAbs(RedisService redisService) { + this.redisService = redisService; + } /** * 根据key获取值 + * * @param key * @return */ - protected abstract V get(K key); + public List get(K key) { + List v = redisService.getCacheList(String.valueOf(key)); + if (v != null) { + return v; + } + return null; + } /** * 存入值 + * * @param k * @param v */ - void put(K k, V v) { + public void put(K k, V v) { String key = enCode(k); - redisService.setCacheObject(key, JSON.toJSONString(v)); + redisService.setCacheList(key, v); } /** * 删除值 + * * @param k */ - void remove(K k){ - redisService.deleteObject(enCode(k)); - }; + void remove(K k) { + redisService.deleteObject(enCode(k)); + } + + ; } diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/Cache.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/Cache.java index 4b31c05..72efa29 100644 --- a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/Cache.java +++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/Cache.java @@ -9,7 +9,7 @@ package com.muyu.cache.redis; public interface Cache { - String preKey(K key); + String preKey(); String enCode(K key); diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java index 9791293..f7ad9bf 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java @@ -58,7 +58,7 @@ public class IpUtils { ip = request.getRemoteAddr(); } - return "0:0:0:0:0:0:0:1".equals(ip) ? "43.142.100.73" : getMultistageReverseProxyIp(ip); + return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : getMultistageReverseProxyIp(ip); } /** @@ -70,7 +70,7 @@ public class IpUtils { */ public static boolean internalIp (String ip) { byte[] addr = textToNumericFormatV4(ip); - return internalIp(addr) || "43.142.100.73".equals(ip); + return internalIp(addr) || "127.0.0.1".equals(ip); } /** @@ -197,7 +197,7 @@ public class IpUtils { return InetAddress.getLocalHost().getHostAddress(); } catch (UnknownHostException e) { } - return "43.142.100.73"; + return "127.0.0.1"; } /** diff --git a/muyu-common/muyu-common-etl-scope/pom.xml b/muyu-common/muyu-common-etl-scope/pom.xml new file mode 100644 index 0000000..24eb502 --- /dev/null +++ b/muyu-common/muyu-common-etl-scope/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.muyu + muyu-common + 3.6.3 + + + muyu-common-etl-scope + + + 17 + 17 + UTF-8 + + + + org.projectlombok + lombok + + + + diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/Engine.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/Engine.java similarity index 80% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/Engine.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/Engine.java index bf0e5f5..df454e9 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/Engine.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/Engine.java @@ -1,4 +1,4 @@ -package com.muyu.etl.domain.scope.engine; +package com.muyu.scope.engine; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/action/ActionDiscard.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/action/ActionDiscard.java similarity index 75% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/action/ActionDiscard.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/action/ActionDiscard.java index c4d437b..cda339a 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/action/ActionDiscard.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/action/ActionDiscard.java @@ -1,4 +1,4 @@ -package com.muyu.etl.domain.scope.engine.action; +package com.muyu.scope.engine.action; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/custom/IsNotNullEngineCustom.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/custom/IsNotNullEngineCustom.java similarity index 68% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/custom/IsNotNullEngineCustom.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/custom/IsNotNullEngineCustom.java index 8a0810f..c05cdb1 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/custom/IsNotNullEngineCustom.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/custom/IsNotNullEngineCustom.java @@ -1,8 +1,8 @@ -package com.muyu.etl.domain.scope.engine.custom; +package com.muyu.scope.engine.custom; -import com.muyu.etl.domain.scope.engine.action.ActionDiscard; -import com.muyu.etl.domain.scope.engine.scope.DataModelEngine; +import com.muyu.scope.engine.action.ActionDiscard; +import com.muyu.scope.engine.scope.DataModelEngine; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataModelEngine.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/DataModelEngine.java similarity index 76% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataModelEngine.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/DataModelEngine.java index bcec429..88ea847 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataModelEngine.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/DataModelEngine.java @@ -1,10 +1,10 @@ -package com.muyu.etl.domain.scope.engine.scope; +package com.muyu.scope.engine.scope; -import com.muyu.etl.domain.scope.engine.Engine; -import com.muyu.etl.domain.scope.model.DataModel; -import com.muyu.etl.domain.scope.scope.DataModelContext; -import com.muyu.etl.domain.scope.scope.model.DataProcessModel; +import com.muyu.scope.engine.Engine; +import com.muyu.scope.model.DataModel; +import com.muyu.scope.scope.DataModelContext; +import com.muyu.scope.scope.model.DataProcessModel; import lombok.Data; /** diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataSetEngine.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/DataSetEngine.java similarity index 64% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataSetEngine.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/DataSetEngine.java index 7437051..88c95db 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/DataSetEngine.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/DataSetEngine.java @@ -1,10 +1,10 @@ -package com.muyu.etl.domain.scope.engine.scope; +package com.muyu.scope.engine.scope; -import com.muyu.etl.domain.scope.engine.Engine; -import com.muyu.etl.domain.scope.model.DataSetModel; -import com.muyu.etl.domain.scope.scope.DataSetContext; -import com.muyu.etl.domain.scope.scope.model.DataSetProcessModel; +import com.muyu.scope.engine.Engine; +import com.muyu.scope.model.DataSetModel; +import com.muyu.scope.scope.DataSetContext; +import com.muyu.scope.scope.model.DataSetProcessModel; import lombok.Data; /** diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/RecordEngine.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/RecordEngine.java similarity index 67% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/RecordEngine.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/RecordEngine.java index f9d0910..e721dfb 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/engine/scope/RecordEngine.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/engine/scope/RecordEngine.java @@ -1,10 +1,10 @@ -package com.muyu.etl.domain.scope.engine.scope; +package com.muyu.scope.engine.scope; -import com.muyu.etl.domain.scope.engine.Engine; -import com.muyu.etl.domain.scope.model.RecordModel; -import com.muyu.etl.domain.scope.scope.RecordContext; -import com.muyu.etl.domain.scope.scope.model.RecordProcessModel; +import com.muyu.scope.engine.Engine; +import com.muyu.scope.model.RecordModel; +import com.muyu.scope.scope.RecordContext; +import com.muyu.scope.scope.model.RecordProcessModel; import lombok.Data; /** diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataModel.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataModel.java similarity index 92% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataModel.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataModel.java index 38d38c4..249a550 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataModel.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataModel.java @@ -1,4 +1,4 @@ -package com.muyu.etl.domain.scope.model; +package com.muyu.scope.model; import lombok.Data; diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataSetModel.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataSetModel.java similarity index 92% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataSetModel.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataSetModel.java index 677bf4b..c00b9c1 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataSetModel.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataSetModel.java @@ -1,8 +1,7 @@ -package com.muyu.etl.domain.scope.model; +package com.muyu.scope.model; import lombok.Data; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataStandard.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataStandard.java similarity index 78% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataStandard.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataStandard.java index 1138a26..571e02e 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataStandard.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/DataStandard.java @@ -1,4 +1,4 @@ -package com.muyu.etl.domain.scope.model; +package com.muyu.scope.model; /** * 数据标准 diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/RecordModel.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/RecordModel.java similarity index 94% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/RecordModel.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/RecordModel.java index f0d53ce..8437b54 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/RecordModel.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/model/RecordModel.java @@ -1,4 +1,4 @@ -package com.muyu.etl.domain.scope.model; +package com.muyu.scope.model; import lombok.Data; diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataModelContext.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/DataModelContext.java similarity index 83% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataModelContext.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/DataModelContext.java index 10891fc..ebc6a40 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataModelContext.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/DataModelContext.java @@ -1,7 +1,7 @@ -package com.muyu.etl.domain.scope.scope; +package com.muyu.scope.scope; -import com.muyu.etl.domain.scope.scope.model.DataProcessModel; +import com.muyu.scope.scope.model.DataProcessModel; /** * @Author: Saisai.Liu diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataSetContext.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/DataSetContext.java similarity index 83% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataSetContext.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/DataSetContext.java index 56239ef..0a36318 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataSetContext.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/DataSetContext.java @@ -1,7 +1,7 @@ -package com.muyu.etl.domain.scope.scope; +package com.muyu.scope.scope; -import com.muyu.etl.domain.scope.scope.model.DataSetProcessModel; +import com.muyu.scope.scope.model.DataSetProcessModel; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/RecordContext.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/RecordContext.java similarity index 82% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/RecordContext.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/RecordContext.java index 44e70f5..88e7e28 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/RecordContext.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/RecordContext.java @@ -1,7 +1,7 @@ -package com.muyu.etl.domain.scope.scope; +package com.muyu.scope.scope; -import com.muyu.etl.domain.scope.scope.model.RecordProcessModel; +import com.muyu.scope.scope.model.RecordProcessModel; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/ScopeContext.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/ScopeContext.java similarity index 78% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/ScopeContext.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/ScopeContext.java index f249fc6..a9dc516 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/ScopeContext.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/ScopeContext.java @@ -1,4 +1,4 @@ -package com.muyu.etl.domain.scope.scope; +package com.muyu.scope.scope; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/TaskContext.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/TaskContext.java similarity index 83% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/TaskContext.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/TaskContext.java index 6d3c5d4..f31cc1e 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/TaskContext.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/TaskContext.java @@ -1,4 +1,4 @@ -package com.muyu.etl.domain.scope.scope; +package com.muyu.scope.scope; /** * @Author: DongZeLiang diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataProcessModel.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/DataProcessModel.java similarity index 69% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataProcessModel.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/DataProcessModel.java index 0dc4986..18dcbd7 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataProcessModel.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/DataProcessModel.java @@ -1,7 +1,7 @@ -package com.muyu.etl.domain.scope.scope.model; +package com.muyu.scope.scope.model; -import com.muyu.etl.domain.scope.model.DataModel; +import com.muyu.scope.model.DataModel; import lombok.Data; /** diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataSetProcessModel.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/DataSetProcessModel.java similarity index 70% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataSetProcessModel.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/DataSetProcessModel.java index 8beec37..581cb03 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/DataSetProcessModel.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/DataSetProcessModel.java @@ -1,7 +1,7 @@ -package com.muyu.etl.domain.scope.scope.model; +package com.muyu.scope.scope.model; -import com.muyu.etl.domain.scope.model.DataSetModel; +import com.muyu.scope.model.DataSetModel; import lombok.Data; /** diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/RecordProcessModel.java b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/RecordProcessModel.java similarity index 73% rename from muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/RecordProcessModel.java rename to muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/RecordProcessModel.java index 9c0aa15..4ac9ba9 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/model/RecordProcessModel.java +++ b/muyu-common/muyu-common-etl-scope/src/main/java/com/muyu/scope/scope/model/RecordProcessModel.java @@ -1,6 +1,6 @@ -package com.muyu.etl.domain.scope.scope.model; +package com.muyu.scope.scope.model; -import com.muyu.etl.domain.scope.model.RecordModel; +import com.muyu.scope.model.RecordModel; import lombok.Data; /** diff --git a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java b/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java index 656f604..24e66b1 100644 --- a/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java +++ b/muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java @@ -1,5 +1,6 @@ package com.muyu.common.redis.service; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; import org.springframework.data.redis.core.HashOperations; @@ -240,4 +241,19 @@ public class RedisService { public Collection keys(final String pattern) { return redisTemplate.keys(pattern); } + + /** + * 存入一个集合 + * @param key + * @param t + * @param + */ + public > void setCacheList(String key, T t) { + redisTemplate.opsForList().leftPush(String.valueOf(key),t); + } + + public long setCacheList(final String key, final T dataList) { + Long count = redisTemplate.opsForList().rightPushAll(key, dataList); + return count == null ? 0 : count; + } } diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml index ca042b2..db7a6b7 100644 --- a/muyu-common/pom.xml +++ b/muyu-common/pom.xml @@ -19,6 +19,7 @@ muyu-common-datasource muyu-common-system muyu-common-cache + muyu-common-etl-scope muyu-common diff --git a/muyu-modules/muyu-etl/muyu-etl-cache/src/main/java/com/muyu/cache/AssetCache.java b/muyu-modules/muyu-etl/muyu-etl-cache/src/main/java/com/muyu/cache/AssetCache.java index acc5bda..77670a1 100644 --- a/muyu-modules/muyu-etl/muyu-etl-cache/src/main/java/com/muyu/cache/AssetCache.java +++ b/muyu-modules/muyu-etl/muyu-etl-cache/src/main/java/com/muyu/cache/AssetCache.java @@ -1,7 +1,9 @@ package com.muyu.cache; import com.muyu.cache.abs.CacheAbs; +import com.muyu.common.redis.service.RedisService; import com.muyu.etl.domain.BasicConfigInfo; +import org.springframework.stereotype.Component; import java.util.List; @@ -11,21 +13,22 @@ import java.util.List; * @Author SaiSai.Liu * @Date 2024/5/14 21:03 */ +@Component public class AssetCache extends CacheAbs> { - @Override - protected List get(String key) { - return null; + + public AssetCache(RedisService redisService) { + super(redisService); } @Override - public String preKey(String key) { - return null; + public String preKey() { + return "etl-cache-"; } @Override public String enCode(String key) { - return "etl-cache:" + key; + return "etl-cache-" + key; } @Override diff --git a/muyu-modules/muyu-etl/muyu-etl-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/muyu-modules/muyu-etl/muyu-etl-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..aa666fc --- /dev/null +++ b/muyu-modules/muyu-etl/muyu-etl-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.cache.AssetCache diff --git a/muyu-modules/muyu-etl/muyu-etl-client/pom.xml b/muyu-modules/muyu-etl/muyu-etl-client/pom.xml index a51f6e4..fd081c3 100644 --- a/muyu-modules/muyu-etl/muyu-etl-client/pom.xml +++ b/muyu-modules/muyu-etl/muyu-etl-client/pom.xml @@ -78,12 +78,6 @@ muyu-common-datascope - - - - - - com.muyu @@ -96,7 +90,10 @@ 3.6.3 - + + com.muyu + muyu-etl-cache + diff --git a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/AssetClientRunner.java b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/AssetClientRunner.java index 242d990..c801650 100644 --- a/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/AssetClientRunner.java +++ b/muyu-modules/muyu-etl/muyu-etl-client/src/main/java/com/muyu/etl/AssetClientRunner.java @@ -1,9 +1,11 @@ package com.muyu.etl; import com.alibaba.druid.pool.DruidPooledConnection; +import com.muyu.cache.AssetCache; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.redis.service.RedisService; import com.muyu.etl.domain.BasicConfigInfo; import com.muyu.etl.util.factory.DruidUtilsFactory; import com.muyu.etl.util.service.ConnectionPoolFactory; @@ -31,6 +33,8 @@ public class AssetClientRunner implements ApplicationRunner { private RemoteAssetService remoteAssetService; @Autowired private ConnectionPoolFactory connectionPoolFactory; + @Autowired + private RedisService redisService; @Override public void run(ApplicationArguments args) throws ServletException { @@ -38,12 +42,17 @@ public class AssetClientRunner implements ApplicationRunner { setIsTest("1"); }}; Result> result = remoteAssetService.list(basicConfigInfoSel, SecurityConstants.INNER); + AssetCache assetCache = new AssetCache(redisService); + List> basicConfigInfos = assetCache.get(assetCache.preKey()+"basic"); + System.out.println(basicConfigInfos.get(0)); + log.info("basicInfoList::{}",basicConfigInfos.get(0)); log.info("初始话内容为{}", result); - List rows = result.getData().getRows(); - if (rows.isEmpty()) throw new ServletException("初始化调用失败，无数据"); - log.info(rows); +// List rows = result.getData().getRows(); + if (basicConfigInfos.get(0).isEmpty()) throw new ServletException("初始化调用失败，无数据"); +// if (rows.isEmpty()) throw new ServletException("初始化调用失败，无数据"); +// log.info(rows); int a = 0; - for (BasicConfigInfo basicConfigInfo : rows) { + for (BasicConfigInfo basicConfigInfo : basicConfigInfos.get(0)) { a++; log.info("a:{}", a); log.warn("接入信息：{}", basicConfigInfo); diff --git a/muyu-modules/muyu-etl/muyu-etl-common/pom.xml b/muyu-modules/muyu-etl/muyu-etl-common/pom.xml index c1290a1..58b7a1e 100644 --- a/muyu-modules/muyu-etl/muyu-etl-common/pom.xml +++ b/muyu-modules/muyu-etl/muyu-etl-common/pom.xml @@ -31,6 +31,8 @@ mysql mysql-connector-java + 8.0.24 + @@ -39,11 +41,5 @@ 1.2.8 - - com.muyu - muyu-common-cache - - - diff --git a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/test/Engine_custom_email_test.java b/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/test/Engine_custom_email_test.java deleted file mode 100644 index 658527f..0000000 --- a/muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/test/Engine_custom_email_test.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.etl.domain.scope.test; - -import com.muyu.etl.domain.scope.engine.action.ActionDiscard; -import com.muyu.etl.domain.scope.engine.scope.DataModelEngine; - -/** - * @Author: Saisai - * @date: 2024/4/3 - * @Description: 测试-test - * @Version: 1.0 - */ - public class Engine_custom_email_test extends DataModelEngine { - @Override - public void execution () { - Object value = getValue(); - - if (value == null || "".equals(value) || "null".equals(value)) { - throw new ActionDiscard(); - } - } - } - diff --git a/muyu-modules/muyu-etl/muyu-etl-service/pom.xml b/muyu-modules/muyu-etl/muyu-etl-service/pom.xml index 7ea09bf..90ce67b 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/pom.xml +++ b/muyu-modules/muyu-etl/muyu-etl-service/pom.xml @@ -109,6 +109,17 @@ 2.9.10 + + com.muyu + muyu-etl-cache + + + com.muyu + muyu-common-etl-scope + 3.6.3 + compile + + diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/EtlApplicationRunner.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/EtlApplicationRunner.java index ede69b7..b3a2279 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/EtlApplicationRunner.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/EtlApplicationRunner.java @@ -1,5 +1,7 @@ package com.muyu; +import com.muyu.cache.AssetCache; +import com.muyu.common.redis.service.RedisService; import com.muyu.etl.domain.BasicConfigInfo; import com.muyu.etl.service.BasicConfigInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -20,11 +22,17 @@ public class EtlApplicationRunner implements ApplicationRunner { @Autowired private BasicConfigInfoService basicConfigInfoService; + @Autowired + private RedisService redisService; + @Override public void run(ApplicationArguments args) throws Exception { List basicConfigInfos = basicConfigInfoService.selectBasicConfigInfoList(new BasicConfigInfo() {{ setIsTest("1"); }}); +// AssetCache assetCache = new AssetCache(); + AssetCache assetCache = new AssetCache(redisService); + assetCache.put("basic", basicConfigInfos); } } diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java index c2ea022..3a62215 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java @@ -43,9 +43,11 @@ public class BasicConfigInfoController extends BaseController { /** * 查询基础信息列表 */ -// @RequiresPermissions("etl:info:list") + @RequiresPermissions("etl:info:list") @PostMapping("/list") public Result> list(@RequestBody BasicConfigInfo basicConfigInfo) { + ThreadLocal local = new ThreadLocal<>(); + local.set("啊啊手动阀手动阀"); startPage(); List list = basicConfigInfoService.selectBasicConfigInfoList(basicConfigInfo); return getDataTable(list); diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetImpowerServiceImpl.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetImpowerServiceImpl.java index d8f78f3..d30c9f7 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetImpowerServiceImpl.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/AssetImpowerServiceImpl.java @@ -69,7 +69,6 @@ public class AssetImpowerServiceImpl extends ServiceImpl deptList = remoteUserService.list(new SysDept(), SecurityConstants.INNER).getData(); - System.out.println(remoteUserService.list(new SysDept(), SecurityConstants.INNER)); //单表单个用户赋权 if (assetImpower.getTableId() != null && assetImpower.getUserId() != null) { rows.add(assetImpower); diff --git a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java index 82b1c49..89800af 100644 --- a/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java +++ b/muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java @@ -11,18 +11,15 @@ import com.muyu.etl.domain.Structure; import com.muyu.etl.domain.TableInfo; import com.muyu.etl.domain.req.TableInfoScopeReq; import com.muyu.etl.domain.resp.BasicTableInfoResp; -import com.muyu.etl.domain.resp.StructureValueResp; import com.muyu.etl.domain.resp.TableInfoStructureResp; import com.muyu.etl.domain.resp.TableTreeResp; -import com.muyu.etl.domain.scope.model.DataModel; -import com.muyu.etl.domain.scope.model.DataSetModel; -import com.muyu.etl.domain.scope.model.RecordModel; -import com.muyu.etl.domain.scope.scope.DataModelContext; -import com.muyu.etl.domain.scope.scope.model.RecordProcessModel; import com.muyu.etl.mapper.BasicConfigInfoMapper; import com.muyu.etl.service.BasicConfigInfoService; import com.muyu.etl.service.StructureService; import com.muyu.etl.service.TableInfoService; +import com.muyu.scope.model.DataModel; +import com.muyu.scope.model.DataSetModel; +import com.muyu.scope.model.RecordModel; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +35,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.stream.Collectors; +import static org.apache.ibatis.ognl.Ognl.setValue; + /** * Service业务层处理 * @@ -444,7 +443,7 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl getList(TableInfoScopeReq tableInfoScopeReq, List structureList, int last,int num) { + public List getList(TableInfoScopeReq tableInfoScopeReq, List structureList, int last, int num) { List list = new ArrayList<>(); BasicConfigInfo basicConfigInfo = this.selectBasicConfigInfoById(tableInfoScopeReq.getBasicId()); try { diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml index b181813..5e0162c 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/pom.xml @@ -102,6 +102,12 @@ classgraph 4.1.7 + + com.muyu + muyu-common-etl-scope + 3.6.3 + compile + diff --git a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/test/custom/engine_custom_PhotoTest_DATARULE.java b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/test/custom/engine_custom_PhotoTest_DATARULE.java index ec952ec..4171587 100644 --- a/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/test/custom/engine_custom_PhotoTest_DATARULE.java +++ b/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/test/custom/engine_custom_PhotoTest_DATARULE.java @@ -1,7 +1,8 @@ package com.muyu.engine.domain.test.custom; -import com.muyu.etl.domain.scope.engine.action.ActionDiscard; -import com.muyu.etl.domain.scope.engine.scope.DataModelEngine; + +import com.muyu.scope.engine.action.ActionDiscard; +import com.muyu.scope.engine.scope.DataModelEngine; /** * @Author: Saisai diff --git a/muyu-modules/muyu-unit/muyu-unit-common/pom.xml b/muyu-modules/muyu-unit/muyu-unit-common/pom.xml index 6a89e9c..6ceac41 100644 --- a/muyu-modules/muyu-unit/muyu-unit-common/pom.xml +++ b/muyu-modules/muyu-unit/muyu-unit-common/pom.xml @@ -21,10 +21,12 @@ com.muyu muyu-etl-client + 3.6.3 com.muyu muyu-ruleEngine-client + 3.6.3 diff --git a/muyu-modules/muyu-unit/muyu-unit-service/pom.xml b/muyu-modules/muyu-unit/muyu-unit-service/pom.xml index 87646fd..b370e21 100644 --- a/muyu-modules/muyu-unit/muyu-unit-service/pom.xml +++ b/muyu-modules/muyu-unit/muyu-unit-service/pom.xml @@ -20,14 +20,7 @@ com.muyu - muyu-etl-client - 3.6.3 - - - - com.muyu - muyu-ruleEngine-client - 3.6.3 + muyu-unit-common @@ -85,11 +78,6 @@ muyu-common-log - - - com.muyu - muyu-common-swagger - com.muyu diff --git a/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/controller/UnitController.java b/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/controller/UnitController.java new file mode 100644 index 0000000..cde80b4 --- /dev/null +++ b/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/controller/UnitController.java @@ -0,0 +1,31 @@ +package com.muyu.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.domain.TableInfo; +import com.muyu.service.UnitService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @ClassName UnitController + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/5/15 22:08 + */ +@RestController +@RequestMapping("/unit/") +public class UnitController { + @Autowired + private UnitService unitService; + + @PostMapping("/getTableInfo") + public Result> getTableInfoList(@RequestBody BasicConfigInfo basicConfigInfo) { + return Result.success(unitService.getTableInfoList(basicConfigInfo)); + } +} diff --git a/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/service/UnitService.java b/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/service/UnitService.java new file mode 100644 index 0000000..e3e054c --- /dev/null +++ b/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/service/UnitService.java @@ -0,0 +1,17 @@ +package com.muyu.service; + +import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.domain.TableInfo; + +import javax.servlet.ServletException; +import java.util.List; + +/** + * @ClassName UnitService + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/5/15 22:10 + */ +public interface UnitService { + List getTableInfoList(BasicConfigInfo basicConfigInfo) ; +} diff --git a/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/service/impl/UnitServiceImpl.java b/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/service/impl/UnitServiceImpl.java new file mode 100644 index 0000000..2b1e86f --- /dev/null +++ b/muyu-modules/muyu-unit/muyu-unit-service/src/main/java/com/muyu/service/impl/UnitServiceImpl.java @@ -0,0 +1,56 @@ +package com.muyu.service.impl; + +import com.muyu.etl.domain.BasicConfigInfo; +import com.muyu.etl.domain.TableInfo; +import com.muyu.etl.util.factory.DruidUtilsFactory; +import com.muyu.etl.util.service.ConnectionPoolFactory; +import com.muyu.service.UnitService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.servlet.ServletException; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +/** + * @ClassName UnitServiceImpl + * @Description 描述 + * @Author SaiSai.Liu + * @Date 2024/5/15 22:10 + */ +@Service +public class UnitServiceImpl implements UnitService { + + @Autowired + private DruidUtilsFactory druidUtilsFactory; + private HashMap basicConfigInfoHashMap = new HashMap<>(); + @Override + public List getTableInfoList(BasicConfigInfo basicConfigInfo) { + Connection connection = druidUtilsFactory.getConnection(basicConfigInfo); + if (connection == null) { + try { + throw new ServletException("获取连接失败"); + } catch (ServletException e) { + throw new RuntimeException(e); + } + } + try { + DatabaseMetaData metaData = connection.getMetaData(); + ResultSet tables = metaData.getTables(basicConfigInfo.getDatabaseName(), null, + "%", new String[]{"TABLE", "VIEW"}); + ArrayList tableInfos = new ArrayList<>(); + while (tables.next()){ + + } + + } catch (SQLException e) { + throw new RuntimeException(e); + } + return null; + } +} diff --git a/pom.xml b/pom.xml index 45e9c15..f63ec33 100644 --- a/pom.xml +++ b/pom.xml @@ -213,6 +213,13 @@ ${muyu.version} + + + com.muyu + muyu-common-cache + ${muyu.version} + + com.muyu @@ -234,6 +241,13 @@ ${muyu.version} + + + com.muyu + muyu-etl-cache + ${muyu.version} + +