1、增加香港置地首页环境品质面板

2、增加消防管理模块报警统计
3、ReadEquipStaticInfoById只返回isVisible等于true的信息点

ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExeclReadEquipStaticInfoUtil.java

@@ -77,7 +77,8 @@ public class ExeclReadEquipStaticInfoUtil {
 				object.put(caVal, dic);
 			}
 			fis.close();
-		} else if (Constant.info_point_version.equals("new")) {
+		}
+		else if (Constant.info_point_version.equals("new")) {
 			String infoClass = "基本参数";
 			JSONArray dic = new JSONArray();
 			for (SceneDataObject sdo : Repository.InfoPointListArray.set) {
@@ -183,9 +184,9 @@ public class ExeclReadEquipStaticInfoUtil {
 				map.put(caVal, dic);
 			}
 			fis.close();
-		} else if (Constant.info_point_version.equals("new")) {
+		}
+		else if (Constant.info_point_version.equals("new")) {
 			JSONArray infoArray = Repository.infoArrayJson.get(classCode);
-
 			String infoClass = "基本参数";
 			JSONArray dic = new JSONArray();
 			for (SceneDataObject sdo : Repository.InfoPointListArray.set) {
@@ -197,17 +198,20 @@ public class ExeclReadEquipStaticInfoUtil {
 				String infoType = (String) sdo.get("infoType").value_prim.value;
 				String infoCode = (String) sdo.get("infoCode").value_prim.value;
 				boolean isVisible = (Boolean) sdo.get("isVisible").value_prim.value;
-				if (infoType.equals(infoClass)) {
-					for (int z = 0; z < infoArray.size(); z++) {
-						JSONObject obj = (JSONObject) FastJsonUtil.Clone_JSON(infoArray.get(z));
-						String codeVal = obj.get("code").toString();
-						if (codeVal.equals(infoCode)) {
-							if (queryObj != null) {
-								obj.put("data", queryObj.get(infoCode));
+				if(isVisible)
+				{
+					if (infoType.equals(infoClass)) {
+						for (int z = 0; z < infoArray.size(); z++) {
+							JSONObject obj = (JSONObject) FastJsonUtil.Clone_JSON(infoArray.get(z));
+							String codeVal = obj.get("code").toString();
+							if (codeVal.equals(infoCode)) {
+								if (queryObj != null) {
+									obj.put("data", queryObj.get(infoCode));
+								}
+								//obj.put("enable", isVisible);
+								dic.add(obj);
+								break;
 							}
-							obj.put("enable", isVisible);
-							dic.add(obj);
-							break;
 						}
 					}
 				}

ibms-data-sdk/src/main/resources/config.xml

@@ -185,6 +185,35 @@
 	<Redirect code="登录" http_request_type="post" url="http://39.102.43.179:9982/zkt-monitor/user/login">
 		<header key="Content-Type" value="application/json"/>
 	</Redirect>
+	<!--香港置地首页环境品质面板，需配置ibms-alarm的地址和端口-->
+	<Redirect code="环境品质" http_request_type="post" url="http://192.168.0.33:9982/environmentQuality/getRealTimeRateUseCache">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<Redirect code="查询环境达标率列表" http_request_type="post" url="http://192.168.0.44:9982/environmentQuality/queryDetails/list">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<Redirect code="查询环境达标率图片" http_request_type="post" url="http://192.168.0.44:9982/environmentQuality/queryDetails/pictureData">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<Redirect code="获取开闭店时间" http_request_type="post" url="http://192.168.0.44:9982/environmentQuality/getMarkOpenAndCloseTime">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<Redirect code="获取第一条达标率时间" http_request_type="post" url="http://192.168.0.44:9982/environmentQuality/getProjectStartTime">
+		<header key="Content-Type" value="application/json"/>
+	</Redirect>
+	<!--消防管理模块,需配置ibms-alarm的地址和端口-->
+	<Redirect code="折线图统计" http_request_type="get" url="http://39.102.43.179:9993/alarm-record/fire-alarm-count">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="防火分区统计" http_request_type="get" url="http://39.102.43.179:9993/alarm-record/zone-equ-alarm-count">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="首页火灾故障报警统计" http_request_type="get" url="http://39.102.43.179:9993/alarm-record/today-alarm-count">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
+	<Redirect code="七天报警统计" http_request_type="get" url="http://39.102.43.179:9993/alarm-record/week-count">
+		<header key="Content-Type" value="application/json" />
+	</Redirect>
 	<Redirect code="test-get1" http_request_type="get" url="http://39.102.43.179:9993/alarm-record/list" />
 	<Redirect code="test-post1" http_request_type="post" url="http://192.168.4.69:8806/zkt-sdk/post" />
 	<Redirect code="test-get2" http_request_type="get" url="http://39.102.43.179:9993/alarm-record/list?projectId=Pj4403070003&amp;groupCode=WD" />