Browse Source

日志不好使,改改

menglu 3 years ago
parent
commit
23f7479da4

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

@@ -124,11 +124,11 @@ public class RefreshThread extends Thread {
 		}
 		// 检查一致性
 		boolean compare = FileUtil.compareRecursive(dir1, dir2);
-		log.info(LogUtil.refreshLoggerName, "Compare tmp1" + (compare ? "==" : "!=") + "tmp2");
+		log.debug(LogUtil.refreshLoggerName, "Compare tmp1" + (compare ? "==" : "!=") + "tmp2");
 		if (compare) {
 			File valid = new File(validPath);
 			boolean compare_valid = FileUtil.compareRecursive(valid, dir2);
-			log.info(LogUtil.refreshLoggerName, "Compare valid" + (compare_valid ? "==" : "!=") + "tmp2");
+			log.debug(LogUtil.refreshLoggerName, "Compare valid" + (compare_valid ? "==" : "!=") + "tmp2");
 			if (compare_valid) {
 				return false;
 			} else {

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

@@ -136,18 +136,18 @@ public class ComputeUtil {
 				}
 			}
 		}
-		log.info("****************");
+		log.debug("****************");
 		for (SceneProperty spInner : spList) {
 			// 打印路径
 			{
 				String path = getPropertyPath(Repository, spInner);
-				log.info("getPropertyBefore:" + path);
+				log.debug("getPropertyBefore:" + path);
 			}
 			{
 				List<SceneProperty> beforeList = CheckUtil.getPropertyBefore(Repository, spInner);
 				Repository.beforeDic.put(spInner, beforeList);
 				for (SceneProperty spInner2 : beforeList) {
-					log.info(getPropertyPath(Repository, spInner2));
+					log.debug(getPropertyPath(Repository, spInner2));
 				}
 			}
 		}
@@ -181,19 +181,19 @@ public class ComputeUtil {
 				processedDic.put(spInner, true);
 			}
 		}
-		log.info("****************************************************************");
+		log.debug("****************************************************************");
 		for (List<SceneProperty> spInnerList : spListList) {
-			log.info("********************************");
+			log.debug("********************************");
 			for (SceneProperty spInner2 : spInnerList) {
 				Repository.property2lock.put(spInner2, new ReentrantLock(true));
-				log.info(getPropertyPath(Repository, spInner2));
+				log.debug(getPropertyPath(Repository, spInner2));
 				if (!Repository.property2SDV.containsKey(spInner2)) {
 					Repository.property2SDV.put(spInner2, new ArrayList<SceneDataValue>());
 				}
 			}
-			log.info("********************************");
+			log.debug("********************************");
 		}
-		log.info("****************************************************************");
+		log.debug("****************************************************************");
 
 		return spListList;
 	}
@@ -331,7 +331,7 @@ public class ComputeUtil {
 						}
 						sb.append(ss.propertyName);
 					}
-					log.info("computeOnce:" + sb.toString());
+					log.debug("computeOnce:" + sb.toString());
 					// if (sb.toString().equals("基础对象-设备-清单")) {
 					// System.out.println();
 					// }
@@ -347,7 +347,7 @@ public class ComputeUtil {
 
 	public static void computeProperty(Repository Repository, SceneDataValue sv) throws Exception {
 		String svPath = RecursiveUtil.getDataPath(sv);
-		log.info(svPath);
+		log.debug(svPath);
 		// if (svPath.equals("基础对象.设备.[电梯].设备类型.[直梯].清单.[Eq4403070003d6f62fb297c64106b3bd17517a5b7f0c].状态")) {
 		// System.out.println();
 		// }

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

@@ -113,8 +113,8 @@ public class ControlUtil {
 		postJSON.put("building", RepositoryBase.projectId.substring(2));
 		postJSON.put("points", points);
 		String post_url = Constant.iot_project_url + "pointsetbatch_post";
-		log.info(postJSON.toJSONString());
+		log.debug(postJSON.toJSONString());
 		String post_result = HttpClientUtil.post(post_url, postJSON.toJSONString());
-		log.info(post_result);
+		log.debug(post_result);
 	}
 }

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

@@ -112,8 +112,8 @@ public class DeamonUtil {
 		String post_result = HttpClientUtil.post(post_url, postJSON.toJSONString());
 		JSONObject resultJSON = JSON.parseObject(post_result);
 		if (resultJSON == null) {
-			log.info(points.toJSONString());
-			log.info(post_result);
+			log.debug(points.toJSONString());
+			log.debug(post_result);
 		}
 		JSONArray result = (JSONArray) resultJSON.get("points");
 		for (int i = 0; i < result.size(); i++) {

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

@@ -73,7 +73,7 @@ public class FileUtil {
 			Object json1 = FastJsonReaderUtil.Instance().Read(file1);
 			Object json2 = FastJsonReaderUtil.Instance().Read(file2);
 			boolean file_compare = FastJsonCompareUtil.Instance().CompareObject(json1, json2);
-			log.info(LogUtil.refreshLoggerName + "\t" + "Compare " + file1.getPath() + " " + file2.getPath() + "\t" + file_compare);
+			log.debug(LogUtil.refreshLoggerName + "\t" + "Compare " + file1.getPath() + " " + file2.getPath() + "\t" + file_compare);
 			return file_compare;
 		} else {
 			return false;

+ 6 - 6
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -49,7 +49,7 @@ public class RWDDownloadUtil {
 	}
 
 	public static void LoadPhysicalWorld(String path) throws Exception {
-		log.info(LogUtil.refreshLoggerName + "\t" + "Download physical world refresh dir");
+		log.debug(LogUtil.refreshLoggerName + "\t" + "Download physical world refresh dir");
 		FileUtil.deleteRecursive(new File(path));
 		{
 			File root = new File(path);
@@ -70,7 +70,7 @@ public class RWDDownloadUtil {
 			}
 		}
 
-		log.info(LogUtil.refreshLoggerName + "\t" + "Download physical world begin " + path);
+		log.debug(LogUtil.refreshLoggerName + "\t" + "Download physical world begin " + path);
 		JSONArray classArray;
 		{
 			JSONObject param = new JSONObject();
@@ -94,7 +94,7 @@ public class RWDDownloadUtil {
 				criteria.put("classCode", code);
 				criteria.put("valid", 1);
 				param.put("criteria", criteria);
-				log.info(LogUtil.refreshLoggerName + "\t" + "Download info " + code);
+				log.debug(LogUtil.refreshLoggerName + "\t" + "Download info " + code);
 				String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/def/funcid", param.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
 				infoArray = resultJSON.getJSONArray("data");
@@ -114,7 +114,7 @@ public class RWDDownloadUtil {
 				criteria.put("classCode", code);
 				criteria.put("valid", 1);
 				param.put("criteria", criteria);
-				log.info(LogUtil.refreshLoggerName + "\t" + "Download object " + code);
+				log.debug(LogUtil.refreshLoggerName + "\t" + "Download object " + code);
 				String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/instance/object/query?projectId=" + RepositoryBase.projectId
 						+ "&groupCode=" + RepositoryBase.groupCode, param.toJSONString());
 				JSONObject resultJSON = JSON.parseObject(post_result);
@@ -140,7 +140,7 @@ public class RWDDownloadUtil {
 					criteria.put("graphCode", graphCode);
 					criteria.put("relCode", relCode);
 					param.put("criteria", criteria);
-					log.info(LogUtil.refreshLoggerName + "\t" + "Download relation " + graphCode + " " + relCode);
+					log.debug(LogUtil.refreshLoggerName + "\t" + "Download relation " + graphCode + " " + relCode);
 					String post_result = HttpClientUtil.post(Constant.rwd_url + "rwd/instance/relation/query?projectId=" + RepositoryBase.projectId
 							+ "&groupCode=" + RepositoryBase.groupCode, param.toJSONString());
 					JSONObject resultJSON = JSON.parseObject(post_result);
@@ -151,6 +151,6 @@ public class RWDDownloadUtil {
 						+ ".json", FastJsonUtil.toFormatString(infoArray));
 			}
 		}
-		log.info(LogUtil.refreshLoggerName + "\t" + "Download physical world finish " + path);
+		log.debug(LogUtil.refreshLoggerName + "\t" + "Download physical world finish " + path);
 	}
 }

+ 3 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -65,7 +65,7 @@ public class RWDLoadUtil {
 			for (File file : files) {
 				int index_ = file.getName().indexOf('.');
 				String code = file.getName().substring(0, index_);
-				log.info(infoPath + Constant.getSeperator() + "" + file.getName());
+				log.debug(infoPath + Constant.getSeperator() + "" + file.getName());
 				try {
 					JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(infoPath + Constant.getSeperator() + "" + file.getName()));
 					if (code.equals("OTSECB")) {
@@ -101,7 +101,7 @@ public class RWDLoadUtil {
 				int index_ = file.getName().indexOf('.');
 				String code = file.getName().substring(0, index_);
 				String className = Repository.classCode2NameMap.get(code);
-				log.info(objectPath + Constant.getSeperator() + "" + file.getName());
+				log.debug(objectPath + Constant.getSeperator() + "" + file.getName());
 				JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(objectPath + Constant.getSeperator() + "" + file.getName()));
 				if (code.equals("OTSECB")) {
 					for (int ii = 0; ii < array.size(); ii++) {
@@ -191,7 +191,7 @@ public class RWDLoadUtil {
 				for (File file : files) {
 					int index_ = file.getName().indexOf('.');
 					String code = file.getName().substring(0, index_);
-					log.info(relationPath + Constant.getSeperator() + "" + dir.getName() + Constant.getSeperator() + file.getName());
+					log.debug(relationPath + Constant.getSeperator() + "" + dir.getName() + Constant.getSeperator() + file.getName());
 					JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(
 							new File(relationPath + Constant.getSeperator() + "" + dir.getName() + Constant.getSeperator() + file.getName()));
 					SceneDataSet SceneDataSet = new SceneDataSet(false);

+ 3 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RecursiveUtil.java

@@ -456,12 +456,12 @@ public class RecursiveUtil {
 
 		if (sdv.rel_property.propertyValueSchema.equals("JSONObject")) {
 			if (sdv.rel_property.propertyValueType.equals("query")) {
-				log.info(path + "\t" + "variable set object" + "\t" + sdv.rel_property.propertyValueType + "\t" + sdv.value_object.change.toString());
+				log.debug(path + "\t" + "variable set object" + "\t" + sdv.rel_property.propertyValueType + "\t" + sdv.value_object.change.toString());
 			}
 			print_variable_set(path, sdv.value_object);
 		} else if (sdv.rel_property.propertyValueSchema.equals("JSONArray")) {
 			if (sdv.rel_property.propertyValueType.equals("query")) {
-				log.info(path + "\t" + "variable set array" + "\t" + sdv.rel_property.propertyValueType + "\t" + sdv.value_array.change.toString());
+				log.debug(path + "\t" + "variable set array" + "\t" + sdv.rel_property.propertyValueType + "\t" + sdv.value_array.change.toString());
 			}
 			for (int i = 0; i < sdv.value_array.set.size(); i++) {
 				SceneDataObject sdb = sdv.value_array.set.get(i);
@@ -473,7 +473,7 @@ public class RecursiveUtil {
 		} else {
 			if (sdv.rel_property.propertyValueType.equals("query")) {
 				{
-					log.info(path + "\t" + "variable value" + "\t" + sdv.value_prim.change);
+					log.debug(path + "\t" + "variable value" + "\t" + sdv.value_prim.change);
 				}
 			}
 		}

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

@@ -53,7 +53,7 @@ public class AlarmWebSocketClient extends WebSocketClient {
 		try {
 			// String message = GZIPCompressUtil.uncompress(arg0);
 			String message = arg0;
-			log.info("AlarmWebSocketClient: " + message);
+			log.debug("AlarmWebSocketClient: " + message);
 			JSONObject alarm = (JSONObject) JSON.parse(message);
 			RWDAlarmUtil.ProcessAlarm(alarm);
 		} catch (Exception e) {