优化

liuhaonan

2022-07-21 38b60d99fc04db878c43cb9f6d03476a30979be6

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

@@ -11,7 +11,7 @@
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;
@@ -36,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
@@ -128,23 +128,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;
@@ -164,19 +164,19 @@
        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;
                }
            }
@@ -245,7 +245,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()) {