feat():添加缓存，修改远程的调用无权限bug

muyu-common/muyu-common-cache/pom.xml

@@ -22,7 +22,7 @@
         <!-- MuYu Common Security -->
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>muyu-common-security</artifactId>
+            <artifactId>muyu-common-redis</artifactId>
         </dependency>
     </dependencies>
 

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<K,V> implements Cache<K> {
+    @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));
+     };
+}

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<K> {
+
+
+    String preKey(K key);
+
+    String enCode(K key);
+
+    String unCode(String string);
+
+}

muyu-common/muyu-common-cache/src/main/java/com/muyu/cache/redis/RedisCache.java

@@ -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,V,T> {
-    K getKey(T t);
-
-    V get(K key);
-
-    void put(K k ,V v);
-
-    void remove(K k);
-
-
-
-}

muyu-common/muyu-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java

@@ -48,7 +48,6 @@ public class RedisService {
      *
      * @param key     Redis键
      * @param timeout 超时时间
-     *
      * @return true=设置成功；false=设置失败
      */
     public boolean expire(final String key, final long timeout) {
@@ -61,7 +60,6 @@ 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) {
@@ -72,7 +70,6 @@ public class RedisService {
      * 获取有效时间
      *
      * @param key Redis键
-     *
      * @return 有效时间
      */
     public long getExpire(final String key) {
@@ -83,7 +80,6 @@ public class RedisService {
      * 判断 key是否存在
      *
      * @param key 键
-     *
      * @return true 存在 false不存在
      */
     public Boolean hasKey(String key) {
@@ -94,7 +90,6 @@ public class RedisService {
      * 获得缓存的基本对象。
      *
      * @param key 缓存键值
-     *
      * @return 缓存键值对应的数据
      */
     public <T> T getCacheObject(final String key) {
@@ -115,7 +110,6 @@ public class RedisService {
      * 删除集合对象
      *
      * @param collection 多个对象
-     *
      * @return
      */
     public boolean deleteObject(final Collection collection) {
@@ -127,7 +121,6 @@ public class RedisService {
      *
      * @param key      缓存的键值
      * @param dataList 待缓存的List数据
-     *
      * @return 缓存的对象
      */
     public <T> long setCacheList(final String key, final List<T> dataList) {
@@ -139,7 +132,6 @@ public class RedisService {
      * 获得缓存的list对象
      *
      * @param key 缓存的键值
-     *
      * @return 缓存键值对应的数据
      */
     public <T> List<T> getCacheList(final String key) {
@@ -151,7 +143,6 @@ public class RedisService {
      *
      * @param key     缓存键值
      * @param dataSet 缓存的数据
-     *
      * @return 缓存数据的对象
      */
     public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
@@ -167,7 +158,6 @@ public class RedisService {
      * 获得缓存的set
      *
      * @param key
-     *
      * @return
      */
     public <T> Set<T> getCacheSet(final String key) {
@@ -190,7 +180,6 @@ public class RedisService {
      * 获得缓存的Map
      *
      * @param key
-     *
      * @return
      */
     public <T> Map<String, T> getCacheMap(final String key) {
@@ -213,7 +202,6 @@ public class RedisService {
      *
      * @param key  Redis键
      * @param hKey Hash键
-     *
      * @return Hash中的对象
      */
     public <T> T getCacheMapValue(final String key, final String hKey) {
@@ -226,7 +214,6 @@ public class RedisService {
      *
      * @param key   Redis键
      * @param hKeys Hash键集合
-     *
      * @return Hash对象集合
      */
     public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
@@ -238,7 +225,6 @@ public class RedisService {
      *
      * @param key  Redis键
      * @param hKey Hash键
-     *
      * @return 是否成功
      */
     public boolean deleteCacheMapValue(final String key, final String hKey) {
@@ -249,7 +235,6 @@ public class RedisService {
      * 获得缓存的基本对象列表
      *
      * @param pattern 字符串前缀
-     *
      * @return 对象列表
      */
     public Collection<String> keys(final String pattern) {

muyu-modules/muyu-etl/muyu-etl-cache/pom.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>muyu-etl</artifactId>
+        <version>3.6.3</version>
+    </parent>
+
+    <artifactId>muyu-etl-cache</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-etl-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-cache</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

muyu-modules/muyu-etl/muyu-etl-cache/src/main/java/com/muyu/cache/AssetCache.java

@@ -0,0 +1,35 @@
+package com.muyu.cache;
+
+import com.muyu.cache.abs.CacheAbs;
+import com.muyu.etl.domain.BasicConfigInfo;
+
+import java.util.List;
+
+/**
+ * @ClassName AssetCache
+ * @Description 描述
+ * @Author SaiSai.Liu
+ * @Date 2024/5/14 21:03
+ */
+public class AssetCache extends CacheAbs<String, List<BasicConfigInfo>> {
+
+    @Override
+    protected List<BasicConfigInfo> get(String key) {
+        return null;
+    }
+
+    @Override
+    public String preKey(String key) {
+        return null;
+    }
+
+    @Override
+    public String enCode(String key) {
+        return "etl-cache:" + key;
+    }
+
+    @Override
+    public String unCode(String string) {
+        return null;
+    }
+}

muyu-modules/muyu-etl/muyu-etl-common/pom.xml

@@ -22,19 +22,28 @@
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.muyu</groupId>
             <artifactId>muyu-common-security</artifactId>
         </dependency>
+
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
             <version>1.2.8</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>muyu-common-cache</artifactId>
+        </dependency>
+
+
     </dependencies>
 </project>

muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/cache/AssetCache.java

@@ -0,0 +1,15 @@
+//package com.muyu.etl.domain.cache;
+//
+////import com.muyu.etl.domain.BasicConfigInfo;
+//
+//import com.muyu.etl.domain.BasicConfigInfo;
+//
+///**
+// * @ClassName AssetCache
+// * @Description 描述
+// * @Author SaiSai.Liu
+// * @Date 2024/5/14 21:03
+// */
+//public class AssetCache extends CacheAbs<String, BasicConfigInfo>{
+//}
+////

muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/DataSetModel.java

@@ -3,6 +3,8 @@ package com.muyu.etl.domain.scope.model;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 一页
@@ -12,24 +14,25 @@ import java.io.Serializable;
  * @Version: 1.0
  */
 @Data
-public class DataSetModel implements Serializable {
+public class DataSetModel {
 
     // [[DataModel,DataModel,DataModel],[DataModel,DataModel,DataModel]]
 
-    private RecordModel[] recordModelArr = null;
+    private List<RecordModel> recordModelArr = null;
 
     private DataSetModel(int recordModelLength){
-        recordModelArr = new RecordModel[recordModelLength];
+        recordModelArr = new ArrayList<RecordModel>();
     }
-    private DataSetModel(RecordModel[] recordModelArr){
+
-        recordModelArr = recordModelArr;
+    private DataSetModel(List<RecordModel> recordModelArr){
+        this.recordModelArr = recordModelArr;
     }
 
     public static DataSetModel build(int recordModelLength){
         return new DataSetModel(recordModelLength);
     }
 
-    public static DataSetModel build(RecordModel[] recordModelArr){
+    public static DataSetModel build(List<RecordModel> recordModelArr){
         return new DataSetModel(recordModelArr);
     }
 

muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/model/RecordModel.java

@@ -1,5 +1,10 @@
 package com.muyu.etl.domain.scope.model;
 
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 记录模型
  * @Author: DongZeLiang
@@ -7,23 +12,24 @@ package com.muyu.etl.domain.scope.model;
  * @Description: 记录模型
  * @Version: 1.0
  */
+@Data
 public class RecordModel {
     // [DataModel,DataModel,DataModel]
 
+    private List<DataModel> dataModelArr = null;
     private RecordModel(int dataModelLength){
-        dataModelArr = new DataModel[dataModelLength];
+        dataModelArr = new ArrayList<>();
-    }
-    private RecordModel(DataModel[] dataModelArr){
-        dataModelArr = dataModelArr;
     }
 
-    private DataModel[] dataModelArr = null;
+    private RecordModel(List<DataModel> dataModelArr){
+        this.dataModelArr = dataModelArr;
+    }
 
     public static RecordModel build(int dataModelLength){
         return new RecordModel(dataModelLength);
     }
 
-    public static RecordModel build(DataModel[] dataModelArr){
+    public static RecordModel build(List<DataModel> dataModelArr){
         return new RecordModel(dataModelArr);
     }
 }

muyu-modules/muyu-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/scope/scope/DataModelContext.java

@@ -4,7 +4,7 @@ package com.muyu.etl.domain.scope.scope;
 import com.muyu.etl.domain.scope.scope.model.DataProcessModel;
 
 /**
- * @Author: DongZeLiang
+ * @Author: Saisai.Liu
  * @date: 2024/4/29
  * @Description: 数据模型
  * @Version: 1.0

muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/EtlApplicationRunner.java

@@ -0,0 +1,30 @@
+package com.muyu;
+
+import com.muyu.etl.domain.BasicConfigInfo;
+import com.muyu.etl.service.BasicConfigInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ClassName EtlApplicationRunner
+ * @Description 描述
+ * @Author SaiSai.Liu
+ * @Date 2024/5/14 20:54
+ */
+@Component
+public class EtlApplicationRunner implements ApplicationRunner {
+    @Autowired
+    private BasicConfigInfoService basicConfigInfoService;
+
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        List<BasicConfigInfo> basicConfigInfos = basicConfigInfoService.selectBasicConfigInfoList(new BasicConfigInfo() {{
+            setIsTest("1");
+        }});
+    }
+}

muyu-modules/muyu-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java

@@ -18,6 +18,7 @@ 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;
@@ -467,20 +468,15 @@ public class BasicConfigInfoServiceImpl extends ServiceImpl<BasicConfigInfoMappe
                             setSourceType(structureList.get(finalI).getColumnType());
                             setSourceType(structureList.get(finalI).getJavaType());
                         }};
-                        log.info("对象{}",dataModel);
                         dataModelList.add(dataModel);
-
                     }
                     // 记录模型
-                    RecordModel recordModel = RecordModel.build(dataModelList.toArray(new DataModel[structureList.size()]));
+                    RecordModel recordModel = RecordModel.build(dataModelList);
                     recordModelList.add(recordModel);
-                    log.info("recordModelList数据：{}", recordModelList);
                 }
-
                 // 页数据
-                DataSetModel build = DataSetModel.build(recordModelList.toArray(new RecordModel[num]));
+                DataSetModel build = DataSetModel.build(recordModelList);
                 list.add(build);
-                log.info("list数据：{}", list);
             }
         } catch (SQLException e) {
             throw new RuntimeException(e);

muyu-modules/muyu-etl/pom.xml

@@ -16,6 +16,7 @@
         <module>muyu-etl-remote</module>
         <module>muyu-etl-service</module>
         <module>muyu-etl-client</module>
+        <module>muyu-etl-cache</module>
     </modules>
 
     <properties>

muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/domain/test/custom/engine_custom_PhotoTest_DATARULE.java

@@ -0,0 +1,21 @@
+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;
+
+/**
+         * @Author: Saisai
+         * @date: 2024/4/5
+         * @Description: 数据字段-DATARULE
+         * @Version: 1.0
+         */
+        public class engine_custom_PhotoTest_DATARULE extends DataModelEngine {
+            @Override
+            public void execution () {
+                Object value = getValue();
+
+                if (value == null || "".equals(value) || "null".equals(value)) {
+                    throw new ActionDiscard();
+                }
+            }
+        }

muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/com/muyu/engine/service/impl/RuleEngineVersionServiceImpl.java

@@ -132,7 +132,7 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl<RuleEngineVersionM
             File file = new File("D:/ruoyi/FinallyTest/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/" + path + "/" + fileName + ".java");
             File fileMenu = new File("D:/ruoyi/FinallyTest/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/" + path );
             if (!file.exists()) {
-                //不存在创建
+                //不存在创建目录和文件
                 fileMenu.mkdirs();
                 file.createNewFile();
             } else {
@@ -165,6 +165,35 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl<RuleEngineVersionM
     }
 
 
+    /**
+     * 测试资产接入传来的数据信息
+     * @return
+     */
+    public boolean testAssetEngine(String codeIng,Object obj){
+        String path = codeIng.substring(codeIng.indexOf("com"),codeIng.indexOf(";")).replaceAll("/.","/").trim();
+        String fileName = codeIng.substring(codeIng.indexOf("class")+6, codeIng.indexOf("{")).trim();
+        String name = path+"."+fileName;
+        String javaPackageName = name.replace(".",File.separator)+".java";
+        String javaAbsolutePath = "D:/ruoyi/FinallyTest/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/" + javaPackageName;
+        String jarAbsolutePath = "D:/ruoyi/FinallyTest/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/target/classes/com/muyu/engine/scope/test";
+        try {
+            Process process = Runtime.getRuntime().exec("javac -classpath "+ jarAbsolutePath + " " + javaAbsolutePath);
+            int i = process.waitFor();
+            //创建类加载器
+            ClassLoader classLoader = ReflectionUtils.class.getClassLoader();
+            Class<?> aClass = classLoader.loadClass(name);
+            Object o = aClass.newInstance();
+            Method[] methods = aClass.getMethods();
+            for (Method method : methods) {
+                method.invoke(0,obj);
+            }
+        } catch (Exception e) {
+            log.error("报错信息：{}",e.getMessage());
+            throw new RuntimeException(e);
+        }
+        return true;
+    }
+
     /**
      * 测试引擎版本
      *
@@ -178,8 +207,8 @@ public class RuleEngineVersionServiceImpl extends ServiceImpl<RuleEngineVersionM
         String fileName = codeIng.substring(codeIng.indexOf("class") + 6, codeIng.indexOf("{")).trim();
         String name = path + "." + fileName;
         String javaPackageName = name.replace(".", File.separator) + ".java";
-        String javaAbsolutePath = "D:/ruoyi/FinallyTest/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-redis/src/main/java/" + javaPackageName;
+        String javaAbsolutePath = "D:/ruoyi/FinallyTest/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/src/main/java/" + javaPackageName;
-        String jarAbsolutePath = "D:/ruoyi/FinallyTest/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-redis/target/classes/com/muyu/engine/scope/test";
+        String jarAbsolutePath = "D:/ruoyi/FinallyTest/muyu-modules/muyu-ruleEngine/muyu-ruleEngine-service/target/classes/com/muyu/engine/scope/test";
         Process process = Runtime.getRuntime().exec("javac -classpath " + jarAbsolutePath + " " + javaAbsolutePath);
         try {
             int exitVal = process.waitFor();

pom.xml

@@ -185,6 +185,13 @@
                 <version>${muyu.version}</version>
             </dependency>
 
+            <!-- 缓存 -->
+            <dependency>
+                <groupId>com.muyu</groupId>
+                <artifactId>muyu-common-cache</artifactId>
+                <version>${muyu.version}</version>
+            </dependency>
+
             <!-- 日志记录 -->
             <dependency>
                 <groupId>com.muyu</groupId>