|
@@ -22,9 +22,9 @@ import lombok.extern.slf4j.Slf4j;
|
|
@Slf4j
|
|
@Slf4j
|
|
public class RWDLoadUtil {
|
|
public class RWDLoadUtil {
|
|
public static String[] concentrate_types = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17" };
|
|
public static String[] concentrate_types = { "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17" };
|
|
- public static String[] concentrate_codes = { "CO", "CO2", "SO", "NOX", "HCHO", "BTX", "TVOC", "pm10", "pm2.5", "SMOG", "BIMI", "HOW", "PH", "SS",
|
|
|
|
|
|
+ public static String[] concentrate_codes = { "CO", "CO2", "SO", "NOX", "HCHO", "BTX", "TVOC", "PM10", "PM2_5", "SMOG", "BIMI", "HOW", "PH", "SS",
|
|
"COD", "O2", "NOI" };
|
|
"COD", "O2", "NOI" };
|
|
- public static String[] concentrate_names = { "一氧化碳", "二氧化碳", "二氧化硫", "氮氧化物", "甲醛", "苯", "总挥发性有机化合物", "pm10", "pm2.5", "烟雾浓度", "生物微粒", "水硬度",
|
|
|
|
|
|
+ public static String[] concentrate_names = { "一氧化碳", "二氧化碳", "二氧化硫", "氮氧化物", "甲醛", "苯", "总挥发性有机化合物", "PM10", "PM2.5", "烟雾浓度", "生物微粒", "水硬度",
|
|
"PH值", "SS值", "COD值", "氧气", "负氧离子" };
|
|
"PH值", "SS值", "COD值", "氧气", "负氧离子" };
|
|
|
|
|
|
public static void LoadPhysicalWorld(RepositoryImpl Repository) throws Exception {
|
|
public static void LoadPhysicalWorld(RepositoryImpl Repository) throws Exception {
|
|
@@ -618,28 +618,29 @@ public class RWDLoadUtil {
|
|
public static void LoadZKTAlarmConfig(RepositoryImpl Repository) throws Exception {
|
|
public static void LoadZKTAlarmConfig(RepositoryImpl Repository) throws Exception {
|
|
String validPath = Constant.zkt_alarm_config;
|
|
String validPath = Constant.zkt_alarm_config;
|
|
{
|
|
{
|
|
- JSONArray alarmConfigArray = FastJsonReaderUtil.Instance().ReadJSONArray(new File(validPath + Constant.getSeperator() + "zkt_alarm_config.json"));
|
|
|
|
|
|
+ JSONArray alarmConfigArray = FastJsonReaderUtil.Instance()
|
|
|
|
+ .ReadJSONArray(new File(validPath + Constant.getSeperator() + "zkt_alarm_config.json"));
|
|
{
|
|
{
|
|
SceneDataSet SceneDataSet = new SceneDataSet(false);
|
|
SceneDataSet SceneDataSet = new SceneDataSet(false);
|
|
SceneDataSet.set = RWDUtil.array2SDOList(alarmConfigArray);
|
|
SceneDataSet.set = RWDUtil.array2SDOList(alarmConfigArray);
|
|
Repository.alarmConfigArray = SceneDataSet;
|
|
Repository.alarmConfigArray = SceneDataSet;
|
|
}
|
|
}
|
|
- JSONArray alarmConfigTriggerArray=new JSONArray();
|
|
|
|
|
|
+ JSONArray alarmConfigTriggerArray = new JSONArray();
|
|
for (int i = 0; i < alarmConfigArray.size(); i++) {
|
|
for (int i = 0; i < alarmConfigArray.size(); i++) {
|
|
JSONObject alarmConfigItem = (JSONObject) alarmConfigArray.get(i);
|
|
JSONObject alarmConfigItem = (JSONObject) alarmConfigArray.get(i);
|
|
String objId = (String) alarmConfigItem.get("objId");
|
|
String objId = (String) alarmConfigItem.get("objId");
|
|
JSONObject condition = (JSONObject) alarmConfigItem.get("condition");
|
|
JSONObject condition = (JSONObject) alarmConfigItem.get("condition");
|
|
JSONObject configs = (JSONObject) condition.get("configs");
|
|
JSONObject configs = (JSONObject) condition.get("configs");
|
|
JSONArray trigger = (JSONArray) configs.get("trigger");
|
|
JSONArray trigger = (JSONArray) configs.get("trigger");
|
|
- if (trigger!=null) {
|
|
|
|
- JSONObject item=(JSONObject) trigger.get(0);
|
|
|
|
- item.put("objId",objId);
|
|
|
|
|
|
+ if (trigger != null) {
|
|
|
|
+ JSONObject item = (JSONObject) trigger.get(0);
|
|
|
|
+ item.put("objId", objId);
|
|
alarmConfigTriggerArray.add(item);
|
|
alarmConfigTriggerArray.add(item);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
SceneDataSet alarmConfigTrigger = new SceneDataSet(false);
|
|
SceneDataSet alarmConfigTrigger = new SceneDataSet(false);
|
|
alarmConfigTrigger.set = RWDUtil.array2SDOList(alarmConfigTriggerArray);
|
|
alarmConfigTrigger.set = RWDUtil.array2SDOList(alarmConfigTriggerArray);
|
|
- Repository.alarmConfigTrigger=alarmConfigTrigger;
|
|
|
|
|
|
+ Repository.alarmConfigTrigger = alarmConfigTrigger;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|