|
@@ -2,19 +2,19 @@ package com.persagy.ibms.data.sdk.util;
|
|
|
|
|
|
import java.io.File;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.concurrent.locks.ReentrantLock;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.persagy.ibms.data.sdk.data.SceneDataObject;
|
|
|
+import com.persagy.ibms.data.sdk.data.SceneDataPrimitive;
|
|
|
+import com.persagy.ibms.data.sdk.data.SceneDataSet;
|
|
|
import com.persagy.ibms.data.sdk.data.SceneDataValue;
|
|
|
import com.persagy.ibms.data.sdk.data.SceneObject;
|
|
|
import com.persagy.ibms.data.sdk.data.SceneProperty;
|
|
|
-import com.persagy.ibms.data.sdk.data.SceneDataPrimitive;
|
|
|
-import com.persagy.ibms.data.sdk.data.SceneDataSet;
|
|
|
import com.sagacloud.ExpressionUtil;
|
|
|
import com.sagacloud.advanced.expression.AdvancedExpressionScanner;
|
|
|
import com.sagacloud.advanced.expression.AdvancedExpressionWalker;
|
|
@@ -191,7 +191,6 @@ public class ComputeUtil {
|
|
|
for (List<SceneProperty> spInnerList : spListList) {
|
|
|
log.info("********************************");
|
|
|
for (SceneProperty spInner2 : spInnerList) {
|
|
|
- Repository.property2lock.put(spInner2, new ReentrantLock(true));
|
|
|
log.info(getPropertyPath(Repository, spInner2));
|
|
|
if (!Repository.property2SDV.containsKey(spInner2)) {
|
|
|
Repository.property2SDV.put(spInner2, new ArrayList<SceneDataValue>());
|
|
@@ -525,6 +524,7 @@ public class ComputeUtil {
|
|
|
}
|
|
|
Repository.deamon_sdv2pointList.put(sv, pointList);
|
|
|
}
|
|
|
+ sv.last_compute_time = new Date();
|
|
|
}
|
|
|
|
|
|
public static Object getValueObject(Repository Repository, String[] valuePath) {
|