111

81041

2018-11-28 bcb7a41f9f4114f0734bd1ef25b0a20eaeb211fe

 gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java

@@ -42,11 +42,10 @@
      return SUCCESS;

   }

   

   //0.5查询实时告警数

   //0.5查询实时告警数(电池告警率)

   public String serchAlm(){

      User_inf uinf=(User_inf) ActionUtil.getUser();

      bmd.setUinf(uinf);

      ServiceModel model=service.serchAlm(bmd);

      ServiceModel model=service.serchAlm(uinf);

      result=ActionUtil.tojson(model);      

      return SUCCESS;

   }

@@ -136,7 +135,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);