更新污染传播接口

ZhuDongming

2019-09-02 321a114af75d62f66bd5d46f01a44c955cbde286

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

@@ -1,16 +1,11 @@
package com.moral.controller;



import static com.moral.common.util.ResourceUtil.getValue;

import static com.moral.common.util.WebUtils.getParametersStartingWith;



import java.io.BufferedReader;

import java.io.ByteArrayInputStream;

import java.io.InputStream;

import java.io.InputStreamReader;

import java.text.DecimalFormat;

import java.time.LocalDate;

import java.time.LocalDateTime;

import java.time.Month;

import java.time.format.DateTimeFormatter;

import java.util.ArrayList;

import java.util.Arrays;

@@ -21,9 +16,6 @@
import java.util.Map;

import java.util.Optional;

import java.util.stream.Collectors;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import org.apache.commons.collections.CollectionUtils;

import org.apache.commons.net.ftp.FTPClient;

@@ -98,11 +90,15 @@
import com.moral.service.WeatherService;

import com.moral.util.AQICalculation;

import com.moral.util.TempAllocationUtils;



import io.swagger.annotations.Api;

import io.swagger.annotations.ApiImplicitParam;

import io.swagger.annotations.ApiImplicitParams;

import io.swagger.annotations.ApiOperation;

import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import static com.moral.common.util.ResourceUtil.getValue;

import static com.moral.common.util.WebUtils.getParametersStartingWith;



/**

 * The Class ScreenController.大屏接口

@@ -1225,7 +1221,7 @@
    @GetMapping("/pollutionSource")

    @ApiOperation(value = "污染传播来源", notes = "污染传播来源")

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "mac", value = "设备mac地址(如：898607b0101730392254)", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "mac", value = "设备mac地址(如：898607b0101730392251)", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "sensorKey", value = "查询的监测因子的key(格式：e1)", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "time", value = "查询时间(格式：2019-09-01-10)", required = true, paramType = "query", dataType = "String")})

    public ModelAndView pollutionSource(ModelAndView model, HttpServletRequest request) throws Exception {

@@ -1238,17 +1234,17 @@
        LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);

        System.out.println(timeLocalDateTime);

        int month = timeLocalDateTime.getMonth().getValue();

        Point dirPoint= historyHourlyService.getDirPoint(parameters);

        Map<String,Object> getPollutionSourceData=historyHourlyService.getPollutionSourceData(parameters);

        Point dirPoint = historyHourlyService.getDirPoint(parameters);

        Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceData(parameters);

        System.out.println(dirPoint.toString());

        System.out.println("getPollutionSourceData:"+getPollutionSourceData);

        System.out.println("getPollutionSourceData:" + getPollutionSourceData);

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

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

        JSONObject params = new JSONObject();

        params.put("device", device);

        params.put("month", month);

        params.put("dirPoint",dirPoint);

        params.put("getPollutionSourceData",getPollutionSourceData);

        params.put("dirPoint", dirPoint);

        params.put("getPollutionSourceData", getPollutionSourceData);

        String paramsJson = params.toJSONString();

        model.addObject("pollutionSourceParams", paramsJson);

        model.setViewName("pollutionsource");