2021与蓝度共同重构项目,服务端
zhanzhiqin
2022-04-18 98a9bf651c3e1e9a44a14bc6ad5143618bd9a0fb
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java
@@ -65,7 +65,6 @@
        if (broadcastTerminalV2Param == null) {
            broadcastTerminalV2Param = new BroadcastTerminalV2Param();
        }
        Long clientId = SecurityUtils.getClientId();
        //在线状态全部的话需要分页
        if (2 == broadcastTerminalV2Param.getWorkState()) {
@@ -78,9 +77,19 @@
        if (broadcastTerminalV2Param.getBindingState() == null || 2 == broadcastTerminalV2Param.getBindingState()) {
            //全部
            int bindingState = 2;
            broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, bindingState);
            if (SecurityUtils.getClientId() == null) {
                broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, bindingState);
            } else {
                broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), bindingState);
            }
        } else {
            broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), clientId, broadcastTerminalV2Param.getBindingState());
            if (SecurityUtils.getClientId() == null) {
                broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
                        , null, broadcastTerminalV2Param.getBindingState());
            } else {
                broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
                        , SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
            }
        }
        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
@@ -185,6 +194,7 @@
    /**
     * 根据终端id获取终端信息
     *
     * @param name
     * @param id
     * @return