代码提交 行权限完成

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

@@ -108,9 +108,9 @@ public class MainFactoryApplication {
             return;
         }
 
-        Map<String,Object> serviceListResult = myDbHelper.queryByParamsReturnList("SELECT serviceID,serviceType FROM serviceinfo WHERE workId = ?", AppConfig.WORK_ID);
+        Map<String, Object> serviceListResult = myDbHelper.queryByParamsReturnList("SELECT serviceID,serviceType FROM serviceinfo WHERE workId = ?", AppConfig.WORK_ID);
         List<Map<String, Object>> serviceList = MapTools.getMapList(serviceListResult);
-        if (!serviceListResult.get("code").equals("0") ||  null == serviceList) {
+        if (!serviceListResult.get("code").equals("0") || null == serviceList) {
             System.out.println("初始化获取服务异常： " + serviceListResult.get("message"));
             return;
         }

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

@@ -106,15 +106,16 @@ public class DataProcess {
             LogUtils.log("processData:1", "-1", null, "服务不可用" + errorMessage, serviceId, AppConfig.WORK_ID, MapTools.jacksonObjToStr(inputData), null, null, null);
             return processFail("服务不可用" + errorMessage, null);
         }
-        lastActive = System.currentTimeMillis();//更新最后活跃时间  //------更新当前服务的最后活跃时间，用于服务监控
-        //更新服务的活跃时间
-        MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.getSystemParams(AppConfig.REMOTE_DB_CONNECT));
-        if (Objects.nonNull(myDbHelper.getErrorMessage())) {
-            LogUtils.log("processData:2", "-1", null, "数据接收错误,获取远程数据库对象: " + myDbHelper.getErrorMessage(), serviceId, AppConfig.WORK_ID, MapTools.jacksonObjToStr(inputData), null, null, null);
-            return processFail("数据接收错误,获取远程数据库对象: " + myDbHelper.getErrorMessage(), null);
+        if (System.currentTimeMillis() - lastActive > 1000) {  //        更新数据库中的服务最新活跃时间
+            //更新服务的活跃时间
+            MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.getSystemParams(AppConfig.REMOTE_DB_CONNECT));
+            if (Objects.nonNull(myDbHelper.getErrorMessage())) {
+                LogUtils.log("processData:2", "-1", null, "数据接收错误,获取远程数据库对象: " + myDbHelper.getErrorMessage(), serviceId, AppConfig.WORK_ID, MapTools.jacksonObjToStr(inputData), null, null, null);
+                return processFail("数据接收错误,获取远程数据库对象: " + myDbHelper.getErrorMessage(), null);
+            }
+            myDbHelper.updateByCondition("update serviceinfo set runState = 1 ,lastactive = now() where  serviceID =?", null, serviceId); // 服务表增加最后活跃时间
         }
-        //        更新数据库中的服务最新活跃时间
-        myDbHelper.updateByCondition("update serviceinfo set runState = 1 ,lastactive = now() where  serviceID =?", null, serviceId); // 服务表增加最后活跃时间
+        lastActive = System.currentTimeMillis();//更新最后活跃时间  //------更新当前服务的最后活跃时间，用于服务监控
         //创建生命周期ID;//默认继承
         if (!inputData.containsKey("dataObjectId")) {
 //            生成新的生命周期ID
@@ -128,9 +129,14 @@ public class DataProcess {
         //通过用户编号，服务编号，从用户权限表获取行列权限
         // 如果列权限为空则 直接返回空
         // 重新组建入口参数：添加filter(行权限)
-        Map<String, Object> authServiceMap = myDbHelper.queryByParamsReturnList("SELECT auth_id FROM t_auth WHERE serviceID = ? and auth_id = ? ", serviceId, inputData.get("auth_id"));
-        if (authServiceMap.get("code").equals("-1")) return authServiceMap;
-        if (event.equals("0") && Objects.nonNull(user_id) && authServiceMap.get("returnData") instanceof List<?> returnDataList && !returnDataList.isEmpty()) {
+        if (!event.equals("1") && Objects.nonNull(user_id) && inputData.containsKey("auth_id")) {
+            MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.getSystemParams(AppConfig.REMOTE_DB_CONNECT));
+            if (Objects.nonNull(myDbHelper.getErrorMessage())) {
+                LogUtils.log("processData:2", "-1", null, "数据接收错误,获取远程数据库对象: " + myDbHelper.getErrorMessage(), serviceId, AppConfig.WORK_ID, MapTools.jacksonObjToStr(inputData), null, null, null);
+                return processFail("数据接收错误,获取远程数据库对象: " + myDbHelper.getErrorMessage(), null);
+            }
+            Map<String, Object> authServiceMap = myDbHelper.queryByParamsReturnList("SELECT auth_id FROM t_auth WHERE serviceID = ? and auth_id = ? ", serviceId, inputData.get("auth_id"));
+            if (authServiceMap.get("code").equals("-1") || (authServiceMap.get("returnData") instanceof List<?> returnDataList && returnDataList.isEmpty())) return authServiceMap;
             //判断filter不为空 且 filter不包含left---{"filter":[{"user_id":""}]} ---- >[{filter:[{left:,column:},{left:,column:}
             /*获取权限filter*/
             Map<String, Object> userDataAuthMap = myDbHelper.queryByParamsReturnList("SELECT QCS.columnName,TUA.row_auth FROM t_user_group_auth  TUA LEFT JOIN querytemplatecolumnset QCS on TUA.queryTemplateColumnSetID = QCS.queryTemplateColumnSetID WHERE TUA.user_id = ?  AND TUA.auth_id = ? AND TUA.queryTemplateColumnSetID IS NOT NULL", user_id[0], inputData.get("auth_id"));
@@ -141,19 +147,19 @@ public class DataProcess {
                 for (String row_auth : row_auths) {
                     if (Objects.isNull(row_auth)) continue;
                     HashMap<String, Object> hashMap = new HashMap<>();
-                    hashMap.put(tempMap.get("columnName").toString(), row_auth.startsWith("!")?row_auth.substring(1):row_auth);
+                    hashMap.put(tempMap.get("columnName").toString(), row_auth.startsWith("!") ? row_auth.substring(1) : row_auth);
                     if (row_auth.startsWith("!")) {
                         userList.addAll(changeSignFilter(hashMap, "!", "or"));
-                    }else {
+                    } else {
                         userList.addAll(changeSignFilter(hashMap, null, "or"));
                     }
                 }
             });
             /*userList第一个以及最后一个添加()*/
-            ((Map<String,Object>)userList.get(0)).put("left","(");
-            ((Map<String,Object>)userList.get(userList.size()-1)).put("connector","  and ");
-            ((Map<String,Object>)userList.get(userList.size()-1)).put("right"," ) ");
-            inputData= initParam(inputData, "0", userList);
+            ((Map<String, Object>) userList.get(0)).put("left", "(");
+            ((Map<String, Object>) userList.get(userList.size() - 1)).put("connector", "  and ");
+            ((Map<String, Object>) userList.get(userList.size() - 1)).put("right", " ) ");
+            inputData = initParam(inputData, "0", userList);
         }
 
         List<Map<String, Object>> calculationResult = new ArrayList<>();//定义算法全量结果列表
@@ -219,13 +225,13 @@ public class DataProcess {
             Object tempFilterObject = inDataContent.get("filter");//获取filter
             tempFilterObject = Objects.isNull(tempFilterObject) ? inDataContent : tempFilterObject;//如果不存在filter则等于原始MAP
             if (tempFilterObject instanceof Map) {////如果filter是单个Map则
-                authList.addAll(changeSignFilter((Map)tempFilterObject,null,null));
+                authList.addAll(changeSignFilter((Map) tempFilterObject, null, null));
                 returnData.put("filter", authList);//转换为标准条件集
             } else {
                 if (tempFilterObject instanceof List tempFilterObjectList && tempFilterObjectList.get(0) instanceof Map) {//如果filter是List则"123"
                     List<Object> tempFilterList = new ArrayList<>(authList);
                     for (Object o : tempFilterObjectList) {//循环List -{c1:c2,c3:c4}
-                        tempFilterList.addAll(changeSignFilter((Map) o,null,null)); //循环添加
+                        tempFilterList.addAll(changeSignFilter((Map) o, null, null)); //循环添加
                     }
                     returnData.put("filter", tempFilterList);//转换为标准条件集
                 } else {//此时tempFilterObject既不是List也不是Map：1、dataContent包含filter且filter是一个字符串
@@ -247,91 +253,18 @@ public class DataProcess {
             Object keyValues = filterMap.get(filterKey);
             returnMap.put("left", "");
             returnMap.put("column", filterKey);
-            returnMap.put("comparator",(Objects.nonNull(compare) && compare.startsWith("!"))?"!=":" = ");
+            returnMap.put("comparator", (Objects.nonNull(compare) && compare.startsWith("!")) ? "!=" : " = ");
             if (Objects.isNull(keyValues)) {
                 returnMap.put("comparator", " is null ");
             }
             returnMap.put("value", keyValues);
             returnMap.put("right", "");
-            returnMap.put("connector", Objects.nonNull(connect)?(" "+connect): " and ");
+            returnMap.put("connector", Objects.nonNull(connect) ? (" " + connect) : " and ");
             objects.add(returnMap);
         }
         return objects;
     }
 
-//    private static Map<String, Object> initParam(Map<String, Object> inputData) {
-//        Object dataContent = inputData.get("dataContent");
-//        if (Objects.isNull(dataContent)) {// null
-//            dataContent = MapTools.removeKey(inputData, baseInfo);
-//        }
-//        /*如果dataContent不是数组也不是map则返回inData,--不是map数组 返回InData*/
-//        if (!(dataContent instanceof Map<?, ?>) && (dataContent instanceof List<?> && !(((List<?>) dataContent).get(0) instanceof Map))) {
-//            return inputData;
-//        }
-//        if (dataContent instanceof Map<?, ?> temMap) {
-//            List<Object> tempList = new ArrayList<>();
-//            tempList.add(temMap);
-//            dataContent = tempList;
-//        }
-//        /*同步添加Value*/
-//        List<Map<String, Object>> tempDataList = (List<Map<String, Object>>) dataContent;
-//        if (!tempDataList.get(0).containsKey("filter")) { //[{a=1,b=2},{a=2,b=3}] ---->[{"filter":[{a=1,b=2}]},{"filter":[{a=2,b=3}]}]
-//            List<Object> tempList = new ArrayList<>();
-//            for (Object tempMap : tempDataList) { //[{a=1,b=2},{a=2,b=3}]
-//                List<Object> tepList = new ArrayList<>();
-//                tepList.add(tempMap);
-//                Map<Object, Object> tmpData = new HashMap<>();
-//                tmpData.put("filter", tepList);
-//                tempList.add(tmpData);
-//            }
-//            dataContent = tempList;
-//        }
-//        if (tempDataList.get(0).get("filter") instanceof Map<?, ?> filterMap) {  //[{"filter":{a=1,b=2}},{"filter":{a=2,b=3}}]
-//            List<Map<String, Object>> returnDataList = new ArrayList<>();
-//            for (Map<String, Object> temp : tempDataList) {
-//                List<Object> tempList = new ArrayList<>();
-//                tempList.add(filterMap);
-//                temp.put("filter", tempList);
-//                returnDataList.add(temp);
-//            }
-//            dataContent = returnDataList;  // [{"filter":[{a=1,b=2}}],{"filter":[{a=2,b=3}]}]
-//        }
-//        List<Map<String, Object>> data = new ArrayList<>();
-//        List<Map<String, Object>> filterList = ((List<Map<String, List<Map<String, Object>>>>) dataContent).get(0).get("filter");
-//        if (!filterList.get(0).containsKey("left")) {
-//            authoParams(filterList, data); //[{"filter":{a=1,b=2}},{"filter":{a=2,b=3}}]
-//        } else {
-//            data = (List<Map<String, Object>>) dataContent;
-//        }
-//        inputData.put("dataContent", data);
-//        return inputData;
-//    }
-//
-//    //[{"filter":{a=1,b=2}},{"filter":{a=2,b=3}}]
-//    private static void authoParams(List<Map<String, Object>> ListInMap, List<Map<String, Object>> filterMapList) {
-////        String filterTemplate = "{\"left\":\"左括号\",\"column\":\"字段\",\"comparator\":\"=\",\"value\":\"值\",\"right\":\"右括号\",\"connector\":\"连接符\"}";
-//        List<Object> filterValue = new ArrayList<>();
-//        for (Map<String, Object> filterKey : ListInMap) {
-//            for (String filKey : filterKey.keySet()) {
-//                HashMap<String, Object> filterMap = new HashMap<>();
-//                Object keyValues = filterKey.get(filKey);
-//                filterMap.put("left", "");
-//                filterMap.put("column", filKey);
-//                filterMap.put("comparator", " = ");
-//                if (Objects.isNull(keyValues)) {
-//                    filterMap.put("comparator", " is null ");
-//                }
-//                filterMap.put("value", keyValues);
-//                filterMap.put("right", "");
-//                filterMap.put("connector", " and ");
-//                filterValue.add(filterMap);
-//            }
-//        }
-//        HashMap<String, Object> hashMap = new HashMap<>();
-//        hashMap.put("filter", filterValue);
-//        filterMapList.add(hashMap);
-//    }
-
     public Map<String, List<Map<String, Object>>> execCalultion(List<Map<String, Object>> inData, String beginLibraryId, Object event, String dataObjectId, Object page, Object pageSize) {
         Map<String, List<Map<String, Object>>> returnData = new HashMap<>();
         List<Map<String, Object>> preData = new ArrayList<>();
@@ -504,7 +437,7 @@ public class DataProcess {
      * @param serviceId
      * @return
      */
-    public static synchronized String createLifeCycleCol(Long workerId, Integer serviceId) {
+    public static String createLifeCycleCol(Long workerId, Integer serviceId) {
         long timestamp = System.currentTimeMillis();
         //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
         //如果是同一时间生成的，则进行毫秒内序列

mainFactory/src/main/java/org/bfkj/config/ObjectMap.java

@@ -18,7 +18,7 @@ public class ObjectMap {
 
     /*针对获取对象*/
     // todo 修改方法名： getordropInput
-    public synchronized static DataProcess getordropInput(String serviceId, boolean isGet) {
+    public static DataProcess getordropInput(String serviceId, boolean isGet) {
         if (isGet) {
             DataProcess dataProcess = dataProcessMaps.get(serviceId);
             if (Objects.nonNull(dataProcess) && Objects.nonNull(dataProcess.getErrorMessage())) {
@@ -41,7 +41,7 @@ public class ObjectMap {
         }
     }
 
-    public synchronized static DataProcess getordropInput(String serviceId) {
+    public static DataProcess getordropInput(String serviceId) {
         return getordropInput(serviceId, true);
     }
 
@@ -49,13 +49,13 @@ public class ObjectMap {
      * @param connectStr 连接字符串
      * @return
      */
-    public synchronized static MyDbHelper getordropMyDbHelper(String connectStr) {
+    public  static MyDbHelper getordropMyDbHelper(String connectStr) {
         return getordropMyDbHelper(connectStr, true);
     }
 
     /*获取数据库对象*/
     //todo  同步修正
-    public synchronized static MyDbHelper getordropMyDbHelper(String connectStr, boolean isGet) {
+    public  static MyDbHelper getordropMyDbHelper(String connectStr, boolean isGet) {
         connectStr = connectStr.replaceAll("\\s*|\r|\n|\t", "");
         if (isGet) {
             MyDbHelper myDbHelper = myDbHelperMaps.get(connectStr);

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

@@ -38,8 +38,8 @@ public class MyKafKa {
             consumer = new KafkaConsumer<>(connectConfigMaps);
             consumer.subscribe(Collections.singleton(sourceObjectName));
         }
-        //todo 1. 如果一次行读取多条 2.偏移修改
-        ConsumerRecords<String, Object> records = consumer.poll(Duration.ofSeconds(1));
+        //todo 1. 如果一次行读取多条 2.偏移修改  : // Duration.ofSeconds(1): 如果没有数据则此处会等待1秒
+        ConsumerRecords<String, Object> records = consumer.poll(Duration.ofMillis(1));
         int count = records.count();
         Object message = null;
         if (count > 0) {

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

@@ -7,7 +7,6 @@ import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 
-import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -168,7 +167,7 @@ public class DataFormat {
                                     if (colValue.length() == 3) {
                                         if ("CLR,RFJ,UCL".contains(colValue)) {
                                             signDataMap.put(transMaps.get(".X/2"), colValue);//写入当前行MAP{"对应数据库字段名",值（不覆盖）}
-                                        }else {
+                                        } else {
                                             signDataMap.put(transMaps.get(".X/1"), colValue);//写入当前行MAP{"对应数据库字段名",值（不覆盖）}
                                         }
                                     }
@@ -285,25 +284,29 @@ public class DataFormat {
      * @return
      */
     public static Map<String, Object> specialHandler(HashMap<String, Object> inMap, String dataObjectId) {
-        String outAirport = inMap.containsKey("flightNo") ? "sourceAirport" : (inMap.containsKey("inflightNo") ? "inflightNo" : null);
-        inMap.put("outAirport", MapTools.isBlank(outAirport) ? null : inMap.get(outAirport));
-
+        String outAirport = inMap.containsKey("flightNo") ? "sourceAirport" : (inMap.containsKey("inairport") ? "inairport" : null);
+        if (MapTools.isNotBlank(outAirport)) {
+            inMap.put("outAirport", inMap.get(outAirport));
+        }
         String landAirport = inMap.containsKey("target_airport") ? "target_airport" : (inMap.containsKey("sourceAirport") ? "sourceAirport" : null);
-        inMap.put("landAirport", MapTools.isBlank(landAirport) ? null : inMap.get(landAirport));
-
+        if (MapTools.isNotBlank(landAirport)) {
+            inMap.put("landAirport", inMap.get(landAirport));
+        }
         String flightNo = inMap.containsKey("flightNo") ? "flightNo" : (inMap.containsKey("inflightNo") ? "inflightNo" : null);
-        inMap.put("flightNo", MapTools.isBlank(flightNo) ? null : inMap.get(flightNo));
+        if (MapTools.isNotBlank(flightNo)) {
+            inMap.put("flightNo", inMap.get(flightNo));
+        }
         String readAddess = inMap.containsKey("location_code") ? "location_code" : (inMap.containsKey("checkInLocation") ? "checkInLocation" : inMap.containsKey("operationArea") ? "operationArea" : null);
-        inMap.put("readAddess", MapTools.isBlank(readAddess) ? null : inMap.get(readAddess));
+        if (MapTools.isNotBlank(readAddess)) {
+            inMap.put("readAddess", inMap.get(readAddess));
+        }
         String readTime = inMap.containsKey("processing_time") ? "processing_time" : (inMap.containsKey("checkInDate") ? "checkInDate" : null);
         inMap.put("readTime", MapTools.isBlank(readTime) ? sdf.format(new Date(MapTools.isBlank(dataObjectId) ? (System.currentTimeMillis()) : Long.parseLong(dataObjectId.substring(0, 13)))) : inMap.get(readTime));
+
         String currentResult = inMap.containsKey("dataState") ? "dataState" : (inMap.containsKey("abnormalState") ? "abnormalState" : inMap.containsKey("securityInspectionResults") ? "securityInspectionResults" : null);
-        if (Objects.nonNull(inMap.get(currentResult))) {
-            inMap.put("currentResult", MapTools.isBlank(currentResult) ? null : inMap.get(currentResult));
+        if (MapTools.isNotBlank(readAddess) && Objects.nonNull(inMap.get(currentResult))) {
+            inMap.put("currentResult", inMap.get(currentResult));
         }
-        // .F/.I/.O/.D/.J/
-
-
         return inMap;
     }
 
@@ -574,11 +577,11 @@ public class DataFormat {
 //        初始化一个返回数组
         List<Map<String, Object>> returnList = new ArrayList<>();
         for (Map<String, Object> childwMap : childList) {
-            HashMap<String,Object> childwMapClone = MapTools.clone(childwMap);
+            HashMap<String, Object> childwMapClone = MapTools.clone(childwMap);
             if (Objects.isNull(childwMapClone)) childwMapClone = new HashMap<>();
             for (Map<String, Object> parentMap : parentList) {
-                HashMap<String,Object> parentMapClone = MapTools.clone(parentMap);
-                if (Objects.isNull(parentMapClone)){
+                HashMap<String, Object> parentMapClone = MapTools.clone(parentMap);
+                if (Objects.isNull(parentMapClone)) {
                     parentMapClone = new HashMap<>();
                 }
                 parentMapClone.putAll(childwMapClone);

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

@@ -10,11 +10,10 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 public class LogUtils { // 依据服务编号ID获取服务类型，如果是异步 异常日志无条件写入到本地数据库（每个服务都有这样的一个数据库） ，在程序启动时会扫描此表，重新进行，如果成功则从此表中移除
-    public static synchronized void log(String location, String success, Object calculationLocation, String logContent, String serviceId, String workId, Object iNDataContent, String dataObjectId, Object OutDataContent, Object event) {
+    public static  void log(String location, String success, Object calculationLocation, String logContent, String serviceId, String workId, Object iNDataContent, String dataObjectId, Object OutDataContent, Object event) {
         ThreadPoolTaskExecutor threadPoolTaskExecutor = SpringContextBeans.getBean("ThreadPoolTaskExecutor");
         threadPoolTaskExecutor.submit(() -> logWrite(location, success, calculationLocation, logContent, serviceId, workId, iNDataContent, dataObjectId, OutDataContent, event));
     }
-
     /*
     算法输入数据
     算法返回结果
@@ -23,7 +22,7 @@ public class LogUtils { // 依据服务编号ID获取服务类型，如果是异
     * */
     public static void logWrite(String location, String success, Object calculationLocation, String logContent, String serviceId, String workId, Object iNDataContent, String dataObjectId, Object OutDataContent, Object event) {
         String inData = MapTools.objectToString(iNDataContent);
-        String shortData = MapTools.isNotBlank(inData) ? inData.substring(0, 1024) : null;
+        String shortData = MapTools.isNotBlank(inData) ? inData.substring(0, 20480) : null;
         List<Map<String, Object>> logParam = new ArrayList<>() {{
             HashMap<String, Object> hashMap = new HashMap<>();
             hashMap.put("location", location);
@@ -57,7 +56,7 @@ public class LogUtils { // 依据服务编号ID获取服务类型，如果是异
         if (!shortMap.get("code").equals("0")) {
             System.out.println("记录日志： 写入" + dbText + "日志失败 ：" + shortMap.get("message") + "\n数据：" + MapTools.objectToString(logParam));
         }
-        if (MapTools.isNotBlank(inData) && inData.length()>1024){
+        if (MapTools.isNotBlank(inData) && inData.length()>20480){
             Map<String, Object> fullMap = myDbHelper.generalProcess("1", "log_fulldata", null, null, logParam, false, null, null);
             if (!fullMap.get("code").equals("0")) {
                 System.out.println("记录日志(超长全量数据)： 写入" + dbText + "日志失败 ：" + fullMap.get("message") + "\n数据：" + MapTools.objectToString(logParam));

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

@@ -314,7 +314,7 @@ public class MyDbHelper {
         return updateByCondition(sql, parameterList);
     }
 
-    public synchronized Map<String, Object> JDBCBatch(String sql, List<Object[]> paramList, List<Map<String, Object>> paramsList) {
+    public  Map<String, Object> JDBCBatch(String sql, List<Object[]> paramList, List<Map<String, Object>> paramsList) {
         if (!sql.contains("?")) {  // Object[]
             return processSuccess(null, sql, paramsList);
         }

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

@@ -48,7 +48,7 @@ public class ScheduleTask implements Runnable {
                 if (Objects.isNull(dataProcess) || Objects.nonNull(dataProcess.getErrorMessage())) {
                     LogUtils.log("run: 1", "-1",  null,"启动服务失败，获取采集对象异常:" + (Objects.isNull(dataProcess) ? "" : dataProcess.getErrorMessage()), id, AppConfig.WORK_ID, "服务编号：" + id, null,null,null);//无条件记录数据接收日志
                 }
-                dataProcess.processData(new HashMap<String, Object>() {{
+                dataProcess.processData(new HashMap<>() {{
                     put("dataContent", "1");
                     put("event", "1");
                 }});

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

@@ -18,9 +18,10 @@ public class ScriptEnginePro {
     private long lastActive; //服务最后活跃时间
     private String errorMessage = null; //初始化时，对象异常信息
 
-    /*java变量*/ Method javaMethod; //java执行函数
-    Method javaMethodClose; //java执行函数
-    Object classInstance;//java执行实例
+    /*java变量*/
+    private Method javaMethod; //java执行函数
+    private Method javaMethodClose; //java执行函数
+    private Object classInstance;//java执行实例
 
     /*JS变量*/
     private ScriptEngine scriptEngine; //脚本执行引擎