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