update：移动到设备marker上实时显示因子数据

ZhuDongming

2019-11-20 f32e22e52376cabe49e8c7d1f52adb4b1aebffd3

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

@@ -21,6 +21,7 @@
import java.util.stream.Collectors;



import org.apache.commons.collections.CollectionUtils;

import org.apache.commons.collections.MapUtils;

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

import org.apache.log4j.Logger;

import org.dom4j.Document;

@@ -543,6 +544,24 @@
        }

    }



    @GetMapping("/getSensorsMap")

    public ResultBean getSensorsMapOnly(String mac){

        Map<String, String> paramMap = sensorService.getSensorsMapOnly(mac);

        ResultBean<Map<String, String>> resultBean = new ResultBean();

        resultBean.setData(paramMap);

        resultBean.setCode(ResultBean.SUCCESS);

        return resultBean;

    }



    @GetMapping("/getSensorsUnitMap")

    public ResultBean getSensorsUnitMap(String mac){

        Map<String, String> paramMap = sensorService.getSensorsUnitMap(mac);

        ResultBean<Map<String, String>> resultBean = new ResultBean();

        resultBean.setData(paramMap);

        resultBean.setCode(ResultBean.SUCCESS);

        return resultBean;

    }



    @RequestMapping(value = "/get-monitorpoints", method = RequestMethod.GET)

    @ResponseBody

    public ResultBean getMonitorpointList(@RequestParam("orgId") String orgId, MapBounds mapBounds,

@@ -1030,10 +1049,11 @@
        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);

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

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

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

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

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

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

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

                }

            }

@@ -1057,14 +1077,12 @@
        Date date = new SimpleDateFormat("yy-MM-dd").parse(intoTime);

        DateFormat df1 = new SimpleDateFormat("yyyy-MM-dd");

        String alterTime = df1.format(date.getTime()-15*24*60*60*1000);

        System.out.println("startTime:"+alterTime);

        parameters.put("time", alterTime);

        ParameterUtils.getTimeType4Time(parameters);

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

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

        String[] sensorKeys = parameters.remove("sensorKey").toString().split(",");

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

        // monitorPointService.isCompensateCalculation(parameters);

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



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

@@ -1074,8 +1092,18 @@
        weatherParameters.put("organizationId", mpMap.get("organization_id"));

        weatherParameters.put("time", intoTime);

        //获取天气信息

        Map<String, Object> weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);

        Map<String, Object> tempMap = TempAllocationUtils.tempAllocation(weatherMap);

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

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

        Boolean tf = false;

        for(int i=0;i<sensorKeys.length;i++) {

           if(sensorKeys[i].equals("e7")) {

              tf = true;

           }

        }

        if (tf) {

            weatherMap = weatherService.get15DayWeatherDataByRegion(weatherParameters);

            tempMap = TempAllocationUtils.tempAllocation(weatherMap);

      }

        //获取单位信息

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



@@ -1083,7 +1111,9 @@
            String time = map.get("time").toString();

            time = time.substring(time.length() - 2);

            map.put("time", Integer.valueOf(time));

            map.put("temp", tempMap.get(map.get("time").toString()));

            if (tempMap!=null) {

               map.put("temp", tempMap.get(map.get("time").toString()));

         }

            List<Number> values = new ArrayList<Number>();

            List<String> units = new ArrayList<String>();

            for (String string : sensorKeys) {

@@ -1199,7 +1229,13 @@
        LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);

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

        Point dirPoint = historyHourlyService.getDirPoint(parameters);

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

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

        if (MapUtils.isEmpty(getPollutionSourceData)) {

            getPollutionSourceData = historyHourlyService.getPollutionSourceDataAll(parameters);

        }

        if (MapUtils.isEmpty(getPollutionSourceData)) {

            getPollutionSourceData = new HashMap<>();

        }

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

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

        JSONObject params = new JSONObject();