污染传播接口修改

ZhuDongming

2019-09-02 e2c9154d3381b365ef4fff5367840725e0c4a57b

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

@@ -8,6 +8,10 @@
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;

import java.util.Collection;

@@ -65,6 +69,7 @@
import com.moral.entity.MapBounds;

import com.moral.entity.MonitorPoint;

import com.moral.entity.Organization;

import com.moral.entity.Point;

import com.moral.entity.Region;

import com.moral.entity.alarm.AlarmConfig;

import com.moral.entity.alarm.AlarmConfigValue;

@@ -80,6 +85,7 @@
import com.moral.service.DictionaryDataService;

import com.moral.service.HangzhouAqiService;

import com.moral.service.HistoryDailyService;

import com.moral.service.HistoryHourlyService;

import com.moral.service.HistoryMinutelyService;

import com.moral.service.HistoryService;

import com.moral.service.MachineActivateService;

@@ -138,6 +144,9 @@
     */

    @Resource

    private DeviceService deviceService;



    @Resource

    private HistoryHourlyService historyHourlyService;



    @Resource

    private HistoryMinutelyService historyMinutelyService;

@@ -365,9 +374,12 @@
    

    @GetMapping("hour-aqi")

    @ApiOperation(value = "获取一小时AQI", notes = "获取一小时AQI")

    @ApiImplicitParams(value = {

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

    })

    public Map<String, Object> getHourAQIByDevice(HttpServletRequest request) {

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

       return historyMinutelyService.getHourAQIByDevice(parameters);

       return historyService.gitHourlyAQIByMacAndTimeslot(parameters);

    }



    /**

@@ -858,7 +870,9 @@
            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "Integer"),

            @ApiImplicitParam(name = "time", defaultValue = "2019", value = "查询的时间", required = true, paramType = "query", dataType = "String"),

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

            @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "区域码", required = true, paramType = "query", dataType = "String")})

            @ApiImplicitParam(name = "regionCode", defaultValue = "130000", value = "区域码", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "monitorPointId", value = "监测点id", required = false, paramType = "query", dataType = "int"),

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

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

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

        List<Map<String, Object>> result = historyDailyService.getEmissionsData(parameters);

@@ -1161,21 +1175,43 @@
    @ApiOperation(value = "显示无人机飞行轨迹", notes = "显示无人机飞行轨迹")

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "mac", value = "设备mac（格式：p5dnd7a0392068）", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "startTime", value = "开始时间(格式：2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "endTime", value = "结束时间(格式：2019-07-17 17:07:00)", required = false, paramType = "query", dataType = "String")

            @ApiImplicitParam(name = "startTime", value = "开始时间(格式：2019-07-17-17)", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "endTime", value = "结束时间(格式：2019-07-17-18)", required = true, paramType = "query", dataType = "String")

    })

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

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

        String st = parameters.get("startTime").toString();

        String startYearAndDay = st.substring(0, st.lastIndexOf("-"));

        String startHour = st.substring(st.lastIndexOf("-") + 1);

        String startTime = startYearAndDay + " " + startHour + ":00:00";

        String et = parameters.get("endTime").toString();

        String endYearAndDay = et.substring(0, et.lastIndexOf("-"));

        String endHour = et.substring(et.lastIndexOf("-") + 1);

        String endTime = endYearAndDay + " " + endHour + ":00:00";

        parameters.put("startTime", startTime);

        parameters.put("endTime", endTime);

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

        if (mac != null && mac.length() != 0) {

            List<Map<String, Object>> sensorList = historyMinutelyService.getSensorData(parameters);

            List<List<Map<String, Object>>> sensorData = historyMinutelyService.getSensorData(parameters);

            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);

            List<Map<String, Object>> sensorList = new ArrayList<>();

            List<Map<String, Object>> sensorListMin = new ArrayList<>();

            List<Map<String, Object>> sensorListMax = new ArrayList<>();

            if (sensorData.size() == 3) {

                sensorList = sensorData.get(0);

                sensorListMin = sensorData.get(1);

                sensorListMax = sensorData.get(2);

            }

            JSONObject params = new JSONObject();

            params.put("sensorInfo", sensorList);

            params.put("sensorInfoMin", sensorListMin);

            params.put("sensorInfoMax", sensorListMax);

            params.put("sensorsMap",sensorsMap);

            String paramsJson = params.toJSONString();

            model.addObject("uavTrajectoryParams", paramsJson);

            model.setViewName("uavTrajectory");

            model.setViewName("uavtrajectory");

            return model;

        }else {

        } else {

            StringBuilder msg = new StringBuilder();

            msg.append(" param[0] mac:");

            msg.append(mac);

@@ -1185,4 +1221,37 @@
        }

    }



    @GetMapping("/pollutionSource")

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

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "mac", value = "设备mac地址(如：898607b0101730392254)", 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 {

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

        String timeStr = parameters.get("time").toString();

        String YearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));

        String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);

        String time = YearAndDay + " " + Hour + ":00:00";

        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

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

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

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

        String paramsJson = params.toJSONString();

        model.addObject("pollutionSourceParams", paramsJson);

        model.setViewName("pollutionsource");

        return model;

    }



}