根据组织，站点获取设备

jinpengyong

2021-05-27 6a54b2b44e4ae62b5f2a884c19e8d81bd5391a12

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

@@ -177,17 +177,13 @@
    }

    @Override
    public List<Map<String, Object>> selectDevicesByOrgId(Integer orgId) {
        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("organization_id", orgId);
        return deviceMapper.selectMaps(queryWrapper);
    public Map<String, Object> selectDevicesByOrgId(Map<String, Object> parameters) {
        return selectDevices(parameters);
    }

    @Override
    public List<Map<String, Object>> selectDevicesByMpId(Integer mpId) {
        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("is_delete", Constants.NOT_DELETE).eq("monitor_point_id", mpId);
        return deviceMapper.selectMaps(queryWrapper);
    public Map<String, Object> selectDevicesByMpId(Map<String, Object> parameters) {
        return selectDevices(parameters);
    }

    @Override
@@ -199,6 +195,19 @@
        Object orderType = parameters.get("orderType");
        Object name = parameters.get("name");
        Object mac = parameters.get("mac");
        Object orgId = parameters.get("organizationId");
        Object mpId = parameters.get("monitorPointId");

        //查询某组织下所有设备
        if (orgId != null) {
            queryWrapper.eq("organization_id", orgId);
        }

        //查询某站点下所有设备
        if (mpId != null) {
            queryWrapper.eq("monitor_point_id", mpId);
        }

        if (name != null) {
            queryWrapper.like("name", name);
        }
@@ -206,6 +215,7 @@
            queryWrapper.like("mac", mac);
        }


        //排序参数,默认create_time降序
        if (order != null && orderType != null) {
            if (Constants.ORDER_ASC.equals(orderType)) {