2.0 异常捕获

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

@@ -320,6 +320,7 @@ public class MainFactoryApplication {
         }
 
         /*批量写日志*/
+        if (logSuccessMap.size() ==0 &&logErrorMap.size() ==0&& logSourceMap.size()==0 ) return;
         MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.getSystemParams(AppConfig.REMOTE_DB_CONNECT));
         if (Objects.nonNull(myDbHelper.getErrorMessage())) {
             System.out.println("获取远程数据库失败：写入日志失败");

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

@@ -312,13 +312,14 @@ public class AuthApplicationImpl {
             return processFail("获取用户权限,获取远程数据库连接失败" + myDbHelper.getErrorMessage());
         }
         String user_id = params.get("user_id");
-        if (user_id.equals("1")){ // 如果是内置管理员 则获取全部权限
-            return myDbHelper.queryByParamsReturnList(" select * from t_auth" );
+        if (user_id.equals("1")) { // 如果是内置管理员 则获取全部权限
+            return myDbHelper.queryByParamsReturnList(" select * from t_auth");
         }
-        return myDbHelper.queryByParamsReturnList(" select * from t_auth" );
+        return myDbHelper.queryByParamsReturnList(" select * from t_auth");
         // 从user_auth表中获取导航栏权限： select auth_id from t_user_auth  where user_id = ?
 //        return myDbHelper.queryByParamsReturnList(" select TA.* from t_user_auth  TUA LEFT JOIN t_auth TA  ON TA.auth_id = TUA.auth_id where TUA.user_id = ?",user_id);
     }
+
     public Map<String, Object> initColumnSet(Map<String, Object> data) {
         if (!data.containsKey("auth_id")) {
             return processFail("权限编号为空");
@@ -341,6 +342,7 @@ public class AuthApplicationImpl {
         String serviceID = serviceInfoList.get(0).get("serviceID").toString();
         // 通过服务获取列设置
         List<Map<String, Object>> columnList;
+        Object tableName = null;
         try {
             Map<String, Object> queryByParamsReturnMap = myDbHelper.queryByParamsReturnList("select calculation_library.*,datasourceinfo.connectConfig  from calculation_library INNER JOIN datasourceinfo on datasourceinfo.dataSourceID = calculation_library.datasource_id  where service_id=? and library_type =3 order by library_sort, library_id limit 1", serviceID);
             if (queryByParamsReturnMap.get("code").equals("-1")) {
@@ -351,26 +353,32 @@ public class AuthApplicationImpl {
                 return processFail("当前服务暂时不支持列设置初始化");
             }
             Map<String, Object> libraryInfo = queryByParamsReturnList.get(0);
-            Object tableName = libraryInfo.get("sourceObjectName");
-            String sql = Objects.isNull(tableName) ? (Objects.isNull(libraryInfo.get("computing_expression")) ? null : libraryInfo.get("computing_expression").toString()) : (" select * from " + tableName + " where 1 =2");
-            if (Objects.isNull(sql)) {
+            tableName = libraryInfo.get("sourceObjectName");
+            Object sql = libraryInfo.get("computing_expression");
+            if (Objects.isNull(sql) && Objects.isNull(tableName)) {
                 return processFail("服务配置错误");
             }
-            //todo 获取对应的数据源 获取mydb对象
-            // 替换SQL中的符号
-            String expression = "(?<=《)([^》]+)?(?=》)";
-            Pattern regExpression = Pattern.compile(expression);  // select * from user where userid = 《userID》 select * from user where userid is null
-            Matcher parameterNames = regExpression.matcher(sql);
-            while (parameterNames.find()) {
-                String tempColumn = parameterNames.group(); //
-                sql = sql.replaceFirst("《" + tempColumn + "》", " null ");
-            }
+            Map<String, Object> specialSearchDataResult = new HashMap<>();
             String connectConfig = libraryInfo.get("connectConfig").toString();
             MyDbHelper remoteMyDbHelper = ObjectMap.getordropMyDbHelper(connectConfig);
             if (Objects.nonNull(remoteMyDbHelper.getErrorMessage())) {
                 return processFail("初始化列设置：权限编号:" + auth_id + " 获取数据库对象异常");
             }
-            Map<String, Object> specialSearchDataResult = remoteMyDbHelper.getAllColumnForSet(sql);
+            if (Objects.nonNull(sql)) {
+                String tempSQL = sql.toString();
+                //todo 获取对应的数据源 获取mydb对象
+                // 替换SQL中的符号
+                String expression = "(?<=《)([^》]+)?(?=》)";
+                Pattern regExpression = Pattern.compile(expression);  // select * from user where userid = 《userID》 select * from user where userid is null
+                Matcher parameterNames = regExpression.matcher(tempSQL);
+                while (parameterNames.find()) {
+                    String tempColumn = parameterNames.group(); //
+                    tempSQL = tempSQL.replaceFirst("《" + tempColumn + "》", " null ");
+                }
+                specialSearchDataResult = remoteMyDbHelper.getAllColumnForSet(tempSQL);
+            } else {
+                specialSearchDataResult = remoteMyDbHelper.getAllColumnTableSet(tableName.toString());
+            }
             if (!"0".equals(specialSearchDataResult.get("code"))) {
                 return processFail("初始化列设置：权限编号:" + auth_id + " 模拟查询异常：" + specialSearchDataResult.get("message"));
             }
@@ -378,11 +386,9 @@ public class AuthApplicationImpl {
             if (Objects.isNull(columnList) || columnList.isEmpty()) {
                 return processFail("当前服务暂时不支持列设置初始化");
             }
-
         } catch (Exception e) {
             return processFail("获取服务对应算法执行异常" + LogUtils.getException(e));
         }
-
         Map<String, Object> columnSetListResult = myDbHelper.queryByParamsReturnList("select  * from querytemplatecolumnset where serviceOutPutId=?", auth_id);
         List<Map<String, Object>> columnSetList = MapTools.getMapList(columnSetListResult);
         if (!"0".equals(columnSetListResult.get("code")) || null == columnSetList) {
@@ -422,14 +428,23 @@ public class AuthApplicationImpl {
             }
             myDbHelper.updateByCondition(sql, selectParams);
         }
+        String sql = "";
         if (insertList.size() > 0) {
-            String sql = " insert into  querytemplatecolumnset(serviceOutPutId,columnName,columnLabel) values(?,?,?)";
+            if (Objects.nonNull(tableName)) {
+                sql = " insert into  querytemplatecolumnset(serviceOutPutId,columnName,columnLabel,columnDescribe) values(?,?,?,?)";
+            } else {
+                sql = " insert into  querytemplatecolumnset(serviceOutPutId,columnName,columnLabel) values(?,?)";
+            }
+
             List<Object[]> insertParams = new ArrayList<>();
             for (Map<String, Object> insertMap : insertList) {
-                List<String> inList = new ArrayList<>();
+                List<Object> inList = new ArrayList<>();
                 inList.add(auth_id);
                 inList.add(insertMap.get("columnName").toString());
                 inList.add(insertMap.get("columnLable").toString());
+                if (Objects.nonNull(tableName)){
+                    inList.add(insertMap.get("columnDescribe"));
+                }
                 insertParams.add(inList.toArray());
             }
             myDbHelper.updateByCondition(sql, insertParams);

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

@@ -201,7 +201,7 @@ public class DataProcess {//数据处理对象
                 }
                 inputData.put("authColumn", authColumn);//添加到入参，方便后面调用
             }
-
+            inputData.put("currentUser",user_id);
         } catch (Exception e) {
             System.out.println("authCheck 异常：" + LogUtils.getException(e));
         }

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

@@ -525,12 +525,12 @@ public class DataFormat {
         }
         Object rsData = returnMap.get("returnData");
         if (rsData instanceof List<?>) {
-            for (Map<String, Object> tempMap : (List<Map<String, Object>>)rsData) {
+            for (Map<String, Object> tempMap : (List<Map<String, Object>>) rsData) {
                 tempMap.values().removeAll(Collections.singleton(null));
                 tempMap.values().removeAll(Collections.singleton(""));
             }
         }
-        if (rsData instanceof Map<?,?> temMap){
+        if (rsData instanceof Map<?, ?> temMap) {
             temMap.values().removeAll(Collections.singleton(null));
             temMap.values().removeAll(Collections.singleton(""));
         }
@@ -545,14 +545,15 @@ public class DataFormat {
         if (xmlList.size() == 1) {
             return customMadeOnexmlToMap(xmlList.get(0), isTwoDimensionalization, noDiKaList, translateName);
         }
-        List<Object> rsList = new ArrayList<>();
+        List<Map<String, Object>> batchList = new ArrayList<>();
         xmlList.forEach(xml -> {
-            Map<String, Object> customMadeOnexmlToMap = customMadeOnexmlToMap(xmlList.get(0), isTwoDimensionalization, noDiKaList, translateName);
-            if (Objects.equals("0", customMadeOnexmlToMap.get("code"))) {
-//                rsList.addAll(customMadeOnexmlToMap.get("returnData"))
+            Map<String, Object> stringObjectMap = customMadeOnexmlToMap(xmlList.get(0), isTwoDimensionalization, noDiKaList, translateName);
+            if ("-1".equals(stringObjectMap.get("code").toString())) {
+                stringObjectMap.put("returnData", new ArrayList<>());
             }
+            batchList.addAll((List) stringObjectMap.get("returnData"));
         });
-        return null;
+        return processSuccess(batchList);
     }
 
 
@@ -574,10 +575,18 @@ public class DataFormat {
                 returnMap = translateMapName((List) returnData, translateName); // code message retrunData
             }
         }
-        for (Map<String, Object> tempMap : (List<Map<String, Object>>) returnMap.get("returnData")) {
+        Object tempReturnData = returnMap.get("returnData");
+        List<Map<String,Object>> tempList = new ArrayList<>();
+        if (tempReturnData instanceof Map<?,?>){
+            tempList.add((Map<String, Object>) tempReturnData);
+        }else {
+            tempList = (List<Map<String, Object>>) tempReturnData;
+        }
+        for (Map<String, Object> tempMap : tempList) {
             tempMap.values().removeAll(Collections.singleton(null));
             tempMap.values().removeAll(Collections.singleton(""));
         }
+        returnMap.put("returnData",tempList);
         return returnMap;
     }
 
@@ -620,9 +629,12 @@ public class DataFormat {
             Document doc = DocumentHelper.parseText(xmlStr);
             Element root = doc.getRootElement();
             Map<String, Object> returnMap = xmlToMap(root);
+            returnMap.put("souceData",xml);
             return processSuccess(returnMap);
         } catch (Exception e) {
-            return processFail("入参不是规则的xml ：" + xml);
+            Map<String, Object> errMap = processFail("入参不是规则的xml ：" + xml);
+            errMap.put("souceData",xml);
+            return errMap;
         }
     }
 
@@ -642,8 +654,7 @@ public class DataFormat {
         }
     }
 
-    public Map<String, Object> collectInsertOrUpdate(List<String> ids, String sourceTable, String sourceKey, String targetTable, List<String> uniqueList,
-                                                     boolean isActive, List<String> targetNull, String dbConnect) {
+    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);
 
@@ -752,8 +763,7 @@ public class DataFormat {
                     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());
+                    myDbHelper.updateByCondition("update " + targetTable + " set " + String.join(",", updateList(currentKeysList, "=?")) + " where " + String.join(" and ", updateList(uniqueKey, "=?")), null, columnValue.toArray());
                 }
             }
         } catch (Exception e) {

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

@@ -31,7 +31,7 @@ public class MyDbHelper {//目前只差主键的条件优化
 
     private HashMap<String, HashSet<Object>> event6Map = new HashMap<>();//用于事件6是否存在的内存检测
 
-    private  boolean isActive = true;
+    private boolean isActive = false;
 
     private Map<String, String> eventSQL = new HashMap<>() {{//用于表名方式组建SQL的基本语句
         put("0", "select 字段 from 表名");
@@ -79,10 +79,8 @@ public class MyDbHelper {//目前只差主键的条件优化
         config.setDriverClassName(connectMaps.get("driver-class-name").toString());
         theDataSource = new HikariDataSource(config);
         theJdbcTemplate = new JdbcTemplate(theDataSource);
-        try (
-                Connection theConnect = theDataSource.getConnection();//用于批量新增以及获取当前数据库的相关信息
-                ResultSet tablesRsesult = theConnect.getMetaData().getTables(theConnect.getCatalog(), theConnect.getCatalog(), null, new String[]{"TABLE"});
-        ) {
+        try (Connection theConnect = theDataSource.getConnection();//用于批量新增以及获取当前数据库的相关信息
+             ResultSet tablesRsesult = theConnect.getMetaData().getTables(theConnect.getCatalog(), theConnect.getCatalog(), null, new String[]{"TABLE"});) {
             while (tablesRsesult.next()) {//缓存当前数据库的所有表名
                 tableList.add(tablesRsesult.getString("TABLE_NAME"));//获取表名
             }
@@ -140,7 +138,7 @@ public class MyDbHelper {//目前只差主键的条件优化
             } else {
                 initParam.add(new HashMap<>());
             }
-
+            int whereIndex = 0;
             for (Map<String, Object> signParam : initParam) {//循环入口参数，可以开启多线程执行
                 String execSQLStr = newSqlStr;
                 Map<String, Object> dbFilter = getdbFilter(varList, event, signParam, rowAuth, allSQLColumn);//获取条件，1、返回where字符串；2、返回执行参数 where  值
@@ -154,14 +152,8 @@ public class MyDbHelper {//目前只差主键的条件优化
                 execSQLStr = dbValueInfo.get("newSqlStr").toString();//修订后的SQL语句，针对in方式进行修订
                 rowCountSql = "0".equals(event) && MapTools.isNotBlank(allSQLColumn) ? execSQLStr.replace(allSQLColumn, " count(1) ") : "";//查询则创建rowCountSql
                 if (MapTools.isNotBlank(whereStr) && !"1".equals(event)) {//如果where字符串不为空
-                    execSQLStr = execSQLStr.concat(execSQLStr.lastIndexOf(")") >= execSQLStr.toLowerCase().lastIndexOf(" where ") ? " where " : " and ")
-                            .concat("(")
-                            .concat(whereStr)
-                            .concat(")");
-                    rowCountSql = MapTools.isBlank(rowCountSql) ? "" : rowCountSql.concat(rowCountSql.lastIndexOf(")") >= rowCountSql.lastIndexOf(" where ") ? " where " : " and ")
-                            .concat("(")
-                            .concat(whereStr)
-                            .concat(")");
+                    execSQLStr = execSQLStr.concat(execSQLStr.lastIndexOf(")") >= execSQLStr.toLowerCase().lastIndexOf(" where ") ? " where " : " and ").concat("(").concat(whereStr).concat(")");
+                    rowCountSql = MapTools.isBlank(rowCountSql) ? "" : rowCountSql.concat(rowCountSql.lastIndexOf(")") >= rowCountSql.lastIndexOf(" where ") ? " where " : " and ").concat("(").concat(whereStr).concat(")");
                     dbValueList.addAll(filterList);//组合执行参数
                 }
 
@@ -182,7 +174,7 @@ public class MyDbHelper {//目前只差主键的条件优化
                 } else {
                     if (!dbParam.contains(dbValueList)) {//参数一致时，去重执行
                         String batchSQL = Objects.nonNull(execSQLMap.get(execSQLStr)) && Objects.nonNull(execSQLMap.get(execSQLStr).get("batchSQL")) ? execSQLMap.get(execSQLStr).get("batchSQL").toString() : "";
-                        if ("0".equals(event) && batchSQL.contains(whereStr) && dbParam.size() > 0) {
+                        if ("0".equals(event)  && dbParam.size() > 0) {
                             batchSQL = (MapTools.isBlank(batchSQL) ? execSQLStr : batchSQL).concat(" or (").concat(whereStr).concat(")");
                             List tempList = dbParam.isEmpty() ? new ArrayList() : (List) dbParam.get(0);
                             tempList.addAll(dbValueList);
@@ -192,6 +184,9 @@ public class MyDbHelper {//目前只差主键的条件优化
                         } else {
                             dbParam.add(dbValueList);//添加当前行的执行参数
                         }
+                        if (execSQLStr.indexOf("{")>0 && execSQLStr.indexOf("}")>0){
+                            whereIndex ++;
+                        }
                     }
                     sqlParmMap.put("dbParam", dbParam);//执行参数
                     if (MapTools.isBlank(whereStr) && "2,3".contains(event)) {
@@ -200,25 +195,42 @@ public class MyDbHelper {//目前只差主键的条件优化
                     execSQLMap.put(execSQLStr, sqlParmMap);//添加到最终执行列表中
                 }
             }
+
+
+
+
             //循环执行execSQLMap
             inertSQLMap.putAll(execSQLMap);
             for (String signSql : inertSQLMap.keySet()) {//循环当前MAP，查询必定是单条SQL，SQL语句方式：都是单条，表名方式：查询、新增是单条，更新、删除可能多条，事件6可能多条
+                Map<String, Object> signParamMap = inertSQLMap.get(signSql);
+                String newSignSQL = signSql;
+                if (signSql.indexOf("{")>0 && signSql.indexOf("}")>0){
+                   String tempWhere =  signSql.substring(signSql.indexOf("{")+1,signSql.indexOf("}"));
+                   String newWhere = tempWhere;
+                    for (int i = 0; i < whereIndex-1; i++) {
+                        newWhere = newWhere.concat(" or ").concat(tempWhere);
+                    }
+                    newWhere = "(".concat(newWhere).concat(")");
+                    signParamMap.put("batchSQL",null);
+                    signParamMap.put("rowCountSql",null);
+                    signSql = signSql.replace(tempWhere,newWhere).replace("{","").replace("}","");
+                }
+
                 Map<String, Object> execSignResult = new HashMap<>();
-                if (inertSQLMap.get(signSql).containsKey("noExec")) {
+                if (signParamMap.containsKey("noExec")) {
                     execSignResult.put("code", "0");
                     execSignResult.put("message", " 禁止全表更新、删除");
                 } else {
-                    execSignResult = execSign(sqlStr, signSql, inertSQLMap.get(signSql), inputData);
+                    execSignResult = execSign(sqlStr, signSql, signParamMap, inputData);
                 }
                 if ("-1".equals(execSignResult.get("code"))) {
                     return execSignResult;
                 }
-                Map<String, Object> signParamMap = inertSQLMap.get(signSql);
                 signParamMap.put("returnData", execSignResult.get("returnData"));
                 signParamMap.put("rowcount", execSignResult.get("rowcount"));
                 signParamMap.put("sql", signSql);
 //                returnList.add(execSignResult.get("returnData"));
-                inertSQLMap.put(signSql, signParamMap);
+                inertSQLMap.put(newSignSQL, signParamMap);
             }
             Object obj = new Object();
             if (inertSQLMap.keySet().size() == 1) {
@@ -232,7 +244,7 @@ public class MyDbHelper {//目前只差主键的条件优化
             return processSuccess(obj);
         } catch (Exception e) {
             return processFail("generalProcess函数：执行出错", LogUtils.getException(e), inParams);
-        }finally {
+        } finally {
             isActive = false;
         }
     }
@@ -284,6 +296,27 @@ public class MyDbHelper {//目前只差主键的条件优化
         }
     }
 
+    public Map<String, Object> getAllColumnTableSet(String tabeName) {
+        try (Connection connection = theDataSource.getConnection()) {
+            DatabaseMetaData dbMetaData = connection.getMetaData();
+            ResultSet rs = dbMetaData.getColumns(connection.getCatalog(), connection.getCatalog(), tabeName, "%");
+            List<Map<String, Object>> columnList = new ArrayList<>();
+            while (rs.next()) {
+                Map<String, Object> tempMap = new HashMap<>();
+                tempMap.put("columnName", rs.getString("COLUMN_NAME"));
+                tempMap.put("columnType", rs.getString("TYPE_NAME"));
+                tempMap.put("columnLable", rs.getString("REMARKS"));
+                tempMap.put("columnDescribe", rs.getString("REMARKS"));
+                tempMap.put("COLUMN_SIZE", rs.getString("COLUMN_SIZE"));
+                columnList.add(tempMap);
+            }
+            return processSuccess(columnList);
+        } catch (Exception e) {
+            return processFail("列设置初始化，获取失败".concat(LogUtils.getException(e)), tabeName, null);
+        }
+    }
+
+
     //SQL语句方式设置列权限
     private String setAuthColumn(String sqlStr, List<String> authColumn, String eventStr) {
         try {
@@ -462,12 +495,7 @@ public class MyDbHelper {//目前只差主键的条件优化
                         if (Objects.nonNull(column) && !varList.contains(column.toString())) {//列名不为空 且 (可用列未获取 或者 当前列存在于可用列)
                             String connector = Objects.isNull(filterMap.get("connector")) ? "" : filterMap.get("connector").toString();//处理连接字符串
                             Object comparator = Objects.isNull(filterMap.get("comparator")) ? "" : filterMap.get("comparator").toString();//比较符
-                            whereStr = whereStr.concat(filterMap.get("left").toString())
-                                    .concat(column.toString())
-                                    .concat(comparator.toString())
-                                    .concat(" is null ".equals(comparator) ? "" : "?")
-                                    .concat(filterMap.get("right").toString())
-                                    .concat((MapTools.isBlank(connector)) ? " and " : ("lastConnector".equals(connector) ? "" : " ".concat(connector).concat(" ")));
+                            whereStr = whereStr.concat(filterMap.get("left").toString()).concat(column.toString()).concat(comparator.toString()).concat(" is null ".equals(comparator) ? "" : "?").concat(filterMap.get("right").toString()).concat((MapTools.isBlank(connector)) ? " and " : ("lastConnector".equals(connector) ? "" : " ".concat(connector).concat(" ")));
                             if (!" is null ".equals(comparator)) {//不是is null，且不是SQL语句执行方式
                                 dbFilter.add(filterMap.get("value"));//添加执行参数
                             }
@@ -614,10 +642,9 @@ public class MyDbHelper {//目前只差主键的条件优化
             for (Object signValue : dbValue) {
                 try {//执行查询
                     Map<String, Object> returnData = processSuccess(theJdbcTemplate.queryForList(signSql, ((List) signValue).toArray()));
-                    String rowCountSQL = sqlParmMap.get("rowCountSql").toString();//提取行总数查询语句
                     try {
-                        if (!MapTools.isBlank(rowCountSQL)) {
-                            returnData.put("rowcount", theJdbcTemplate.queryForObject(rowCountSQL, Integer.class, ((List) signValue).toArray()));
+                        if (Objects.nonNull( sqlParmMap.get("rowCountSql"))) {
+                            returnData.put("rowcount", theJdbcTemplate.queryForObject( sqlParmMap.get("rowCountSql").toString(), Integer.class, ((List) signValue).toArray()));
                         }
                     } catch (Exception e) {
                         System.out.println("获取rowcount失败： ".concat(LogUtils.getException(e)));
@@ -699,7 +726,7 @@ public class MyDbHelper {//目前只差主键的条件优化
     public void close() {
         try {
             errorMessage = "对象正在关闭";
-            while (isActive){
+            while (isActive) {
                 Thread.sleep(1);
             }
             if (Objects.nonNull(theDataSource) && theDataSource.isRunning()) {//关闭连接池
@@ -720,7 +747,7 @@ public class MyDbHelper {//目前只差主键的条件优化
             try {
                 resultData1 = (Map<String, Object>) returnData;
             } catch (Exception e) {
-                resultData1.put("returnData",returnData);
+                resultData1.put("returnData", returnData);
             }
             resultData1.put("code", "0");
             return resultData1;