Jelajahi Sumber

调整日志,增加夜景照明

menglu 3 tahun lalu
induk
melakukan
53dbc16bc9

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

@@ -36,8 +36,8 @@ public class ComputeUtil {
 			} else {
 				RWDLoadUtil.LoadAlarm(Repository, true);
 			}
-			 log.warn("LoadIBMSPhysicalWorld");
-			 RWDLoadUtil.LoadIBMSPhysicalWorld(Repository);
+			log.warn("LoadIBMSPhysicalWorld");
+			RWDLoadUtil.LoadIBMSPhysicalWorld(Repository);
 		} else {
 			Repository.objTypeMap = RepositoryBase.instance.objTypeMap;
 			Repository.code2objTypeMap = RepositoryBase.instance.code2objTypeMap;
@@ -48,6 +48,7 @@ public class ComputeUtil {
 			Repository.relationArrayDic = RepositoryBase.instance.relationArrayDic;
 			Repository.id2object = RepositoryBase.instance.id2object;
 			Repository.id2sdv = RepositoryBase.instance.id2sdv;
+			Repository.IBMSArrayDic = RepositoryBase.instance.IBMSArrayDic;
 		}
 
 		log.warn("LoadConfig");
@@ -138,18 +139,18 @@ public class ComputeUtil {
 				}
 			}
 		}
-		log.debug("****************");
+		log.info("****************");
 		for (SceneProperty spInner : spList) {
 			// 打印路径
 			{
 				String path = getPropertyPath(Repository, spInner);
-				log.debug("getPropertyBefore:" + path);
+				log.info("getPropertyBefore:" + path);
 			}
 			{
 				List<SceneProperty> beforeList = CheckUtil.getPropertyBefore(Repository, spInner);
 				Repository.beforeDic.put(spInner, beforeList);
 				for (SceneProperty spInner2 : beforeList) {
-					log.debug(getPropertyPath(Repository, spInner2));
+					log.info(getPropertyPath(Repository, spInner2));
 				}
 			}
 		}
@@ -183,19 +184,19 @@ public class ComputeUtil {
 				processedDic.put(spInner, true);
 			}
 		}
-		log.debug("****************************************************************");
+		log.info("****************************************************************");
 		for (List<SceneProperty> spInnerList : spListList) {
-			log.debug("********************************");
+			log.info("********************************");
 			for (SceneProperty spInner2 : spInnerList) {
 				Repository.property2lock.put(spInner2, new ReentrantLock(true));
-				log.debug(getPropertyPath(Repository, spInner2));
+				log.info(getPropertyPath(Repository, spInner2));
 				if (!Repository.property2SDV.containsKey(spInner2)) {
 					Repository.property2SDV.put(spInner2, new ArrayList<SceneDataValue>());
 				}
 			}
-			log.debug("********************************");
+			log.info("********************************");
 		}
-		log.debug("****************************************************************");
+		log.info("****************************************************************");
 
 		return spListList;
 	}
@@ -333,7 +334,7 @@ public class ComputeUtil {
 						}
 						sb.append(ss.propertyName);
 					}
-					log.debug("computeOnce:" + sb.toString());
+					log.info("computeOnce:" + sb.toString());
 					// if (sb.toString().equals("基础对象-设备-清单")) {
 					// System.out.println();
 					// }

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

@@ -66,7 +66,7 @@ public class RWDLoadUtil {
 			for (File file : files) {
 				int index_ = file.getName().indexOf('.');
 				String code = file.getName().substring(0, index_);
-				log.debug(infoPath + Constant.getSeperator() + "" + file.getName());
+				log.info(infoPath + Constant.getSeperator() + "" + file.getName());
 				try {
 					JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(infoPath + Constant.getSeperator() + "" + file.getName()));
 					if (code.equals("OTSECB")) {
@@ -102,7 +102,7 @@ public class RWDLoadUtil {
 				int index_ = file.getName().indexOf('.');
 				String code = file.getName().substring(0, index_);
 				String className = Repository.classCode2NameMap.get(code);
-				log.debug(objectPath + Constant.getSeperator() + "" + file.getName());
+				log.info(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++) {
@@ -192,7 +192,7 @@ public class RWDLoadUtil {
 				for (File file : files) {
 					int index_ = file.getName().indexOf('.');
 					String code = file.getName().substring(0, index_);
-					log.debug(relationPath + Constant.getSeperator() + "" + dir.getName() + Constant.getSeperator() + file.getName());
+					log.info(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);
@@ -485,7 +485,7 @@ public class RWDLoadUtil {
 				int index_ = file.getName().indexOf('.');
 				String code = file.getName().substring(0, index_);
 				String infoPath = validPath + Constant.getSeperator() + product;
-				log.debug(infoPath + Constant.getSeperator() + file.getName());
+				log.info(infoPath + Constant.getSeperator() + file.getName());
 				try {
 					JSONArray array = FastJsonReaderUtil.Instance().ReadJSONArray(new File(infoPath + Constant.getSeperator() + file.getName()));
 					SceneDataSet SceneDataSet = new SceneDataSet(false);

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

@@ -67,8 +67,8 @@ public class ToolUtil {
 			SETDLS2GeneralZone.put(objFrom, objTo);
 		}
 
-		String[] levels = { "楼体照明", "楼体照明", "景观照明", "景观照明" };
-		String[] types = { "A", "B", "A", "B" };
+		String[] levels = { "楼体照明", "楼体照明", "景观照明", "景观照明", "标识照明", "标识照明" };
+		String[] types = { "A", "B", "A", "B", "A", "B" };
 		JSONArray result = new JSONArray();
 		for (String SELTCC : SELTCC2SELTCU.keySet()) {
 			if (!SELTCC2SELTCU.containsKey(SELTCC)) {