jinpengyong
2023-08-24 a97c42ad398252b9b69cabc3494a45a79064eec8
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -71,6 +71,15 @@
    }
    @Override
    public List<Device> getDevicesByMonitorPointId(List<Integer> monitorPointId) {
        QueryWrapper<Device> wrapper = new QueryWrapper();
        wrapper.in("monitor_point_id", monitorPointId);
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        wrapper.orderByAsc("dev_num");
        return deviceMapper.selectList(wrapper);
    }
    @Override
    public Map<String, Object> getSensorsByMac(Map<String, Object> params) {
        List<String> sensorCodes = Arrays.asList(Constants.SENSOR_CODE_PM25
                , Constants.SENSOR_CODE_PM10
@@ -295,7 +304,7 @@
                }
                middleDate = DateUtils.addDays(middleDate,1);
            }
        } else if ("monthly".equals(type)){
        } else if ("month".equals(type)){
            end = DateUtils.getDateAddMonth(endTime, 1);
            timeUnits = "monthly";
            dateFormat = "%Y-%m";