소스 검색

query 恢复回来

menglu 3 년 전
부모
커밋
b724d6bbf0

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

@@ -39,7 +39,7 @@ public class RestApi {
 		return "alarm_websocket_close";
 	}
 
-	@PostMapping(path = { "/query" }, produces = "application/json;charset=UTF-8")
+	@PostMapping(path = { "/query", "/zkt-sdk/query" }, produces = "application/json;charset=UTF-8")
 	public String query(@RequestBody String param) {
 		String result = RestUtil.query(param);
 		return result;

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

@@ -63,6 +63,7 @@ public class RestUtil {
 				JSONArray array = (JSONArray) Content;
 				result.put("Count", array.size());
 			}
+			return FastJsonUtil.toFormatString(Content);
 		} catch (Exception e) {
 			e.printStackTrace();
 			result.put("Result", "failure");

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

@@ -25,11 +25,11 @@ public class AlarmWebSocketClient extends WebSocketClient {
 
 	@Override
 	public void onOpen(ServerHandshake arg0) {
-		log.error("onOpen: " + serverUri.toString());
+		log.warn("onOpen: " + serverUri.toString());
 		try {
-			log.error("onOpen refresh begin");
+			log.warn("onOpen refresh begin");
 			int alarm_size = RWDAlarmUtil.refresh();
-			log.error("onOpen refresh finish alarm count: " + alarm_size);
+			log.warn("onOpen refresh finish alarm count: " + alarm_size);
 		} catch (Exception e) {
 			log.error("onOpen refresh error");
 			log.error(e.getMessage(), e);
@@ -38,7 +38,7 @@ public class AlarmWebSocketClient extends WebSocketClient {
 
 	@Override
 	public void onClose(int arg0, String arg1, boolean arg2) {
-		log.error("onClose: " + serverUri.toString());
+		log.warn("onClose: " + serverUri.toString());
 		// this.close_connect();
 	}
 

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/websocket/IOTWebSocketClient.java

@@ -28,13 +28,13 @@ public class IOTWebSocketClient extends WebSocketClient {
 
 	@Override
 	public void onOpen(ServerHandshake arg0) {
-		log.error("onOpen: " + serverUri.toString());
+		log.warn("onOpen: " + serverUri.toString());
 		// IOTWebSocketClient.client.send(RepositoryBase.projectId.substring(2));
 	}
 
 	@Override
 	public void onClose(int arg0, String arg1, boolean arg2) {
-		log.error("onClose: " + serverUri.toString());
+		log.warn("onClose: " + serverUri.toString());
 		// this.close_connect();
 	}