Merge branch 'dev_lxw' of http://whyclj@118.89.139.230:10101/r/~whyclxw/sen...

whyclj

2019-06-29 82c1e7ced425f43781b0cd01290fad298f51e623

 sensor/src/com/fgkj/actions/Sensor_infAction.java

@@ -10,6 +10,15 @@
   private String json;

   private String result;

   

	
   //修改告警值

   public String replaceAlarm(){

      Sensor_inf sinf=ActionUtil.getGson().fromJson(json, Sensor_inf.class);

      ServiceModel model=service.replaceAlarm(sinf);

      result=tojson(model);

      return SUCCESS;

   }

	
   //查询所有的省份（一级）

   public String serchProvice(){

      ServiceModel model=service.serchProvice();

@@ -30,6 +39,13 @@
      result=tojson(model);

      return SUCCESS;

   }

   //查询所有的设备（四级）

   public String serchDevice(){

      Sensor_inf sinf=ActionUtil.getGson().fromJson(json, Sensor_inf.class);

      ServiceModel model=service.serchDevice(sinf);

      result=tojson(model);

      return SUCCESS;

   }

   //根据设备id查询信息

   public String serchByCondition(){

      Sensor_inf sinf=ActionUtil.getGson().fromJson(json, Sensor_inf.class);