jinpengyong
2023-01-05 66309ec82964316c3ae032fdcf2742d59179922c
screen-api/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -481,6 +481,9 @@
            boundary_point_one.add(Double.parseDouble(boundary_point_one_array[1]));
            boundary_pointList.add(boundary_point_one);
        }
        if (boundary_pointList.size()>0){
            boundary_pointList.add(boundary_pointList.get(0));
        }
        bound.add(boundary_pointList);
        resultMap.put("bound", bound);
        List centerPoint = new ArrayList();
@@ -652,6 +655,9 @@
            boundary_point_one.add(Double.parseDouble(boundary_point_one_array[1]));
            boundary_pointList.add(boundary_point_one);
        }
        if (boundary_pointList.size()>0){
            boundary_pointList.add(boundary_pointList.get(0));
        }
        bound.add(boundary_pointList);
        List centerPoint = new ArrayList();
        centerPoint.add(servicesScope.getCenterLongitude());
@@ -773,6 +779,17 @@
    }
    @Override
    public List<HistoryHourly> getHourlyDataByMacs(List<String> macs, String time) {
        QueryWrapper<HistoryHourly> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("mac","time", "value")
                .likeRight("time", time)
                .in("mac", macs);
        Date date = DateUtils.getDate(time, DateUtils.yyyy_MM_dd_EN);
        List<String> tableNames = MybatisPLUSUtils.getTableNamesByWrapper(date, date, SeparateTableType.MONTH);
        return multiTableQuery(queryWrapper, tableNames);
    }
    @Override
    public Double calculatedValue(List<HistoryHourly> list, String sensorCode, String type, Double lower, Double upper) {
        Supplier<Stream<HistoryHourly>> supplier = list::stream;
        DoubleStream doubleStream = supplier.get()