电子屏

于紫祥_1901

2020-12-14 782e84d68779471c0640584678d4c4df3afa80a2

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

@@ -2,8 +2,11 @@

import java.io.*;
import java.lang.reflect.Array;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -17,6 +20,7 @@
import com.alibaba.fastjson.JSONArray;

import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.googlecode.aviator.AviatorEvaluator;
import com.googlecode.aviator.Expression;
import com.moral.common.bean.Constants;
@@ -34,17 +38,21 @@
import com.moral.entity.alarm.AlarmSensorLevel;
import com.moral.entity.charts.DataSortCondition;
import com.moral.entity.layout.RealTimeDeviceLayout;
import com.moral.mapper.HistoryMapper;
import com.moral.service.*;
import com.moral.util.*;

import com.rabbitmq.client.*;
import com.rabbitmq.client.Channel;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import jdk.nashorn.internal.runtime.regexp.joni.Regex;
import net.sf.json.JSONString;

import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.net.ftp.FTPClient;
@@ -69,6 +77,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;

import static com.moral.common.util.ResourceUtil.getValue;
import static com.moral.common.util.WebUtils.getParametersStartingWith;
import static java.util.Calendar.*;
@@ -83,6 +92,9 @@
@Api(tags = "Screen", description = "大屏接口")
public class ScreenController {
    public static Logger log = Logger.getLogger(ScreenController.class);

    @Resource
    private HistoryMapper historyMapper;
    @Resource
    AlarmConfigService alarmConfigService;
    @Resource
@@ -159,6 +171,14 @@
    @Resource
    private QualityDailyService qualityDailyService;

    @Resource
    private DeviceRoadService deviceRoadService;

    @Resource
    private ScreenVersionService screenVersionService;

    @Resource
    private DeviceAdjustValueTimingService deviceAdjustValueTimingService;

    /**
     * Screen login. 大屏登录
@@ -677,40 +697,70 @@


    /*
    * 参数：monitorPoint=368&mac=p5dnd7a0392018&sensorKey=e92&time=2020-08-11
    * 获取传感器均值接口
    * */
     * 参数：monitorPoint=368&mac=p5dnd7a0392018&sensorKey=e92&time=2020-08-11
     * 获取传感器均值接口
     * */
    @GetMapping("report_avg_datas")
    public ResultBean<List<Map<String, Object>>> getMonitorPointOrDeviceAvgData(HttpServletRequest request)
            throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        //该方法用于判断时间是具体到年月日
        ParameterUtils.getTimeType4Time(parameters);
        String time1= (String) parameters.get("time");
        String mac1= (String) parameters.get("mac");
        List<Map<String, Object>> list=null;
        if (mac1.equals("p5dnd7a0392018") && time1.substring(0,4).equals("2019") ){
                list=null;
        }else {
        String time1 = (String) parameters.get("time");
        time1 = time1.replaceAll(" ", "");
        parameters.put("time",time1);

        String mac1 = (String) parameters.get("mac");
        List<Map<String, Object>> list = null;
        if (mac1 != null && mac1.equals("p5dnd7a0392018") && time1.substring(0, 4).equals("2019")) {
            list = null;
        } else {
            parameters.put("monitorPointId", parameters.remove("monitorPoint"));
            Object sensorKey = parameters.remove("sensorKey");
            parameters.put("sensors", Arrays.asList(sensorKey));
            // monitorPointService.isCompensateCalculation(parameters);
            list = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);


            /* 0点的数据是昨天11点到今天0点的，界面显示1-24点的，所以不需要0点的数据，但需要单独查询24点的数据
                因为改动以前24点的数据是23-24，现在24点的数据是第二天0点的数据，
             */
            /*改动范围start-------------------------------------------------------------------------*/
            list.remove(0);
            //if (list.size() == 23) {
                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
                //获取全格式时间yyyy-MM-dd HH:mm:ss
                time1 = time1 + " 00:00:00";
                Date date = sdf.parse(time1);
                date = DateUtil.rollDay(date, 1);
                //将全格式时间截取
                String time2 = sdf2.format(date);
                parameters.put("time", time2);
                /*查询第二天0点的数据，以24点的形式存进集合中*/
                List<Map<String, Object>> nextDayList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
                if(!ObjectUtils.isEmpty(nextDayList)){
                    time1=time1.replaceAll(" 00:00:00"," 24");
                    Map<String, Object> datas = nextDayList.get(0);
                    datas.put("time",time1);
                    list.add(datas);
                }
            //}
            /*改动范围end-------------------------------------------------------------------------*/


            for (Map<String, Object> map : list) {
                String time = map.get("time").toString();
                time = time.substring(time.length() - 2);
                map.put("time", Integer.valueOf(time));
                if (parameters.get("type").equals("day")) {
             /*   if (parameters.get("type").equals("day")) {
                    map.put("time", Integer.valueOf(time) + 1);
                }
                }*/
                map.put("value", map.remove(sensorKey));
            }
        }
        return new ResultBean<List<Map<String, Object>>>(list);
    }




    @GetMapping("report_alarm_datas")
@@ -859,7 +909,6 @@

        List<Map<String, Object>> monitorList = historyMinutelyService.getMonitorPointOrDeviceAvgData(parameters);
        List<Map<String, Object>> areaList = hangzhouAqiService.getAreaAvgDataByAreaCode(parameters);

        if (areaList.isEmpty() && monitorList.isEmpty()) {
            return new ResultBean<List<Map<String, Object>>>(resultList);
        } else if (areaList.isEmpty()) {
@@ -1056,7 +1105,41 @@
    public ResultBean<List<MonitorPoint>> getMonitorPointsAndDevicesByRegion(HttpServletRequest request)
            throws Exception {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        String regionCode = parameters.get("regionCode").toString();
        List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegion(parameters);

        //剔除沧州非本公司设备
        if (regionCode.startsWith("1309")) {
            List<Integer> orgIds = new ArrayList<>();
            Collections.addAll(orgIds, 60, 65, 159, 165, 166);
            Iterator<MonitorPoint> iter = monitorPoints.iterator();
            while (iter.hasNext()) {
                MonitorPoint next = iter.next();
                Integer mpId = next.getId();
                Integer orgId = next.getOrganizationId();
                if (!orgIds.contains(orgId)) {
                    iter.remove();
                } else {
                    if (orgId == 60) {
                        if (mpId != 56) {
                            iter.remove();
                        }
                    } else if (orgId == 65) {
                        if (mpId != 83 && mpId != 84) {
                            iter.remove();
                        }
                    }
                }
            }
        }

        //给每一个monitorPoint下的设备通过device.getName()进行排序
        for (MonitorPoint monitorPoint : monitorPoints) {
            List<Device> deviceList = monitorPoint.getDevices();
            deviceList.sort((Device o1, Device o2) -> {
                return o1.getName().compareTo(o2.getName());
            });
        }
        return new ResultBean<List<MonitorPoint>>(monitorPoints);
    }

@@ -1410,12 +1493,13 @@
    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 yearAndDay = timeStr.substring(0, timeStr.lastIndexOf("-"));
        String Hour = timeStr.substring(timeStr.lastIndexOf("-") + 1);
        String time = YearAndDay + " " + Hour + ":00:00";
        String time = yearAndDay + " " + Hour + ":00:00";
        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
        LocalDateTime timeLocalDateTime = LocalDateTime.parse(time, dateTimeFormatter);
        int month = timeLocalDateTime.getMonth().getValue();
        parameters.put("yearAndDay",yearAndDay);
        Point dirPoint = historyHourlyService.getDirPoint(parameters);
        Map<String, Object> getPollutionSourceData = historyHourlyService.getPollutionSourceDataByHour(parameters);
        if (MapUtils.isEmpty(getPollutionSourceData)) {
@@ -1501,7 +1585,7 @@
        String et = parameters.get("endTime").toString();
        String endYearAndDay = et.substring(0, st.lastIndexOf("-"));
        String endHour = et.substring(et.lastIndexOf("-") + 1);
        String endTime=endYearAndDay + " " + endHour + ":00:00";
        String endTime = endYearAndDay + " " + endHour + ":00:00";
       /* int endHourValue = Integer.valueOf(endHour);
        int startHourValue = Integer.valueOf(startHour);
        if (endHourValue <= startHourValue) {
@@ -1614,6 +1698,7 @@
    @RequestMapping(value = "/newMap-page", method = RequestMethod.GET)
    public ModelAndView newMap(ModelAndView model, @RequestParam("areaCode") long code,
                               @RequestParam("accountId") int accountId) {

        Account account = accountService.getAccountById(accountId);
        List<MonitorPoint> monitorPointList = monitorPointService.getMonitorPointListByAccountId(accountId);
        String regionName = areaService.queryFullNameByCode(code);
@@ -1912,8 +1997,8 @@
            if (minAngle > (Double) longAndLatiList.get(j).get("angle")) {
                minAngle = (Double) longAndLatiList.get(j).get("angle");
                indexAngle = j;
            }else {
                indexAngle=indexAngle;
            } else {
                indexAngle = indexAngle;
            }
        }
        preAngleDeviceList.add(deviceList.get((Integer) longAndLatiList.get(indexAngle).get("h")));
@@ -1951,32 +2036,31 @@

    @GetMapping("/allDevice")
    @ResponseBody
    public Map<String,List> getAllDevice() {
        List<String> macList=deviceService.getAllMac();
        Map<String,List> latlngMap=new HashMap<String,List>();
        Map devMap=null;
        List list=new ArrayList();
    public Map<String, List> getAllDevice() {
        List<String> macList = deviceService.getAllMac();
        Map<String, List> latlngMap = new HashMap<String, List>();
        Map devMap = null;
        List list = new ArrayList();
        for (String mac : macList) {
            devMap=new HashMap();
            if (mac!=null){
                Device device=deviceService.byMacGetDevice(mac);
                List list1= LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(),device.getLongitude());
                if (device.getState()!=4+""){
                    devMap.put("state",device.getState());
            devMap = new HashMap();
            if (mac != null) {
                Device device = deviceService.byMacGetDevice(mac);
                List list1 = LatLngTransformation.Convert_BD09_To_GCJ02(device.getLatitude(), device.getLongitude());
                if (device.getState() != 4 + "") {
                    devMap.put("state", device.getState());
                }
                devMap.put("lat",list1.get(1));
                devMap.put("lng",list1.get(0));
                devMap.put("monitorPointId",device.getMonitorPointId());
                devMap.put("lat", list1.get(1));
                devMap.put("lng", list1.get(0));
                devMap.put("monitorPointId", device.getMonitorPointId());
                //System.out.println(device);
                list.add(devMap);
            }else {
            } else {
                continue;
            }
        }
        latlngMap.put("latlng",list);
        latlngMap.put("latlng", list);
        return latlngMap;
    }



    @GetMapping("/windAndDeviceData")
@@ -1985,17 +2069,17 @@
        Calendar calendar = Calendar.getInstance();
        calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
        String time = df.format(calendar.getTime())+":00";
        //String time = df.format(calendar.getTime()) + ":00";
        int year = calendar.get(Calendar.YEAR);
        int month = calendar.get(Calendar.MONTH) + 1;
        String mon;
        if (month<10){
            mon="0"+month;
        }else {
            mon=""+month;
        if (month < 10) {
            mon = "0" + month;
        } else {
            mon = "" + month;
        }
        String table="history_minutely_"+year+mon;
        List list=deviceService.byMonitorIdGetDeviceAndWind(monitorPointId,time,table);
        String table = "history_five_minutely_" + year + mon;
        List list = deviceService.byMonitorIdGetDeviceAndWind(monitorPointId, table);
        return list;
    }

@@ -2006,17 +2090,17 @@
        Calendar calendar = Calendar.getInstance();
        calendar.set(Calendar.MINUTE, (calendar.get(Calendar.MINUTE) - 2));
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
        String time = df.format(calendar.getTime())+":00";
        String time = df.format(calendar.getTime()) + ":00";
        int year = calendar.get(Calendar.YEAR);
        int month = calendar.get(Calendar.MONTH) + 1;
        String mon;
        if (month<10){
            mon="0"+month;
        }else {
            mon=""+month;
        if (month < 10) {
            mon = "0" + month;
        } else {
            mon = "" + month;
        }
        String table="history_minutely_"+year+mon;
        List list=deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId,time,table);
        String table = "history_five_minutely_" + year + mon;
        List list = deviceService.byMonitorIdGetDeviceAndWindSpecial(monitorPointId, table);
        return list;
    }

@@ -2024,9 +2108,28 @@
    @ApiOperation(value = "预测和实际臭氧对比", notes = "预测和实际臭氧对比")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "监控站id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time", value = "时6间(格式：2020-03-19)", required = true, paramType = "query", dataType = "String")})
            @ApiImplicitParam(name = "time", value = "时间(格式：2020-03-19)", required = true, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String, Object>>> getWeatherNextDayDataByRegion(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        List<String> sensorKeys=new ArrayList<>();
        sensorKeys.add("e15");
        parameters.put("sensorKeys",sensorKeys);
        List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
        return new ResultBean<List<Map<String, Object>>>(resultList);
    }


    @GetMapping("forecastPM")
    @ApiOperation(value = "预测和实测颗粒物对比", notes = "预测和实测颗粒物对比")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "monitorPointId", defaultValue = "1", value = "监控站id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time", value = "时间(格式：2020-03-19)", required = true, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String, Object>>> getForecastAndRealPM(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        List<String> sensorKeys=new ArrayList<>();
        sensorKeys.add("e1");
        sensorKeys.add("e2");
        parameters.put("sensorKeys",sensorKeys);
        List<Map<String, Object>> resultList = weatherService.getForecastAndReal(parameters);
        return new ResultBean<List<Map<String, Object>>>(resultList);
    }
@@ -2067,7 +2170,7 @@
    }

    @PostMapping("updateForecastWeather")
    public void updateForecastWeather(HttpServletRequest request){
    public void updateForecastWeather(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        weatherService.updateForecastWeather(parameters);
    }
@@ -2092,10 +2195,10 @@
        List<Map<String, Object>> device_sensorList = sensorService.getSensorByDeviceId(device.get("id").toString());
        Map<String, Object> device_sensorUnit_map = new HashMap<>();
        for (Map<String, Object> device_sensorMap : device_sensorList) {
            device_sensorUnit_map.put(device_sensorMap.get("sensor_key").toString(),device_sensorMap.get("unit"));
            device_sensorUnit_map.put(device_sensorMap.get("sensor_key").toString(), device_sensorMap.get("unit"));
        }
        Map<String, String> sensorMap = sensorService.getSensorsMap(parameters);
        if (startTime.length()==10&&endTime.length()==10){
        if (startTime.length() == 10 && endTime.length() == 10) {
            //获取当日时间
            Date dd = new Date();
            //格式化
@@ -2104,7 +2207,7 @@
            String nowTime = sim.format(dd);
            int days = endTime.compareTo(nowTime);
            //System.out.println(days);
            List<String> dayList = DatesUtil.findDaysStr(startTime,endTime);
            List<String> dayList = DatesUtil.findDaysStr(startTime, endTime);
            //System.out.println("dayList:"+dayList);
            /*if (days<0){
                Date date=null;
@@ -2120,86 +2223,88 @@
                endTime=new SimpleDateFormat("yyyy-MM-dd").format(calendar.getTime());
            }*/
            List<Map<String, Object>> sameDayHourlyList = null;
            if (days>=0){
            if (days >= 0) {
                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                //获取系统当前时间
                String currentTime = df.format(dd);
                sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac,nowTime,currentTime);
                sameDayHourlyList = historyHourlyService.getDataByTimeSlot(mac, nowTime, currentTime);
            }
            List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac,startTime,endTime);
            if (dataList.isEmpty()){
            List<Map<String, Object>> dataList = historyDailyService.getDataByTimeSlot(mac, startTime, endTime);
            if (dataList.isEmpty()) {
                return null;
            }
            Set<String> keys = sensorMap.keySet();
            for (String key:keys) {
                Map<String,Object> oneSensorMap = new LinkedHashMap<>();
                oneSensorMap.put("monitorPointName",monitorPointMap.get("name"));
                oneSensorMap.put("deviceName",device.get("name"));
                oneSensorMap.put("sersorKey",sensorMap.get(key)+"（"+device_sensorUnit_map.get(key)+"）");
                for (String day:dayList) {
                    for (Map<String, Object> dataMap: dataList) {
            for (String key : keys) {
                Map<String, Object> oneSensorMap = new LinkedHashMap<>();
                oneSensorMap.put("monitorPointName", monitorPointMap.get("name"));
                oneSensorMap.put("deviceName", device.get("name"));
                oneSensorMap.put("sersorKey", sensorMap.get(key) + "（" + device_sensorUnit_map.get(key) + "）");
                for (String day : dayList) {
                    for (Map<String, Object> dataMap : dataList) {
                        JSONObject dataJson = JSONObject.parseObject(dataMap.get("json").toString());
                        if (dataMap.get("time").toString().equals(day+" 00:00:00.0")){
                            oneSensorMap.put(dataMap.get("time").toString().substring(0,10),dataJson.getJSONArray(key).get(2));
                        if (dataMap.get("time").toString().equals(day + " 00:00:00.0")) {
                            oneSensorMap.put(dataMap.get("time").toString().substring(0, 10), dataJson.getJSONArray(key).get(0));
                            break;
                        }else {
                        } else {
                            continue;
                        }
                    }
                    if(!oneSensorMap.containsKey(day)){
                        oneSensorMap.put(day,"");
                    if (!oneSensorMap.containsKey(day)) {
                        oneSensorMap.put(day, "");
                    }
                }

                Double avg = 0.0;
                if (sameDayHourlyList != null){
                    for (Map sameDayHourlyMap:sameDayHourlyList){
                if (sameDayHourlyList != null) {
                    for (Map sameDayHourlyMap : sameDayHourlyList) {
                        List<Double> arr = new ArrayList<>();
                        JSONObject hourlyJson = JSONObject.parseObject(sameDayHourlyMap.get("json").toString());
                        arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(2).toString()));
                        arr.add(Double.parseDouble(hourlyJson.getJSONArray(key).get(0).toString()));
                        Double sum = 0.0;
                        for (int i=0;i<arr.size();i++){
                        for (int i = 0; i < arr.size(); i++) {
                            sum += arr.get(i);
                        }
                        avg = sum / arr.size();
                    }
                    oneSensorMap.put(nowTime,avg);
                    oneSensorMap.put(nowTime, avg);
                }
                list.add(oneSensorMap);
            }
        }else if (startTime.length()==13&&endTime.length()==13){
        } else if (startTime.length() == 13 && endTime.length() == 13) {
            StringBuilder startTime_sb = new StringBuilder(startTime);
            startTime_sb.replace(10,11," ");
            startTime = startTime_sb.toString()+":00:00";
            startTime_sb.replace(10, 11, " ");
            startTime = startTime_sb.toString() + ":00:00";
            StringBuilder endTime_sb = new StringBuilder(endTime);
            endTime_sb.replace(10,11," ");
            endTime = endTime_sb.toString()+":00:00";
            endTime_sb.replace(10, 11, " ");
            endTime = endTime_sb.toString() + ":00:00";

            List<String> hoursList = DatesUtil.findHoursStr(startTime,endTime);
            List<String> hoursList = DatesUtil.findHoursStr(startTime, endTime);
            //System.out.println("hoursList:"+hoursList);

            List<Map<String, Object>> hourlyList = historyHourlyService.getDataByTimeSlot(mac,startTime,endTime);
            if (hourlyList.isEmpty()){
            List<Map<String, Object>> hourlyList = historyHourlyService.getDataByTimeSlot(mac, startTime, endTime);
            if (hourlyList.isEmpty()) {
                return null;
            }
            Set<String> keys = sensorMap.keySet();
            for (String key:keys) {
                Map<String,Object> oneSensorMap = new LinkedHashMap<>();
                oneSensorMap.put("monitorPointName",monitorPointMap.get("name"));
                oneSensorMap.put("deviceName",device.get("name"));
                oneSensorMap.put("sersorKey",sensorMap.get(key)+"（"+device_sensorUnit_map.get(key)+"）");
                for (String hour:hoursList) {
                    for (Map<String, Object> hourlyMap: hourlyList) {
            for (String key : keys) {
                Map<String, Object> oneSensorMap = new LinkedHashMap<>();
                oneSensorMap.put("monitorPointName", monitorPointMap.get("name"));
                oneSensorMap.put("deviceName", device.get("name"));
                oneSensorMap.put("sersorKey", sensorMap.get(key) + "（" + device_sensorUnit_map.get(key) + "）");
                for (String hour : hoursList) {
                    for (Map<String, Object> hourlyMap : hourlyList) {
                        JSONObject dataJson = JSONObject.parseObject(hourlyMap.get("json").toString());
                        if (hourlyMap.get("time").toString().equals(hour+".0")){
                            oneSensorMap.put(hourlyMap.get("time").toString().substring(0,19),dataJson.getJSONArray(key).get(2));
                            break;
                        }else {
                        if (hourlyMap.get("time").toString().equals(hour + ".0")) {
                            if (dataJson.getJSONArray(key) != null) {
                                oneSensorMap.put(hourlyMap.get("time").toString().substring(0, 19), dataJson.getJSONArray(key).get(0));
                                break;
                            }
                        } else {
                            continue;
                        }
                    }
                    if(!oneSensorMap.containsKey(hour)){
                        oneSensorMap.put(hour,"");
                    if (!oneSensorMap.containsKey(hour)) {
                        oneSensorMap.put(hour, "");
                    }
                }
                /*for (Map<String, Object> hourlyMap: hourlyList) {
@@ -2209,12 +2314,11 @@
                }*/
                list.add(oneSensorMap);
            }
        }else {
        } else {
            return null;
        }
        return new ResultBean<List<Map<String, Object>>>(list);
    }



    @GetMapping("/contrastFactor")
@@ -2225,8 +2329,669 @@
            @ApiImplicitParam(name = "time", value = "时间(格式：2020-03-19、20、21)", required = true, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String, Object>>> contrastFactor(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        List list=historyHourlyService.getDataByMacAndTime(parameters);
        List list = historyHourlyService.getDataByMacAndTime(parameters);
        //System.out.println(list);
        return new ResultBean<List<Map<String, Object>>>(list);
    }
}

    @GetMapping("/getAlarm")
    @ResponseBody
    public List<DeviceRoad> getAlarm(@Param("windData") String windData, @Param("code") String code, @Param("mac") String mac, @Param("speedLevel") String speedLevel) {
        List<DeviceRoad> alarmData = deviceRoadService.getAlarmData(windData, code, mac, speedLevel);
        return alarmData;
    }

    @GetMapping("multiDeviceContrast")
    @ApiOperation(value = "多设备因子对比", notes = "多设备因子对比")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "macs", value = "设备mac,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "sensorKey", value = "传感器key", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time", value = "时间,日期(格式：2018-03-12)", required = true, paramType = "query", dataType = "String"),})
    public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        ParameterUtils.getTimeType4Time(parameters);
        List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
        return new ResultBean<List<Map<String, Object>>>(list);
    }


    @PostMapping("/tellAlarm")
    @ResponseBody
    public List<List> tellAlarm(String states, String orgId, String accountId, String states1, String regionCode) {
        JSONArray stateList = JSONArray.parseArray(states);//最新的设备数据
        JSONArray stateList1 = JSONArray.parseArray(states1);//前10秒的设备数据
        List<List> lookList = new ArrayList<>();
        Map params = new HashMap();
        String lookString = "";
        //判断前十秒数据和现在数据是否相等，如果不相等进入方法
        //第一次进入接口前十秒数据为null
        if (stateList1 != null && !states.equals(states1)) {
            List<Map> listDevice = JSONObject.parseArray(stateList.toJSONString(), Map.class);
            List<Map> listDevice1 = JSONObject.parseArray(stateList1.toJSONString(), Map.class);
            //将所有设备放到同一个集合下
            List<Map> deviceList = new ArrayList<Map>();
            List<Map> deviceList1 = new ArrayList<Map>();
            //存放所有组织的id
            List orgList = new ArrayList();
            for (Map devices : listDevice) {
                int monitorId = Integer.parseInt((String) devices.get("id"));
                MonitorPoint monitorPoint = monitorPointService.byIdGetMonitorPoint(monitorId);
                int org_id = monitorPoint.getOrganizationId();
                orgList.add(org_id);
                List<Map> devicesList = (List<Map>) devices.get("devices");
                if (!devicesList.isEmpty()) {
                    if (devicesList.size() > 1) {
                        for (Map map : devicesList) {
                            deviceList.add(map);
                        }
                    } else {
                        deviceList.add((Map) ((List) devices.get("devices")).get(0));
                    }
                }
            }
            for (Map devices1 : listDevice1) {
                int monitorId = Integer.parseInt((String) devices1.get("id"));
                MonitorPoint monitorPoint = monitorPointService.byIdGetMonitorPoint(monitorId);
                int org_id = monitorPoint.getOrganizationId();
                List<Map> devicesList = (List<Map>) devices1.get("devices");
                if (!devicesList.isEmpty()) {
                    if (devicesList.size() > 1) {
                        for (Map map : devicesList) {
                            deviceList1.add(map);
                        }
                    } else {
                        deviceList1.add((Map) ((List) devices1.get("devices")).get(0));
                    }
                }
            }
            List<String> macList = new ArrayList<String>();
            //获得两个时间的设备状态改变的mac号
            for (Map map : deviceList) {
                String state = (String) map.get("state");
                String mac = (String) map.get("mac");
                for (Map map1 : deviceList1) {
                    String state1 = (String) map1.get("state");
                    String mac1 = (String) map1.get("mac");
                    if (mac.equals(mac1)) {
                        if (Integer.parseInt(state) > Integer.parseInt(state1) && Integer.parseInt(state) != 4 /*&& Integer.parseInt(state1) == 0*/) {
                            macList.add(mac + "-" + state + "-" + state1);
                        }
                    }
                }
            }
            //存放不重合的数组
            LinkedHashSet<Integer> orgS = new LinkedHashSet<Integer>(orgList);
            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            Date date = new Date(System.currentTimeMillis());
            Date date1 = new Date(System.currentTimeMillis() - 1000);
            //系统当前时间
            String time = formatter.format(date);
            //系统当前时间的前一秒
            String time1 = formatter.format(date1);
            List<Map> alarmList = new ArrayList<Map>();
            for (Integer org : orgS) {
                int orgNum = alarmConfigService.containOrgId(org);
                Map<String, Object> eMap = new HashMap<String, Object>();
                if (orgNum == 1) {
                    String alarmConfig = alarmConfigService.getValueByOrganizationId(Integer.parseInt(String.valueOf(org)));
                    Map hashMap = JSON.parseObject(alarmConfig, HashMap.class);
                    Map alarmLevels = (Map) hashMap.get("alarmLevels");
                    //数据库因子表只有106个因子
                    for (int i = 1; i < 106; i++) {
                        if (alarmLevels.containsKey("e" + i)) {
                            Map map = (Map) alarmLevels.get("e" + i);
                            if (!map.isEmpty()) {
                                Integer enable = (Integer) map.get("enable");
                                List increment = (List) map.get("increment");
                                if (enable == 1) {
                                    if (!(increment.get(0).toString().equals("0") && increment.get(1).toString().equals("0"))) {
                                        eMap.put("e" + i, increment);
                                    } else {
                                        continue;
                                    }
                                } else {
                                    continue;
                                }
                            }
                        }
                    }
                } else {
                    String defultAlarm = dictionaryDataService.getDefultAlarm();
                    Map hashMap = JSON.parseObject(defultAlarm, HashMap.class);
                    Map alarmLevels = (Map) hashMap.get("alarmLevels");
                    //数据库因子表只有106个因子
                    for (int i = 1; i < 106; i++) {
                        if (alarmLevels.containsKey("e" + i)) {
                            Map map = (Map) alarmLevels.get("e" + i);
                            if (!map.isEmpty()) {
                                Integer enable = (Integer) map.get("enable");
                                List increment = (List) map.get("increment");
                                if (enable == 1) {
                                    if (!(increment.get(0).toString().equals("0") && increment.get(1).toString().equals("0"))) {
                                        eMap.put("e" + i, increment);
                                    } else {
                                        continue;
                                    }
                                } else {
                                    continue;
                                }
                            }
                        }
                    }
                }
                Map map = new HashMap();
                map.put("eMap", eMap);
                map.put("org", org);
                alarmList.add(map);
            }
            for (Map aEMap : alarmList) {
                List<Map> values = new ArrayList<Map>();
                if (macList.size() > 0) {
                    for (String sMac : macList) {
                        String[] aMac = sMac.split("-");
                        String mac = aMac[0];
                        //因为数据库数据是两秒钟插入一条，所以通过两个时间区间获取一条数据，防止一个时间获取数据为空的情况
                        String value = historyService.getValueByMacAndTime(mac, time, time1);
                        Map<String, String> map = new HashMap<String, String>();
                        if (value == null) {
                            Date date2 = new Date(System.currentTimeMillis() - 2000);
                            //系统当前时间的前两秒
                            String time2 = formatter.format(date1);
                            value = historyService.getValueByMacAndTime(mac, time, time2);
                            if (value == null) {
                                Date date3 = new Date(System.currentTimeMillis() - 3000);
                                //系统当前时间的前三秒
                                String time3 = formatter.format(date1);
                                value = historyService.getValueByMacAndTime(mac, time, time3);
                            }
                        }
                        if (value != null) {
                            map.put("mac", mac);
                            map.put("value", value);
                            map.put("state", aMac[1]);
                            map.put("state1", aMac[2]);
                            values.add(map);
                        } else {
                            continue;
                        }
                    }
                }

                if (values.size() > 0 && values.size() == macList.size()) {
                    for (Map dataMap : values) {
                        String oId = deviceService.byMacGetOrgId((String) dataMap.get("mac"));
                        if (!(aEMap.get("org").toString()).equals(oId)) {
                            continue;
                        }
                        List<String> list = new ArrayList<String>();
                        Map sensorMap = JSONObject.parseObject((String) dataMap.get("value"));
                        Iterator<String> iter = sensorMap.keySet().iterator();
                        while (iter.hasNext()) {
                            String key = iter.next();
                            list.add(key);
                        }
                        String state = (String) dataMap.get("state");
                        String state1 = (String) dataMap.get("state1");
                        List<Map> mapList = new ArrayList();
                        for (String key : list) {
                            if (((Map) aEMap.get("eMap")).containsKey(key)) {
                                Double val = Double.valueOf(sensorMap.get(key).toString());
                                List valueList = (List) ((Map) aEMap.get("eMap")).get(key);
                                Device device = deviceService.byMacGetDevice((String) dataMap.get("mac"));
                                Map<String, Object> sensors = sensorService.getSensorBySensorKey(key);
                                if (key.equals("e1") || key.equals("e2") || key.equals("e10") || key.equals("e11") || key.equals("e15") || key.equals("e16")) {
                                    //判断六参因子超标
                                    if ((state1.equals("0") || state1.equals("1")) && Integer.parseInt(state) > 1) {
                                        if (val > Double.valueOf(String.valueOf(valueList.get(1)))) {
                                            Map lookMap = new HashMap();
                                            lookMap.put("time", time);
                                            lookMap.put("name", device.getName());
                                            lookMap.put("sensor", sensors.get("description"));
                                            lookMap.put("value", val + "" + sensors.get("unit"));
                                            mapList.add(lookMap);
                                            //lookString = time+" "+device.getName()+sensors.get("description")+"="+val + sensors.get("unit")+"超标";
                                            //System.out.println(time + "====" + device.getName() + "=====" + sensors.get("description") + "======" + val + sensors.get("unit"));
                                        }
                                    }
                                } else {//判断非六参因子超标
                                    if (state1.equals("0")) {
                                        if (val > Double.valueOf(String.valueOf(valueList.get(0)))) {
                                            Map lookMap = new HashMap();
                                            lookMap.put("time", time);
                                            lookMap.put("name", device.getName());
                                            lookMap.put("sensor", sensors.get("description"));
                                            lookMap.put("value", val + "" + sensors.get("unit"));
                                            mapList.add(lookMap);
                                        }
                                    }
                                }

                            }
                        }
                        if (mapList.size() > 0) {
                            lookList.add(mapList);
                        } else {
                            continue;
                        }
                    }
                }
            }
        }
        return lookList;
    }

    /*  @GetMapping("/lianxian")
      @ApiOperation(value = "连线", notes = "连线" )
      @GetMapping("multiDeviceContrast")
      @ApiOperation(value = "多设备因子对比", notes = "多设备因子对比")
      @ApiImplicitParams(value = {
              @ApiImplicitParam(name = "macs", value = "设备mac,如有多个用逗号分隔", required = true, paramType = "query", dataType = "String"),
              @ApiImplicitParam(name = "sensorKey", value = "传感器key", required = true, paramType = "query", dataType = "String"),
              @ApiImplicitParam(name = "time", value = "时间,日期(格式：2018-03-12)", required = true, paramType = "query", dataType = "String"),})
      public ResultBean<List<Map<String, Object>>> multiDeviceSensor(HttpServletRequest request) throws Exception {
          Map<String, Object> parameters = getParametersStartingWith(request, null);
          ParameterUtils.getTimeType4Time(parameters);
          List<Map<String, Object>> list = historyMinutelyService.getMultiDeviceSensorData(parameters);
          return new ResultBean<List<Map<String, Object>>>(list);
      }

      /*
      * 根据大屏版本号获取版本更新信息
      */
    @GetMapping("screenVersion")
    public Map<String, Object> getScreenVersion(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        String version = parameters.get("version").toString();
        return screenVersionService.getScreenVersion(version);
    }

    @GetMapping("allDeviceExcel")
    @ApiOperation(value = "所有设备多因子数据报表", notes = "所有设备多因子数据报表")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "monitorPoint", value = "监控站点id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "sensorKey", value = "传感器key,多个逗号隔开", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "startTime", value = "起始时间(格式：2020-08-03)", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "endTime", value = "结束时间(格式：2020-08-04)", required = false, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String, Object>>> getAllDeviceDataToExcel(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        List<Map<String, Object>> list = historyMinutelyService.getAllDeviceDataToExcel(parameters);
        return new ResultBean<List<Map<String, Object>>>(list);
    }

    /*@PostMapping("insertAdjustValue")
    @ApiOperation(value = "所有设备多因子数据报表", notes = "所有设备多因子数据报表")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "id", value = "设备id", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time", value = "时间（格式08:30:00）", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "dataArray", value = "公式", required = false, paramType = "query", dataType = "String")})
    public void insertAdjustValue(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = WebUtils.getParametersStartingWith(request, null);
        int device_id = Integer.parseInt(parameters.get("id").toString());
        String hour_minute_second = parameters.get("time").toString();
        String[] arr = hour_minute_second.split(":");
        int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
        String value = parameters.get("dataArray").toString();
        deviceAdjustValueTimingService.insertData(device_id,seconds,value);;
    }*/

    @PostMapping("insertAdjustValue")
    public  int insertAdjustValue(@RequestBody HashMap map){
        try{
            int device_id = Integer.parseInt(map.get("id").toString());
            String time = map.get("time").toString();
            String[] arr = time.split(":");
            int seconds = Integer.parseInt(arr[0])*3600+Integer.parseInt(arr[1])*60+Integer.parseInt(arr[2]);
            //String t = URLEncoder.encode(参数,"UTF-8")
            List list = (List) map.get("dataArray");
            String val="";
            for (int i = 0; i <list.size() ; i++) {
                if (i==0){
                    val=val+list.get(i);
                }else {
                    val=val+","+list.get(i);
                }
            }
            String value = "{"+val+"}";
            deviceAdjustValueTimingService.insertData(device_id,seconds,value);
            return 1;
        }catch (Exception e){
            log.warn(e);
        }
        return 0;
    }

    @RequestMapping("/biaozhun")
    @ResponseBody
    public List<Device> queryDevice(String macOrName){
        List<Device> deviceList = new ArrayList<>();
        if (!macOrName.equals("")){
             deviceList= deviceService.getDevice(macOrName);
        }
        return deviceList;
    }

    @RequestMapping("/getBiaoZhun")
    @ResponseBody
    public List<DeviceAdjustValueTiming> getBiaoZhun(String id){
        List<DeviceAdjustValueTiming> dataByDeviceid = deviceAdjustValueTimingService.getDataByDeviceid(Integer.parseInt(id));
        for (DeviceAdjustValueTiming deviceAdjustValueTiming : dataByDeviceid) {
            int seconds = Integer.parseInt(deviceAdjustValueTiming.getSeconds());
            String hour = String.valueOf(seconds/3600);
            int millAndSeconds = seconds%3600;
            String mill = String.valueOf(millAndSeconds/60);
            String second = String.valueOf(millAndSeconds%60);
            if (hour.length()<2){
                hour="0"+hour;
            }
            if (mill.length()<2){
                mill="0"+mill;
            }
            if (second.length()<2){
                second="0"+second;
            }
            String time = hour+":"+mill+":"+second;
            Map<String, String> value = deviceAdjustValueTiming.getValue();
            Collection<String> values = value.values();
            deviceAdjustValueTiming.setSeconds(time);
        }
        return dataByDeviceid;
    }


    @RequestMapping("/getSensor")
    @ResponseBody
    public  List<Map<String, Object>> getSensor(String id){
        List<Map<String, Object>> allSensors = sensorService.getSensorByDeviceId(id);
        return allSensors;
    }

    @RequestMapping("/deleteBiaoZhun")
    @ResponseBody
    public int deleteBiaoZhun(String id){
        int i= deviceAdjustValueTimingService.delete(id);
        return i;
    }


    @GetMapping("/monitorAVGData")
    @ApiOperation(value = "monitor平均数据导出", notes = "monitor平均数据导出")
    @ApiImplicitParams(value = {
            @ApiImplicitParam(name = "monitorPointIds", value = "多个monitorid", required = true, paramType = "query", dataType = "String"),
            @ApiImplicitParam(name = "time", value = "时间(格式：2020-03-19)", required = true, paramType = "query", dataType = "String")})
    public ResultBean<List<Map<String,Object>>> monitorAVGData(HttpServletRequest request) throws Exception {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        String monitorPointIds = (String) parameters.get("monitorPointIds");
        String time = (String) parameters.get("time");
        time = time+" 00:00:00";
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd mm:HH:ss");//注意月份是MM
        Date date = simpleDateFormat.parse(time);
        Calendar calendar = new GregorianCalendar();
        calendar.setTime(date);
        calendar.add(calendar.DATE,+1);
        String date1= simpleDateFormat.format(date);
        String date2= simpleDateFormat.format(calendar.getTime());
        String[] mIds = monitorPointIds.split(",");
        List<List<Map<String,Object>>> lists = new ArrayList<>();
        if (mIds.length==1 && mIds.length!=0){
            String mId = mIds[0];
            List<Map<String,Object>> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mId, date1, date2);
            Double maxO3 = Double.parseDouble(dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 1).get("maxO3").toString());
            Map<String,Object> dailyAvgData =new HashMap<>();
            if (dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data")!=""){
                dailyAvgData = (Map<String, Object>) dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data");
                dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(0,BigDecimal.ROUND_HALF_UP).doubleValue());
            }else {
                dailyAvgData= historyHourlyService.getAvgDataByMId(mId, date1, date2);
                if (dailyAvgData!=null){
                    dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(0,BigDecimal.ROUND_HALF_UP).doubleValue());
                }else {
                    dailyAvgData = new HashMap<>();
                    dailyAvgData.put("PM2_5","");
                    dailyAvgData.put("NO2","");
                    dailyAvgData.put("SO2","");
                    dailyAvgData.put("PM10","");
                    dailyAvgData.put("O3_day","");
                    dailyAvgData.put("CO","");
                }
            }
            dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
            dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
            Map<String,Object> dayMap = new HashMap<>();
            dayMap.put("data",dailyAvgData);
            dayMap.put("time",date1.substring(0,11));
            dataAvbByMIdAndTime.add(dayMap);
            for (int i = 0; i <dataAvbByMIdAndTime.size() ; i++) {
                if (i!=dataAvbByMIdAndTime.size()-1){
                    Map<String, Object> map1 = AQICalculation2.hourlyAQI((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data"));
                    if (Double.parseDouble(map1.get("AQI").toString())>50.0){
                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
                    }else {
                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants","-");
                        ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
                    }
                }else {
                    Map<String, Object> map1 = AQICalculation2.dayAQI((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data"));
                    if (map1.get("AQI").toString().equals("")){
                        break;
                    }
                        if (Double.parseDouble(map1.get("AQI").toString())>50.0){
                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants",map1.get("maxSensor"));
                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
                        }else {
                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("primary_pollutants","-");
                            ((Map<String, Object>) dataAvbByMIdAndTime.get(i).get("data")).put("AQI",map1.get("AQI"));
                        }
                }
            }
            List timeList = new ArrayList();
            for (int q = 0; q < dataAvbByMIdAndTime.size(); q++) {
                timeList.add(dataAvbByMIdAndTime.get(q).get("time"));
            }
            if (dataAvbByMIdAndTime.size()<25){
                for (int j = 1; j < 25; j++) {
                    Map<String,Object> map = null;
                    for (int q = 0; q < dataAvbByMIdAndTime.size(); q++) {
                        if (dataAvbByMIdAndTime.get(q).get("time").toString().length() > 2){
                            continue;
                        }else {
                            // System.out.println(Integer.parseInt(dataAvbByMIdAndTime.get(q).get("time").toString())+"==="+j);
                            String sj="";
                            if (j<10){
                                sj="0"+j;
                            }else {
                                if (j==24){
                                    sj="00";
                                }else {
                                    sj=""+j;
                                }
                            }
                            if (!timeList.contains(sj)){
                                map = new HashMap<>();
                                map.put("time",sj);
                                Map map1 = new HashMap();
                                map1.put("PM2_5","");
                                map1.put("NO2","");
                                map1.put("primary_pollutants","-");
                                map1.put("SO2","");
                                map1.put("O3","");
                                map1.put("PM10","");
                                map1.put("O3_8h","");
                                map1.put("CO","");
                                map1.put("AQI","");
                                map.put("data",map1);
                                dataAvbByMIdAndTime.add(map);
                                break;
                            }else {
                                break;
                            }
                        }
                    }
                }
            }
             /* for (int i1 = 0; i1 < dataAvbByMIdAndTime.size(); i1++) {
                    System.out.println(dataAvbByMIdAndTime.get(i1));
                }*/
            Collections.sort(dataAvbByMIdAndTime, new Comparator<Map<String, Object>>(){
                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                    String name1 =(String)o1.get("time");//name1是从你list里面拿出来的一个
                    String name2= (String)o2.get("time"); //name1是从你list里面拿出来的第二个name
                    return name1.compareTo(name2);
                }
            });
            Map map1 = dataAvbByMIdAndTime.get(0);
            dataAvbByMIdAndTime.remove(0);
            dataAvbByMIdAndTime.add(map1);
            for (int j = 0; j <dataAvbByMIdAndTime.size() ; j++) {
                if (dataAvbByMIdAndTime.get(j).get("time").toString().length()>2){
                    Map map2 = dataAvbByMIdAndTime.get(j);
                    dataAvbByMIdAndTime.remove(j);
                    dataAvbByMIdAndTime.add(map2);
                }
            }
            if (dataAvbByMIdAndTime.size()==1){
                dataAvbByMIdAndTime=null;
            }
            lists.add(dataAvbByMIdAndTime);
            //List<Device> devicesByMonitorPointId = deviceService.getDevicesByMonitorPointId(Integer.valueOf(mId));
        }else {
            for (int i = 0; i <mIds.length ; i++) {
                List<Map<String,Object>> dataAvbByMIdAndTime = historyHourlyService.getDataAvbByMIdAndTime(mIds[i], date1, date2);
                Double maxO3 = Double.parseDouble(dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 1).get("maxO3").toString());
                Map<String,Object> dailyAvgData =new HashMap<>();
                if (dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data")!=""){
                    dailyAvgData = (Map<String, Object>) dataAvbByMIdAndTime.get(dataAvbByMIdAndTime.size() - 2).get("data");
                    dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(0,BigDecimal.ROUND_HALF_UP).doubleValue());
                }else {
                    dailyAvgData= historyHourlyService.getAvgDataByMId(mIds[i], date1, date2);
                    if (dailyAvgData!=null){
                        dailyAvgData.put("maxO3_8h",new BigDecimal(maxO3).setScale(0,BigDecimal.ROUND_HALF_UP).doubleValue());
                    }else {
                        dailyAvgData = new HashMap<>();
                        dailyAvgData.put("PM2_5","");
                        dailyAvgData.put("NO2","");
                        dailyAvgData.put("SO2","");
                        dailyAvgData.put("PM10","");
                        dailyAvgData.put("O3_day","");
                        dailyAvgData.put("CO","");
                    }
                }
                dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
                dataAvbByMIdAndTime.remove(dataAvbByMIdAndTime.size() - 1);
                Map<String,Object> dayMap = new HashMap<>();
                dayMap.put("data",dailyAvgData);
                dayMap.put("time",date1.substring(0,11));
                dataAvbByMIdAndTime.add(dayMap);
                List timeList = new ArrayList();
                for (int q = 0; q < dataAvbByMIdAndTime.size(); q++) {
                    timeList.add(dataAvbByMIdAndTime.get(q).get("time"));
                }
                  if (dataAvbByMIdAndTime.size()<25){
                    for (int j = 1; j < 25; j++) {
                        Map<String,Object> map = null;
                        for (int q = 0; q < dataAvbByMIdAndTime.size(); q++) {
                            if (dataAvbByMIdAndTime.get(q).get("time").toString().length() > 2){
                                continue;
                            }else {
                               // System.out.println(Integer.parseInt(dataAvbByMIdAndTime.get(q).get("time").toString())+"==="+j);
                                String sj="";
                                if (j<10){
                                    sj="0"+j;
                                }else {
                                    if (j==24){
                                        sj="00";
                                    }else {
                                        sj=""+j;
                                    }
                                }
                                if (!timeList.contains(sj)){
                                    map = new HashMap<>();
                                    map.put("time",sj);
                                    Map map1 = new HashMap();
                                    map1.put("PM2_5","");
                                    map1.put("NO2","");
                                    map1.put("SO2","");
                                    map1.put("O3","");
                                    map1.put("PM10","");
                                    map1.put("O3_8h","");
                                    map1.put("CO","");
                                    map.put("data",map1);
                                    dataAvbByMIdAndTime.add(map);
                                    break;
                                }else {
                                    break;
                                }
                            }
                        }

                    }
                }
                Collections.sort(dataAvbByMIdAndTime, new Comparator<Map<String, Object>>(){
                    public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                        String name1 =(String)o1.get("time");//name1是从你list里面拿出来的一个
                        String name2= (String)o2.get("time"); //name1是从你list里面拿出来的第二个name
                        return name1.compareTo(name2);
                    }
                });
                Map map1 = dataAvbByMIdAndTime.get(0);
                dataAvbByMIdAndTime.remove(0);
                dataAvbByMIdAndTime.add(map1);
                for (int j = 0; j <dataAvbByMIdAndTime.size() ; j++) {
                    if (dataAvbByMIdAndTime.get(j).get("time").toString().length()>2){
                        Map map2 = dataAvbByMIdAndTime.get(j);
                        dataAvbByMIdAndTime.remove(j);
                        dataAvbByMIdAndTime.add(map2);
                    }
                }
                lists.add(dataAvbByMIdAndTime);
            }
            List<Map<String, Object>> dataByMonitorPoints = historyHourlyService.getDataByMonitorPoints(mIds, date1, date2);
            lists.add(dataByMonitorPoints);
        }
        List<Map<String, Object>> rList =new ArrayList<>();
        if (lists.size()==1 && lists.get(0)!=null){
            for (int i = 0; i < lists.get(0).size(); i++) {
                List list = new ArrayList();
                list.add(lists.get(0).get(i).get("data"));
                Map map = new HashMap();
                map.put("data",list);
                map.put("time",lists.get(0).get(i).get("time"));
                rList.add(map);
            }

        } else if (lists.size()==1 && lists.get(0)==null){
            rList.add(null);
        }else {
            for (int j = 0; j < lists.get(0).size(); j++) {
                Map<String, Object> listMap = new HashMap();
                List<Map> mapList = new ArrayList<>();
                if (lists.get(0).size() == 1) {
                    mapList.add(null);
                } else {
                    mapList.add((Map) lists.get(0).get(j).get("data"));
                }
                for (int i = 1; i < lists.size(); i++) {
                    if (lists.get(i).size() == 1) {
                        mapList.add(null);
                        listMap.put("data", mapList);
                    } else {
                        if (lists.get(0).get(j).get("time").equals(lists.get(i).get(j).get("time"))) {
                            mapList.add((Map) lists.get(i).get(j).get("data"));
                        }
                        listMap.put("time", lists.get(0).get(j).get("time"));
                        listMap.put("data", mapList);
                    }
                }
                rList.add(listMap);
            }
        }
        return new ResultBean<List<Map<String,Object>>>(rList);
    }

    @PostMapping("byAccountGetDevices")
    public List<Device> byAccountGetDevices(@RequestBody Map<String, Object> parameters) {
        String id =parameters.get("id").toString();
        List<Device> devicesList = deviceService.getDevicesByAccountId(id);
        return devicesList;
    }
}