jinpengyong
2021-08-03 477b3197e1ded6920461094a8f449d99e5c67f9d
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -50,14 +50,15 @@
    @Override
    public List<Device> getDevicesByMonitorPointId(Integer monitorPointId) {
        QueryWrapper<Device> wrapper = new QueryWrapper();
        wrapper.eq("monitor_point_id",monitorPointId);
        wrapper.eq("monitor_point_id", monitorPointId);
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        return deviceMapper.selectList(wrapper);
    }
    @Override
    public Map<String, Object> getSensorsByMac(Map<String, Object> params) {
        String[] macs = params.get("macs").toString().split(",");
        //设备mac
        List<String> macs = (List<String>) params.remove("macs");
        List<Map<String, Object>> elementLists = new ArrayList<>();
        for (String mac : macs) {
@@ -86,9 +87,9 @@
    public List<Map<String, Object>> getTrendChartData(Map<String, Object> params) {
        Object type = params.get("type");
        //设备mac
        String[] macs = params.remove("macs").toString().split(",");
        List<String> macs = (List<String>) params.remove("macs");
        //所选时间
        String[] times = params.remove("times").toString().split(",");
        List<String> times = (List<String>) params.remove("times");
        //因子code
        String sensorCode = params.get("sensorCode").toString();
        String end;