Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-28 bfce748e37a753c729e15dd233600379f504d019

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
@@ -64,10 +65,9 @@
        if (broadcastTerminalV2Param == null) {
            broadcastTerminalV2Param = new BroadcastTerminalV2Param();
        }
        Long clientId = SecurityUtils.getClientId();

        //在线状态全部的话需要分页
        if (2 == broadcastTerminalV2Param.getWorkState()) {
        if (baseConditionVO != null && 2 == broadcastTerminalV2Param.getWorkState()) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        }

@@ -77,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();
@@ -182,5 +192,19 @@
    }



    /**
     * 根据终端id获取终端信息
     *
     * @param name
     * @param id
     * @return
     */
    public boolean updateBroadcastTerminalName(String name, Integer id) {
        BroadcastTerminalV2Entity byId = getById(id);
        if (byId == null) {
            throw new BusinessException("终端不存在");
        }
        byId.setTerminalName(name);
        return updateById(byId);
    }
}