Merge remote-tracking branch 'origin/master'

.idea/encodings.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$/mainFactory/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+    <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>

mainFactory/src/main/java/org/bfkj/MainFactoryApplication.java

@@ -240,8 +240,6 @@ public class MainFactoryApplication implements InitializingBean {
         Runtime.getRuntime().gc();
     }
 
-    private MyDbHelper logDbHelper;
-
     /*1每2秒执行一次 日志的批量插入*/
     @Scheduled(cron = "*/2 * * * * *")
     public void batchLog() {
@@ -262,16 +260,12 @@ public class MainFactoryApplication implements InitializingBean {
             logErrorList.addAll(logErrorMap.get(currentTime));
             logErrorMap.remove(currentTime);
         }
-        if (Objects.isNull(logDbHelper)) {
-            logDbHelper = new MyDbHelper(AppConfig.REMOTE_DB_LOG_CONNECT);//获取底座数据库对象
-            if (Objects.nonNull(logDbHelper.getErrorMessage())) {
-                return;
-            }
-        }
-        if (Objects.isNull(logDbHelper)) {
-            System.out.println("获取远程数据库失败：写入日志失败");
+        MyDbHelper logDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.REMOTE_DB_LOG_CONNECT);
+        if (Objects.nonNull(logDbHelper.getErrorMessage())) {
+            System.out.println("获取日志数据库失败");
             return;
         }
+
         try {
             if (logSuccessList.size() > 0) logDbHelper.JDBCBatch(INSERT_SQL, logSuccessList, null);
             if (logErrorList.size() > 0) logDbHelper.JDBCBatch(ERROR_SQL, logErrorList, null);

mainFactory/src/main/java/org/bfkj/application/DataProcess.java

@@ -2,6 +2,7 @@ package org.bfkj.application;
 
 
 import org.bfkj.config.AppConfig;
+import org.bfkj.config.ObjectMap;
 import org.bfkj.utils.LogUtils;
 import org.bfkj.utils.MapTools;
 import org.bfkj.utils.MyDbHelper;
@@ -28,7 +29,7 @@ public class DataProcess {//数据处理对象
         lastActive = System.currentTimeMillis();//默认最后活跃时间
         serviceId = service_Id;
         try {
-            baseDbHelper = new MyDbHelper(AppConfig.REMOTE_DB_CONNECT);//获取底座数据库对象
+            baseDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.REMOTE_DB_CONNECT);
             if (Objects.nonNull(baseDbHelper.getErrorMessage())) {
                 errorMessage = "获取底座myDbHelper对象异常: ".concat(baseDbHelper.getErrorMessage());
                 return;
@@ -80,7 +81,7 @@ public class DataProcess {//数据处理对象
             try {
                 resultData1 = (Map<String, Object>) returnData;
             } catch (Exception e) {
-                resultData1.put("returnData",returnData);
+                resultData1.put("returnData", returnData);
             }
             resultData1.put("code", "0");
             return resultData1;
@@ -112,7 +113,7 @@ public class DataProcess {//数据处理对象
             }
             if (System.currentTimeMillis() - lastActive > 2000) {  //        更新数据库中的服务最新活跃时间
                 lastActive = System.currentTimeMillis();//更新最后活跃时间  //------更新当前服务的最后活跃时间，用于服务监控
-                baseDbHelper.updateByCondition("update serviceinfo set runState = ? ,lastactive = ? where  serviceID =?", null, "1", lastActive, serviceId); // 服务表增加最后活跃时间
+                baseDbHelper.updateByCondition("update serviceinfo set runState = ? ,lastactive = ? where  serviceID =?", null, "1", new Date(lastActive), serviceId); // 服务表增加最后活跃时间
             }
             //创建生命周期ID;//默认继承
             if (!inputData.containsKey("dataObjectId")) {
@@ -147,7 +148,7 @@ public class DataProcess {//数据处理对象
             calcData = calcData.stream().filter(Objects::nonNull).collect(Collectors.toList());
             return processSuccess(calcData.get(calcData.size() - 1)); /*可订阅任意算法结果，也可以订阅全量结果，由最后一个算法决定*/
         } catch (Exception e) {
-            return processFail("processData 异常： " + LogUtils.getException(e),null);
+            return processFail("processData 异常： " + LogUtils.getException(e), null);
         }
 
     }
@@ -176,6 +177,14 @@ public class DataProcess {//数据处理对象
                     authColumn.add(columnName);//添加到列权限
                     Object rowAuthObj = dataAuthMap.get("row_auth");//获取对应列的行权限
                     if (Objects.nonNull(rowAuthObj)) {//如果存在则组建标准的限制条件
+
+                        /*获取规格*/
+                        Map<String, Object> authExtendMapList = baseDbHelper.queryByParamsReturnList("select nextRule from belowSet where  auth_id =?", inputData.get("authId"));
+                        if ("-1".equals(authExtendMapList.get("code"))) {
+                            System.out.println("权限集成执行异常".concat(authExtendMapList.get("message").toString()));
+                            return;
+                        }
+                        Object nextRule =authExtendMapList.get("returnData") instanceof List<?> tempList && tempList.get(0) instanceof Map tempMap ? tempMap.get("nextRule"):null;  // t_user_group.up_user_groupid
                         String tempRowAuth = rowAuthObj.toString();
                         String connect = tempRowAuth.startsWith("!") ? "!=" : "=";//如果首位是！代表不等于，否则代表等于
                         tempRowAuth = tempRowAuth.startsWith("!") ? tempRowAuth.substring(1) : tempRowAuth;//修订行权限表达式
@@ -185,6 +194,17 @@ public class DataProcess {//数据处理对象
                             Map<String, Object> signRowAuth = new HashMap<>();
                             signRowAuth.put(columnName, row_auth);
                             rowAuth.addAll(baseDbHelper.changeSignFilter(signRowAuth, connect, connect.equals("!=") ? "and" : "or"));
+                            //如果row_auth开始左括号，且结束是右口号则------PEK,CTU,(t_user_group.up_user_groupid)
+                            if (Objects.nonNull(nextRule)) {
+                                List<Object> childAuthList = extendNextAuth(columnName, row_auth, nextRule); // [4,5]
+                                if (!childAuthList.isEmpty()) {
+                                    childAuthList.forEach(authid -> {
+                                        Map<String, Object> tpSignRowAuth = new HashMap<>();
+                                        tpSignRowAuth.put(columnName, authid);
+                                        rowAuth.addAll(baseDbHelper.changeSignFilter(tpSignRowAuth, connect, connect.equals("!=") ? "and" : "or"));
+                                    });
+                                }
+                            }
                         }
                     }
                 });
@@ -196,13 +216,34 @@ public class DataProcess {//数据处理对象
                 }
                 inputData.put("authColumn", authColumn);//添加到入参，方便后面调用
             }
-            inputData.put("currentUser",user_id);
+            inputData.put("currentUser", user_id);
         } catch (Exception e) {
             System.out.println("authCheck 异常：" + LogUtils.getException(e));
         }
         return inputData;
     }
 
+    /**
+     *
+     * @param columnName ID
+     * @param row_auth   2
+     * @param nextRule   t_user_group.up_user_groupid
+     * @return
+     */
+    private List<Object> extendNextAuth(String columnName, String row_auth, Object nextRule) {
+        List<Object> returnData = new ArrayList<>();
+        String[] rule = nextRule.toString().split("\\.");
+        Map<String, Object> queryAuthReturnList = baseDbHelper.queryByParamsReturnList("select " + columnName + " from " + rule[0] + " where " + rule[1] + " = ?", row_auth);
+        if ("-1".equals(queryAuthReturnList.get("code")) || ((List) queryAuthReturnList.get("returnData")).isEmpty()) {
+            return returnData;
+        }
+        ((List<Map<String,Object>>) queryAuthReturnList.get("returnData")).stream().filter(Objects::nonNull).forEach(authvalue -> {
+            returnData.add(authvalue.get(columnName)); // 5
+            returnData.addAll(extendNextAuth(columnName, authvalue.toString(), nextRule));
+        });
+        return returnData;
+    }
+
     /*执行算法*/
     public Map<String, Object> execCalultion(List<Map<String, Object>> inData, String beginLibraryId, String dataObjectId) {
         Map<String, Object> returnData = new HashMap<>();//初始化最终返回结果
@@ -226,7 +267,7 @@ public class DataProcess {//数据处理对象
                     preCalMap.put("library_type", 2);/*如果脚本包含function则js否则java*/
                     preCalMap.put("computing_expression", is_exec); //组建前置算法配置信息
                     Map<String, Object> preEnginResult = execEngine(lastLibraryId, preCalMap, calcData);//调用算法引擎进行执行
-                    preEnginResult.put("preExecTime",System.currentTimeMillis()-beginTime);
+                    preEnginResult.put("preExecTime", System.currentTimeMillis() - beginTime);
                     beginTime = System.currentTimeMillis();
                     // 获取当前时间搓
                     preData.add(preEnginResult);//添加执行结果到前置检测结果列表
@@ -242,7 +283,7 @@ public class DataProcess {//数据处理对象
                 }
                 //依据算法类型调用数据库对象或脚本引擎对象进行算法执行
                 Map<String, Object> currentResult = calculationLibrary.get("library_type").toString().equals("3") ? execDB(lastLibraryId, calculationLibrary, inData, dataObjectId) : execEngine(lastLibraryId, calculationLibrary, inData);
-                currentResult.put("execTime",System.currentTimeMillis()-beginTime);
+                currentResult.put("execTime", System.currentTimeMillis() - beginTime);
                 beginTime = System.currentTimeMillis();
 
                 setServiceErrorCount(lastLibraryId, Objects.nonNull(currentResult) && currentResult.containsKey("code") ? currentResult.get("code").toString() : "0");//依据返回的code进行连续错误计数和重置
@@ -252,8 +293,8 @@ public class DataProcess {//数据处理对象
                 }
             }
 
-        }catch (Exception e){
-            System.out.println("execCalultion: 算法执行异常： "  +LogUtils.getException(e) );
+        } catch (Exception e) {
+            System.out.println("execCalultion: 算法执行异常： " + LogUtils.getException(e));
         }
         returnData.put("library_id", lastLibraryId);
         returnData.put("preData", preData);
@@ -283,11 +324,11 @@ public class DataProcess {//数据处理对象
             Map<String, Object> paramValue = new HashMap<>();
             for (String key : parmaNames.keySet()) {//理论上此处最多单个key是list[]，如果存在多个list[]则应开启迪卡乘积
                 Object currentData = dataSubscription(calcAllData, key, currentCalMap);//获取数据
-                paramValue.put(currentCalMap.get("library_type").toString().equals("2")?parmaNames.get(key):key, currentData);
+                paramValue.put(currentCalMap.get("library_type").toString().equals("2") ? parmaNames.get(key) : key, currentData);
             }
             Map<String, Object> stringObjectMap = currentEngin.execScript(paramValue);
             return stringObjectMap;
-        }catch (Exception e){
+        } catch (Exception e) {
             return processFail("创建引擎失败".concat(LogUtils.getException(e)), library_id);
         }
     }
@@ -332,7 +373,7 @@ public class DataProcess {//数据处理对象
                 return myDbHelper.generalProcess(tempCalcInfo, tempDBPrams, dataObjectId, calcData.get(0));//调用表名方式执行事件
             }
             return myDbHelper.generalProcess(calculationLibrary, tempDBPrams, dataObjectId, calcData.get(0));
-        }catch (Exception e){
+        } catch (Exception e) {
             return processFail("数据库执行失败".concat(LogUtils.getException(e)), library_id);
         }
     }
@@ -391,9 +432,9 @@ public class DataProcess {//数据处理对象
                         : returnData)));
             }
             return returnData;
-        }catch (Exception e){
+        } catch (Exception e) {
             System.out.println("数据订阅异常: ".concat(LogUtils.getException(e)));
-            return  null;
+            return null;
         }
 
     }

mainFactory/src/main/java/org/bfkj/protocol/FtpHandler.java

@@ -0,0 +1,110 @@
+package org.bfkj.protocol;
+
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+import org.bfkj.utils.LogUtils;
+import org.bfkj.utils.MapTools;
+import org.springframework.util.StringUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.util.*;
+import java.util.zip.GZIPInputStream;
+
+/*es协议*/
+public class FtpHandler {
+
+    private static final int BUFFER_SIZE = 4096;
+
+    /**
+     * 设置ftp客户端参数并创建ftp客户端
+     *
+     * @param config ftp连接配置信息
+     * @return ftp客户端
+     */
+    private FTPClient createFtpClient(Map<String, Object> config) throws Exception {
+        FTPClient ftp = new FTPClient();
+        ftp.connect(Objects.toString(config.get("host")), Objects.nonNull(config.get("port")) ? Integer.parseInt(Objects.toString(config.get("port"))) : 21);
+        //common-net的ftpclient默认是使用ASCII_FILE_TYPE，文件会经过ASCII编码转换，所以可能会造成文件损坏
+        ftp.login(Objects.toString(config.get("username")), Objects.toString(config.get("password")));//登录
+        ftp.setConnectTimeout(Objects.nonNull(config.get("timeOut")) ? Integer.parseInt(Objects.toString(config.get("timeOut"))) : (1000 * 120)); //120秒
+        ftp.setDataTimeout(Duration.ofSeconds(Objects.nonNull(config.get("timeOut")) ? Integer.parseInt(Objects.toString(config.get("timeOut"))) : (1000 * 120))); //120秒
+        ftp.setBufferSize(1024 * 1024 * 10); //每次读取文件流时缓存数组的大小
+        ftp.setRemoteVerificationEnabled(false); // 取消服务器获取自身Ip地址和提交的host进行匹配
+        ftp.setControlEncoding(Objects.nonNull(config.get("encoding")) ? config.get("encoding").toString() : "UTF-8"); //设置ftp编码
+        ftp.setFileType(FTPClient.BINARY_FILE_TYPE);//设置文件编码类型为二进制文件，
+        return ftp;
+    }
+
+    /**
+     *
+     * @param filePathName 组装好的文件名称
+     * @param connectConfig 连接fpt的连接信息
+     * @return
+     */
+    public Map<String, Object> readData(String  filePathName, String connectConfig) {
+        Map<String, Object> connectConfigMaps = (Map<String, Object>) MapTools.strToObj(connectConfig);
+        FTPClient ftp = null;
+        try {
+            String basePath = Objects.toString(connectConfigMaps.get("basePath")); //根路径
+            ftp = createFtpClient(connectConfigMaps);
+            if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
+                System.out.println("未连接到FTP，用户名或密码错误。");
+                ftp.logout();
+                return MapTools.processFail("未连接到FTP，用户名或密码错误。");
+            }
+            if (StringUtils.hasLength(basePath)) {
+                ftp.changeWorkingDirectory(basePath);
+            }
+            String rootPath = ftp.printWorkingDirectory(); //ftp根目录
+            FTPFile[] ftpFiles = ftp.listFiles(rootPath + filePathName);
+            if (ftpFiles.length == 0) {
+                ftp.logout();
+                return MapTools.processFail("没有找到文件".concat(filePathName));
+            }
+            List<File> files = new ArrayList<>();
+            for (FTPFile ftpFile : ftpFiles) {
+                String path = System.getProperty("user.dir") + File.separator + "ftp" + File.separator + ftpFile.getName();
+                File targetFile = new File(path);
+                files.add(targetFile);
+                FileOutputStream fileOutputStream = new FileOutputStream(targetFile);
+                ftp.retrieveFile(ftpFile.getName(), fileOutputStream);
+                fileOutputStream.close();
+            }
+
+            List<String> fileContent = new ArrayList<>();
+            for (File ftpFile : files) {
+                String path = System.getProperty("user.dir") + File.separator + "ftp" + File.separator + ftpFile.getName();
+                File targetFile = new File(path);
+                if (targetFile.exists()) {
+                    GZIPInputStream gzipInputStream = new GZIPInputStream(Files.newInputStream(targetFile.toPath()));
+                    ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                    byte[] buf = new byte[BUFFER_SIZE];
+                    int len;
+                    while ((len = gzipInputStream.read(buf, 0, BUFFER_SIZE)) != -1) {
+                        baos.write(buf, 0, len);
+                    }
+                    fileContent.add(baos.toString(StandardCharsets.UTF_8));
+                }
+            }
+            ftp.logout();//退出ftp
+            return MapTools.processSuccess(fileContent);
+        } catch (Exception e) {
+            return MapTools.processFail("fpt读取文件异常".concat(LogUtils.getException(e)));
+        } finally {
+            try {
+                if (null != ftp) {
+                    ftp.disconnect();
+                }
+            } catch (Exception ex) {
+                System.out.println("ftp关闭时异常:".concat(ex.getMessage()));
+            }
+        }
+    }
+}

mainFactory/src/main/java/org/bfkj/utils/LogUtils.java

@@ -16,16 +16,16 @@ public class LogUtils { // 依据服务编号ID获取服务类型，如果是异
     public static Map<String, List<Object>> logSuccessMapList = new HashMap<>();
     public static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
     public static  void log(String location, String success, Object calculationLocation, String logContent, String serviceId,  Object iNDataContent, String dataObjectId, Object OutDataContent, Object event) {
-//        ThreadPoolTaskExecutor threadPoolTaskExecutor = SpringContextApplication.getBean("ThreadPoolTaskExecutor");
-//        threadPoolTaskExecutor.submit(() ->
-                logWrite(location, success, calculationLocation, logContent, serviceId, iNDataContent, dataObjectId, OutDataContent, event);
-//        );
+        ThreadPoolTaskExecutor threadPoolTaskExecutor = SpringContextApplication.getBean("ThreadPoolTaskExecutor");
+        threadPoolTaskExecutor.submit(() ->
+                logWrite(location, success, calculationLocation, logContent, serviceId, iNDataContent, dataObjectId, OutDataContent, event)
+        );
     }
 
     public static void logWrite(String location, String success, Object calculationLocation, String logContent, String serviceId, Object iNDataContent, String dataObjectId, Object OutDataContent, Object event) {
         String inData = MapTools.objToJSONStr(iNDataContent);
         try {
-            Map<Object, Object> filterMap = Objects.nonNull(iNDataContent) && ((List) iNDataContent).size() == 2 ? (Map) (((List) iNDataContent).get(1)) : null;
+            Map<Object, Object> filterMap = Objects.nonNull(iNDataContent) && iNDataContent instanceof List<?>  tempList && tempList.size() == 2 ? (Map) (((List) iNDataContent).get(1)) : null;
             if (Objects.nonNull(filterMap) && Objects.nonNull(filterMap.get("returnData")) && filterMap.get("returnData").toString().equals("[]")) {
                 return;
             }

mainFactory/src/main/java/org/bfkj/utils/MyDbHelper.java

@@ -69,6 +69,7 @@ public class MyDbHelper {//目前只差主键的条件优化
         config.addDataSourceProperty("cacheServerConfiguration", "true");
         config.addDataSourceProperty("elideSetAutoCommits", "true");
         config.addDataSourceProperty("maintainTimeStats", "false");
+//        config.setConnectionTimeout();
         if (Objects.nonNull(connectMaps.get("username"))) {
             config.setUsername(connectMaps.get("username").toString());
         }
@@ -78,6 +79,8 @@ public class MyDbHelper {//目前只差主键的条件优化
         config.setJdbcUrl(connectMaps.get("url").toString());
         config.setDriverClassName(connectMaps.get("driver-class-name").toString());
 
+        config.setPoolName("");
+
         theDataSource = new HikariDataSource(config);
         theJdbcTemplate = new JdbcTemplate(theDataSource);
         try (Connection theConnect = theDataSource.getConnection();//用于批量新增以及获取当前数据库的相关信息
@@ -342,7 +345,8 @@ public class MyDbHelper {//目前只差主键的条件优化
                             tempColumn.add(auColumn);
                         }
                     }
-                    newSqlStr = newSqlStr.replaceFirst(allSQLColumn, String.join(",", tempColumn));//直接进行清除
+                    //todo 涉及到列的取值 存在问题
+                    newSqlStr = newSqlStr.replaceFirst(allSQLColumn," ".concat(String.join(",", tempColumn)));//直接进行清除
                     newSqlStr = newSqlStr.replaceAll("[,]+", ",").replaceAll(", from ", " from ");//清除多余的逗号
                 }
                 sqlAllColumn.put(sqlAuthKey, allSQLColumn);//缓存当前SQL可用的字段
@@ -737,6 +741,7 @@ public class MyDbHelper {//目前只差主键的条件优化
                 }
             }
 
+
         }
     }
 

mainFactory/src/main/resources/application-prod.yml

@@ -34,7 +34,7 @@ mydb:
   title: ${MYDB_USER:root}
   cipher: ${MYDB_PASSWD:QtrmuqDw^bJu$}
   type: ${MYDB_DRIVER:com.mysql.cj.jdbc.Driver}
-  serviceURL: ${MY_SERVICE_URL:127.0.0.1:8080}
+  serviceURL: ${MY_SERVICE_URL:10.211.66.23:380}
 
 #isEs:
 #  open: true

mainFactory/src/main/resources/static/staticConfig.js

@@ -34,9 +34,9 @@ switch (baseNewUrl) {
   case 'localhost':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,
-      baseNewUrl: 'http://localhost:8082',
-      baseURLCA: 'http://localhost:8082',
-      fileUrl: 'http://localhost:8082',
+      baseNewUrl: 'http://localhost:18400',
+      baseURLCA: 'http://localhost:18400',
+      fileUrl: 'http://localhost:18400',
       expressUrl: 'http://localhost:8043',
       tempUrl: 'http://localhost:16300', // 1.0临时地址
       tempToken: 'bb1bcfcb336b40e9b8602e808b053c3b', // 1.0临时token