fix:代码优化测试提交

jinpengyong

2024-02-01 1ef1640c9eebf928b28befa55c5f3e3f8fece4b9

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

@@ -565,12 +565,13 @@
        int nh = 1000 * 60 * 60;
        String startTime = onlineRatePageCond.getStartTime();
        String endTime = onlineRatePageCond.getEndTime();
        Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
        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; //获取间隔几个小时

        List<OnlineRateVo> OnlineRateVoList = deviceMapper.getList(onlineRatePageCond.getOrganizationId());

        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);
@@ -578,9 +579,15 @@
                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_mm_ss_EN);
                Date start1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
                if (!ObjectUtils.isEmpty(valueByMacAndTime)){
                    for (HistoryHourly historyHourly : 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;
@@ -615,8 +622,8 @@
                    }
//               it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
                    onlineRateVo.setNum(dates1.size()+"");
                    onlineRateVo.setOnlineTime(valueByMacAndTime.size());
                    double number = (double) valueByMacAndTime.size() / hour * 100;
                    onlineRateVo.setOnlineTime(collects.size());
                    double number = (double) collects.size() / hour * 100;
                    String result = String.format("%.2f", number);
                    onlineRateVo.setOnlineRate(result+"%");
                }
@@ -698,7 +705,7 @@
                new Comparator<String>() {
                    @Override
                    public int compare(String o1, String o2) {
                        return o2.compareTo(o1);
                        return o1.compareTo(o2);
                    }
                }
        );
@@ -713,8 +720,15 @@
            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)){
                for (HistoryHourly historyHourly : 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());
                }
@@ -741,7 +755,21 @@
                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)));
//                    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)));

                        }
                    }
//                    if (!ObjectUtils.isEmpty(StartDates)){
//                        long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
//                        onlineRateLogsForm.setMun(Long.toString(l/nh));
@@ -770,14 +798,19 @@
            String result = String.format("%.2f", number);
            rsMap.put("pieChart1",endNumber);
            rsMap.put("pieChart2",dates.size());
            rsMap.put("code","共"+map.size()+"小时，"+"在线"+dates.size()+"小时，"+"在线率"+result);
            rsMap.put("code","共"+map.size()+"小时，"+"在线"+dates.size()+"小时，"+"在线率"+(result.equals("NaN")?"0":result));

        } 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)){
                for (HistoryDaily historyDaily : 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());
                }
@@ -813,10 +846,11 @@
                        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.setStartTime(DateUtils.dateToDateString(StartDates.get(i)));
                        long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
                        onlineRateLogsForm.setMun(Long.toString(l/nd));
                    }
//                    if (!ObjectUtils.isEmpty(StartDates)){
//                        long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
@@ -847,13 +881,18 @@
            String result = String.format("%.2f", number);
            rsMap.put("pieChart1",endNumber);
            rsMap.put("pieChart2",dates.size());
            rsMap.put("code","共"+map.size()+"天，"+"在线"+dates.size()+"天，"+"在线率"+result);
            rsMap.put("code","共"+map.size()+"天，"+"在线"+dates.size()+"天，"+"在线率"+(result.equals("NaN")?"0":result));
        }else {
            Date start = DateUtils.getDate(startTime,"yyyy-MM-dd HH:mm:00");
            Date end = DateUtils.getDate(endTime, "yyyy-MM-dd HH:mm:00");
            Date start = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_EN);
            Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_mm_EN);
            List<HistoryMinutely> historyMinutelys = historyHourlyService.getHistoryMinutely(mac, start, end);
            if (!ObjectUtils.isEmpty(historyMinutelys)){
                for (HistoryMinutely historyMinutely : 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());
                }
@@ -881,7 +920,20 @@
                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)));
//                    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)));
                        }
                    }
//                    if (!ObjectUtils.isEmpty(StartDates)){
//                        long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
//                        onlineRateLogsForm.setMun(Long.toString(l/nm));
@@ -909,10 +961,70 @@
            String result = String.format("%.2f", number);
            rsMap.put("pieChart1",endNumber);
            rsMap.put("pieChart2",dates.size());
            rsMap.put("code","共"+map.size()+"分钟，"+"在线"+dates.size()+"分钟，"+"在线率"+result);
            rsMap.put("code","共"+map.size()+"分钟，"+"在线"+dates.size()+"分钟，"+"在线率"+(result.equals("NaN")?"0":result));
        }

        return rsMap;
    }

    @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){
@@ -982,4 +1094,62 @@
    }


    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;
    }
}