|
@@ -45,16 +45,17 @@ public class RepositoryImpl extends RepositoryBase {
|
|
public Map<String, SceneDataObject> id2sdv = new HashMap<String, SceneDataObject>();
|
|
public Map<String, SceneDataObject> id2sdv = new HashMap<String, SceneDataObject>();
|
|
|
|
|
|
// 管理范围
|
|
// 管理范围
|
|
- public SceneDataSet classArrayZKT = new SceneDataSet(false);
|
|
|
|
- public Map<String, Map<String, SceneDataSet>> objectArrayDicZKT = new HashMap<String, Map<String, SceneDataSet>>();
|
|
|
|
|
|
+ public SceneDataSet ZKTClassArray = new SceneDataSet(false);
|
|
|
|
+ public Map<String, Map<String, SceneDataSet>> ZKTObjectArrayDic = new HashMap<String, Map<String, SceneDataSet>>();
|
|
|
|
+ public SceneDataSet ZKTAlarmTypeArray = new SceneDataSet(false);
|
|
|
|
|
|
// 编组
|
|
// 编组
|
|
public SceneDataSet IBMSGroupArray = new SceneDataSet(false);
|
|
public SceneDataSet IBMSGroupArray = new SceneDataSet(false);
|
|
public Map<String, Map<String, SceneDataSet>> IBMSArrayDic = new HashMap<String, Map<String, SceneDataSet>>();
|
|
public Map<String, Map<String, SceneDataSet>> IBMSArrayDic = new HashMap<String, Map<String, SceneDataSet>>();
|
|
|
|
|
|
// 日历模式:周期性刷新,不需要拷贝
|
|
// 日历模式:周期性刷新,不需要拷贝
|
|
- public SceneDataSet IBMSCalendarModel = new SceneDataSet(false);
|
|
|
|
- public SceneDataSet IBMSCalendarBinding = new SceneDataSet(false);
|
|
|
|
|
|
+ public SceneDataSet IBMSCalendarModel = new SceneDataSet(false, true);
|
|
|
|
+ public SceneDataSet IBMSCalendarBinding = new SceneDataSet(false, true);
|
|
|
|
|
|
public ConcurrentHashMap<SceneDataValue, String> sdv2point() {
|
|
public ConcurrentHashMap<SceneDataValue, String> sdv2point() {
|
|
return RepositoryBase.sdv2point;
|
|
return RepositoryBase.sdv2point;
|
|
@@ -113,17 +114,15 @@ public class RepositoryImpl extends RepositoryBase {
|
|
result.setRowChange(false);
|
|
result.setRowChange(false);
|
|
}
|
|
}
|
|
} else if (Source.equals("zkt-class")) {
|
|
} else if (Source.equals("zkt-class")) {
|
|
- result = this.classArrayZKT;
|
|
|
|
|
|
+ result = this.ZKTClassArray;
|
|
} else if (Source.equals("zkt-object")) {
|
|
} else if (Source.equals("zkt-object")) {
|
|
String ibmsSceneCode = (descSet.get("ibmsSceneCode")).toString();
|
|
String ibmsSceneCode = (descSet.get("ibmsSceneCode")).toString();
|
|
String ibmsClassCode = (descSet.get("ibmsClassCode")).toString();
|
|
String ibmsClassCode = (descSet.get("ibmsClassCode")).toString();
|
|
- result = this.objectArrayDicZKT.get(ibmsSceneCode).get(ibmsClassCode);
|
|
|
|
|
|
+ result = this.ZKTObjectArrayDic.get(ibmsSceneCode).get(ibmsClassCode);
|
|
} else if (Source.equals("ibms")) {
|
|
} else if (Source.equals("ibms")) {
|
|
String product = (descSet.get("product")).toString();
|
|
String product = (descSet.get("product")).toString();
|
|
String type = (descSet.get("type")).toString();
|
|
String type = (descSet.get("type")).toString();
|
|
result = this.IBMSArrayDic.get(product).get(type);
|
|
result = this.IBMSArrayDic.get(product).get(type);
|
|
- } else if (Source.equals("alarm")) {
|
|
|
|
- result = this.RepositoryBase.alarmArray;
|
|
|
|
} else if (Source.equals("alarmConfig")) {
|
|
} else if (Source.equals("alarmConfig")) {
|
|
String alarmConfig = (descSet.get("alarmConfig")).toString();
|
|
String alarmConfig = (descSet.get("alarmConfig")).toString();
|
|
if (alarmConfig.equals("configTrigger")) {
|
|
if (alarmConfig.equals("configTrigger")) {
|
|
@@ -135,6 +134,10 @@ public class RepositoryImpl extends RepositoryBase {
|
|
result = this.IBMSCalendarModel;
|
|
result = this.IBMSCalendarModel;
|
|
} else if (Source.equals("ibms-calendar")) {
|
|
} else if (Source.equals("ibms-calendar")) {
|
|
result = this.IBMSCalendarBinding;
|
|
result = this.IBMSCalendarBinding;
|
|
|
|
+ } else if (Source.equals("ibms-alarm-type")) {
|
|
|
|
+ result = this.ZKTAlarmTypeArray;
|
|
|
|
+ } else if (Source.equals("alarm")) {
|
|
|
|
+ result = this.RepositoryBase.alarmArray;
|
|
}
|
|
}
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|