Browse Source

逻辑编组查询日程有bug,修复,另外推送报警打印

menglu 3 years ago
parent
commit
596d193822

+ 1 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/rest/LightingUtil.java

@@ -34,6 +34,7 @@ public class LightingUtil {
 				Target.put("Source", "ibms-group");
 				sql_json.put("Target", Target);
 				JSONObject Criteria = new JSONObject();
+				Criteria.put("logicalGroupingId", logicalGroupId);
 				sql_json.put("Criteria", Criteria);
 				SceneDataSet SceneDataSet = (SceneDataSet) QueryUtil.query(Repository, null, sql_json, new QueryAssist());
 				JSONArray queryResult = SceneDataSet.toJSON(1);

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/AlarmWebSocketClient.java

@@ -72,7 +72,7 @@ public class AlarmWebSocketClient extends WebSocketClient {
 				RWDAlarmUtil.ProcessAlarm(alarm);
 			}
 		} catch (Exception e) {
-			log.error(e.getMessage(), e);
+			log.error(arg0, e);
 		}
 	}
 }