~whychwj/haha.git

			@@ -136,7 +136,13 @@
			result=ActionUtil.tojson(model);
			return SUCCESS;
			}

			//告警发声(30秒之内的告警)
			public String serchIn30(){
			User_inf uinf=(User_inf) ActionUtil.getUser();
			ServiceModel model=service.serchIn30(uinf);
			result=ActionUtil.tojson(model);
			return SUCCESS;
			}
			//点击项目下方的滚动，查询该条告警的实时信息
			public String serchBatt_alarm(){
			Battalarm_data adata=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Battalarm_data.class);