fix:尘负荷排序接口提交

jinpengyong

2024-06-19 32cc13189371ee1e367897a64fbc22f90b53add8

 screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -4,29 +4,33 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.mybatis.MybatisPlusConfig;
import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.dto.OnlineRatePageCond;
import com.moral.api.entity.*;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.HistoryFiveMinutelyMapper;
import com.moral.api.mapper.HistoryHourlyMapper;
import com.moral.api.mapper.OrganizationUnitAlarmMapper;
import com.moral.api.mapper.UnitConversionMapper;
import com.moral.api.pojo.dust.OnlineRateLogsForm;
import com.moral.api.pojo.vo.device.AppDeviceVo;
import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.HistoryDailyService;
import com.moral.api.service.HistoryHourlyService;
import com.moral.api.service.SensorService;
import com.moral.api.service.UnitConversionService;
import com.moral.api.utils.StringUtils;
import com.moral.api.vo.OnlineRateVo;
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.constant.SeparateTableType;
import com.moral.util.DateUtils;

import com.moral.util.MybatisPLUSUtils;
import org.apache.kafka.streams.state.internals.metrics.Sensors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;

import java.util.*;
import java.util.stream.Collectors;

@@ -52,12 +56,20 @@

    @Autowired
    SensorService sensorService;
    @Autowired
    private DeviceService deviceService;

    @Autowired
    UnitConversionService unitConversionService;

    @Autowired
    HistoryHourlyMapper historyHourlyMapper;

    @Autowired
    HistoryHourlyService historyHourlyService;

    @Autowired
    HistoryDailyService historyDailyService;

    @Autowired
    HistoryFiveMinutelyMapper historyFiveMinutelyMapper;
@@ -97,9 +109,18 @@
        );

        //设备mac
        List<String> macs = (List<String>) params.remove("macs");
        List<String> macList = (List<String>) params.remove("macs");
        List<Map<String, Object>> elementLists = new ArrayList<>();

        List<String> idList = macList.stream().filter(it->it.contains(",avg")).collect(Collectors.toList());
        List<String> idListExcluding = macList.stream().filter(it->!it.contains(",avg")).collect(Collectors.toList());
        List<String> macs = new ArrayList<>();
        for(String s : idList){
            String mm = s.substring(0, s.indexOf(",avg"));
            List<String> macResultList = deviceService.getMacMonitorPointId(Integer.parseInt(mm));
            macs.addAll(macResultList);
        }
        macs.addAll(idListExcluding);
        macs = macs.stream().distinct().collect(Collectors.toList());
        for (String mac : macs) {
            //从redis中获取设备因子信息
            Device device = (Device) redisTemplate.opsForHash().get(RedisConstants.DEVICE_INFO, mac);
@@ -341,7 +362,7 @@
            Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
            List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(startDate, endDate, SeparateTableType.MONTH);
            for (String mac:macs) {
/*            for (String mac:macs) {
                Map<String, Object> mapParams = new HashMap<>();
                mapParams.put("startDate",startDate);
                mapParams.put("endDate",endDate);
@@ -375,6 +396,56 @@
                    historyHourlyMap.put("time",timeStr);
                    list.add(historyHourlyMap);
                }
            }*/


            for (String mac:macs) {
                Map<String, Object> mapParams = new HashMap<>();
                mapParams.put("startDate",startDate);
                mapParams.put("endDate",endDate);
                mapParams.put("mac",mac);
                List<HistoryFiveMinutely> HistoryFiveMinutelys = FiveMinuteTableQuery(mapParams, tableNames);
                HistoryFiveMinutelys = HistoryFiveMinutelys.stream().distinct().collect(Collectors.toList());
                List<HistoryFiveMinutely> distinctHistoryHourlies = new ArrayList<>();
                Map<String, Object> disMap = new HashMap<>();
                for (HistoryFiveMinutely historyFiveMinutely:HistoryFiveMinutelys) {
                    Date time = historyFiveMinutely.getTime();
                    String timeStr = DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_EN);
                    if (!disMap.containsKey(timeStr)){
                        distinctHistoryHourlies.add(historyFiveMinutely);
                        disMap.put(timeStr,true);
                    }
                }
                for (HistoryFiveMinutely historyFiveMinutely:distinctHistoryHourlies) {
                    Map<String,Object> historyHourlyMap = new HashMap<>();
                    historyHourlyMap.put("mac",mac);
                    JSONObject  value= JSONObject.parseObject(historyFiveMinutely.getValue());
                    Double sensorValue = Objects.nonNull(value)&&Objects.nonNull(value.get(sensorCode))?Double.parseDouble(value.get(sensorCode).toString()):0d;
                    historyHourlyMap.put(sensorCode,sensorValue);
                    Date time = historyFiveMinutely.getTime();
                    String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_EN);
                    historyHourlyMap.put("time",timeStr);
                    list.add(historyHourlyMap);
                }
            }
            Date middleDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_EN);
            while (DateUtils.compareDateStr(endTime,DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_mm_EN),DateUtils.yyyy_MM_dd_HH_mm_EN)<=0){
                for (String mac:macs) {
                    boolean flag = true;
                    for (Map map:list) {
                        if (map.get("time").equals(DateUtils.dateToDateString(middleDate, DateUtils.yyyy_MM_dd_HH_mm_EN)) && map.get("mac").toString().equals(mac.toString())){
                            flag = false;
                        }
                    }
                    if (flag){
                        Map<String,Object> historyHourlyMap = new HashMap<>();
                        historyHourlyMap.put("mac",mac);
                        historyHourlyMap.put(sensorCode,"0.0");
                        historyHourlyMap.put("time",DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_mm_EN));
                        list.add(historyHourlyMap);
                    }
                }
                middleDate = DateUtils.getDateOfMin(middleDate,5);
            }
        }
        for (Map map:list) {
@@ -479,6 +550,15 @@
    }

    @Override
    public List getMacMonitorPointId(Integer monitorPointId) {
        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("mac")
                .eq("monitor_point_id", monitorPointId)
                .eq("is_delete", Constants.NOT_DELETE);
        return deviceMapper.selectObjs(queryWrapper);
    }

    @Override
    public List getMacsByOrgIdAndRegionCode(Integer organizationId, Integer regionCode) {
        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("mac")
@@ -503,19 +583,22 @@
     * @return
     */
    @Override
    public List<Device> getFuzzySearch(String mac) {
        LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
        if (ObjectUtils.isEmpty(mac)){
            return null;
    public List<AppDeviceVo> getFuzzySearch(String mac) {
        QxUser user = UserHelper.getCurrentUser();
        Integer organizationId = user.getOrganizationId();
//        Integer organizationId = 24;
        List<AppDeviceVo> devices;
        if (organizationId!=24){
             devices = deviceMapper.getDevices(mac,organizationId);
        }else {
             devices = deviceMapper.getDevices(mac,null);
        }
        wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
        wrapper.like(Device::getMac,mac);
        List<Device> devices = deviceMapper.selectList(wrapper);
        return devices;
    }


    /**
     * 根据组织查询设备
     * 根据站点查询设备
     *
     * @param id
     * @return
@@ -523,11 +606,528 @@
    @Override
    public List<Device> getOrganizationDevice(Integer id) {
        LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(Device::getOrganizationId,id);
        wrapper.eq(Device::getMonitorPointId,id);
        wrapper.eq(Device::getIsDelete,Constants.NOT_DELETE);
        wrapper.orderByAsc(Device::getCreateTime);
        List<Device> devices = deviceMapper.selectList(wrapper);
        return devices;
    }

    /**
     * 在线率
     * @param onlineRatePageCond
     * @return
     */
    @Override
    public List<OnlineRateVo> getPage(OnlineRatePageCond onlineRatePageCond) {
        int nh = 1000 * 60 * 60;
        String startTime = onlineRatePageCond.getStartTime();
        String endTime = onlineRatePageCond.getEndTime();
        Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
        Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_EN);
        long diff = end.getTime() - start.getTime(); //获取毫秒
        long hour = (diff / nh)+1; //获取间隔几个小时

        Map<String, List<OnlineRateVo>> collectList=new HashMap<>();
//        List<OnlineRateVo> OnlineRateVoList = deviceMapper.getLists(onlineRatePageCond.getOrganizationId(),onlineRatePageCond.getState());
        List<OnlineRateVo> OnlineRateVoList = deviceMapper.getLists(onlineRatePageCond.getMacs(),onlineRatePageCond.getState());
        if (!ObjectUtils.isEmpty(OnlineRateVoList)){

            for (OnlineRateVo onlineRateVo : OnlineRateVoList) {
                List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(onlineRateVo.getMac(), start, end);
                ArrayList<Date> dates = new ArrayList<>();
                //离线时间
                ArrayList<Date> dates1 = new ArrayList<>();
                //上线时间
                ArrayList<Date> dates2 = new ArrayList<>();
                ArrayList<Integer> list = new ArrayList<>();
                Date start1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
                if (!ObjectUtils.isEmpty(valueByMacAndTime)){
                    //数据去重
                    ArrayList<HistoryHourly> collects = valueByMacAndTime.stream().collect(
                            Collectors.collectingAndThen(Collectors.toCollection(
                                    () -> new TreeSet<>(Comparator.comparing(p -> p.getTime()))), ArrayList::new)
                    );

                    for (HistoryHourly historyHourly : collects) {
                        dates.add(historyHourly.getTime());
                    }
                    boolean flag= true;
                    int i = 0;
                    while (DateUtils.isTimeBeforE(end,start1)){
                        if (dates.contains(start1)){
                            if (flag){
                                list.add(i);
                            }else {
                                i++;
                                list.add(i);
                                dates2.add(start1);
                                flag= true;
                            }
                        }else {
                            if (flag){
                                i++;
                                list.add(i);
                                dates1.add(start1);
                                flag=false;
                            }else {
                                list.add(i);
                            }
                        }
                        start1 = DateUtils.getDateAddHour(start1,1);
                    }
                    if (!ObjectUtils.isEmpty(dates1)){
                        if (dates1.size()>dates2.size()){
                            onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
                            onlineRateVo.setStartTime("-");
                            onlineRateVo.setHourState("0");
                        }else {
                            onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
                            onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
                            onlineRateVo.setHourState("1");
                        }
                    }else {
                        onlineRateVo.setHourState("1");
                    }
//                    if (!ObjectUtils.isEmpty(dates2)){
//                        onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
//                    }
//                    if (!ObjectUtils.isEmpty(dates1)){
//                        onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
//                    }
                    onlineRateVo.setNum(dates1.size()+"");
                    onlineRateVo.setOnlineTime(collects.size());
                    double number = (double) collects.size() / hour * 100;
                    String result = String.format("%.2f", number);
                    onlineRateVo.setOnlineRate(result);
                }
            }

        }
     /*   Page<OnlineRateVo> page = deviceMapper.getPage(onlineRatePageCond.getPage().convertPage(), onlineRatePageCond.getOrganizationId());
        if(CollectionUtils.isNotEmpty(page.getRecords())){
            page.getRecords().forEach(it->{
                Date start1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
                List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(it.getMac(), start, end);
                ArrayList<Date> dates = new ArrayList<>();
                ArrayList<Date> dates1 = new ArrayList<>();
                ArrayList<Date> dates2 = new ArrayList<>();

                ArrayList<Integer> list = new ArrayList<>();
                if (!ObjectUtils.isEmpty(valueByMacAndTime)){
                    for (HistoryHourly historyHourly : valueByMacAndTime) {
                        dates.add(historyHourly.getTime());
                    }
                    boolean flag= true;
                    int i = 0;
                    while (DateUtils.isTimeBeforE(end,start1)){
                    if (dates.contains(start1)){
                        if (flag){
                          list.add(i);
                        }else {
                          i++;
                          list.add(i);
                          dates2.add(start1);
                          flag= true;
                        }
                    }else {
                        if (flag){
                            i++;
                            list.add(i);
                            dates1.add(start1);
                            flag=false;
                        }else {
                          list.add(i);
                        }
                    }
                        start1 = DateUtils.getDateAddHour(start1,1);
                    }
                    if (!ObjectUtils.isEmpty(dates2)){
                        it.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
                    }
                    if (!ObjectUtils.isEmpty(dates1)){
                        it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
                    }
//                    it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
                    it.setNum(dates1.size()+"");
                    it.setOnlineTime(valueByMacAndTime.size());
                    double number = (double) valueByMacAndTime.size() / hour * 100;
                    String result = String.format("%.2f", number);
                    it.setOnlineRate(result+"%");
                }
            });
        }*/
        if (!ObjectUtils.isEmpty(OnlineRateVoList)){
            collectList = OnlineRateVoList.stream().collect(Collectors.groupingBy(OnlineRateVo::getHourState));
        }
        return ObjectUtils.isEmpty(onlineRatePageCond.getHourState())?OnlineRateVoList:collectList.get(onlineRatePageCond.getHourState());
    }

    /**
     * 设备在线率详情
     *
     * @param mac
     * @param startTime
     * @param endTime
     * @param type
     * @return
     */
    @Override
    public Map<String,Object> detail(String mac, String startTime, String endTime, String type) {
        int nh = 1000 * 60 * 60;
        long nd = 1000 * 24 * 60 * 60;
        long nm = 1000 * 60;
        HashMap<String, Object> rsMap = new HashMap<>();
        Map<String, Object> map = new TreeMap<>(
                new Comparator<String>() {
                    @Override
                    public int compare(String o1, String o2) {
                        return o1.compareTo(o2);
                    }
                }
        );
//        HashMap<String, Object> map = new HashMap<>();
        //离线数据
        ArrayList<Date> EndDates = new ArrayList<>();
        //在线数据
        ArrayList<Date> StartDates = new ArrayList<>();
        ArrayList<Date> dates = new ArrayList<>();

        if (type.equals("hour")){
            Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
            Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_EN);
            List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(mac, start, end);

            if (!ObjectUtils.isEmpty(valueByMacAndTime)){

                //数据去重
                ArrayList<HistoryHourly> collect = valueByMacAndTime.stream().collect(
                        Collectors.collectingAndThen(Collectors.toCollection(
                                () -> new TreeSet<>(Comparator.comparing(p -> p.getTime()))), ArrayList::new)
                );
                for (HistoryHourly historyHourly : collect) {
                    map.put(DateUtils.dateToDateString(historyHourly.getTime()),1);
                    dates.add(historyHourly.getTime());
                }
                boolean flag= true;
                while (DateUtils.isTimeBeforE(end,start)){
                    if (dates.contains(start)){
                        if (!flag){
                            StartDates.add(start);
                            flag= true;
                        }
                    }else {
                        if (flag){
                            Date date = new Date();
                            String dateString = DateUtils.dateToDateString(date, DateUtils.yyyy_MM_dd_HH_EN);
                            Date date1 = DateUtils.getDate(dateString, DateUtils.yyyy_MM_dd_HH_EN);
                            if (!date1.equals(start)){
                                EndDates.add(start);
                                flag=false;
                            }
                        }
                        map.put(DateUtils.dateToDateString(start),0);
                    }
                    start = DateUtils.getDateAddHour(start,1);
                }
            }else {
                while (DateUtils.isTimeBeforE(end,start)){
                    map.put(DateUtils.dateToDateString(start),0);
                    start = DateUtils.getDateAddHour(start,1);
                }
            }
            //表格
            ArrayList<OnlineRateLogsForm> OrfList = new ArrayList<>();
            if (!ObjectUtils.isEmpty(EndDates)){
                for (int i = 0; i < EndDates.size(); i++) {
                    OnlineRateLogsForm onlineRateLogsForm = new OnlineRateLogsForm();
                    onlineRateLogsForm.setEndTime(DateUtils.dateToDateString(EndDates.get(i)));
//                    onlineRateLogsForm.setStartTime(ObjectUtils.isEmpty(StartDates)?"-":DateUtils.dateToDateString(StartDates.get(i)));
                    if (ObjectUtils.isEmpty(StartDates)){
                        onlineRateLogsForm.setStartTime("-");
                        onlineRateLogsForm.setMun("-");
                    }else {
                        if (EndDates.size()>StartDates.size()&& i==EndDates.size()-1){
                            onlineRateLogsForm.setStartTime("-");
                            onlineRateLogsForm.setMun("-");
                        }else {
                            onlineRateLogsForm.setStartTime(DateUtils.dateToDateString(StartDates.get(i)));
                            long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
                            onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nh)));

                        }
                    }

                    onlineRateLogsForm.setDate("小时");
                    OrfList.add(onlineRateLogsForm);
                }
            }
            //折线图
            ArrayList<String> list1 = new ArrayList<>();
            ArrayList<Integer> list2 = new ArrayList<>();
            Set<String> strings = map.keySet();
            for (String string : strings) {
                list1.add(string);
                list2.add(Integer.parseInt(map.get(string).toString()));
            }
            rsMap.put("lineChart1",list1);
            rsMap.put("lineChart2",list2);
            rsMap.put("tabulation",OrfList);
            //离线多少个小时
            int endNumber = map.size() - dates.size();
            rsMap.put("pieChart1",endNumber);
            rsMap.put("pieChart2",dates.size());
            rsMap.put("sum",map.size());

        } else if (type.equals("day")){
            Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_EN);
            Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_EN);
            List<HistoryDaily> historyDailys = historyDailyService.getHistoryDailyByMacAndTimeSlot(mac, start, end);
            if (!ObjectUtils.isEmpty(historyDailys)){
                //数据去重
                ArrayList<HistoryDaily> collects = historyDailys.stream().collect(
                        Collectors.collectingAndThen(Collectors.toCollection(
                                () -> new TreeSet<>(Comparator.comparing(p -> p.getTime()))), ArrayList::new)
                );
                for (HistoryDaily historyDaily : collects) {
                    map.put(DateUtils.dateToDateString(historyDaily.getTime()),1);
                    dates.add(historyDaily.getTime());
                }
                boolean flag= true;
                while (DateUtils.isTimeBeforE(end,start)){
                    if (dates.contains(start)){
                        if (!flag){
                            StartDates.add(start);
                            flag= true;
                        }
                    }else {
                        if (flag){
                            EndDates.add(start);
                            flag=false;
                        }
                        map.put(DateUtils.dateToDateString(start),0);
                    }
                    start = DateUtils.getDateOfDay(start,1);
                }
            }else {
                while (DateUtils.isTimeBeforE(end,start)){
                    map.put(DateUtils.dateToDateString(start),0);
                    start = DateUtils.getDateOfDay(start,1);
                }
            }
            //表格
            ArrayList<OnlineRateLogsForm> OrfList = new ArrayList<>();
            if (!ObjectUtils.isEmpty(EndDates)){
                for (int i = 0; i < EndDates.size(); i++) {
                    OnlineRateLogsForm onlineRateLogsForm = new OnlineRateLogsForm();
                    onlineRateLogsForm.setEndTime(DateUtils.dateToDateString(EndDates.get(i)));
//                    onlineRateLogsForm.setStartTime(ObjectUtils.isEmpty(StartDates)?"-":DateUtils.dateToDateString(StartDates.get(i)));
                    if (ObjectUtils.isEmpty(StartDates)){
                        onlineRateLogsForm.setStartTime("-");
                        onlineRateLogsForm.setMun("-");
                    }else {
                        if (EndDates.size()>StartDates.size()&& i==EndDates.size()-1){
                            onlineRateLogsForm.setStartTime("-");
                            onlineRateLogsForm.setMun("-");
                        }else {
                            onlineRateLogsForm.setStartTime(DateUtils.dateToDateString(StartDates.get(i)));
                            long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
                            onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nd)));
                        }
                    }
                    onlineRateLogsForm.setDate("天");
                    OrfList.add(onlineRateLogsForm);
                }
            }
            //折线图
            ArrayList<String> list1 = new ArrayList<>();
            ArrayList<Integer> list2 = new ArrayList<>();
            Set<String> strings = map.keySet();
            for (String string : strings) {
                list1.add(string);
                list2.add(Integer.parseInt(map.get(string).toString()));
            }

            rsMap.put("lineChart1",list1);
            rsMap.put("lineChart2",list2);
            rsMap.put("tabulation",OrfList);
            //离线多少天
            int endNumber = map.size() - dates.size();
            rsMap.put("pieChart1",endNumber);
            rsMap.put("pieChart2",dates.size());
            rsMap.put("sum",map.size());
        }else {
            Date start = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_EN);
            Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_mm_EN);
            Date date = new Date();
            String dateString = DateUtils.dateToDateString(date, DateUtils.yyyy_MM_dd_HH_mm_EN);
            Date date1 = DateUtils.getDate(dateString, DateUtils.yyyy_MM_dd_HH_mm_EN);
            if (end.equals(date1)){
                String dateOfMin = DateUtils.getDateOfMin(dateString, -1, DateUtils.yyyy_MM_dd_HH_mm_EN);
                end = DateUtils.getDate(dateOfMin, DateUtils.yyyy_MM_dd_HH_mm_EN);
            }
            List<HistoryMinutely> historyMinutelys = historyHourlyService.getHistoryMinutely(mac, start, end);
            if (!ObjectUtils.isEmpty(historyMinutelys)){
                //数据去重
                ArrayList<HistoryMinutely> collects = historyMinutelys.stream().collect(
                        Collectors.collectingAndThen(Collectors.toCollection(
                                () -> new TreeSet<>(Comparator.comparing(p -> p.getTime()))), ArrayList::new)
                );
                for (HistoryMinutely historyMinutely : collects) {
                    map.put(DateUtils.dateToDateString(historyMinutely.getTime()),1);
                    dates.add(historyMinutely.getTime());
                }
                boolean flag= true;
                while (DateUtils.isTimeBeforE(end,start)){
                    if (dates.contains(start)){
                        if (!flag){
                            StartDates.add(start);
                            flag= true;
                        }
                    }else {
                        if (flag){
                            EndDates.add(start);
                            flag=false;
                        }
                        map.put(DateUtils.dateToDateString(start),0);
                    }
                    start = DateUtils.getDateOfMin(start,1);
                }
            }else {
                while (DateUtils.isTimeBeforE(end,start)){
                    map.put(DateUtils.dateToDateString(start),0);
                    start = DateUtils.getDateOfMin(start,1);
                }
            }
            //表格
            ArrayList<OnlineRateLogsForm> OrfList = new ArrayList<>();
            if (!ObjectUtils.isEmpty(EndDates)){
                for (int i = 0; i < EndDates.size(); i++) {
                    OnlineRateLogsForm onlineRateLogsForm = new OnlineRateLogsForm();
                    onlineRateLogsForm.setEndTime(DateUtils.dateToDateString(EndDates.get(i)));
//                    onlineRateLogsForm.setStartTime(ObjectUtils.isEmpty(StartDates)?"-":DateUtils.dateToDateString(StartDates.get(i)));
                    if (ObjectUtils.isEmpty(StartDates)){
                        onlineRateLogsForm.setStartTime("-");
                        onlineRateLogsForm.setMun("-");
                    }else {
                        if (EndDates.size()>StartDates.size()&& i==EndDates.size()-1){
                            onlineRateLogsForm.setStartTime("-");
                            onlineRateLogsForm.setMun("-");
                        }else {
                            onlineRateLogsForm.setStartTime(DateUtils.dateToDateString(StartDates.get(i)));
                            long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
                            onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nm)));
                        }
                    }
                    onlineRateLogsForm.setDate("分钟");
                    OrfList.add(onlineRateLogsForm);
                }
            }
            //折线图
            ArrayList<String> list1 = new ArrayList<>();
            ArrayList<Integer> list2 = new ArrayList<>();
            Set<String> strings = map.keySet();
            for (String string : strings) {
                list1.add(string);
                list2.add(Integer.parseInt(map.get(string).toString()));
            }
            rsMap.put("lineChart1",list1);
            rsMap.put("lineChart2",list2);
            rsMap.put("tabulation",OrfList);
            //离线多少天
            int endNumber = map.size() - dates.size();
            rsMap.put("pieChart1",endNumber);
            rsMap.put("pieChart2",dates.size());
            rsMap.put("sum",map.size());
        }
        return rsMap;
    }

    @Override
    public Map<String,Object> getStart(List<String> macs) {
        HashMap<String, Object> map = new HashMap<>();
        List<OnlineRateVo> lists = deviceMapper.getLists(macs, null);
        if (!ObjectUtils.isEmpty(lists)){
            Map<String, List<OnlineRateVo>> collect = lists.stream().collect(Collectors.groupingBy(OnlineRateVo::getState));
            int size1 = lists.size();
            List<OnlineRateVo> onlineRateVos = collect.get("0");
            int i ;
            if (!ObjectUtils.isEmpty(onlineRateVos)){
                int size = onlineRateVos.size();
                 i = size1 - size;
            }else {
                 i= size1;
            }
            //总数
            map.put("sum",lists.size());
            //在线
            map.put("online",i);
            double number = (double) i / size1 * 100;
            String result = String.format("%.2f", number);
            map.put("onlineRate",result);
        }
        return map;
    }

    @Override
    public Map<String, Object> detailV1(String mac, String startTime, String endTime, String type) {
        HashMap<String, Object> rsMap = new HashMap<>();
        Map<String, Object> map = new TreeMap<>(
                new Comparator<String>() {
                    @Override
                    public int compare(String o1, String o2) {
                        return o1.compareTo(o2);
                    }
                }
        );
        //离线数据
        ArrayList<Date> EndDates = new ArrayList<>();
        //在线数据
        ArrayList<Date> StartDates = new ArrayList<>();
        ArrayList<Date> dates = new ArrayList<>();
        if (type.equals("hour")){
            Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
            Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_EN);
            List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(mac, start, end);
            if (!ObjectUtils.isEmpty(valueByMacAndTime)){
                //数据去重
                ArrayList<HistoryHourly> collect = valueByMacAndTime.stream().collect(
                        Collectors.collectingAndThen(Collectors.toCollection(
                                () -> new TreeSet<>(Comparator.comparing(p -> p.getTime()))), ArrayList::new)
                );
                for (HistoryHourly historyHourly : collect) {
                    map.put(DateUtils.dateToDateString(historyHourly.getTime()),1);
                    dates.add(historyHourly.getTime());
                }
             setCode(end,start,dates,StartDates,EndDates,map,type);
            }
            //表格
            List<OnlineRateLogsForm> OrfList = getList(EndDates, StartDates, type);
            //折线图
            ArrayList<String> list1 = new ArrayList<>();
            ArrayList<Integer> list2 = new ArrayList<>();
            Set<String> strings = map.keySet();
            for (String string : strings) {
                list1.add(string);
                list2.add(Integer.parseInt(map.get(string).toString()));
            }
            rsMap.put("lineChart1",list1);
            rsMap.put("lineChart2",list2);
            rsMap.put("tabulation",OrfList);
            //离线多少个小时
            int endNumber = map.size() - dates.size();
            double number = (double) dates.size() / map.size() * 100;
            String result = String.format("%.2f", number);
            rsMap.put("pieChart1",endNumber);
            rsMap.put("pieChart2",dates.size());
            rsMap.put("code","共"+map.size()+"小时，"+"在线"+dates.size()+"小时，"+"在线率"+(result.equals("NaN")?"0":result));

        }else if (type.equals("day")){

        }else {

        }
        return null;
    }

    private Device getDeviceUnitAlramInforByMacFromDb(String mac){
@@ -597,4 +1197,68 @@
    }


    private void setCode(Date end,Date start,ArrayList<Date> dates,ArrayList<Date> StartDates,ArrayList<Date> EndDates,Map<String,Object> map,String type){
        boolean flag= true;
        while (DateUtils.isTimeBeforE(end,start)){
            if (dates.contains(start)){
                if (!flag){
                    StartDates.add(start);
                    flag= true;
                }
            }else {
                if (flag){
                    EndDates.add(start);
                    flag=false;
                }
                map.put(DateUtils.dateToDateString(start),0);
            }
            if (type.equals("hour")){
                start = DateUtils.getDateAddHour(start,1);
            }else if (type.equals("day")){
                start = DateUtils.getDateOfDay(start,1);
            }else {
                start = DateUtils.getDateOfMin(start,1);
            }
        }
    }

    private List<OnlineRateLogsForm>  getList(ArrayList<Date> EndDates,ArrayList<Date> StartDates,String type){
        int nh = 1000 * 60 * 60;
        long nd = 1000 * 24 * 60 * 60;
        long nm = 1000 * 60;
        ArrayList<OnlineRateLogsForm> OrfList = new ArrayList<>();
        if (!ObjectUtils.isEmpty(EndDates)){
            for (int i = 0; i < EndDates.size(); i++) {
                OnlineRateLogsForm onlineRateLogsForm = new OnlineRateLogsForm();
                onlineRateLogsForm.setEndTime(DateUtils.dateToDateString(EndDates.get(i)));
                if (ObjectUtils.isEmpty(StartDates)){
                    onlineRateLogsForm.setStartTime("-");
                    onlineRateLogsForm.setMun("-");
                }else {
                    if (EndDates.size()>StartDates.size()&& i==EndDates.size()-1){
                        onlineRateLogsForm.setStartTime("-");
                        onlineRateLogsForm.setMun("-");
                    }else {
                        onlineRateLogsForm.setStartTime(DateUtils.dateToDateString(StartDates.get(i)));
                        long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
                        if (type.equals("hour")){
                            onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nh)));
                        }else if (type.equals("day")){
                            onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nd)));
                        }else {
                            onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nm)));
                        }
                    }
                }
                OrfList.add(onlineRateLogsForm);
            }
        }
        return OrfList;
    }
    private boolean subStr(String mac){
        if(StringUtils.isNotEmpty(mac)&&mac.contains(",avg")){
            return true;
        }
        return false;
    }
}