Browse Source

照明基本实现联调

menglu 3 years ago
parent
commit
8185853c21

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

@@ -69,7 +69,7 @@ public class RefreshThread extends Thread {
 					}
 					last_refresh_config = currTime;
 				}
-				//to do lirong
+				// 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) {
@@ -91,7 +91,7 @@ public class RefreshThread extends Thread {
 					}
 					last_refresh_zkt_physical_world = currTime;
 				}
-				if (changed_config || changed_physical_world || changed_zkt_physical_world) {
+				if (changed_config || changed_physical_world || changed_zkt_physical_world || changed_zkt_alarm_config) {
 					log.warn("recompute begin");
 					RepositoryImpl Repository = new RepositoryImpl();
 					Repository.use_thread = !Constant.debug;

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

@@ -496,7 +496,6 @@ public class RWDDownloadUtil {
 	}
 
 	public static boolean Process_zkt_alarm_config() throws Exception {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
 		String validPath = Constant.zkt_alarm_config;
 		File valid = new File(validPath);
 
@@ -507,8 +506,7 @@ public class RWDDownloadUtil {
 		boolean compare_valid = FileUtil.compareRecursive(valid, tmp);
 		boolean result;
 		if (!compare_valid) {
-			Date currTime = new Date();
-			tmp.renameTo(new File(Constant.zkt_alarm_config + Constant.getSeperator() + "zkt_alarm_config.json"));// sdf.format(currTime)+".json"
+			tmp.renameTo(new File(Constant.zkt_alarm_config + Constant.getSeperator() + "zkt_alarm_config.json"));
 			result = true;
 		} else {
 			result = false;

+ 30 - 3
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -697,21 +697,21 @@ public class RWDLoadUtil {
 						if (SELTCUArray.value_array.set.size() == 1) {
 							SceneDataObject SELTCU = SELTCUArray.value_array.set.get(0);
 							String SELTCU_id = (String) SELTCU.get("id").value_prim.value;
-							String SELTCU_name = (String) SELTCU.get("localName").value_prim.value;
+							String SELTCU_name = getValidName(SELTCU);
 							itemInner.put("模块编号", SELTCU_id);
 							itemInner.put("模块名称", SELTCU_name);
 							SceneDataValue SETDLSArray = SELTCU.get("被设备供电");
 							if (SETDLSArray.value_array.set.size() == 1) {
 								SceneDataObject SETDLS = SETDLSArray.value_array.set.get(0);
 								String SETDLS_id = (String) SETDLS.get("id").value_prim.value;
-								String SETDLS_name = (String) SETDLS.get("localName").value_prim.value;
+								String SETDLS_name = getValidName(SETDLS);
 								itemInner.put("配电箱编号", SETDLS_id);
 								itemInner.put("配电箱名称", SETDLS_name);
 								SceneDataValue GeneralZoneArray = SETDLS.get("所在物业空间");
 								if (GeneralZoneArray.value_array.set.size() == 1) {
 									SceneDataObject GeneralZone = GeneralZoneArray.value_array.set.get(0);
 									String GeneralZone_id = (String) GeneralZone.get("id").value_prim.value;
-									String GeneralZone_name = (String) GeneralZone.get("localName").value_prim.value;
+									String GeneralZone_name = getValidName(GeneralZone);
 									itemInner.put("电井编号", GeneralZone_id);
 									itemInner.put("电井名称", GeneralZone_name);
 								}
@@ -755,6 +755,33 @@ public class RWDLoadUtil {
 		}
 	}
 
+	private static String getValidName(SceneDataObject sdo) {
+		String result = null;
+		if (sdo.containsKey("localName")) {
+			SceneDataValue sdv = sdo.get("localName");
+			if (sdv.value_prim != null) {
+				result = (String) sdv.value_prim.value;
+				return result;
+			}
+		}
+		if (sdo.containsKey("localId")) {
+			SceneDataValue sdv = sdo.get("localId");
+			if (sdv.value_prim != null) {
+				result = (String) sdv.value_prim.value;
+				return result;
+			}
+		}
+		if (sdo.containsKey("name")) {
+			SceneDataValue sdv = sdo.get("name");
+			if (sdv.value_prim != null) {
+				result = (String) sdv.value_prim.value;
+				return result;
+			}
+		}
+
+		return result;
+	}
+
 	public static void LoadZKTAlarmConfig(RepositoryImpl Repository) throws Exception {
 		String validPath = Constant.zkt_alarm_config;
 		{