update

ZhuDongming

2019-09-11 b0c63481b2c1e0fa5c67f10827c4568dc3c02ac2

update

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

@@ -90,10 +90,12 @@
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;



@@ -368,15 +370,15 @@
        Map<String, Object> parameters = getParametersStartingWith(request, null);

        return historyMinutelyService.getDayAQIByDevice(parameters);

    }

    


    @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 historyService.gitHourlyAQIByMacAndTimeslot(parameters);

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

        return historyService.gitHourlyAQIByMacAndTimeslot(parameters);

    }



    /**

@@ -868,8 +870,8 @@
            @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 = "monitorPointId", value = "监测点id", required = false, paramType = "query", dataType = "int"),

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

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

            @ApiImplicitParam(name = "mac", value = "设备mac(格式：vocscxwnm00001)", 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);

@@ -922,10 +924,10 @@
    @GetMapping("/map-traceability")

    @ApiOperation(value = "获取污染溯源", notes = "获取污染溯源")

    @ApiImplicitParams(value = {

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

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

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

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

            @ApiImplicitParam(name = "monitorPointId", value = "监测点id(格式：319)", required = true, paramType = "query", dataType = "int"),

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

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

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

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

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

        Integer monitorPointId = Integer.parseInt(parameters.get("monitorPointId").toString());

@@ -991,50 +993,50 @@
        List<Map<String, Object>> map = sensorUnitService.getSensorsByMonitPointId2(monitor_point_id);

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

    }

    


    @GetMapping("getSensorByDeviceId")

    @ApiOperation(value = "通过设备获取因子", notes = "通过设备获取因子")

    @ApiImplicitParams(value = {

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

    })

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

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

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

        List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);

        Map<String,Object> map = list.get(0);

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

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

        System.out.println(sensorUnitList);

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

            for (Map<String, Object> sensorUnitMap : sensorUnitList) {

                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {

                    sensorMap.put("unit", sensorUnitMap.get("name"));

                }

            }

        }

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

    }

	
    @GetMapping("getSensorWithUnitByMonitorPointId")

    @ApiOperation(value = "通过站点获取因子", notes = "通过站点获取因子")

    @ApiImplicitParams(value = {

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

    })

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

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

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

        List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);

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

        System.out.println(sensorUnitList);

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

            for (Map<String, Object> sensorUnitMap : sensorUnitList) {

                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {

                    sensorMap.put("unit", sensorUnitMap.get("name"));

                }

            }

        }

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

    }

    @ApiOperation(value = "通过设备获取因子", notes = "通过设备获取因子")

    @ApiImplicitParams(value = {

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

    })

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

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

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

        List<Map<String, Object>> list = sensorService.getSensorByDeviceId(id);

        Map<String, Object> map = list.get(0);

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

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

        System.out.println(sensorUnitList);

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

            for (Map<String, Object> sensorUnitMap : sensorUnitList) {

                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {

                    sensorMap.put("unit", sensorUnitMap.get("name"));

                }

            }

        }

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

    }



    @GetMapping("getSensorWithUnitByMonitorPointId")

    @ApiOperation(value = "通过站点获取因子", notes = "通过站点获取因子")

    @ApiImplicitParams(value = {

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

    })

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

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

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

        List<Map<String, Object>> list = sensorService.getSensorByMonitorPointId(monitor_point_id);

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

        System.out.println(sensorUnitList);

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

            for (Map<String, Object> sensorUnitMap : sensorUnitList) {

                if (sensorUnitMap.get("sensor_key").equals(sensorMap.get("sensor_key"))) {

                    sensorMap.put("unit", sensorUnitMap.get("name"));

                }

            }

        }

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

    }



    @GetMapping("AIForecast")

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

@@ -1203,7 +1205,7 @@
            params.put("sensorInfo", sensorList);

            params.put("sensorInfoMin", sensorListMin);

            params.put("sensorInfoMax", sensorListMax);

            params.put("sensorsMap",sensorsMap);

            params.put("sensorsMap", sensorsMap);

            String paramsJson = params.toJSONString();

            model.addObject("uavTrajectoryParams", paramsJson);

            model.setViewName("uavtrajectory");

@@ -1247,12 +1249,12 @@
        model.setViewName("pollutionsource");

        return model;

    }

    


    @GetMapping("getAirQualityComparison")

    @ApiOperation(value = "空气质量对比", notes = "空气质量对比")

    @ApiImplicitParams(value = {

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

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

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

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

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

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

@@ -1264,38 +1266,38 @@
        sensorMap.put("e10", Double.parseDouble(map.get("co").toString()));

        sensorMap.put("e15", Double.parseDouble(map.get("o3").toString()));

        Map<String, Object> StateControl = AQICalculation.hourlyAQI(sensorMap);

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

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

        Map<String, Object> hourAqi = historyService.gitHourlyAQIByMonitorPointIdAndTimeslot(parameters);

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

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

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

        returnMap.put("MonitorPointAQI", hourAqi.get("AQI"));

        returnMap.put("StateControlAQI", StateControl.get("AQI"));

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

    }

    


    @GetMapping("mointorPointRank")

    @ApiOperation(value = "获取站点排名", notes = "获取站点排名")

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "accountId", value = "账号id", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "sensor", value = "因子", required = true, paramType = "query", dataType = "String")

    })

    public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request){

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

        String id = parameters.get("accountId").toString();

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

        Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);

        //通过组织id来获取站点和设备信息

        account.put("sensor", sensor);

        List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);

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

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

            boolean contains = map.containsKey("sensor");

            if (contains) {

                returnList.add(map);

            }

        }

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

    }

    


    @GetMapping("mointorPointRank")

    @ApiOperation(value = "获取站点排名", notes = "获取站点排名")

    @ApiImplicitParams(value = {

            @ApiImplicitParam(name = "accountId", value = "账号id", required = true, paramType = "query", dataType = "String"),

            @ApiImplicitParam(name = "sensor", value = "因子", required = true, paramType = "query", dataType = "String")

    })

    public ResultBean<List<Map<String, Object>>> getMointorPointRank(HttpServletRequest request) {

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

        String id = parameters.get("accountId").toString();

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

        Map<String, Object> account = accountService.getOrganizationIdByAccountId(id);

        //通过组织id来获取站点和设备信息

        account.put("sensor", sensor);

        List<Map<String, Object>> rankList = historyService.getMointorPointRankByOrganizationId(account);

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

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

            boolean contains = map.containsKey("sensor");

            if (contains) {

                returnList.add(map);

            }

        }

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

    }



}


 src/main/resources/mapper/HistoryDailyMapper.xml

@@ -14,10 +14,10 @@
            hd.mac = vdi.mac

            AND vdi.monitor_point_id = mp.id

            AND vdi.device_tech = 1

            <if test="monitorPointId != null and monitorPointId!=''">

            <if test="monitorPointId != null">

                AND mp.id = #{monitorPointId}

            </if>

            <if test="mac != null and mac!=''">

            <if test="mac != null">

                AND hd.mac = #{mac}

            </if>

            <if test="start != null">

@@ -111,10 +111,10 @@
        FROM

        history_daily

        <where>

            <if test="mac!=null and mac!=''">

            <if test="mac!=null">

                AND mac=#{mac}

            </if>

            <if test="time!=null and time!=''">

            <if test="time!=null">

                AND time=#{time}

            </if>

        </where>