Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2024-02-29 34c5df174a03341fa469a5196410205cebc26b82

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

@@ -557,13 +557,16 @@
        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());
        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);
@@ -601,18 +604,30 @@
                        }
                        start1 = DateUtils.getDateAddHour(start1,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)));
                        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");
                    }
//               it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-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+"%");
                    onlineRateVo.setOnlineRate(result);
                }
            }

@@ -670,7 +685,10 @@
                }
            });
        }*/
        return OnlineRateVoList;
        if (!ObjectUtils.isEmpty(OnlineRateVoList)){
            collectList = OnlineRateVoList.stream().collect(Collectors.groupingBy(OnlineRateVo::getHourState));
        }
        return ObjectUtils.isEmpty(onlineRatePageCond.getHourState())?OnlineRateVoList:collectList.get(onlineRatePageCond.getHourState());
    }

    /**
@@ -728,11 +746,21 @@
                        }
                    }else {
                        if (flag){
                            EndDates.add(start);
                            flag=false;
                            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);
                }
            }
@@ -757,13 +785,7 @@

                        }
                    }
//                    if (!ObjectUtils.isEmpty(StartDates)){
//                        long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
//                        onlineRateLogsForm.setMun(Long.toString(l/nh));
//                        StartDates.remove(i);
//                    }else {
//                        onlineRateLogsForm.setMun("-");
//                    }

                    onlineRateLogsForm.setDate("小时");
                    OrfList.add(onlineRateLogsForm);
                }
@@ -781,11 +803,9 @@
            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));
            rsMap.put("sum",map.size());

        } else if (type.equals("day")){
            Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_EN);
@@ -815,7 +835,11 @@
                        }
                        map.put(DateUtils.dateToDateString(start),0);
                    }
//                    start = DateUtils.getDateAddHour(start,24);
                    start = DateUtils.getDateOfDay(start,1);
                }
            }else {
                while (DateUtils.isTimeBeforE(end,start)){
                    map.put(DateUtils.dateToDateString(start),0);
                    start = DateUtils.getDateOfDay(start,1);
                }
            }
@@ -839,12 +863,6 @@
                            onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nd)));
                        }
                    }
//                    if (!ObjectUtils.isEmpty(StartDates)){
//                        long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
//                        onlineRateLogsForm.setMun(Long.toString(l/nd));
//                    }else {
//                        onlineRateLogsForm.setMun("-");
//                    }
                    onlineRateLogsForm.setDate("天");
                    OrfList.add(onlineRateLogsForm);
                }
@@ -858,20 +876,24 @@
                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));
            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)){
                //数据去重
@@ -897,7 +919,11 @@
                        }
                        map.put(DateUtils.dateToDateString(start),0);
                    }
//                    start = DateUtils.getDateAddHour(start,24);
                    start = DateUtils.getDateOfMin(start,1);
                }
            }else {
                while (DateUtils.isTimeBeforE(end,start)){
                    map.put(DateUtils.dateToDateString(start),0);
                    start = DateUtils.getDateOfMin(start,1);
                }
            }
@@ -921,12 +947,6 @@
                            onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nm)));
                        }
                    }
//                    if (!ObjectUtils.isEmpty(StartDates)){
//                        long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
//                        onlineRateLogsForm.setMun(Long.toString(l/nm));
//                    }else {
//                        onlineRateLogsForm.setMun("-");
//                    }
                    onlineRateLogsForm.setDate("分钟");
                    OrfList.add(onlineRateLogsForm);
                }
@@ -944,16 +964,40 @@
            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));
            rsMap.put("sum",map.size());
        }
        return rsMap;
    }

    @Override
    public Map<String,Object> getStart(Integer organizationId) {
        HashMap<String, Object> map = new HashMap<>();
        List<OnlineRateVo> lists = deviceMapper.getLists(organizationId, 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<>(