异常修复

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

@@ -97,16 +97,14 @@ public class DataProcess {
     }
 
     //数据收集----目前应该是数据处理
-    int count = 0;
-    Long begin = 0L;
-
     public Map<String, Object> processData(Map<String, Object> inputData, String... user_id) { //{serviceid:1,datacontent:[{key:value},{key:value}],event:0,page:1,pagesize:10}
         //事件判断由算法进行，不再作为入口必须条件  ?
         if (!MapTools.isBlank(errorMessage)) {//如果当前服务存在问题，代表数据库对象不可用，此时应该重构当前对象，调用方控制
             LogUtils.log("processData:1", "-1", null, "服务不可用" + errorMessage, serviceId, AppConfig.WORK_ID, MapTools.jacksonObjToStr(inputData), null, null, null);
             return processFail("服务不可用" + errorMessage, null);
         }
-        if (System.currentTimeMillis() - lastActive > 1000) {  //        更新数据库中的服务最新活跃时间
+        if (System.currentTimeMillis() - lastActive > 2000) {  //        更新数据库中的服务最新活跃时间
+            Runtime.getRuntime().gc();
             //更新服务的活跃时间
             MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.getSystemParams(AppConfig.REMOTE_DB_CONNECT));
             if (Objects.nonNull(myDbHelper.getErrorMessage())) {
@@ -364,9 +362,12 @@ public class DataProcess {
                 if (eventFlag.equals("6")) {
                     currentResult = myDbHelper.insertOrUpdate(tableName, dbPrams);
                 } else {
-                    currentResult = myDbHelper.generalProcess(eventFlag, tableName, computing_expression, null, dbPrams, Objects.nonNull(isActiveTable) && Objects.equals(isActiveTable, "true"), page, pageSize);
+                    if (eventFlag.equals("7")){
+                        currentResult = myDbHelper.bathEvent7(computing_expression, dbPrams);
+                    }else {
+                        currentResult = myDbHelper.generalProcess(eventFlag, tableName, computing_expression, null, dbPrams, Objects.nonNull(isActiveTable) && Objects.equals(isActiveTable, "true"), page, pageSize);
+                    }
                 }
-
             } else {
                 currentResult = execEngine(calculationLibrary, inData, dataObjectId);
             }

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

@@ -92,9 +92,9 @@ public class DataFormat {
         return tempIndex == str.length() ? str : str.substring(0, tempIndex);
     }
 
-//    public static void main(String[] args) {
-//        String xx = "BPM\\r\\n.V/1LWNZ\\r\\n.J/R/13203/0/13MAR/1143L/MBWNZ\\r\\n.F/CA8531/13MAR/TSN/Y\\r\\n.U/ULD000282//X/Y/TSN\\r\\n.B/OFF/3999159951001\\r\\n.I/G54873/13MAR/CGD/J\\r\\n.S/Y/19C/C/045//Y\\r\\n.P/WANGDONGHONG\\r\\n.L/NY51JP\\r\\n.R/+ACT/OL/B/S/3\\r\\nENDBPM";
-//
+    public static void main(String[] args) {
+//        String xx = "{BSM0G\\r\\n.R/+ACT/LD/B/S/1\\r\\nENDBPM\\r\\n\",\"dataObjectId\":\"167894111307300001000100\"}{\"dataContent\":\"QP CABDPCA\\r\\n.HKGBMCA 161231\\r\\nBPM\\r\\n.V/1LHKG\\r\\n.J/R/JAT/H92165/16MAR/123150L\\r\\n.F/CA0112/16MAR/PEK/Y\\r\\n.U/AKE29241CA//M/Y/PEK\\r\\n.N/3999456596001\\r\\n.Q/019\\r\\n.S/Y/55C/C/118//Y\\r\\n.P/1ZHONG/WEIGIANG\\r\\n.L/NBE0JY\\r\\nENDBPM\\r\\n\",\"dataObjectId\":\"167894111357600001000100\"}{\"dataContent\":\"CABDPCA\\r\\n.FRAHQ0A 160431\\r\\nBPM\\r\\n.V/1LPEK\\r\\n.J/R/13301/4693/16MAR/1231L/T2FJP43\\r\\n.F/CA1257/16MAR/KRL/Y\\r\\n.U/DOU41257CA//X/Y/KRL\\r\\n.N/3999431112001\\r\\n.Q/040\\r\\n.S/Y/12C/C/117//Y\\r\\n.P/RONGHONGQING\\r\\n.Y/CA006362841835\\r\\n.L/PFRGZG\\r\\n.R/+ACT/LD/B/S/1\\r\\nENDBPM\\r\\n\",\"dataObjectId\":\"167894111399100001000100\"}{\"dataContent\":\"QD CABDPCA\\r\\n.PEKBS1E 161231\\r\\nBSM\\r\\nCHG\\r\\n.V/1LPEK\\r\\n.F/CA1541/16MAR/NGB/Y\\r\\n.N/3999362826001\\r\\n.D/SELF//16MAR/1231L//BJS159627\\r\\n.S/Y/18L/C/046//Y//A\\r\\n.W/K/1/9\\r\\n.P/1ZHANGHONGHAI\\r\\n.Y/CA005317156803\\r\\n.L/PX201T\\r\\n.T/159627\\r\\nENDBSM}";
+
 //        HashMap<String, String> objectObjectHashMap = new HashMap<>();
 //        objectObjectHashMap.put("dataType", "dataType");
 //        objectObjectHashMap.put("dataState", "dataState");
@@ -166,15 +166,12 @@ public class DataFormat {
 //        objectObjectHashMap.put(".X/4", "securityInspectionMethod");
 //        objectObjectHashMap.put(".Y/1", "frequentflyerNO");
 //        objectObjectHashMap.put(".Y/2", "frequentflyerGrade");
+//        System.out.println(typeBToMap(xx,"11111111111111",objectObjectHashMap));
 //
+//        String typeStr = "{1}{2}";
 //
-//
-//
-//
-//
-//
-//        System.out.println(typeBToMap(xx,"11111111111111",objectObjectHashMap));
-//    }
+//        System.out.println(typeStrList);
+    }
 
 
     public static Map<String, Object> typeBToMap(String typeStr, String dataObjectId, Map<String, String> transMaps) {
@@ -185,10 +182,27 @@ public class DataFormat {
             if (Objects.isNull(transMaps)) {
                 transMaps = new HashMap<>();
             }
+            List<String> typeStrList = MapTools.patternContent(typeStr, "\\{(.+?)\\}");
             //设定报文提取规则MAP，此MAP应该放到类变量中，属于常量，没必要每次调用都去创建：未来从配置文件或者数据库读取TypeB的所有数据格式，只是目前只支持BSM和BPM，未来可以加
             List<Map<String, Object>> returnDataList = new ArrayList<>();//初始化一个最终返回的数组
             for (String dataType : messageRules.keySet()) {//循环报文提取规则MAP:为了兼容一条字符串中既有BSM又有BPM的情况
-                List<String> messagList = MapTools.patternContent(typeStr, messageRules.get(dataType)); //使用对应的提取正则表达式进行报文提取
+                List<String> messagList = new ArrayList<>();
+                for (String tempTypeStr : typeStrList) {
+                    List<String> tempMessageList = MapTools.patternContent(tempTypeStr, messageRules.get(dataType)); //使用对应的提取正则表达式进行报文提取
+                    if (tempMessageList.size() > 0) {
+                        messagList.addAll(tempMessageList);
+                    }else {
+                        if (tempTypeStr.contains(dataType)){
+                            HashMap<String, Object> errorMap = new HashMap<>();
+                            errorMap.put("dataObjectId", dataObjectId);
+                            errorMap.put("errMessage", "报文数据格式错误");
+                            errorMap.put("sourceData", tempTypeStr);
+                            if (!returnDataList.contains(errorMap)) {
+                                returnDataList.add(errorMap);
+                            }
+                        }
+                    }
+                }
                 for (String signData : messagList) {//循环提取到的报文数组中每一条报文
                     Map<String, Object> signDataMap = new HashMap<>();//创建一个当前报文的MAP
                     signDataMap.put("dataType", dataType);//默认报文类型
@@ -396,444 +410,444 @@ public class DataFormat {
         }
     }
 
-        /**
-         * //必要的特殊处理：
-         * //承运航班：如果有F则F否则如果有I则I否则空
-         * //起飞机场：如果有F则V否则如果有I则I否则空
-         * //降落机场：如果有F则F否则V
-         * //读取地点：如果有J则J否则如果有D则D否则有H则H
-         * //读取时间：如果有J则J否则如果有D则D否则接收时间
-         * //当前结果：如果有dataState则dataState否则有B则B否则有X则X
-         *
-         * @return
-         */
-
-
-        public static Map<String, Object> specialHandler (HashMap < String, Object > inMap, String dataObjectId){
-            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);
-            if (MapTools.isNotBlank(landAirport)) {
-                inMap.put("landAirport", inMap.get(landAirport));
-            }
+    /**
+     * //必要的特殊处理：
+     * //承运航班：如果有F则F否则如果有I则I否则空
+     * //起飞机场：如果有F则V否则如果有I则I否则空
+     * //降落机场：如果有F则F否则V
+     * //读取地点：如果有J则J否则如果有D则D否则有H则H
+     * //读取时间：如果有J则J否则如果有D则D否则接收时间
+     * //当前结果：如果有dataState则dataState否则有B则B否则有X则X
+     *
+     * @return
+     */
 
-            String carrierFlights = inMap.containsKey("flightNo") ? "flightNo" : (inMap.containsKey("inflightNo") ? "inflightNo" : null);
-            if (MapTools.isNotBlank(carrierFlights)) {
-                inMap.put("carrierFlights", inMap.get(carrierFlights));
-            }
-            String carrierFlightsDate = inMap.containsKey("flightDate") ? "flightDate" : (inMap.containsKey("inflightDate") ? "inflightDate" : null);
-            if (MapTools.isNotBlank(carrierFlightsDate)) {
-                inMap.put("carrierFlightsDate", inMap.get(carrierFlightsDate));
-            }
 
-            String readAddess = inMap.containsKey("location_code") ? "location_code" : (inMap.containsKey("checkInLocation") ? "checkInLocation" : inMap.containsKey("operationArea") ? "operationArea" : (inMap.containsKey("location_describe") ? "location_describe" : null));
-            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));
+    public static Map<String, Object> specialHandler(HashMap<String, Object> inMap, String dataObjectId) {
+        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);
+        if (MapTools.isNotBlank(landAirport)) {
+            inMap.put("landAirport", inMap.get(landAirport));
+        }
 
-            String currentResult = inMap.containsKey("dataState") ? "dataState" : (inMap.containsKey("abnormalState") ? "abnormalState" : inMap.containsKey("securityInspectionResults") ? "securityInspectionResults" : null);
-            if (MapTools.isNotBlank(readAddess) && Objects.nonNull(inMap.get(currentResult))) {
-                inMap.put("currentResult", inMap.get(currentResult));
-            }
+        String carrierFlights = inMap.containsKey("flightNo") ? "flightNo" : (inMap.containsKey("inflightNo") ? "inflightNo" : null);
+        if (MapTools.isNotBlank(carrierFlights)) {
+            inMap.put("carrierFlights", inMap.get(carrierFlights));
+        }
+        String carrierFlightsDate = inMap.containsKey("flightDate") ? "flightDate" : (inMap.containsKey("inflightDate") ? "inflightDate" : null);
+        if (MapTools.isNotBlank(carrierFlightsDate)) {
+            inMap.put("carrierFlightsDate", inMap.get(carrierFlightsDate));
+        }
 
-            if (inMap.containsKey("dataType") && Objects.equals(inMap.get("dataType"), "BSM")) {
-                inMap.put("nodeCode", "CHECKIN");
+        String readAddess = inMap.containsKey("location_code") ? "location_code" : (inMap.containsKey("checkInLocation") ? "checkInLocation" : inMap.containsKey("operationArea") ? "operationArea" : (inMap.containsKey("location_describe") ? "location_describe" : null));
+        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 (MapTools.isNotBlank(readAddess) && Objects.nonNull(inMap.get(currentResult))) {
+            inMap.put("currentResult", inMap.get(currentResult));
+        }
+
+        if (inMap.containsKey("dataType") && Objects.equals(inMap.get("dataType"), "BSM")) {
+            inMap.put("nodeCode", "CHECKIN");
+        }
+        if (Objects.nonNull(inMap.get("readAddess")) && "ARRIVED,LOAD,INFL,SECURITY,SORT,UNLOAD".contains(inMap.get("readAddess").toString())) {
+            inMap.put("nodeCode", inMap.get("readAddess"));
+        }
+        if (Objects.nonNull(inMap.get("securityInspectionResults"))) {
+            inMap.put("nodeCode", "SECURITY");
+        }
+        Object sourceSign = inMap.get("sourceSign");
+        Object secondary_code = inMap.get("secondary_code");
+        Object location_describe = inMap.get("location_describe");
+        Object to_location_describe = inMap.get("to_location_describe");
+        if (Objects.nonNull(sourceSign)) {
+            if (!inMap.containsKey("nodeCode") && Objects.equals(sourceSign, "T") && Objects.equals(secondary_code, "G")) {
+                inMap.put("nodeCode", "TRANSFER");
             }
-            if (Objects.nonNull(inMap.get("readAddess")) && "ARRIVED,LOAD,INFL,SECURITY,SORT,UNLOAD".contains(inMap.get("readAddess").toString())) {
-                inMap.put("nodeCode", inMap.get("readAddess"));
+            if (!inMap.containsKey("nodeCode") && !Objects.equals(sourceSign, "X") && Objects.equals(location_describe, "RM") && Objects.equals(to_location_describe, "AC")) {
+                inMap.put("nodeCode", "INFL");
             }
-            if (Objects.nonNull(inMap.get("securityInspectionResults"))) {
-                inMap.put("nodeCode","SECURITY");
+            if (!inMap.containsKey("nodeCode") && Objects.equals(sourceSign, "X") && Objects.equals(location_describe, "AC")) {
+                inMap.put("nodeCode", "UNLOAD");
             }
-            Object sourceSign = inMap.get("sourceSign");
-            Object secondary_code = inMap.get("secondary_code");
-            Object location_describe = inMap.get("location_describe");
-            Object to_location_describe = inMap.get("to_location_describe");
-            if (Objects.nonNull(sourceSign)){
-                if (!inMap.containsKey("nodeCode") && Objects.equals(sourceSign,"T") &&Objects.equals(secondary_code,"G") ){
-                    inMap.put("nodeCode","TRANSFER");
-                }
-                if (!inMap.containsKey("nodeCode") &&!Objects.equals(sourceSign,"X") &&Objects.equals(location_describe,"RM") && Objects.equals(to_location_describe,"AC") ){
-                    inMap.put("nodeCode","INFL");
-                }
-                if (!inMap.containsKey("nodeCode") &&Objects.equals(sourceSign,"X") &&Objects.equals(location_describe,"AC")){
-                    inMap.put("nodeCode","UNLOAD");
-                }
-                if (!inMap.containsKey("nodeCode") &&!Objects.equals(sourceSign,"X") &&Objects.equals(secondary_code,"S")){
-                    inMap.put("nodeCode","SORT");
-                }
-                if (!inMap.containsKey("nodeCode") &&!Objects.equals(sourceSign,"X") &&Objects.equals(secondary_code,"R")){
-                    inMap.put("nodeCode","LOAD");
-                }
-                if (!inMap.containsKey("nodeCode") &&Objects.equals(sourceSign,"X") && !Objects.equals(secondary_code,"S")){
-                    inMap.put("nodeCode","ARRIVED");
-                }
+            if (!inMap.containsKey("nodeCode") && !Objects.equals(sourceSign, "X") && Objects.equals(secondary_code, "S")) {
+                inMap.put("nodeCode", "SORT");
             }
-            return inMap;
-        }
-
-        /**
-         * xml转map 定制化
-         *
-         * @param xml                     字符串
-         * @param isTwoDimensionalization 是否需要二维化
-         * @param noDiKaList              是否需要dika
-         * @param translateName           需要转义的名称
-         * @return code message returnData
-         */
-        public static Map<String, Object> customMadexmlToMap (String xml,boolean isTwoDimensionalization, List<String > noDiKaList, Map < String, String > translateName){
-            Map<String, Object> returnMap = xmlToMapFormat(xml); //  code ,message ,returenData
-            if (returnMap.get("code").equals("-1")) return returnMap;
-            if (isTwoDimensionalization) {
-                Map<String, Object> xmlMap = (Map<String, Object>) returnMap.get("returnData");
-                returnMap = twoDimensionalizationFormat(xmlMap, noDiKaList); //  code ,message ,returenData
-                if (returnMap.get("code").equals("-1")) return returnMap;
+            if (!inMap.containsKey("nodeCode") && !Objects.equals(sourceSign, "X") && Objects.equals(secondary_code, "R")) {
+                inMap.put("nodeCode", "LOAD");
             }
-            if (null != translateName && !translateName.isEmpty()) {
-                Object returnData = returnMap.get("returnData"); //  code ,message ,returenData
-                if (returnData instanceof Map) {
-                    List<Map<String, Object>> inData = new ArrayList<>();
-                    inData.add((Map) returnData);
-                    returnMap = translateMapName(inData, translateName); // code message retrunData
-                } else if (returnData instanceof List) {
-                    returnMap = translateMapName((List) returnData, translateName); // code message retrunData
-                }
+            if (!inMap.containsKey("nodeCode") && Objects.equals(sourceSign, "X") && !Objects.equals(secondary_code, "S")) {
+                inMap.put("nodeCode", "ARRIVED");
             }
-            for (Map<String, Object> tempMap : (List<Map<String, Object>>) returnMap.get("returnData")) {
-                tempMap.values().removeAll(Collections.singleton(null));
-                tempMap.values().removeAll(Collections.singleton(""));
+        }
+        return inMap;
+    }
+
+    /**
+     * xml转map 定制化
+     *
+     * @param xml                     字符串
+     * @param isTwoDimensionalization 是否需要二维化
+     * @param noDiKaList              是否需要dika
+     * @param translateName           需要转义的名称
+     * @return code message returnData
+     */
+    public static Map<String, Object> customMadexmlToMap(String xml, boolean isTwoDimensionalization, List<String> noDiKaList, Map<String, String> translateName) {
+        Map<String, Object> returnMap = xmlToMapFormat(xml); //  code ,message ,returenData
+        if (returnMap.get("code").equals("-1")) return returnMap;
+        if (isTwoDimensionalization) {
+            Map<String, Object> xmlMap = (Map<String, Object>) returnMap.get("returnData");
+            returnMap = twoDimensionalizationFormat(xmlMap, noDiKaList); //  code ,message ,returenData
+            if (returnMap.get("code").equals("-1")) return returnMap;
+        }
+        if (null != translateName && !translateName.isEmpty()) {
+            Object returnData = returnMap.get("returnData"); //  code ,message ,returenData
+            if (returnData instanceof Map) {
+                List<Map<String, Object>> inData = new ArrayList<>();
+                inData.add((Map) returnData);
+                returnMap = translateMapName(inData, translateName); // code message retrunData
+            } else if (returnData instanceof List) {
+                returnMap = translateMapName((List) returnData, translateName); // code message retrunData
             }
-            return returnMap;
-        }
-
-        /**
-         * map key值转换
-         *
-         * @param returnDataList
-         * @param translateName
-         * @return
-         */
-        public static Map<String, Object> translateMapName (List < Map < String, Object >> returnDataList, Map < String, String > translateName){
-            try {
-                List<Map<String, Object>> dataList = new ArrayList<>();
-                for (Map<String, Object> returnData : returnDataList) {
-                    Map<String, Object> temMap = new HashMap<>();
-                    for (String key : returnData.keySet()) {
-                        if (translateName.containsKey(key)) {
-                            temMap.put(translateName.get(key), returnData.get(key));
-                        }
+        }
+        for (Map<String, Object> tempMap : (List<Map<String, Object>>) returnMap.get("returnData")) {
+            tempMap.values().removeAll(Collections.singleton(null));
+            tempMap.values().removeAll(Collections.singleton(""));
+        }
+        return returnMap;
+    }
+
+    /**
+     * map key值转换
+     *
+     * @param returnDataList
+     * @param translateName
+     * @return
+     */
+    public static Map<String, Object> translateMapName(List<Map<String, Object>> returnDataList, Map<String, String> translateName) {
+        try {
+            List<Map<String, Object>> dataList = new ArrayList<>();
+            for (Map<String, Object> returnData : returnDataList) {
+                Map<String, Object> temMap = new HashMap<>();
+                for (String key : returnData.keySet()) {
+                    if (translateName.containsKey(key)) {
+                        temMap.put(translateName.get(key), returnData.get(key));
                     }
-                    dataList.add(temMap);
                 }
-                return processSuccess(dataList);
-            } catch (Exception e) {
-                return processFail("translateMapName替换异常");
+                dataList.add(temMap);
             }
+            return processSuccess(dataList);
+        } catch (Exception e) {
+            return processFail("translateMapName替换异常");
         }
+    }
 
-        /**
-         * xml 转map 通用化
-         *
-         * @param xml
-         * @return
-         */
-        public static Map<String, Object> xmlToMapFormat (String xml){
-            try {
-                String xmlStr = xml.substring(xml.contains("<") ? xml.indexOf("<") : 0, xml.lastIndexOf(">") > 0 ? xml.lastIndexOf(">") + 1 : xml.length());
-                xmlStr = (xmlStr.contains("<?xml") ? "" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n").concat(xmlStr);
-                Document doc = DocumentHelper.parseText(xmlStr);
-                Element root = doc.getRootElement();
-                Map<String, Object> returnMap = xmlToMap(root);
-                return processSuccess(returnMap);
-            } catch (Exception e) {
-                return processFail("入参不是规则的xml ：" + xml);
-            }
+    /**
+     * xml 转map 通用化
+     *
+     * @param xml
+     * @return
+     */
+    public static Map<String, Object> xmlToMapFormat(String xml) {
+        try {
+            String xmlStr = xml.substring(xml.contains("<") ? xml.indexOf("<") : 0, xml.lastIndexOf(">") > 0 ? xml.lastIndexOf(">") + 1 : xml.length());
+            xmlStr = (xmlStr.contains("<?xml") ? "" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n").concat(xmlStr);
+            Document doc = DocumentHelper.parseText(xmlStr);
+            Element root = doc.getRootElement();
+            Map<String, Object> returnMap = xmlToMap(root);
+            return processSuccess(returnMap);
+        } catch (Exception e) {
+            return processFail("入参不是规则的xml ：" + xml);
         }
+    }
 
-        /**
-         * map 二维化
-         *
-         * @param inMap      需要二维化map
-         * @param noDiKaList 需要dika
-         * @return
-         */
-        public static Map<String, Object> twoDimensionalizationFormat (Map < String, Object > inMap, List < String > noDiKaList){
-            try {
-                List<Map<String, Object>> returnDataList = twoDimensionalization(inMap, "", noDiKaList); /*生命周期未添加*/
-                return processSuccess(returnDataList);
-            } catch (Exception e) {
-                return processFail(LogUtils.getException(e));
-            }
+    /**
+     * map 二维化
+     *
+     * @param inMap      需要二维化map
+     * @param noDiKaList 需要dika
+     * @return
+     */
+    public static Map<String, Object> twoDimensionalizationFormat(Map<String, Object> inMap, List<String> noDiKaList) {
+        try {
+            List<Map<String, Object>> returnDataList = twoDimensionalization(inMap, "", noDiKaList); /*生命周期未添加*/
+            return processSuccess(returnDataList);
+        } catch (Exception e) {
+            return processFail(LogUtils.getException(e));
         }
+    }
 
-        public Map<String, Object> collectInsertOrUpdate (List < String > ids, String sourceTable, String sourceKey, String targetTable, List < String > uniqueList,
-        boolean isActive, List<String > targetNull, String dbConnect){
-            if ("".equals(dbConnect) || ids.isEmpty() || uniqueList.isEmpty()) {
-                return processSuccess(null);
+    public Map<String, Object> collectInsertOrUpdate(List<String> ids, String sourceTable, String sourceKey, String targetTable, List<String> uniqueList,
+                                                     boolean isActive, List<String> targetNull, String dbConnect) {
+        if ("".equals(dbConnect) || ids.isEmpty() || uniqueList.isEmpty()) {
+            return processSuccess(null);
 
-            }
-            MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(dbConnect);
-            /*检测数据库中是否存在对应的表*/
-            Map<String, String> hasTableMap = myDbHelper.queryForObject("select COUNT(1) as count from information_schema.TABLES  where TABLE_NAME = ?", targetTable);
-            if (hasTableMap.get("code").equals("-1")) {
-                return processFail("算法工具类获取目标表结构执行SQL失败： " + hasTableMap.get("message"));
-            }
-            String count = hasTableMap.get("returnData");
-            if ("".equals(count) || "0".equals(count)) {
-                if (isActive) {
-                    try {
-                        String tempSql = "CREATE TABLE if not EXISTS " + targetTable + " (" + targetTable + "_id int(11) NOT NULL AUTO_INCREMENT  PRIMARY KEY,`dataObjectId` VARCHAR(32) DEFAULT NULL ,`createtime` timestamp not null default current_timestamp) ";
-                        myDbHelper.execute(tempSql);
-                    } catch (Exception e) {
-                        return processFail("collectInsertOrUpdate动态创建表结构失败 " + LogUtils.getException(e));
-                    }
-                } else {
-                    return processFail("目标表不是动态表，数据库中不存在");
+        }
+        MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(dbConnect);
+        /*检测数据库中是否存在对应的表*/
+        Map<String, String> hasTableMap = myDbHelper.queryForObject("select COUNT(1) as count from information_schema.TABLES  where TABLE_NAME = ?", targetTable);
+        if (hasTableMap.get("code").equals("-1")) {
+            return processFail("算法工具类获取目标表结构执行SQL失败： " + hasTableMap.get("message"));
+        }
+        String count = hasTableMap.get("returnData");
+        if ("".equals(count) || "0".equals(count)) {
+            if (isActive) {
+                try {
+                    String tempSql = "CREATE TABLE if not EXISTS " + targetTable + " (" + targetTable + "_id int(11) NOT NULL AUTO_INCREMENT  PRIMARY KEY,`dataObjectId` VARCHAR(32) DEFAULT NULL ,`createtime` timestamp not null default current_timestamp) ";
+                    myDbHelper.execute(tempSql);
+                } catch (Exception e) {
+                    return processFail("collectInsertOrUpdate动态创建表结构失败 " + LogUtils.getException(e));
                 }
-            }
-
-            /*检测数据库中是否存在对应表的唯一键*/
-            List<String> allColumn = new ArrayList<>();
-            List<String> tempUnique;
-            List<String> addIndex = new ArrayList<>();
-            tempUnique = MapTools.deepCopy(uniqueList);
-            tempUnique = (tempUnique == null) ? new ArrayList<>() : tempUnique;
-            Map<String, Object> desc_1Map = myDbHelper.queryByParamsReturnList("desc " + targetTable);
-            List<Map<String, Object>> mapList = MapTools.getMapList(desc_1Map);
-            if (!desc_1Map.get("code").equals("0") || null == mapList) {
+            } else {
                 return processFail("目标表不是动态表，数据库中不存在");
             }
-            for (String unique : uniqueList) {
-                for (Map<String, Object> fieldMap : mapList) {
-                    String field = fieldMap.get("Field").toString();
-                    Object key = fieldMap.get("key");
-                    allColumn.add(field);
-                    if (field.equals(unique)) {
-                        tempUnique.remove(unique);
-                        if (Objects.isNull(key)) {
-                            addIndex.add(field);
-                        }
+        }
+
+        /*检测数据库中是否存在对应表的唯一键*/
+        List<String> allColumn = new ArrayList<>();
+        List<String> tempUnique;
+        List<String> addIndex = new ArrayList<>();
+        tempUnique = MapTools.deepCopy(uniqueList);
+        tempUnique = (tempUnique == null) ? new ArrayList<>() : tempUnique;
+        Map<String, Object> desc_1Map = myDbHelper.queryByParamsReturnList("desc " + targetTable);
+        List<Map<String, Object>> mapList = MapTools.getMapList(desc_1Map);
+        if (!desc_1Map.get("code").equals("0") || null == mapList) {
+            return processFail("目标表不是动态表，数据库中不存在");
+        }
+        for (String unique : uniqueList) {
+            for (Map<String, Object> fieldMap : mapList) {
+                String field = fieldMap.get("Field").toString();
+                Object key = fieldMap.get("key");
+                allColumn.add(field);
+                if (field.equals(unique)) {
+                    tempUnique.remove(unique);
+                    if (Objects.isNull(key)) {
+                        addIndex.add(field);
                     }
                 }
             }
-            for (String field : tempUnique) {
-                myDbHelper.execute("alter table " + targetTable + " add " + field + " text ");
-            }
-            if (!addIndex.isEmpty()) {
-                myDbHelper.execute("alter table " + targetTable + " add  UNIQUE(" + String.join(",", addIndex) + ")");
-            }
-            tempUnique = MapTools.deepCopy(uniqueList);
-            try {
-                Map<String, Object> sourceDataListResult = myDbHelper.queryByParamsReturnList("select * from " + sourceTable + " where " + sourceKey + " in (" + String.join(",", ids) + ")");
-                List<Map<String, Object>> tempSourceData = MapTools.getMapList(sourceDataListResult);
-                if (!sourceDataListResult.get("code").equals("0") || null == tempSourceData) {
-                    return processFail("查询数据数据失败");
+        }
+        for (String field : tempUnique) {
+            myDbHelper.execute("alter table " + targetTable + " add " + field + " text ");
+        }
+        if (!addIndex.isEmpty()) {
+            myDbHelper.execute("alter table " + targetTable + " add  UNIQUE(" + String.join(",", addIndex) + ")");
+        }
+        tempUnique = MapTools.deepCopy(uniqueList);
+        try {
+            Map<String, Object> sourceDataListResult = myDbHelper.queryByParamsReturnList("select * from " + sourceTable + " where " + sourceKey + " in (" + String.join(",", ids) + ")");
+            List<Map<String, Object>> tempSourceData = MapTools.getMapList(sourceDataListResult);
+            if (!sourceDataListResult.get("code").equals("0") || null == tempSourceData) {
+                return processFail("查询数据数据失败");
+            }
+            for (Map<String, Object> currentData : tempSourceData) {
+                List<String> currentKeysList = new ArrayList<>(currentData.keySet());
+                for (String key : currentKeysList) {
+                    if (!allColumn.contains(key)) {
+                        myDbHelper.execute("alter table " + targetTable + " add " + key + " text ");
+                    }
                 }
-                for (Map<String, Object> currentData : tempSourceData) {
-                    List<String> currentKeysList = new ArrayList<>(currentData.keySet());
-                    for (String key : currentKeysList) {
-                        if (!allColumn.contains(key)) {
-                            myDbHelper.execute("alter table " + targetTable + " add " + key + " text ");
-                        }
+                List<String> uniqueKey = new ArrayList<>();
+                List<Object> uniqueValue = new ArrayList<>();
+                List<Object> columnValue = new ArrayList<>();
+                List<String> flag = new ArrayList<>();
+                for (String tpKey : currentData.keySet()) {
+                    Object tpValue = currentData.get(tpKey);
+                    if (Objects.isNull(tpValue) && !targetNull.contains(tpKey)) {
+                        currentKeysList.remove(tpKey);
+                        continue;
                     }
-                    List<String> uniqueKey = new ArrayList<>();
-                    List<Object> uniqueValue = new ArrayList<>();
-                    List<Object> columnValue = new ArrayList<>();
-                    List<String> flag = new ArrayList<>();
-                    for (String tpKey : currentData.keySet()) {
-                        Object tpValue = currentData.get(tpKey);
-                        if (Objects.isNull(tpValue) && !targetNull.contains(tpKey)) {
-                            currentKeysList.remove(tpKey);
-                            continue;
-                        }
-                        if (tempUnique.contains(tpKey)) {
-                            uniqueValue.add(tpValue);
-                            uniqueKey.add(tpKey);
-                            currentKeysList.remove(tpKey);
-                            continue;
-                        }
-
-                        if (tpKey.equals("createtime") || tpKey.equals(sourceKey)) {
-                            currentKeysList.remove(tpKey);
-                            continue;
-                        }
-                        flag.add("?");
-                        columnValue.add(tpValue.toString());
+                    if (tempUnique.contains(tpKey)) {
+                        uniqueValue.add(tpValue);
+                        uniqueKey.add(tpKey);
+                        currentKeysList.remove(tpKey);
+                        continue;
                     }
-                    String sql = "select count(1) count from " + targetTable + " where " + String.join(" and ", updateList(uniqueKey, "=?"));
-                    Map<String, String> hasTargetTableMap = myDbHelper.queryForObject(sql, uniqueValue.toArray());
-                    if (hasTargetTableMap.get("code").equals("-1")) {
-                        return processFail("算法工具类获取目标表结构执行SQL失败： " + hasTargetTableMap.get("message"));
+
+                    if (tpKey.equals("createtime") || tpKey.equals(sourceKey)) {
+                        currentKeysList.remove(tpKey);
+                        continue;
                     }
-                    String targetCount = hasTargetTableMap.get("returnData");
-                    if ("".equals(targetCount) || "0".equals(targetCount)) {
-                        currentKeysList.addAll(uniqueKey);
-                        for (String ignored : uniqueKey) {
-                            flag.add("?");
-                        }
-                        String tempSql = "insert into " + targetTable + "(" + String.join(",", currentKeysList) + ")" + "values  (" + String.join(",", flag) + ")";
-                        columnValue.addAll(uniqueValue);
-                        myDbHelper.updateByCondition(tempSql, null, columnValue.toArray());
-                    } else {
-                        columnValue.addAll(uniqueValue);
-                        myDbHelper.updateByCondition("update " + targetTable + " set " + String.join(",", updateList(currentKeysList, "=?")) + " where " + String.join(" and ", updateList(uniqueKey, "=?")),
-                                null, columnValue.toArray());
+                    flag.add("?");
+                    columnValue.add(tpValue.toString());
+                }
+                String sql = "select count(1) count from " + targetTable + " where " + String.join(" and ", updateList(uniqueKey, "=?"));
+                Map<String, String> hasTargetTableMap = myDbHelper.queryForObject(sql, uniqueValue.toArray());
+                if (hasTargetTableMap.get("code").equals("-1")) {
+                    return processFail("算法工具类获取目标表结构执行SQL失败： " + hasTargetTableMap.get("message"));
+                }
+                String targetCount = hasTargetTableMap.get("returnData");
+                if ("".equals(targetCount) || "0".equals(targetCount)) {
+                    currentKeysList.addAll(uniqueKey);
+                    for (String ignored : uniqueKey) {
+                        flag.add("?");
                     }
+                    String tempSql = "insert into " + targetTable + "(" + String.join(",", currentKeysList) + ")" + "values  (" + String.join(",", flag) + ")";
+                    columnValue.addAll(uniqueValue);
+                    myDbHelper.updateByCondition(tempSql, null, columnValue.toArray());
+                } else {
+                    columnValue.addAll(uniqueValue);
+                    myDbHelper.updateByCondition("update " + targetTable + " set " + String.join(",", updateList(currentKeysList, "=?")) + " where " + String.join(" and ", updateList(uniqueKey, "=?")),
+                            null, columnValue.toArray());
                 }
-            } catch (Exception e) {
-                return processFail("collectInsertOrUpdate SQL 执行异常 " + LogUtils.getException(e));
             }
-            return processSuccess(null);
+        } catch (Exception e) {
+            return processFail("collectInsertOrUpdate SQL 执行异常 " + LogUtils.getException(e));
         }
+        return processSuccess(null);
+    }
 
-        private static List<Map<String, Object>> twoDimensionalization (Map < String, Object > inMap, String keyName, List < String > noDiKaList){
-            //初始化一个返回数组List<map<string,object>> returnList
-            List<Map<String, Object>> returnList = new ArrayList<>();
-            // 默认添加一个空MAP----returnList.add(new map)//目的是确保计算迪卡乘积以及最后的单值赋值不出现问题
-            returnList.add(new HashMap<>());
-            //循环入参inMap
-            for (String currentKeyName : inMap.keySet()) {
+    private static List<Map<String, Object>> twoDimensionalization(Map<String, Object> inMap, String keyName, List<String> noDiKaList) {
+        //初始化一个返回数组List<map<string,object>> returnList
+        List<Map<String, Object>> returnList = new ArrayList<>();
+        // 默认添加一个空MAP----returnList.add(new map)//目的是确保计算迪卡乘积以及最后的单值赋值不出现问题
+        returnList.add(new HashMap<>());
+        //循环入参inMap
+        for (String currentKeyName : inMap.keySet()) {
 //            组装键名itemKeyName = (keyName为空？'':keyName) + '_' + currentKeyName
-                String itemKeyName = (Objects.equals(keyName, "") ? "" : keyName + '_') + currentKeyName;//组装键名
-                Object currentValue = inMap.get(currentKeyName);
-                if (currentValue instanceof List) {
+            String itemKeyName = (Objects.equals(keyName, "") ? "" : keyName + '_') + currentKeyName;//组装键名
+            Object currentValue = inMap.get(currentKeyName);
+            if (currentValue instanceof List) {
+                List<Map<String, Object>> tempList = new ArrayList<>();
+                List<Object> list = (List<Object>) currentValue;
+                if (Objects.nonNull(noDiKaList) && noDiKaList.contains(itemKeyName)) {
+                    Map<String, Object> tempMap = new HashMap<>();
+                    tempMap.put(itemKeyName, currentValue.toString());
+                    tempList.add(tempMap);
+                } else {
+                    for (Object o : list) {
+                        if (o instanceof Map) {
+                            List<Map<String, Object>> tempListMap = twoDimensionalization((Map<String, Object>) o, itemKeyName, noDiKaList);
+                            tempListMap = dikaMap(returnList, tempListMap);//计算迪卡乘积
+                            tempList.addAll(tempListMap);
+                        } else {
+                            tempList.add(new HashMap<>() {{
+                                put(itemKeyName, o);
+                            }});
+                        }
+                    }
+                }
+                returnList = tempList;
+            } else {
+                if (currentValue instanceof Map) {
+                    List<Map<String, Object>> tempListMap = twoDimensionalization((Map<String, Object>) currentValue, itemKeyName, noDiKaList);//递归下一级
                     List<Map<String, Object>> tempList = new ArrayList<>();
-                    List<Object> list = (List<Object>) currentValue;
                     if (Objects.nonNull(noDiKaList) && noDiKaList.contains(itemKeyName)) {
                         Map<String, Object> tempMap = new HashMap<>();
                         tempMap.put(itemKeyName, currentValue.toString());
                         tempList.add(tempMap);
+                        returnList = tempList;
                     } else {
-                        for (Object o : list) {
-                            if (o instanceof Map) {
-                                List<Map<String, Object>> tempListMap = twoDimensionalization((Map<String, Object>) o, itemKeyName, noDiKaList);
-                                tempListMap = dikaMap(returnList, tempListMap);//计算迪卡乘积
-                                tempList.addAll(tempListMap);
-                            } else {
-                                tempList.add(new HashMap<>() {{
-                                    put(itemKeyName, o);
-                                }});
-                            }
-                        }
+                        returnList = dikaMap(returnList, tempListMap);//计算迪卡乘积后替换当前的returnList
                     }
-                    returnList = tempList;
                 } else {
-                    if (currentValue instanceof Map) {
-                        List<Map<String, Object>> tempListMap = twoDimensionalization((Map<String, Object>) currentValue, itemKeyName, noDiKaList);//递归下一级
-                        List<Map<String, Object>> tempList = new ArrayList<>();
-                        if (Objects.nonNull(noDiKaList) && noDiKaList.contains(itemKeyName)) {
-                            Map<String, Object> tempMap = new HashMap<>();
-                            tempMap.put(itemKeyName, currentValue.toString());
-                            tempList.add(tempMap);
-                            returnList = tempList;
-                        } else {
-                            returnList = dikaMap(returnList, tempListMap);//计算迪卡乘积后替换当前的returnList
-                        }
-                    } else {
-                        for (Map<String, Object> map : returnList) {//循环returnList
-                            map.put(itemKeyName, currentValue);////值不为MAP也不是数组则直接添加
-                        }
+                    for (Map<String, Object> map : returnList) {//循环returnList
+                        map.put(itemKeyName, currentValue);////值不为MAP也不是数组则直接添加
                     }
                 }
             }
-            return returnList;//返回returnList
         }
+        return returnList;//返回returnList
+    }
 
 
-        //MAP二维化辅助方法，返回List<map<string,object>>
-        private static List<Map<String, Object>> dikaMap (List < Map < String, Object >> parentList, List < Map < String, Object >> childList){
+    //MAP二维化辅助方法，返回List<map<string,object>>
+    private static List<Map<String, Object>> dikaMap(List<Map<String, Object>> parentList, List<Map<String, Object>> childList) {
 //        初始化一个返回数组
-            List<Map<String, Object>> returnList = new ArrayList<>();
-            for (Map<String, Object> childwMap : childList) {
-                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)) {
-                        parentMapClone = new HashMap<>();
-                    }
-                    parentMapClone.putAll(childwMapClone);
-                    returnList.add(parentMapClone);//注意使用HashMap.putall实现深拷贝
+        List<Map<String, Object>> returnList = new ArrayList<>();
+        for (Map<String, Object> childwMap : childList) {
+            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)) {
+                    parentMapClone = new HashMap<>();
                 }
+                parentMapClone.putAll(childwMapClone);
+                returnList.add(parentMapClone);//注意使用HashMap.putall实现深拷贝
             }
-            return returnList;
         }
+        return returnList;
+    }
 
-        private static Map<String, Object> xmlToMap (Element element){
-            String currentName = element.getName(); //当前节点名称
-            String currentValue = MapTools.getText(element.getTextTrim());// 当前节点值
+    private static Map<String, Object> xmlToMap(Element element) {
+        String currentName = element.getName(); //当前节点名称
+        String currentValue = MapTools.getText(element.getTextTrim());// 当前节点值
 
-            Map<String, Object> returnMap = new HashMap<>();//初始化一个返回的结构
-            Map<String, Object> attrMap = new HashMap<>(); //初始化一个当前节点的属性结构
-            List<Attribute> attributes = element.attributes();  //属性处理
-            for (Attribute childAttribute : attributes) { //循环当前节点所有属性
-                attrMap.put(childAttribute.getName(), childAttribute.getValue());//逐个添加属性值到属性结构
-            }
-            List<Element> childNodes = element.elements(); //获取当前节点的所有子节点
-            if (childNodes.isEmpty() && !attrMap.isEmpty()) { // //无子节点且当前节点存在属性则
-                attrMap.put(currentName, currentValue); //当前节点值添加到属性中
-            }
-            for (Element childElement : childNodes) { //循环所有子节点，如果没有子节点不会进入循环
-                String childName = childElement.getName(); //获取子节点名称
-                if (attrMap.containsKey(childName)) { //已经存在相同子节点名称的值代表需要形成数组
-                    Object oldValue = attrMap.get(childName); //获取已经存在的值
-                    List<Object> newList = new ArrayList<>();
-                    if (oldValue instanceof List) { //如果旧值已经是数组则
-                        newList = (List<Object>) oldValue; //强制转换为数组
-                    } else {
-                        newList.add(oldValue); //转换为数组，旧值添加到数组中
-                    }
-                    newList.add(xmlToMap(childElement).get(childName));//添加子节点的数据，递归获取子节点的数据
-                    attrMap.put(childName, newList);//添加到返回结构中;
+        Map<String, Object> returnMap = new HashMap<>();//初始化一个返回的结构
+        Map<String, Object> attrMap = new HashMap<>(); //初始化一个当前节点的属性结构
+        List<Attribute> attributes = element.attributes();  //属性处理
+        for (Attribute childAttribute : attributes) { //循环当前节点所有属性
+            attrMap.put(childAttribute.getName(), childAttribute.getValue());//逐个添加属性值到属性结构
+        }
+        List<Element> childNodes = element.elements(); //获取当前节点的所有子节点
+        if (childNodes.isEmpty() && !attrMap.isEmpty()) { // //无子节点且当前节点存在属性则
+            attrMap.put(currentName, currentValue); //当前节点值添加到属性中
+        }
+        for (Element childElement : childNodes) { //循环所有子节点，如果没有子节点不会进入循环
+            String childName = childElement.getName(); //获取子节点名称
+            if (attrMap.containsKey(childName)) { //已经存在相同子节点名称的值代表需要形成数组
+                Object oldValue = attrMap.get(childName); //获取已经存在的值
+                List<Object> newList = new ArrayList<>();
+                if (oldValue instanceof List) { //如果旧值已经是数组则
+                    newList = (List<Object>) oldValue; //强制转换为数组
                 } else {
-                    attrMap.put(childName, xmlToMap(childElement).get(childName));//递归获取子节点的数据;
+                    newList.add(oldValue); //转换为数组，旧值添加到数组中
                 }
+                newList.add(xmlToMap(childElement).get(childName));//添加子节点的数据，递归获取子节点的数据
+                attrMap.put(childName, newList);//添加到返回结构中;
+            } else {
+                attrMap.put(childName, xmlToMap(childElement).get(childName));//递归获取子节点的数据;
             }
-            returnMap.put(currentName, attrMap.isEmpty() ? currentValue : attrMap);//添加当前节点的属性以及值（包括了子节点）
-            return returnMap;
-        }
-
-        private static String TypeBDateChange (String inDate, String inTime){
-            //如果日期不为空
-            if (MapTools.isNotBlank(inDate)) {
-                String dayStr = inDate.trim().substring(0, 2);
-                String monthStr = EMonth.get(inDate.trim().substring(2, 5));
-                Calendar currentDate = Calendar.getInstance();
-                int yearStr = currentDate.get(Calendar.YEAR);
-                //处理跨年问题
-                int systemDay = currentDate.get(Calendar.DATE);
-                if (currentDate.get(Calendar.MONTH) + 1 == 12 && systemDay > 20 && Integer.parseInt(monthStr) == 1 && Integer.parseInt(dayStr) < 10) {
-                    yearStr = yearStr + 1;
-                }
-                if (currentDate.get(Calendar.MONTH) + 1 == 1 && systemDay < 10 && Integer.parseInt(monthStr) == 12 && Integer.parseInt(dayStr) > 20) {
-                    yearStr = yearStr - 1;
-                }
-                return yearStr + "-" + monthStr + "-" + dayStr;
-            }
-            if (MapTools.isNotBlank(inTime)) {
-                String dateType = inTime.substring(inTime.length() - 1);
-                dateType = MapTools.isNumber(dateType) ? "L" : dateType;
-                String h = inTime.length() > 1 ? inTime.substring(0, 2) : "00";
-                String m = inTime.length() > 3 ? inTime.substring(2, 4) : "00";
-                String s = inTime.length() > 5 ? inTime.substring(4, 6) : "00";
-                // 组合时间
-                return h + ":" + m + ":" + s + " " + dateType;
-            }
-            return null;
         }
+        returnMap.put(currentName, attrMap.isEmpty() ? currentValue : attrMap);//添加当前节点的属性以及值（包括了子节点）
+        return returnMap;
+    }
 
-        /**
-         * 修改list内容
-         *
-         * @param list 源list
-         * @param spc  针对每条数据添加的字符
-         * @return 新list
-         */
-        private List<String> updateList (List < String > list, String spc){
-            return list.stream().map(x -> x + spc).collect(Collectors.toList());
+    private static String TypeBDateChange(String inDate, String inTime) {
+        //如果日期不为空
+        if (MapTools.isNotBlank(inDate)) {
+            String dayStr = inDate.trim().substring(0, 2);
+            String monthStr = EMonth.get(inDate.trim().substring(2, 5));
+            Calendar currentDate = Calendar.getInstance();
+            int yearStr = currentDate.get(Calendar.YEAR);
+            //处理跨年问题
+            int systemDay = currentDate.get(Calendar.DATE);
+            if (currentDate.get(Calendar.MONTH) + 1 == 12 && systemDay > 20 && Integer.parseInt(monthStr) == 1 && Integer.parseInt(dayStr) < 10) {
+                yearStr = yearStr + 1;
+            }
+            if (currentDate.get(Calendar.MONTH) + 1 == 1 && systemDay < 10 && Integer.parseInt(monthStr) == 12 && Integer.parseInt(dayStr) > 20) {
+                yearStr = yearStr - 1;
+            }
+            return yearStr + "-" + monthStr + "-" + dayStr;
+        }
+        if (MapTools.isNotBlank(inTime)) {
+            String dateType = inTime.substring(inTime.length() - 1);
+            dateType = MapTools.isNumber(dateType) ? "L" : dateType;
+            String h = inTime.length() > 1 ? inTime.substring(0, 2) : "00";
+            String m = inTime.length() > 3 ? inTime.substring(2, 4) : "00";
+            String s = inTime.length() > 5 ? inTime.substring(4, 6) : "00";
+            // 组合时间
+            return h + ":" + m + ":" + s + " " + dateType;
         }
-    }
+        return null;
+    }
+
+    /**
+     * 修改list内容
+     *
+     * @param list 源list
+     * @param spc  针对每条数据添加的字符
+     * @return 新list
+     */
+    private List<String> updateList(List<String> list, String spc) {
+        return list.stream().map(x -> x + spc).collect(Collectors.toList());
+    }
+}

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

@@ -388,7 +388,7 @@ public class MapTools implements Serializable {
             }
              return obj.toString();
         } catch (JsonProcessingException e) {
-            return "日志数据转json字符串异常： " + e.getMessage() + ": " + obj.toString();
+            return "日志数据转json字符串异常： " + e.getMessage() + ": " + obj;
         }
     }
     /**

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

@@ -6,6 +6,7 @@ import org.bfkj.config.AppConfig;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.util.StringUtils;
 
 import java.sql.*;
 import java.util.Date;
@@ -161,21 +162,89 @@ public class MyDbHelper {
      * @param params  单挑执行参数
      * @return sql执行返回结果
      */
-    public Map<String, Object> updateByCondition(String sql, List<Object[]> batchPm, Object... params) {
+    public   Map<String, Object> updateByCondition(String sql, List<Object[]> batchPm, Object... params) {
         try {
+            boolean bathpmNull = Objects.isNull(batchPm) || batchPm.size()==0 || Objects.isNull(batchPm.get(0)) || Objects.isNull(batchPm.get(0)[0]);
+            if (sql.contains("?") && (bathpmNull && params.length !=StringUtils.countOccurrencesOf(sql,"?"))){
+                return processSuccess(null, sql, null);
+            }
             Object tempObject;
-            if (Objects.isNull(batchPm) || Objects.isNull(batchPm.get(0)) || Objects.isNull(batchPm.get(0)[0])) {
+            if (bathpmNull) {
                 tempObject = theJdbcTemplate.update(sql, params);
             } else {
                 tempObject = theJdbcTemplate.batchUpdate(sql, batchPm);
             }
             return processSuccess(MapTools.jacksonObjToStr(tempObject), sql, (Objects.nonNull(batchPm) && batchPm.get(0) != null) ? MapTools.jacksonObjToStr(batchPm) : MapTools.jacksonObjToStr(params));
         } catch (Exception e) {
-            return processFail("根据条件更新异常,SQL: " + LogUtils.getException(e), sql, ((Objects.nonNull(batchPm) && batchPm.get(0) != null) ? MapTools.jacksonObjToStr(batchPm) : MapTools.jacksonObjToStr(params)));
+            return processFail("根据条件更新异常,SQL: " + LogUtils.getException(e), sql, ((Objects.nonNull(batchPm) && batchPm.size()>0) ? MapTools.jacksonObjToStr(batchPm) : MapTools.jacksonObjToStr(params)));
         }
     }
 
 
+
+
+    public   Map<String, Object> bathEvent7(String sql, List<Map<String,Object>> inParam){
+        if (Objects.isNull(inParam) || inParam.isEmpty()){
+            return processSuccess(null,sql,inParam);
+        }
+        Pattern regExpression = Pattern.compile("(?<=《)([^》]+)?(?=》)");
+        Matcher parameterNames = regExpression.matcher(sql);
+        List<String> paramNameList = new ArrayList<>();
+        while (parameterNames.find()) {
+            paramNameList.add(parameterNames.group());
+        }
+        Statement stmd = null;
+        Connection connection = null;
+        try {
+            connection = theDataSource.getConnection();
+            connection.setAutoCommit(false);
+            stmd= connection.createStatement();
+            for (Map<String, Object> itemMap : inParam) {
+                String strSQL = sql;
+                for (String colName : paramNameList) {
+                    Object colValue = itemMap.get(colName);
+                    if (Objects.isNull(colValue)){
+                        break;
+                    }
+                    strSQL= strSQL.replaceFirst("《" + colName + "》", "'"+colValue+"'"); //
+                }
+                if (!strSQL.contains("《")){
+                    stmd.addBatch(strSQL);
+                }
+            }
+            int[] ints = stmd.executeBatch();
+            connection.commit(); // List<Object[]>
+            stmd.clearBatch();
+            return processSuccess(ints, sql, inParam);
+        } catch (Exception e) {
+            try {
+                if (connection != null) {
+                    connection.rollback();
+                }
+            } catch (SQLException ex) {
+                System.out.println("jdbc 批量新增 : 事务回滚异常信息：" + LogUtils.getException(e));
+            }
+            return processFail("dbSava执行批量Insert SQL异常 " + LogUtils.getException(e) + "事务回滚", sql, inParam);
+        } finally {
+            try {
+                if (stmd != null) {
+                    stmd.close();
+                }
+            } catch (SQLException e) {
+                System.out.println("jdbc 批量新增 关闭结果集异常: " + LogUtils.getException(e));
+            }
+            try {
+                if (connection != null) {
+                    connection.setAutoCommit(true);
+                    connection.close();
+                }
+            } catch (SQLException e) {
+                System.out.println("jdbc 批量新增 关闭连接异常: " + LogUtils.getException(e));
+            }
+        }
+
+    }
+
     public synchronized Boolean updateEvent6Map(String tableName, Object updateParam, boolean isAdd) {
         boolean isNew = false; //{tableName:[Map<String,Object>]}
         if (!event6Map.containsKey(tableName)) {
@@ -199,27 +268,25 @@ public class MyDbHelper {
     }
 
     public Map<String, Object> insertOrUpdate(String tableName, List<Map<String, Object>> params) {  // [{“name”:"111"},[{Value:{},filter:{"name":"111"}]
+        if (Objects.isNull(params)) {
+            params = new ArrayList<>();
+            params.add( new HashMap<>());
+        };
         List<Map<String, Object>> paramsList = new ArrayList<>(params); /*深拷贝入参*/
         if (MapTools.isBlank(tableName)) {
             return processFail("事件标志为6、其表名不能为空", tableName, paramsList);
         }
-
         List<Map<String, Object>> returnList = new ArrayList<>();
-//        long l2 = System.currentTimeMillis();
-//        System.out.println("event6: 操作开始 ");
-        int index = 0;
         for (Map<String, Object> signParam : paramsList) {
-            index++;
             String eventStr = "2";
             Map<String, Object> tempFilterMap = (Map<String, Object>) signParam.get("filter");
             if (updateEvent6Map(tableName, tempFilterMap, true)) { //不包含true
-//                long l = System.currentTimeMillis();
                 String whereStr = "";
                 List<Object> tempCheckValue = new ArrayList<>();
                 for (String key : tempFilterMap.keySet()) {
-                    if (Objects.isNull(tempFilterMap.get(key))){
+                    if (Objects.isNull(tempFilterMap.get(key))) {
                         whereStr = whereStr + " " + key + " is null and ";
-                    }else {
+                    } else {
                         whereStr = whereStr + " " + key + " = ? and ";
                         tempCheckValue.add(tempFilterMap.get(key));
                     }
@@ -228,35 +295,31 @@ public class MyDbHelper {
                 String checkSQL = "select 1 from " + tableName + " where " + whereStr + " limit 1";
                 try {
                     List<Map<String, Object>> queryForList = theJdbcTemplate.queryForList(checkSQL, tempCheckValue.toArray());
-//                    eventStr = (Objects.isNull(selectMap.get("returnData")) || ((List<?>) selectMap.get("returnData")).size() == 0) ? "1" : eventStr;
                     eventStr = (queryForList.size() == 0) ? "1" : eventStr;
                 } catch (Exception e) {
-//                    if (selectMap.get("code").equals("-1")) {
                     updateEvent6Map(tableName, signParam.get("filter"), false);
-//                    returnList.add(processFail());
                     continue;
-//                }
                 }
-//                Map<String, Object> selectMap = generalProcess("0", null, "select 1 from " + tableName, null, new ArrayList<>() {{
-//                    add(signParam);
-//                }}, false, 1, 1);
-//                System.out.println("event6: 查询时间为： " + (System.currentTimeMillis()-l));
             }
-//            System.out.println("event6: 单挑开始： " + index);
-//            long l3 = System.currentTimeMillis();
-            // 包含:
             returnList.add(generalProcess(eventStr, tableName, null, null, new ArrayList<>() {{
                 add(signParam);
-            }}, false, null, null));
-//            System.out.println("event6: 单挑ji结束： " + (System.currentTimeMillis() - l3));
+            }}, false, null, null,"1"));
         }
-//        System.out.println("event6: 操作结束： " + (System.currentTimeMillis() - l2));
         return returnList.size() == 1 ? returnList.get(0) : processSuccess(returnList, tableName, paramsList);
     }
 
+    public static void main(String[] args) {
+        List<Map<String, Object>> paramsList = new ArrayList<>(new ArrayList<>()); /*深拷贝入参*/
+        System.out.println(paramsList);
+    }
 
     //统一数据处理，兼容增删改查
-    public Map<String, Object> generalProcess(String event, String tableName, String sql, String rowCountSQL, List<Map<String, Object>> params, boolean isActive, Object page, Object pageSize) {
+    public Map<String, Object> generalProcess(String event, String tableName, String sql, String rowCountSQL, List<Map<String, Object>> params, boolean isActive, Object
+            page, Object pageSize,String ... isBatch) {
+        if (Objects.isNull(params)) {
+            params = new ArrayList<>();
+            params.add( new HashMap<>());
+        };
         List<Map<String, Object>> paramsList = new ArrayList<>(params); /*深拷贝入参*/
         //-----入参检测
         if (MapTools.isBlank(tableName) && MapTools.isBlank(sql)) {//如果表名为空 且SQL为空则返回错误
@@ -279,7 +342,7 @@ public class MyDbHelper {
             String querySQL = parameterListByBookTitle.get("sql").toString();
             rowCountSQL = Objects.isNull(parameterListByBookTitle.get("rowCountSQL")) ? null : parameterListByBookTitle.get("rowCountSQL").toString();
             List<Object[]> sqlValue = Objects.isNull(parameterListByBookTitle.get("value")) ? new ArrayList<>() : (List<Object[]>) parameterListByBookTitle.get("value");
-            return execSign(event, querySQL, rowCountSQL, page, pageSize, sqlValue, paramsList); // {"code":"",returnData:{"code":"",}}
+            return execSign(event, querySQL, rowCountSQL, page, pageSize, sqlValue, paramsList,"1"); // {"code":"",returnData:{"code":"",}}
         } else {//表名或无书名号的SQL
             List<String> allColumn = new ArrayList<>();//初始化所有列
             List<String> allPrimaryKey = new ArrayList<>();//初始化所有主键
@@ -325,9 +388,9 @@ public class MyDbHelper {
             Map<String, Map<String, Object>> modify = getModify(sql, tableName, paramsList, allColumn, allPrimaryKey, event, isActive, rowCountSQL);
             for (String sqlStr : modify.keySet()) { // rowCountSQL : null
                 if (modify.keySet().size() == 1) {                                                       //[[],[]]
-                    return execSign(event, sqlStr, modify.get(sqlStr).get("rowCountSQL"), page, pageSize, (List<Object[]>) modify.get(sqlStr).get("valueList"), paramsList);
+                    return execSign(event, sqlStr, modify.get(sqlStr).get("rowCountSQL"), page, pageSize, (List<Object[]>) modify.get(sqlStr).get("valueList"), paramsList,isBatch);
                 } else { //todo 目前无应用场景
-                    Map<String, Object> map = execSign(event, sqlStr, modify.get(sqlStr).get("rowCountSQL"), page, pageSize, (List<Object[]>) modify.get(sqlStr).get("valueList"), paramsList);
+                    Map<String, Object> map = execSign(event, sqlStr, modify.get(sqlStr).get("rowCountSQL"), page, pageSize, (List<Object[]>) modify.get(sqlStr).get("valueList"), paramsList,isBatch);
                     returnList.add(map.get("returnData"));
                 }
             }
@@ -335,7 +398,7 @@ public class MyDbHelper {
         return processSuccess(returnList, sql, paramsList);
     }
 
-    private Map<String, Object> execSign(String event, String sql, Object rowCountSQL, Object page, Object pageSize, List<Object[]> parameterList, List<Map<String, Object>> paramsList) {
+    private Map<String, Object> execSign(String event, String sql, Object rowCountSQL, Object page, Object pageSize, List<Object[]>parameterList, List<Map<String, Object>> paramsList,String ... isBatch) {
         if ("0".equals(event)) {//如果是查询则
             if (sql.lastIndexOf(")") >= sql.lastIndexOf("limit")) {//如果是查询则进行翻页默认值处理,需要加入是否是数字的判断
                 int thePage = (Objects.isNull(page) || !MapTools.isNumber(page.toString())) ? 1 : Integer.parseInt(page.toString());
@@ -352,14 +415,14 @@ public class MyDbHelper {
                 return processFail("查询出现异常：" + LogUtils.getException(e), sql, parameterList);
             }
         }
-        if ("1".equals(event) && sql.contains("?")) {//如果是新增则使用JDBC方式进行，方便获取新增后的主键
+        if ("1".equals(event) && sql.contains("?") && (isBatch.length ==0)) {//如果是新增则使用JDBC方式进行，方便获取新增后的主键
             return JDBCBatch(sql, parameterList, paramsList);
         }
         return updateByCondition(sql, parameterList);
     }
 
     public  Map<String, Object> JDBCBatch(String sql, List<Object[]> paramList, List<Map<String, Object>> paramsList) {
-        if (!sql.contains("?")) {  // Object[]
+        if (!sql.contains("?") || paramList.size() ==0) {  // Object[]
             return processSuccess(null, sql, paramsList);
         }
         ResultSet currentRS = null;
@@ -431,7 +494,8 @@ public class MyDbHelper {
         }
     }
 
-    private Map<String, Map<String, Object>> getModify(String sql, String tableName, List<Map<String, Object>> paramsList, List<String> allColumn, List<String> allPrimaryKey, String event, boolean isActive, String rowCountSQL) {
+    private Map<String, Map<String, Object>> getModify(String sql, String
+            tableName, List<Map<String, Object>> paramsList, List<String> allColumn, List<String> allPrimaryKey, String event, boolean isActive, String rowCountSQL) {
         // 需要处理sql，如果表名为空则 此时sql 需要组件where条件
         if (Objects.isNull(allColumn)) allColumn = new ArrayList<>();
         if (Objects.isNull(allPrimaryKey)) allPrimaryKey = new ArrayList<>();
@@ -541,7 +605,7 @@ public class MyDbHelper {
             if (event.equals("0") && !MapTools.isBlank(tableName)) { // 理论上sql 不为空 可以通过allColumn 替换为count 1 来组建rowCountSQL---> select * from biao left ……
                 rowCountSQL = "select count(1) from " + tableName;
             }
-            if ( !MapTools.isBlank(tableName) &&event.equals("0") && MapTools.isNotBlank(sql) && MapTools.isBlank(rowCountSQL) && allColumn.size() > 0) {
+            if (!MapTools.isBlank(tableName) && event.equals("0") && MapTools.isNotBlank(sql) && MapTools.isBlank(rowCountSQL) && allColumn.size() > 0) {
                 rowCountSQL = sql;
                 for (int index = 0; index < allColumn.size(); index++) {
                     rowCountSQL = rowCountSQL.replace(allColumn.get(index), index == 0 ? " count(1) " : "");
@@ -795,10 +859,12 @@ public class MyDbHelper {
         }
         List<Object> signList = new ArrayList<>();
         List<String> columnName = new ArrayList<>();
+        int paramNameLen = 0;
         while (parameterNames.find()) {
             String colName = parameterNames.group();
             columnName.add(colName);
             signList.add(null);
+            paramNameLen ++;
             sql = sql.replaceFirst("《" + colName + "》", "?"); //
             if (Objects.nonNull(rowCountSQL)) {
                 rowCountSQL = rowCountSQL.replaceFirst("《" + colName + "》", "?");
@@ -811,10 +877,11 @@ public class MyDbHelper {
                 signList.set(paramIndex, getValue(itemMap, colName));
                 paramIndex++;
             }
-            returnData.add(signList.toArray());
+            if (signList.size() == paramNameLen){
+                returnData.add(signList.toArray());
+            }
         }
 
-
         HashMap<String, Object> objectHashMap = new HashMap<>();
         objectHashMap.put("value", returnData);
         objectHashMap.put("rowCountSQL", rowCountSQL);

mainFactory/src/main/resources/application.yml

@@ -20,7 +20,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:127.0.0.9:8888}
 
 service:
   pool: