Browse Source

调整日志

menglu 3 years ago
parent
commit
5c14d0619a

+ 3 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DaemonThread.java

@@ -65,7 +65,7 @@ public class DaemonThread extends Thread {
 
 		try {
 			if (Constant.iot_websocket_url != null) {
-				log.info("iot-websocket");
+				log.warn("iot-websocket");
 				IOTWebSocketClient.client = new IOTWebSocketClient(
 						new URI(Constant.iot_websocket_url + "?projectId=" + RepositoryBase.projectId.substring(2) + "&type=iot,text,pointset"));
 				IOTWebSocketClient.client.connect();
@@ -77,7 +77,7 @@ public class DaemonThread extends Thread {
 				Thread.sleep(1000L);
 			}
 			if (Constant.alarm_enable) {
-				log.info("alarm-websocket");
+				log.warn("alarm-websocket");
 				AlarmWebSocketClient.client = new AlarmWebSocketClient(new URI(Constant.alarm_websocket + "/" + RepositoryBase.projectId));
 				AlarmWebSocketClient.client.connect();
 				// while (!myClient.getReadyState().equals(READYSTATE.OPEN)) {
@@ -90,7 +90,7 @@ public class DaemonThread extends Thread {
 
 			Repository Repository = RepositoryBase.instance;
 			ComputeUtil.DoRepository(Repository, true);
-			log.info("compute finish");
+			log.warn("compute finish");
 			RepositoryBase.compute_finish = true;
 			// 查询可变集合
 			// RecursiveUtil.print_variable_set("", Repository.objectData);

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/RefreshThread.java

@@ -77,11 +77,11 @@ public class RefreshThread extends Thread {
 					last_refresh_physical_world = currTime;
 				}
 				if (changed_config || changed_physical_world) {
-					log.info("recompute begin");
+					log.warn("recompute begin");
 					Repository Repository = new Repository();
 					ComputeUtil.DoRepository(Repository, changed_physical_world);
 					RepositoryBase.instance = Repository;
-					log.info("recompute finish");
+					log.warn("recompute finish");
 				}
 			} catch (Exception e) {
 				e.printStackTrace();

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

@@ -280,7 +280,7 @@ public class RestUtil {
 		} catch (Exception e) {
 			e.printStackTrace();
 			String message = LogUtil.GetExceptionStackTrace(e);
-			log.info(message);
+			log.error(message);
 			return message;
 		}
 	}
@@ -313,7 +313,7 @@ public class RestUtil {
 		} catch (Exception e) {
 			e.printStackTrace();
 			String message = LogUtil.GetExceptionStackTrace(e);
-			log.info(message);
+			log.error(message);
 			return message;
 		}
 	}
@@ -345,7 +345,7 @@ public class RestUtil {
 	// } catch (Exception e) {
 	// e.printStackTrace();
 	// String message = LogUtil.GetExceptionStackTrace(e);
-	// log.info(message);
+	// log.error(message);
 	// result.put("Result", "failure");
 	// result.put("ResultMsg", message);
 	// result.put("ResultCode", 250);
@@ -382,7 +382,7 @@ public class RestUtil {
 		} catch (Exception e) {
 			e.printStackTrace();
 			String message = LogUtil.GetExceptionStackTrace(e);
-			log.info(message);
+			log.error(message);
 			result.put("result", "failure");
 		}
 		return result.toJSONString();
@@ -418,7 +418,7 @@ public class RestUtil {
 	// } catch (Exception e) {
 	// e.printStackTrace();
 	// String message = LogUtil.GetExceptionStackTrace(e);
-	// log.info(message);
+	// log.error(message);
 	// result.put("Result", "failure");
 	// result.put("ResultMsg", message);
 	// result.put("ResultCode", 250);
@@ -607,7 +607,7 @@ public class RestUtil {
 		} catch (Exception e) {
 			e.printStackTrace();
 			String message = LogUtil.GetExceptionStackTrace(e);
-			log.info(message);
+			log.error(message);
 			result.put("result", "failure");
 		}
 		return result.toJSONString();
@@ -637,7 +637,7 @@ public class RestUtil {
 	// } catch (Exception e) {
 	// e.printStackTrace();
 	// String message = LogUtil.GetExceptionStackTrace(e);
-	// log.info(message);
+	// log.error(message);
 	// result.put("Result", "failure");
 	// result.put("ResultMsg", message);
 	// result.put("ResultCode", 250);
@@ -661,7 +661,7 @@ public class RestUtil {
 		} catch (Exception e) {
 			e.printStackTrace();
 			String message = LogUtil.GetExceptionStackTrace(e);
-			log.info(message);
+			log.error(message);
 			result.put("Result", "failure");
 			result.put("ResultMsg", message);
 			result.put("ResultCode", 250);
@@ -731,7 +731,7 @@ public class RestUtil {
 		} catch (Exception e) {
 			e.printStackTrace();
 			String message = LogUtil.GetExceptionStackTrace(e);
-			log.info(message);
+			log.error(message);
 			result.put("Result", "failure");
 			result.put("ResultMsg", message);
 			result.put("ResultCode", 250);

+ 5 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ComputeUtil.java

@@ -26,8 +26,11 @@ public class ComputeUtil {
 
 	public static void DoRepository(Repository Repository, boolean load_physical_world) throws Exception {
 		if (load_physical_world) {
+			log.warn("LoadPhysicalWorld");
 			RWDLoadUtil.LoadPhysicalWorld(Repository);
+			log.warn("LoadReference");
 			RWDLoadUtil.LoadReference(Repository);
+			log.warn("LoadAlarm");
 			if (Constant.alarm_enable) {
 				RWDLoadUtil.LoadAlarm(Repository, false);
 			} else {
@@ -45,6 +48,7 @@ public class ComputeUtil {
 			Repository.id2sdv = RepositoryBase.instance.id2sdv;
 		}
 
+		log.warn("LoadConfig");
 		SceneObject sceneObject = new SceneObject();
 		JSONObject sceneJSON = FastJsonReaderUtil.Instance().ReadJSONObject(new File(Constant.getLatestPath(Constant.config, false)));
 		FastJsonUtil.Set_JavaObject(sceneJSON, sceneObject);
@@ -53,6 +57,7 @@ public class ComputeUtil {
 		Repository.property2SDV.clear();
 		ComputeUtil.RefreshRepository(Repository);
 		List<List<SceneProperty>> spListList = ComputeUtil.computePrepare(Repository);
+		log.warn("computeAll");
 		ComputeUtil.computeAll(Repository, spListList);
 		try {
 			DeamonUtil.Process(Repository);

+ 1 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/DataUtil.java

@@ -79,7 +79,7 @@ public class DataUtil {
 		} else if (value_primitive instanceof BigDecimal) {
 			return ((BigDecimal) value_primitive).doubleValue();
 		} else {
-			log.info("primitive2double: " + value_primitive + "\t" + value_primitive.getClass().getName());
+			log.error("primitive2double: " + value_primitive + "\t" + value_primitive.getClass().getName());
 			throw new Exception();
 		}
 	}

+ 2 - 2
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/DeamonUtil.java

@@ -18,7 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 @Slf4j
 public class DeamonUtil {
 	public static void Process(Repository Repository) throws Exception {
-		log.info("deamon start");
+		log.warn("deamon start");
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
 		Map<String, Boolean> pointMap = new HashMap<String, Boolean>();
 		for (SceneDataValue sdv : Repository.deamon_sdv2pointList.keySet()) {
@@ -101,7 +101,7 @@ public class DeamonUtil {
 				sdv.value_array.setRowChange(true);
 			}
 		}
-		log.info("deamon finish");
+		log.warn("deamon finish");
 	}
 
 	public static void Process(Repository Repository, JSONArray points) throws Exception {