更改上传导包*问题

ZhuDongming

2019-06-12 f2a2ea09481d49a2e7aecb521249f9e18834af54

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

@@ -68,6 +68,8 @@
    @Resource

    SensorService sensorService;

    @Resource

    SensorUnitService sensorUnitService;

    @Resource

    MonitorPointService monitorPointService;

    @Resource

    DeviceVersionService deviceVersionService;

@@ -863,11 +865,13 @@
            Long code = monitorPoint.getAreaCode().longValue();

            String regionName = areaService.queryFullNameByCode(code);

            Device device = deviceService.getDeviceByMac(mac, false);

            Device deviceSecond = deviceService.getDeviceByLongitudeAsc(mac);

            params.put("sensorInfo", resultMap);

            params.put("regionCode", code);

            params.put("regionName", regionName);

            params.put("monitorPoint", monitorPoint);

            params.put("device", device);

            params.put("deviceSecond",deviceSecond);

            String paramsJson = params.toJSONString();

            model.addObject("traceabilityParams", paramsJson);

            model.setViewName("traceability");

@@ -887,5 +891,86 @@
            return model;

        }

    }

    
    /*@GetMapping("getSensor")

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

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "mac", value = "设备MN号", required = true, paramType = "query", dataType = "String")

   })

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

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

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

      //System.out.println("ScreenController-----getSensor-----mac:"+mac);

      Map<String, Object> map = sensorUnitService.getSensorByMac(mac);

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

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

   }*/

	
   /*@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 {

      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);

   }*/

	
   @GetMapping("AIForecast")

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

   @ApiImplicitParams(value = {

         @ApiImplicitParam(name = "monitorPoint", value = "监控站id", required = true, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "mac", value = "设备mac", required = false, paramType = "query", dataType = "String"),

         @ApiImplicitParam(name = "sensorKey", value = "传感器key,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"), 
         @ApiImplicitParam(name = "time", value = "时间,天(格式：2018-03-06)", required = true, paramType = "query", dataType = "String"), 
   })

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

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

      ParameterUtils.getTimeType4Time(parameters);

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

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

      Object sensorKey = parameters.remove("sensorKey");

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

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

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

		
      //获取单位信息

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

		
      if(sensorMap!=null && !sensorMap.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));

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

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

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

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

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

               map.put("rules", sensorMap.get("rules"));

            }else {

               map.put("unit", null);

               map.put("name", null);

               map.put("rules", null);

            }

         }

      }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));

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

            map.put("unit", null);

            map.put("name", null);

            map.put("rules", null);

         }

      }

      //return null;

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

   }



}