Merge remote-tracking branch 'origin/master'

liuhaonan

2022-08-12 4e53338c0c6859a43693f3f690f0c05da888a02e

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

@@ -11,9 +11,10 @@
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.TerminalAPIUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.admin.vo.TerminalVO;
import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
@@ -35,7 +36,7 @@
    public void synchTerminal() {
        List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll();

        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
        List<TerminalDto> list = TerminalAPIUtils.getTerminalList();
        System.out.println(list);
        list.stream().forEach(item -> {
            //  音柱服务器终端ID
@@ -67,6 +68,15 @@
         */
    }

    /**
     * IP音柱列表
     *
     * @param baseConditionVO
     * @param order
     * @param seq
     * @param broadcastTerminalV2Param
     * @return
     */
    public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, Integer order, Integer seq, BroadcastTerminalV2Param broadcastTerminalV2Param) {
        if (broadcastTerminalV2Param == null) {
            broadcastTerminalV2Param = new BroadcastTerminalV2Param();
@@ -127,23 +137,23 @@
            }
        }

        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
        List<TerminalDto> list = TerminalAPIUtils.getTerminalList();
        for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
            for (TerminalVO terminalVO : list) {
                if (bean.getId().equals(terminalVO.getId())) {
                    bean.setStatus(terminalVO.getStatus());
                    bean.setIp(terminalVO.getIp());
                    bean.setVolumn(terminalVO.getVolumn());
                    bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
                    bean.setPower(terminalVO.getPower());
                    bean.setDefaultPower(terminalVO.getDefaultPower());
                    bean.setLast(terminalVO.getLast());
                    bean.setTaskType(terminalVO.getTaskType());
                    bean.setTaskID(terminalVO.getTaskID());
            for (TerminalDto terminalDto : list) {
                if (bean.getId().equals(terminalDto.getId())) {
                    bean.setStatus(terminalDto.getStatus());
                    bean.setIp(terminalDto.getIp());
                    bean.setVolumn(terminalDto.getVolumn());
                    bean.setDefaultVolumn(terminalDto.getDefaultVolumn());
                    bean.setPower(terminalDto.getPower());
                    bean.setDefaultPower(terminalDto.getDefaultPower());
                    bean.setLast(terminalDto.getLast());
                    bean.setTaskType(terminalDto.getTaskType());
                    bean.setTaskID(terminalDto.getTaskID());

                    if (0 == broadcastTerminalV2Param.getWorkState() && 0 == terminalVO.getStatus()) {
                    if (0 == broadcastTerminalV2Param.getWorkState() && 0 == terminalDto.getStatus()) {
                        broadcastTerminalV2EntityBos_final.add(bean);
                    } else if (1 == broadcastTerminalV2Param.getWorkState() && 1 == terminalVO.getStatus()) {
                    } else if (1 == broadcastTerminalV2Param.getWorkState() && 1 == terminalDto.getStatus()) {
                        broadcastTerminalV2EntityBos_final.add(bean);
                    }
                    break;
@@ -157,25 +167,42 @@
        }
    }

    /**
     * IP音柱列表（用于首页数据统计）
     *
     * @return
     */
    public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalListOnHome() {
        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos_final = new ArrayList<>();

        if (SecurityUtils.getClientId() == null) {
            broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(null, null, 2);
        } else {
            broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(null, SecurityUtils.getUserId(), 2);
        }

        return broadcastTerminalV2EntityBos;
    }

    public List<BroadcastTerminalV2EntityBo> newIpTerminalList(String keyword) {

        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.newListTerminalOnBind(SecurityUtils.getClientId(), keyword);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getListTerminalOnBind(SecurityUtils.getClientId(), keyword);


        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
        List<TerminalDto> list = TerminalAPIUtils.getTerminalList();
        for (BroadcastTerminalV2EntityBo bean : broadcastTerminalV2EntityBos) {
            for (TerminalVO terminalVO : list) {
                if (bean.getId().equals(terminalVO.getId())) {
                    bean.setStatus(terminalVO.getStatus());
                    bean.setIp(terminalVO.getIp());
                    bean.setVolumn(terminalVO.getVolumn());
                    bean.setDefaultVolumn(terminalVO.getDefaultVolumn());
                    bean.setPower(terminalVO.getPower());
                    bean.setDefaultPower(terminalVO.getDefaultPower());
                    bean.setLast(terminalVO.getLast());
                    bean.setTaskType(terminalVO.getTaskType());
                    bean.setTaskID(terminalVO.getTaskID());
            for (TerminalDto terminalDto : list) {
                if (bean.getId().equals(terminalDto.getId())) {
                    bean.setStatus(terminalDto.getStatus());
                    bean.setIp(terminalDto.getIp());
                    bean.setVolumn(terminalDto.getVolumn());
                    bean.setDefaultVolumn(terminalDto.getDefaultVolumn());
                    bean.setPower(terminalDto.getPower());
                    bean.setDefaultPower(terminalDto.getDefaultPower());
                    bean.setLast(terminalDto.getLast());
                    bean.setTaskType(terminalDto.getTaskType());
                    bean.setTaskID(terminalDto.getTaskID());
                    break;
                }
            }
@@ -244,7 +271,7 @@
            equipmentInfo.setEquipmentMac(id);
            equipmentInfo.setEquipmentName(one.getTerminalName());
        }
        TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
        TerminalDto terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
        if (terminalInfo != null) {
            //空闲 1、   工作中 2 或者 4、     断线 0，    报 错 8
            switch (terminalInfo.getStatus()) {
@@ -287,9 +314,11 @@
        if (byId == null) {
            throw new BusinessException("终端不存在");
        }
        boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
        if (!belong) {
            throw new BusinessException("该设备不属于您,不能修改设备信息");
        if (AdministratorEnums.NORMAL.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
            boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
            if (!belong) {
                throw new BusinessException("该设备不属于您,不能修改设备信息");
            }
        }
        byId.setTerminalName(name);
        boolean flag = updateById(byId);