代码提交

杜洪波

2024-10-09 701a0c959706bda85cc49186e18915af00fc5f0c

代码提交

 src/main/java/com/product/administration/service/EarlyWarningManagerService.java

@@ -300,10 +300,10 @@
     * @return
     */
    public boolean conditionCheck(String mainTableName, String warnCondition) {
        Map<String, String> tableNameAndAlias = new HashMap<>();    //相关表名-->表别名,tableName-->tableName1
        Map<String, String> fieldAndAlias = new HashMap<>();        //相关字段-->字段别名,tableName.fieldName-->tableName1fieldName
        Map<String, String> fieldReference = new HashMap<>();    //组合相关字段的参照,tableName1fieldName-->referenceName
        StringBuilder concatField = new StringBuilder();        //组合相关字段,tableName1.fieldName tableName1fieldName
        Map<String, String> tableNameAndAlias = new HashMap<>();//相关表名-->表别名,tableName-->tableName1
        Map<String, String> fieldAndAlias = new HashMap<>();    //相关字段-->字段别名,tableName.fieldName-->tableName1fieldName
        Map<String, String> fieldReference = new HashMap<>();    //组合相关字段的参照,tableName1fieldName-->referenceName
        StringBuilder concatField = new StringBuilder();        //组合相关字段,tableName1.fieldName tableName1fieldName
        earlyWarningServer.parseWarningContent(warnCondition, concatField, tableNameAndAlias, fieldAndAlias, fieldReference);
        // 替换系统参数
        warnCondition = SystemParamReplace.systemParamsReplace(warnCondition);
@@ -312,11 +312,11 @@
        String relationSQL = earlyWarningServer.createTableRelation(tableNameAndAlias, mainTableName);

        StringBuilder serviceSQL = new StringBuilder();
        serviceSQL.append(" SELECT ");
        serviceSQL.append("\nSELECT \n");
        serviceSQL.append(StringUtils.isEmpty(concatField) ? "*" : concatField.subSequence(1, concatField.length()));
        serviceSQL.append(" FROM ");
        serviceSQL.append("\nFROM \n");
        serviceSQL.append(relationSQL);
        serviceSQL.append(" WHERE ");
        serviceSQL.append("\nWHERE \n");
        serviceSQL.append(earlyWarningServer.parseWarnCondition(warnCondition, tableNameAndAlias));
        try {
            baseDao.listTable(serviceSQL.toString(), new Object[]{});

 src/main/java/com/product/administration/service/EarlyWarningServer.java

@@ -321,7 +321,7 @@
        while (s >= 0) {
            int c = warnContent.indexOf("{#", s);
            if (c == -1) {
                concatField.append(" uuid ");
                concatField.append(", uuid ");
                break;
            }
            int m = warnContent.indexOf("#}", c);