|
@@ -438,6 +438,17 @@ public class QueryUtil {
|
|
SceneDataValue last_sdv = null;
|
|
SceneDataValue last_sdv = null;
|
|
for (int i = index_split; i < splits.length; i++) {
|
|
for (int i = index_split; i < splits.length; i++) {
|
|
String split = splits[i];
|
|
String split = splits[i];
|
|
|
|
+ //允许expression里面引用信息点的表号功能号
|
|
|
|
+ if (i == splits.length - 1 && splits[i].equals("meter-funcid")) {
|
|
|
|
+ if (RepositoryBase.sdv2point.containsKey(svInner)) {
|
|
|
|
+ String meter_funcid = RepositoryBase.sdv2point.get(svInner);
|
|
|
|
+ svInner = new SceneDataValue(Repository, null, null, null);
|
|
|
|
+ svInner.value_prim = new SceneDataPrimitive();
|
|
|
|
+ svInner.value_prim.value = meter_funcid;
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+
|
|
int index_ = split.indexOf('=');
|
|
int index_ = split.indexOf('=');
|
|
if (index_ != -1) {
|
|
if (index_ != -1) {
|
|
String propertyName = split.substring(0, index_);
|
|
String propertyName = split.substring(0, index_);
|