From 701a0c959706bda85cc49186e18915af00fc5f0c Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 09 十月 2024 11:20:00 +0800
Subject: [PATCH] 代码提交

---
 src/main/java/com/product/administration/service/EarlyWarningServer.java         |    2 +-
 src/main/java/com/product/administration/service/EarlyWarningManagerService.java |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java b/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
index ac7b876..876d16a 100644
--- a/src/main/java/com/product/administration/service/EarlyWarningManagerService.java
+++ b/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[]{});
diff --git a/src/main/java/com/product/administration/service/EarlyWarningServer.java b/src/main/java/com/product/administration/service/EarlyWarningServer.java
index d640dd8..ac20d2d 100644
--- a/src/main/java/com/product/administration/service/EarlyWarningServer.java
+++ b/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);

--
Gitblit v1.9.2