排放量 报表

xufenglei

2019-02-28 5f1807ece119b2337ed71b575292e47a447cd154

 src/main/java/com/moral/controller/ScreenController.java

@@ -468,11 +468,13 @@
   }

   @RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET)

   @ResponseBody

   public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds){

   public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){

      ResultBean<List<MonitorPoint>> resultBean = new ResultBean();

      Map<String,Object> paramMap = new HashMap<String, Object>();

      paramMap.put("orgId", orgId);

      paramMap.put("mapBounds",mapBounds);

      paramMap.put("regionCode",regionCode);

      ParameterUtils.getRegionType4RegionCode(paramMap);

      List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);

      resultBean.setData(list);

      resultBean.setCode(ResultBean.SUCCESS);

@@ -480,11 +482,13 @@
   }

   @RequestMapping(value="/get-devices",method = RequestMethod.GET)

   @ResponseBody

   public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds){

   public ResultBean getDevices(@RequestParam("orgId")Integer orgId,MapBounds mapBounds,@RequestParam("regionCode")String regionCode){

      ResultBean<List<Device>> resultBean = new ResultBean();

      Map<String,Object> paramMap = new HashMap<String, Object>();

      paramMap.put("orgId", orgId);

      paramMap.put("mapBounds",mapBounds);

      paramMap.put("regionCode",regionCode);

      ParameterUtils.getRegionType4RegionCode(paramMap);

      List<Device> list = deviceService.query(paramMap);

      resultBean.setData(list);

      resultBean.setCode(ResultBean.SUCCESS);