添加多站多参接口

jinpengyong

2023-06-15 dbb8355061b6f60976d410fe475157c6e82f5593

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

@@ -219,7 +219,17 @@
                wrapper.between("time", startDate, endDate);
                List<HistoryHourly> historyHourlies = multiTableQuery(wrapper, tableNames);
                historyHourlies = historyHourlies.stream().distinct().collect(Collectors.toList());
                List<HistoryHourly> distinctHistoryHourlies = new ArrayList<>();
                Map<String, Object> disMap = new HashMap<>();
                for (HistoryHourly historyHourly:historyHourlies) {
                    Date time = historyHourly.getTime();
                    String timeStr = DateUtils.dateToDateString(time,DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
                    if (!disMap.containsKey(timeStr)){
                        distinctHistoryHourlies.add(historyHourly);
                        disMap.put(timeStr,true);
                    }
                }
                for (HistoryHourly historyHourly:distinctHistoryHourlies) {
                    Map<String,Object> historyHourlyMap = new HashMap<>();
                    historyHourlyMap.put("mac",mac);
                    JSONObject value = JSONObject.parseObject(historyHourly.getValue());
@@ -323,6 +333,11 @@
                        List<Map<String,Object>> deviceData = new ArrayList<>();
                        deviceData = (List<Map<String,Object>>)resultMap.get("deviceData");
                        deviceData.add(deviceMap);
                        Collections.sort(deviceData, (map1,map2) -> {
                            String name1 = map1.get("name").toString();//name1是从你list里面拿出来的一个
                            String name2 = map2.get("name").toString(); //name1是从你list里面拿出来的第二个name
                            return name1.compareTo(name2);
                        });
                        resultMap.put("deviceData",deviceData);
                        //result.add(resultMap);
                        flag = false;
@@ -332,6 +347,11 @@
                if (flag){
                    List<Map<String,Object>> deviceData = new ArrayList<>();
                    deviceData.add(deviceMap);
                    Collections.sort(deviceData, (map1,map2) -> {
                        String name1 = map1.get("name").toString();//name1是从你list里面拿出来的一个
                        String name2 = map2.get("name").toString(); //name1是从你list里面拿出来的第二个name
                        return name1.compareTo(name2);
                    });
                    Map<String,Object> resultMap = new HashMap<>();
                    resultMap.put("deviceData",deviceData);
                    resultMap.put("time",time);
@@ -340,6 +360,11 @@
            }else {
                List<Map<String,Object>> deviceData = new ArrayList<>();
                deviceData.add(deviceMap);
                Collections.sort(deviceData, (map1,map2) -> {
                    String name1 = map1.get("name").toString();//name1是从你list里面拿出来的一个
                    String name2 = map2.get("name").toString(); //name1是从你list里面拿出来的第二个name
                    return name1.compareTo(name2);
                });
                Map<String,Object> resultMap = new HashMap<>();
                resultMap.put("deviceData",deviceData);
                resultMap.put("time",time);