Browse Source

调试报警,报警配置合并到zkt物理世界

menglu 3 years ago
parent
commit
3007536f7b

+ 1 - 17
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DaemonThread.java

@@ -47,8 +47,7 @@ public class DaemonThread extends Thread {
 		// 没有就下载
 		{
 			Date currTime = new Date();
-			String[] pathArray = { Constant.physical_world, Constant.zkt_physical_world, Constant.config, Constant.ibms_physical_world,
-					Constant.zkt_alarm_config };
+			String[] pathArray = { Constant.physical_world, Constant.zkt_physical_world, Constant.config, Constant.ibms_physical_world };
 			for (String path : pathArray) {
 				File root = new File(path);
 				if (!root.exists()) {
@@ -98,21 +97,6 @@ public class DaemonThread extends Thread {
 					log.error(e.getMessage(), e);
 				}
 			}
-			if (Constant.zkt_alarm_config_enable) {
-				try {
-					String validPath = Constant.getLatestPath(Constant.zkt_alarm_config, true);
-					if (validPath == null) {
-						while (true) {
-							boolean changed_physical_world = RWDDownloadUtil.Process_zkt_alarm_config();
-							if (changed_physical_world) {
-								break;
-							}
-						}
-					}
-				} catch (Exception e) {
-					log.error(e.getMessage(), e);
-				}
-			}
 			try {
 				String validPath = Constant.getLatestPath(Constant.config, false);
 				if (validPath == null) {

+ 1 - 10
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/RefreshThread.java

@@ -53,7 +53,6 @@ public class RefreshThread extends Thread {
 		Date last_refresh_config = null;
 		Date last_refresh_physical_world = null;
 		Date last_refresh_zkt_physical_world = null;
-		Date last_refresh_zkt_alarm_config = null;
 		while (!stop) {
 			try {
 				Thread.sleep(1000L);
@@ -70,14 +69,6 @@ public class RefreshThread extends Thread {
 					}
 					last_refresh_config = currTime;
 				}
-				// to do lirong
-				boolean changed_zkt_alarm_config = false;
-				if (last_refresh_zkt_alarm_config == null || currTime.getTime() - last_refresh_zkt_alarm_config.getTime() > 1000L * 15) {
-					if (Constant.zkt_alarm_config_refresh_enable) {
-						changed_zkt_alarm_config = RWDDownloadUtil.Process_zkt_alarm_config();
-					}
-					last_refresh_zkt_alarm_config = currTime;
-				}
 				boolean changed_physical_world = false;
 				if (last_refresh_physical_world == null || currTime.getTime() - last_refresh_physical_world.getTime() > 1000L * 60 * 60) {
 					if (Constant.physical_world_refresh_enable) {
@@ -92,7 +83,7 @@ public class RefreshThread extends Thread {
 					}
 					last_refresh_zkt_physical_world = currTime;
 				}
-				if (changed_config || changed_physical_world || changed_zkt_physical_world || changed_zkt_alarm_config) {
+				if (changed_config || changed_physical_world || changed_zkt_physical_world) {
 					log.warn("recompute begin");
 					RepositoryImpl Repository = new RepositoryImpl();
 					Repository.use_thread = !Constant.debug;

+ 0 - 14
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java

@@ -42,11 +42,6 @@ public class Constant {
 	public static String alarm_rest;
 	public static boolean alarm_rest_get;
 
-	// To Do lirong 增加报警配置
-	public static String zkt_alarm_config;
-	public static boolean zkt_alarm_config_enable;
-	public static boolean zkt_alarm_config_refresh_enable;
-
 	public static Map<String, Boolean> objType_hasRelation = new HashMap<String, Boolean>();
 	public static List<ConfigRelation> ConfigRelationList = new ArrayList<ConfigRelation>();
 	public static Map<String, Boolean> keyWordMap = new HashMap<String, Boolean>();
@@ -134,15 +129,6 @@ public class Constant {
 						config_refresh_enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
 					}
 
-					// To Do lirong
-					iter = document.selectNodes("/root/zkt_alarm_config").iterator();
-					if (iter.hasNext()) {
-						element = (Element) iter.next();
-						zkt_alarm_config = element.attribute("path").getValue();
-						zkt_alarm_config_enable = Boolean.parseBoolean(element.attribute("enable").getValue());
-						zkt_alarm_config_refresh_enable = Boolean.parseBoolean(element.attribute("refresh_enable").getValue());
-					}
-
 					iter = document.selectNodes("/root/iot_websocket").iterator();
 					if (iter.hasNext()) {
 						element = (Element) iter.next();

+ 21 - 13
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -1,5 +1,6 @@
 package com.persagy.ibms.data.sdk.util;
 
+import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -51,9 +52,9 @@ public class RWDAlarmUtil {
 			JSONObject params = (JSONObject) paramObject.get("params");
 			JSONArray Content;
 			if (Constant.alarm_rest_get) {
-				String get_url = Constant.alarm_rest + "/alarm-record/page?projectId=" + RepositoryContainer.RepositoryBase.projectId + "&groupCode="
-						+ RepositoryContainer.RepositoryBase.groupCode;
+				String get_url = Constant.alarm_rest + "alarm-record/page?";
 				StringBuffer sb = new StringBuffer();
+				sb.append("projectId=" + RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode);
 				sb.append("&userId=" + "systemId");
 				sb.append("&searchCount=" + "true");
 				if (params.containsKey("报警级别")) {
@@ -65,17 +66,17 @@ public class RWDAlarmUtil {
 					sb.append("&treatState=" + 3);
 				}
 				if (params.containsKey("报警类型")) {
-					sb.append("&itemName=" + params.get("报警类型"));
+					sb.append("&itemName=" + URLEncoder.encode(params.getString("报警类型"), "utf-8"));
 				}
 				if (params.containsKey("是否重点关注")) {
 					sb.append("&concern=" + params.get("是否重点关注"));
 				}
 				if (params.containsKey("搜索关键字")) {
-					sb.append("&keyWord=" + params.get("搜索关键字"));
+					sb.append("&keyWord=" + URLEncoder.encode(params.getString("搜索关键字"), "utf-8"));
 				}
 				if (params.containsKey("startTime") && params.containsKey("endTime")) {
-					sb.append("&startTime=" + params.get("startTime"));
-					sb.append("&endTime=" + params.get("endTime"));
+					sb.append("&startTime=" + URLEncoder.encode(params.getString("startTime"), "utf-8"));
+					sb.append("&endTime=" + URLEncoder.encode(params.getString("endTime"), "utf-8"));
 				}
 				if (params.containsKey("page")) {
 					boolean page = params.getBoolean("page");
@@ -83,17 +84,16 @@ public class RWDAlarmUtil {
 						int pageSize = params.getInteger("pageSize");
 						int pageIndex = params.getInteger("pageIndex");
 						sb.append("&size=" + pageSize);
-						sb.append("&page=" + pageIndex + 1);
+						sb.append("&current=" + pageIndex + 1);
 					}
 				}
 
-				String getResultString = HttpClientUtil.get(get_url, null);
+				String getResultString = HttpClientUtil.get(get_url + sb.toString(), null);
 				JSONObject getResult = JSON.parseObject(getResultString);
-				JSONObject con = getResult.getJSONObject("content");
-				result.put("count", con.get("total"));
-				Content = con.getJSONArray("records");
+				result.put("count", getResult.get("Count"));
+				Content = getResult.getJSONArray("Content");
 			} else {
-				String post_url = Constant.alarm_rest + "/alarm/queryAlarmList";
+				String post_url = Constant.alarm_rest + "alarm/queryAlarmList";
 				JSONObject postParam = new JSONObject();
 				postParam.put("userId", "systemId");
 				postParam.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
@@ -158,7 +158,7 @@ public class RWDAlarmUtil {
 
 	public static void modify_alarm(JSONObject alarm) throws Exception {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-		SimpleDateFormat sdf_ = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat sdf_ = new SimpleDateFormat("yyyyMMddHHmmss");
 
 		if (alarm.containsKey("triggerInfo")) {
 			Object object = alarm.get("triggerInfo");
@@ -250,6 +250,14 @@ public class RWDAlarmUtil {
 		if (alarm.containsKey("endTime")) {
 			alarm.put("close_time", alarm.get("endTime"));
 		}
+
+		if (alarm.containsKey("concern")) {
+			Object concern = alarm.get("concern");
+			if (concern != null && concern instanceof Boolean) {
+				boolean concernBoolean = (Boolean) concern;
+				alarm.put("concern", concernBoolean ? 1 : 0);
+			}
+		}
 	}
 
 	public static void chixushijian(SimpleDateFormat sdf, Date currentTime, SceneDataObject sdoInner) {

+ 54 - 88
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDDownloadUtil.java

@@ -315,7 +315,7 @@ public class RWDDownloadUtil {
 		log.debug("Download zkt physical world finish " + path);
 
 		{
-			Map<String, Boolean> alarmTypeMap = new HashMap<String, Boolean>();
+			Map<String, String> alarmTypeMap = new HashMap<String, String>();
 			if (Constant.alarm_rest_get) {
 				for (int i = 0; i < classArray.size(); i++) {
 					JSONObject classItem = classArray.getJSONObject(i);
@@ -334,8 +334,9 @@ public class RWDDownloadUtil {
 					JSONArray Content = resultJSON.getJSONArray("Content");
 					for (int ii = 0; ii < Content.size(); ii++) {
 						JSONObject ContentItem = Content.getJSONObject(ii);
+						String itemCode = ContentItem.getString("itemCode");
 						String name = ContentItem.getString("name");
-						alarmTypeMap.put(name, true);
+						alarmTypeMap.put(itemCode, name);
 					}
 				}
 			} else {
@@ -349,8 +350,9 @@ public class RWDDownloadUtil {
 				JSONArray Content = resultJSON.getJSONArray("Content");
 				for (int ii = 0; ii < Content.size(); ii++) {
 					JSONObject ContentItem = Content.getJSONObject(ii);
+					String code = ContentItem.getString("code");
 					String name = ContentItem.getString("name");
-					alarmTypeMap.put(name, true);
+					alarmTypeMap.put(code, name);
 				}
 			}
 			JSONArray alarmTypeArray = new JSONArray();
@@ -359,11 +361,59 @@ public class RWDDownloadUtil {
 			for (String key : alarmTypes) {
 				JSONObject item = new JSONObject();
 				item.put("code", key);
-				item.put("name", key);
+				item.put("name", alarmTypeMap.get(key));
 				alarmTypeArray.add(item);
 			}
 			FileUtil.Save(path + Constant.getSeperator() + "alarmTypeArray.json", FastJsonUtil.toFormatString(alarmTypeArray));
 		}
+
+		{
+			JSONArray alarmConfigArray;
+			if (Constant.alarm_rest_get) {
+				alarmConfigArray = new JSONArray();
+				for (int i = 0; i < classArray.size(); i++) {
+					JSONObject classItem = classArray.getJSONObject(i);
+					String ibmsSceneCode = classItem.getString("ibmsSceneCode");
+					String ibmsClassCode = classItem.getString("ibmsClassCode");
+					String itemListResultString = HttpClientUtil
+							.get(Constant.alarm_rest + "alarm-config/itemList/" + ibmsSceneCode + "/" + ibmsClassCode, null);
+					JSONObject itemListResultJSON = JSON.parseObject(itemListResultString);
+					JSONArray itemListResultContent = itemListResultJSON.getJSONArray("Content");
+					for (int ii = 0; ii < itemListResultContent.size(); ii++) {
+						JSONObject itemAlarmType = itemListResultContent.getJSONObject(ii);
+						String itemId = itemAlarmType.getString("id");
+						String alarmDefineListString = HttpClientUtil
+								.get(Constant.alarm_rest + "alarm-config/configPage" + "?userId=systemId&appId=0" + "&projectId="
+										+ RepositoryContainer.RepositoryBase.projectId + "&groupCode=" + RepositoryContainer.RepositoryBase.groupCode
+										+ "&ibmsSceneCode=" + ibmsSceneCode + "&ibmsClassCode=" + ibmsClassCode + "&itemId=" + itemId, null);
+						JSONObject alarmDefineListJSON = JSON.parseObject(alarmDefineListString);
+						JSONArray alarmDefineListContent = alarmDefineListJSON.getJSONArray("Content");
+						for (int iii = 0; iii < alarmDefineListContent.size(); iii++) {
+							JSONObject alarmDefine = alarmDefineListContent.getJSONObject(iii);
+							if (alarmDefine.containsKey("condition")) {
+								Object condition = alarmDefine.get("condition");
+								if (condition != null && condition instanceof String) {
+									String conditionString = (String) condition;
+									JSONObject conditionJSON = JSON.parseObject(conditionString);
+									alarmDefine.put("condition", conditionJSON);
+								}
+							}
+						}
+						alarmConfigArray.addAll(alarmDefineListContent);
+					}
+				}
+			} else {
+				JSONObject param = new JSONObject();
+				param.put("userId", "systemId");
+				param.put("appId", "datautils");
+				param.put("groupCode", RepositoryContainer.RepositoryBase.groupCode);
+				param.put("projectId", RepositoryContainer.RepositoryBase.projectId);
+				String post_result = HttpClientUtil.post(Constant.alarm_rest + "alarm/queryConfig", param.toJSONString());
+				JSONObject resultJSON = JSON.parseObject(post_result);
+				alarmConfigArray = resultJSON.getJSONArray("Content");
+			}
+			FileUtil.Save(path + Constant.getSeperator() + "zkt_alarm_config.json", FastJsonUtil.toFormatString(alarmConfigArray));
+		}
 	}
 
 	public static boolean Process_ibms_physical_world() throws Exception {
@@ -515,88 +565,4 @@ public class RWDDownloadUtil {
 			}
 		}
 	}
-
-	public static void LoadZKTAlarmConfig(String path) throws Exception {
-		FileUtil.deleteRecursive(new File(path));
-		File root = new File(path);
-		if (!root.exists()) {
-			root.mkdir();
-		}
-		JSONArray alarmConfigArray = null;
-		List<String> groupCodeList = new ArrayList<String>();
-		groupCodeList.add(RepositoryContainer.RepositoryBase.groupCode);
-		groupCodeList.add(RepositoryContainer.RepositoryBase.groupCode);
-		groupCodeList.add("0");
-		List<String> projectIdList = new ArrayList<String>();
-		projectIdList.add(RepositoryContainer.RepositoryBase.projectId);
-		projectIdList.add("0");
-		projectIdList.add("0");
-		for (int i = 0; i < groupCodeList.size(); i++) {
-			String groupCode = groupCodeList.get(i);
-			String projectId = projectIdList.get(i);
-			JSONObject param = new JSONObject();
-			param.put("userId", "systemId");
-			param.put("appId", "datautils");
-			param.put("groupCode", groupCode);
-			param.put("projectId", projectId);
-			String post_result = HttpClientUtil.post(Constant.alarm_rest + "alarm/queryConfig", param.toJSONString());
-			JSONObject resultJSON = JSON.parseObject(post_result);
-			alarmConfigArray = resultJSON.getJSONArray("Content");
-			if (alarmConfigArray != null) {
-				break;
-			}
-		}
-		if (alarmConfigArray != null) {
-			FileUtil.Save(path + Constant.getSeperator() + "zkt_alarm_config.json", FastJsonUtil.toFormatString(alarmConfigArray));
-		}
-	}
-
-	public static boolean Process_zkt_alarm_config() throws Exception {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
-		String validPath = Constant.getLatestPath(Constant.zkt_alarm_config, true);
-		// 存储临时文件
-		File dir1;
-		{
-			String tmpPath = Constant.zkt_alarm_config + Constant.getSeperator() + "tmp1";
-			dir1 = new File(tmpPath);
-			RWDDownloadUtil.LoadZKTAlarmConfig(tmpPath);
-		}
-		File dir2;
-		{
-			String tmpPath = Constant.zkt_alarm_config + Constant.getSeperator() + "tmp2";
-			dir2 = new File(tmpPath);
-			RWDDownloadUtil.LoadZKTAlarmConfig(tmpPath);
-		}
-		// 检查一致性
-		boolean compare = FileUtil.compareRecursive(dir1, dir2);
-		log.debug("Compare tmp1" + (compare ? "==" : "!=") + "tmp2");
-		boolean result;
-		if (compare) {
-			File valid = null;
-			if (validPath != null) {
-				valid = new File(validPath);
-			}
-			if (valid != null && valid.exists()) {
-				boolean compare_valid = FileUtil.compareRecursive(valid, dir2);
-				log.debug("Compare valid" + (compare_valid ? "==" : "!=") + "tmp2");
-				if (compare_valid) {
-					result = false;
-				} else {
-					// 移动tmp2
-					Date currTime = new Date();
-					dir2.renameTo(new File(Constant.zkt_alarm_config + Constant.getSeperator() + sdf.format(currTime)));
-					result = true;
-				}
-			} else {
-				// 移动tmp2
-				Date currTime = new Date();
-				dir2.renameTo(new File(Constant.zkt_alarm_config + Constant.getSeperator() + sdf.format(currTime)));
-				result = true;
-			}
-		} else {
-			result = false;
-		}
-		Clear(Constant.zkt_alarm_config, true);
-		return result;
-	}
 }

+ 32 - 63
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -554,13 +554,13 @@ public class RWDLoadUtil {
 						SceneDataSet.setColChange(info_code);
 					}
 				}
-				SceneDataSet.set = RWDUtil.array2SDOList(array);
-				// for (int ii = 0; ii < array.size(); ii++) {
-				// JSONObject arrayItem = array.getJSONObject(ii);
-				// String id = (String) arrayItem.get("id");
-				// SceneDataObject sdo = Repository.id2sdv.get(id);
-				// SceneDataSet.set.add(sdo);
-				// }
+				// SceneDataSet.set = RWDUtil.array2SDOList(array);
+				for (int ii = 0; ii < array.size(); ii++) {
+					JSONObject arrayItem = array.getJSONObject(ii);
+					String id = (String) arrayItem.get("id");
+					SceneDataObject sdo = Repository.id2sdv.get(id);
+					SceneDataSet.set.add(sdo);
+				}
 				mapInner.put(ibmsClassCode, SceneDataSet);
 			}
 			Repository.ZKTObjectArrayDic = objectArrayDicZKT;
@@ -571,6 +571,31 @@ public class RWDLoadUtil {
 			SceneDataSet.set = RWDUtil.array2SDOList(array);
 			Repository.ZKTAlarmTypeArray = SceneDataSet;
 		}
+		{
+			JSONArray alarmConfigArray = FastJsonReaderUtil.Instance()
+					.ReadJSONArray(new File(validPath + Constant.getSeperator() + "zkt_alarm_config.json"));
+			{
+				SceneDataSet SceneDataSet = new SceneDataSet(false);
+				SceneDataSet.set = RWDUtil.array2SDOList(alarmConfigArray);
+				Repository.alarmConfigArray = SceneDataSet;
+			}
+			JSONArray alarmConfigTriggerArray = new JSONArray();
+			for (int i = 0; i < alarmConfigArray.size(); i++) {
+				JSONObject alarmConfigItem = (JSONObject) alarmConfigArray.get(i);
+				String objId = (String) alarmConfigItem.get("objId");
+				JSONObject condition = (JSONObject) alarmConfigItem.get("condition");
+				JSONObject configs = (JSONObject) condition.get("configs");
+				JSONArray trigger = (JSONArray) configs.get("trigger");
+				if (trigger != null) {
+					JSONObject item = (JSONObject) trigger.get(0);
+					item.put("objId", objId);
+					alarmConfigTriggerArray.add(item);
+				}
+			}
+			SceneDataSet alarmConfigTrigger = new SceneDataSet(false);
+			alarmConfigTrigger.set = RWDUtil.array2SDOList(alarmConfigTriggerArray);
+			Repository.alarmConfigTrigger = alarmConfigTrigger;
+		}
 	}
 
 	public static void LoadIBMSPhysicalWorld(RepositoryImpl Repository) throws Exception {
@@ -798,35 +823,6 @@ public class RWDLoadUtil {
 		return result;
 	}
 
-	public static void LoadZKTAlarmConfig(RepositoryImpl Repository) throws Exception {
-		String validPath = Constant.getLatestPath(Constant.zkt_alarm_config, true);
-		{
-			JSONArray alarmConfigArray = FastJsonReaderUtil.Instance()
-					.ReadJSONArray(new File(validPath + Constant.getSeperator() + "zkt_alarm_config.json"));
-			{
-				SceneDataSet SceneDataSet = new SceneDataSet(false);
-				SceneDataSet.set = RWDUtil.array2SDOList(alarmConfigArray);
-				Repository.alarmConfigArray = SceneDataSet;
-			}
-			JSONArray alarmConfigTriggerArray = new JSONArray();
-			for (int i = 0; i < alarmConfigArray.size(); i++) {
-				JSONObject alarmConfigItem = (JSONObject) alarmConfigArray.get(i);
-				String objId = (String) alarmConfigItem.get("objId");
-				JSONObject condition = (JSONObject) alarmConfigItem.get("condition");
-				JSONObject configs = (JSONObject) condition.get("configs");
-				JSONArray trigger = (JSONArray) configs.get("trigger");
-				if (trigger != null) {
-					JSONObject item = (JSONObject) trigger.get(0);
-					item.put("objId", objId);
-					alarmConfigTriggerArray.add(item);
-				}
-			}
-			SceneDataSet alarmConfigTrigger = new SceneDataSet(false);
-			alarmConfigTrigger.set = RWDUtil.array2SDOList(alarmConfigTriggerArray);
-			Repository.alarmConfigTrigger = alarmConfigTrigger;
-		}
-	}
-
 	public static void LoadCalendar(RepositoryImpl Repository) throws Exception {
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(new Date());
@@ -886,32 +882,5 @@ public class RWDLoadUtil {
 			}
 			Repository.IBMSCalendarBinding.set = RWDUtil.array2SDOList(array);
 		}
-
-		String validPath = Constant.getLatestPath(Constant.zkt_alarm_config, true);
-		{
-			JSONArray alarmConfigArray = FastJsonReaderUtil.Instance()
-					.ReadJSONArray(new File(validPath + Constant.getSeperator() + "zkt_alarm_config.json"));
-			{
-				SceneDataSet SceneDataSet = new SceneDataSet(false);
-				SceneDataSet.set = RWDUtil.array2SDOList(alarmConfigArray);
-				Repository.alarmConfigArray = SceneDataSet;
-			}
-			JSONArray alarmConfigTriggerArray = new JSONArray();
-			for (int i = 0; i < alarmConfigArray.size(); i++) {
-				JSONObject alarmConfigItem = (JSONObject) alarmConfigArray.get(i);
-				String objId = (String) alarmConfigItem.get("objId");
-				JSONObject condition = (JSONObject) alarmConfigItem.get("condition");
-				JSONObject configs = (JSONObject) condition.get("configs");
-				JSONArray trigger = (JSONArray) configs.get("trigger");
-				if (trigger != null) {
-					JSONObject item = (JSONObject) trigger.get(0);
-					item.put("objId", objId);
-					alarmConfigTriggerArray.add(item);
-				}
-			}
-			SceneDataSet alarmConfigTrigger = new SceneDataSet(false);
-			alarmConfigTrigger.set = RWDUtil.array2SDOList(alarmConfigTriggerArray);
-			Repository.alarmConfigTrigger = alarmConfigTrigger;
-		}
 	}
 }

+ 1 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDRepositoryUtil.java

@@ -25,8 +25,6 @@ public class RWDRepositoryUtil {
 			RWDLoadUtil.LoadPhysicalWorld(Repository);
 			log.warn("LoadReference");
 			RWDLoadUtil.LoadReference(Repository);
-			log.warn("LoadZKTAlarmConfig");
-			RWDLoadUtil.LoadZKTAlarmConfig(Repository);
 
 			if (Constant.zkt_physical_world_enable) {
 				log.warn("LoadZKTPhysicalWorld");
@@ -67,7 +65,7 @@ public class RWDRepositoryUtil {
 			Repository.ZKTClassArray = RepositoryContainer.instance.ZKTClassArray;
 			Repository.ZKTObjectArrayDic = RepositoryContainer.instance.ZKTObjectArrayDic;
 			Repository.ZKTAlarmTypeArray = RepositoryContainer.instance.ZKTAlarmTypeArray;
-			
+
 			Repository.IBMSGroupArray = RepositoryContainer.instance.IBMSGroupArray;
 			Repository.IBMSArrayDic = RepositoryContainer.instance.IBMSArrayDic;
 		}

+ 3 - 1
ibms-data-sdk/src/main/resources/config.xml

@@ -21,9 +21,11 @@
 	<!-- iot-project的服务地址 -->
 	<!-- <iot_project url="http://192.168.0.30:8862/" /> -->
 	<iot_project url="http://192.168.100.33:9909/iot-project/" />
-	<zkt_alarm_config path="D-zkt_alarm_config" enable="true" refresh_enable="true" />
 	<!-- 报警的websocket地址和服务地址 -->
+	<!--
 	<alarm enable="true" websocket="ws://192.168.100.33:9909/webSocketServer" rest="http://192.168.100.33:9909/zkt-alarm/" rest_get="false" />
+	-->
+	<alarm enable="true" websocket="http://39.102.43.179:9993/webSocketServer" rest="http://39.102.43.179:9993/" rest_get="true" />
 
 	<ConfigRelation graphCode="ArchSubset" relCode="Bd2Fl" objFrom="building" objTo="floor" nameInTo="所属建筑" multiplicityTo="1" />
 	<ConfigRelation graphCode="ArchSubset" relCode="Bd2Sp" objFrom="building" objTo="space" nameInTo="所属建筑" multiplicityTo="1" />