Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_...

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

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

@@ -946,19 +946,17 @@
      return new ResultBean<Map<String, Object>>(map);

   }*/

   

   /*@GetMapping("getSensorByMonitorPointId")

   @GetMapping("getSensorByMonitorPointId")

   @ApiOperation(value = "返回单位", notes = "返回单位")

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "monitor_point_id", value = "监测站点id", required = true, paramType = "query", dataType = "String")

   })

   public ResultBean<Map<String, Object>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {

   public ResultBean<List<Map<String, Object>>> getSensorByMonitorPointId(HttpServletRequest request) throws Exception {

      Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);

      String monitor_point_id = (String) parameters.get("monitor_point_id");

      System.out.println("ScreenController-----getSensorByMonitorPointId-----monitor_point_id:"+monitor_point_id);

      Map<String, Object> map = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);

      System.out.println("ScreenController-----getSensorByMonitorPointId-----map:"+map);

      return new ResultBean<Map<String, Object>>(map);

   }*/

      List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);

      return new ResultBean<List<Map<String, Object>>>(map);

   }

   

   @GetMapping("AIForecast")

   @ApiOperation(value = "AI预测", notes = "AI预测")

@@ -974,38 +972,12 @@
      String monitor_point_id = (String) parameters.get("monitorPoint");

        parameters.put("monitorPointId", parameters.remove("monitorPoint"));

        String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");

        System.out.println("ScreenController-----AIForecast-----sensorKeys:"+sensorKeys.toString());

        parameters.put("sensors", Arrays.asList(sensorKeys));

        // monitorPointService.isCompensateCalculation(parameters);

        List<Map<String, Object>> list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);

        System.out.println("ScreenController-----AIForecast-----list:"+list);

        

        //获取单位信息

         Map<String, Map<String, Object>> sensorUnitMap = sensorUnitService.getSensorsByMonitPointId(monitor_point_id);

      	
         /*if(sensorUnitMap!=null && !sensorUnitMap.isEmpty()) {

            for (Map<String, Object> map : list) {

                String time = map.get("time").toString();

                time = time.substring(time.length() - 2);

                map.put("time", Integer.valueOf(time));

                List<Number> values = new ArrayList<Number>();

                for (String string : sensorKeys) {

                    values.add((Number) map.remove(string));

                }

                map.put("values", values);

            }

         }else {

            for (Map<String, Object> map : list) {

                String time = map.get("time").toString();

                time = time.substring(time.length() - 2);

                map.put("time", Integer.valueOf(time));

                List<Number> values = new ArrayList<Number>();

                for (String string : sensorKeys) {

                    values.add((Number) map.remove(string));

                }

                map.put("values", values);

            }

         }*/



        for (Map<String, Object> map : list) {

            String time = map.get("time").toString();

@@ -1030,28 +1002,6 @@
            map.put("values", values);

            map.put("units", units);

        }

		
		
      /*

      if(sensorMap!=null && !sensorMap.isEmpty()) {

         for (Map<String, Object> map : list) {

            System.out.println("ScreenController-----AIForecast-----map:"+map);

            String time = map.get("time").toString();

            time = time.substring(time.length() - 2);

            map.put("time", Integer.valueOf(time));

            map.put("value", map.remove(sensorKey));

            System.out.println("ScreenController-----AIForecast-----map:"+map);

            System.out.println(sensorMap.get("unit"));

            //String sensor = map.get("sensorKey").toString();

            if(sensorMap.get(sensorKey)!=null) {

               map.put("unit", sensorMap.get(sensorKey).get("name"));

            }else {

               map.put("unit", "mg/m³");

            }

         }

      }*/

      //return null;

        System.out.println("ScreenController-----AIForecast-----list:"+list);

      return new ResultBean<List<Map<String, Object>>>(list);

   }