From c6dab25cada6b493232cb633462332adca104a04 Mon Sep 17 00:00:00 2001
From: Saisai Liu <1374434128@qq.com>
Date: Tue, 14 May 2024 22:14:03 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
muyu-common/muyu-common-cache/pom.xml | 2 +-
.../java/com/muyu/cache/abs/CacheAbs.java | 45 +++++++++++++++
.../main/java/com/muyu/cache/redis/Cache.java | 18 ++++++
.../java/com/muyu/cache/redis/RedisCache.java | 20 -------
.../common/redis/service/RedisService.java | 55 +++++++------------
muyu-modules/muyu-etl/muyu-etl-cache/pom.xml | 30 ++++++++++
.../main/java/com/muyu/cache/AssetCache.java | 35 ++++++++++++
muyu-modules/muyu-etl/muyu-etl-common/pom.xml | 9 +++
.../com/muyu/etl/domain/cache/AssetCache.java | 15 +++++
.../etl/domain/scope/model/DataSetModel.java | 15 +++--
.../etl/domain/scope/model/RecordModel.java | 18 ++++--
.../domain/scope/scope/DataModelContext.java | 2 +-
.../java/com/muyu/EtlApplicationRunner.java | 30 ++++++++++
.../impl/BasicConfigInfoServiceImpl.java | 10 +---
muyu-modules/muyu-etl/pom.xml | 1 +
.../engine_custom_PhotoTest_DATARULE.java | 21 +++++++
.../impl/RuleEngineVersionServiceImpl.java | 35 +++++++++++-
pom.xml | 7 +++
18 files changed, 289 insertions(+), 79 deletions(-)
create mode 100644 muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java
create mode 100644 muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/Cache.java
delete mode 100644 muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java
create mode 100644 muyu-modules/muyu-etl/muyu-etl-cache/pom.xml
create mode 100644 muyu-modules/muyu-etl/muyu-etl-cache/src/main/java/com/muyu/cache/AssetCache.java
create mode 100644 muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/cache/AssetCache.java
create mode 100644 muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/EtlApplicationRunner.java
create mode 100644 muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/test/custom/engine_custom_PhotoTest_DATARULE.java
diff --git a/muyu-common/muyu-common-cache/pom.xml b/muyu-common/muyu-common-cache/pom.xml
index b3bc591..0f84556 100644
--- a/muyu-common/muyu-common-cache/pom.xml
+++ b/muyu-common/muyu-common-cache/pom.xml
@@ -22,7 +22,7 @@
com.muyu
- muyu-common-security
+ muyu-common-redis
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
new file mode 100644
index 0000000..64cb350
--- /dev/null
+++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/abs/CacheAbs.java
@@ -0,0 +1,45 @@
+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;
+
+/**
+ * @ClassName CacheAbs
+ * @Description 描述
+ * @Author SaiSai.Liu
+ * @Date 2024/5/14 17:05
+ */
+public abstract class CacheAbs implements Cache {
+ @Resource
+ private RedisService redisService;
+
+
+ /**
+ * 根据key获取值
+ * @param key
+ * @return
+ */
+ protected abstract V get(K key);
+
+ /**
+ * 存入值
+ * @param k
+ * @param v
+ */
+ void put(K k, V v) {
+ String key = enCode(k);
+ redisService.setCacheObject(key, JSON.toJSONString(v));
+ }
+
+ /**
+ * 删除值
+ * @param 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
new file mode 100644
index 0000000..4b31c05
--- /dev/null
+++ b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/Cache.java
@@ -0,0 +1,18 @@
+package com.muyu.cache.redis;
+
+/**
+ * @ClassName Cache
+ * @Description 描述
+ * @Author SaiSai.Liu
+ * @Date 2024/5/10 19:01
+ */
+public interface Cache {
+
+
+ String preKey(K key);
+
+ String enCode(K key);
+
+ String unCode(String string);
+
+}
diff --git a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java b/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java
deleted file mode 100644
index 953dbd7..0000000
--- a/muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.muyu.cache.redis;
-
-/**
- * @ClassName RedisCache
- * @Description 描述
- * @Author SaiSai.Liu
- * @Date 2024/5/10 19:01
- */
-public interface RedisCache {
- K getKey(T t);
-
- V get(K key);
-
- void put(K k ,V v);
-
- void remove(K k);
-
-
-
-}
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 db90c1e..656f604 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
@@ -27,7 +27,7 @@ public class RedisService {
* @param key 缓存的键值
* @param value 缓存的值
*/
- public void setCacheObject (final String key, final T value) {
+ public void setCacheObject(final String key, final T value) {
redisTemplate.opsForValue().set(key, value);
}
@@ -39,7 +39,7 @@ public class RedisService {
* @param timeout 时间
* @param timeUnit 时间颗粒度
*/
- public void setCacheObject (final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
+ public void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
}
@@ -48,10 +48,9 @@ public class RedisService {
*
* @param key Redis键
* @param timeout 超时时间
- *
* @return true=设置成功;false=设置失败
*/
- public boolean expire (final String key, final long timeout) {
+ public boolean expire(final String key, final long timeout) {
return expire(key, timeout, TimeUnit.SECONDS);
}
@@ -61,10 +60,9 @@ public class RedisService {
* @param key Redis键
* @param timeout 超时时间
* @param unit 时间单位
- *
* @return true=设置成功;false=设置失败
*/
- public boolean expire (final String key, final long timeout, final TimeUnit unit) {
+ public boolean expire(final String key, final long timeout, final TimeUnit unit) {
return redisTemplate.expire(key, timeout, unit);
}
@@ -72,10 +70,9 @@ public class RedisService {
* 获取有效时间
*
* @param key Redis键
- *
* @return 有效时间
*/
- public long getExpire (final String key) {
+ public long getExpire(final String key) {
return redisTemplate.getExpire(key);
}
@@ -83,10 +80,9 @@ public class RedisService {
* 判断 key是否存在
*
* @param key 键
- *
* @return true 存在 false不存在
*/
- public Boolean hasKey (String key) {
+ public Boolean hasKey(String key) {
return redisTemplate.hasKey(key);
}
@@ -94,10 +90,9 @@ public class RedisService {
* 获得缓存的基本对象。
*
* @param key 缓存键值
- *
* @return 缓存键值对应的数据
*/
- public T getCacheObject (final String key) {
+ public T getCacheObject(final String key) {
ValueOperations operation = redisTemplate.opsForValue();
return operation.get(key);
}
@@ -107,7 +102,7 @@ public class RedisService {
*
* @param key
*/
- public boolean deleteObject (final String key) {
+ public boolean deleteObject(final String key) {
return redisTemplate.delete(key);
}
@@ -115,10 +110,9 @@ public class RedisService {
* 删除集合对象
*
* @param collection 多个对象
- *
* @return
*/
- public boolean deleteObject (final Collection collection) {
+ public boolean deleteObject(final Collection collection) {
return redisTemplate.delete(collection) > 0;
}
@@ -127,10 +121,9 @@ public class RedisService {
*
* @param key 缓存的键值
* @param dataList 待缓存的List数据
- *
* @return 缓存的对象
*/
- public long setCacheList (final String key, final List dataList) {
+ public long setCacheList(final String key, final List dataList) {
Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
return count == null ? 0 : count;
}
@@ -139,10 +132,9 @@ public class RedisService {
* 获得缓存的list对象
*
* @param key 缓存的键值
- *
* @return 缓存键值对应的数据
*/
- public List getCacheList (final String key) {
+ public List getCacheList(final String key) {
return redisTemplate.opsForList().range(key, 0, -1);
}
@@ -151,10 +143,9 @@ public class RedisService {
*
* @param key 缓存键值
* @param dataSet 缓存的数据
- *
* @return 缓存数据的对象
*/
- public BoundSetOperations setCacheSet (final String key, final Set dataSet) {
+ public BoundSetOperations setCacheSet(final String key, final Set dataSet) {
BoundSetOperations setOperation = redisTemplate.boundSetOps(key);
Iterator it = dataSet.iterator();
while (it.hasNext()) {
@@ -167,10 +158,9 @@ public class RedisService {
* 获得缓存的set
*
* @param key
- *
* @return
*/
- public Set getCacheSet (final String key) {
+ public Set getCacheSet(final String key) {
return redisTemplate.opsForSet().members(key);
}
@@ -180,7 +170,7 @@ public class RedisService {
* @param key
* @param dataMap
*/
- public void setCacheMap (final String key, final Map dataMap) {
+ public void setCacheMap(final String key, final Map dataMap) {
if (dataMap != null) {
redisTemplate.opsForHash().putAll(key, dataMap);
}
@@ -190,10 +180,9 @@ public class RedisService {
* 获得缓存的Map
*
* @param key
- *
* @return
*/
- public Map getCacheMap (final String key) {
+ public Map getCacheMap(final String key) {
return redisTemplate.opsForHash().entries(key);
}
@@ -204,7 +193,7 @@ public class RedisService {
* @param hKey Hash键
* @param value 值
*/
- public void setCacheMapValue (final String key, final String hKey, final T value) {
+ public void setCacheMapValue(final String key, final String hKey, final T value) {
redisTemplate.opsForHash().put(key, hKey, value);
}
@@ -213,10 +202,9 @@ public class RedisService {
*
* @param key Redis键
* @param hKey Hash键
- *
* @return Hash中的对象
*/
- public T getCacheMapValue (final String key, final String hKey) {
+ public T getCacheMapValue(final String key, final String hKey) {
HashOperations opsForHash = redisTemplate.opsForHash();
return opsForHash.get(key, hKey);
}
@@ -226,10 +214,9 @@ public class RedisService {
*
* @param key Redis键
* @param hKeys Hash键集合
- *
* @return Hash对象集合
*/
- public List getMultiCacheMapValue (final String key, final Collection