Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-09-02 e8ef361dc975aeaedeee6f28dfe679489a22f9d5

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

@@ -69,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;

@@ -84,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;

@@ -143,6 +145,9 @@
     */

    @Resource

    private DeviceService deviceService;



    @Resource

    private HistoryHourlyService historyHourlyService;



    @Resource

    private HistoryMinutelyService historyMinutelyService;

@@ -1220,34 +1225,30 @@
    @GetMapping("/pollutionSource")

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

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "organizationId", defaultValue = "5", value = "登录账号的组织id", required = true, paramType = "query", dataType = "String"),

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

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

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

        LocalDate today = LocalDate.now();

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

        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");

        LocalDate selectTime = LocalDate.parse(time, dateTimeFormatter);

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

        LocalDate yesterday = today.minusDays(1);

        LocalDate futureDay = today.plusDays(14);

        Boolean isAfterYesterday = selectTime.isAfter(yesterday) || selectTime.isEqual(yesterday);

        Boolean isAfterFutureDay = selectTime.isAfter(futureDay);

        Map<String, Object> weatherInfoToday = weatherService.getWeatherDataByRegion(parameters);

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

        if (isAfterYesterday && !isAfterFutureDay) {

            weatherInfoForecast = weatherService.get15DayWeatherDataByRegion(parameters);

        }

        Boolean isToday = selectTime.isEqual(today);

        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("weatherInfoToday", weatherInfoToday);

        params.put("weatherInfoForecast", weatherInfoForecast);

        params.put("device", device);

        params.put("isToday", isToday);

        params.put("month", month);

        params.put("dirPoint",dirPoint);

        params.put("getPollutionSourceData",getPollutionSourceData);

        String paramsJson = params.toJSONString();

        model.addObject("pollutionSourceParams", paramsJson);

        model.setViewName("pollutionsource");