|
@@ -135,14 +135,14 @@ public class ComputeUtil {
|
|
for (SceneProperty spInner : spList) {
|
|
for (SceneProperty spInner : spList) {
|
|
// 打印路径
|
|
// 打印路径
|
|
{
|
|
{
|
|
- String path = getPath(Repository, spInner);
|
|
|
|
|
|
+ String path = getPropertyPath(Repository, spInner);
|
|
log.info("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.info(getPath(Repository, spInner2));
|
|
|
|
|
|
+ log.info(getPropertyPath(Repository, spInner2));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -181,7 +181,7 @@ public class ComputeUtil {
|
|
log.info("********************************");
|
|
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.info(getPath(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>());
|
|
}
|
|
}
|
|
@@ -193,7 +193,7 @@ public class ComputeUtil {
|
|
return spListList;
|
|
return spListList;
|
|
}
|
|
}
|
|
|
|
|
|
- public static String getPath(Repository Repository, SceneProperty spInner) throws Exception {
|
|
|
|
|
|
+ public static String getPropertyPath(Repository Repository, SceneProperty spInner) throws Exception {
|
|
Object parentData = spInner;
|
|
Object parentData = spInner;
|
|
List<SceneProperty> tmpList = new ArrayList<SceneProperty>();
|
|
List<SceneProperty> tmpList = new ArrayList<SceneProperty>();
|
|
while (true) {
|
|
while (true) {
|
|
@@ -341,6 +341,11 @@ public class ComputeUtil {
|
|
}
|
|
}
|
|
|
|
|
|
public static void computeProperty(Repository Repository, SceneDataValue sv) throws Exception {
|
|
public static void computeProperty(Repository Repository, SceneDataValue sv) throws Exception {
|
|
|
|
+ String svPath = RecursiveUtil.getDataPath(sv);
|
|
|
|
+ log.info(svPath);
|
|
|
|
+ // if (svPath.equals("基础对象.设备.[电梯].设备类型.[直梯].清单.[Eq4403070003d6f62fb297c64106b3bd17517a5b7f0c].状态")) {
|
|
|
|
+ // System.out.println();
|
|
|
|
+ // }
|
|
SceneDataObject objectData = sv.parentObjectData;
|
|
SceneDataObject objectData = sv.parentObjectData;
|
|
SceneProperty sceneProperty = sv.rel_property;
|
|
SceneProperty sceneProperty = sv.rel_property;
|
|
if (sceneProperty.propertyValueType.equals("static")) {
|
|
if (sceneProperty.propertyValueType.equals("static")) {
|