Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-11 e14c003f6ff4e78740359828c39674507f134c45

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

@@ -5,12 +5,15 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
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.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.IPBroadcastMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,7 +37,14 @@
     * 同步终端
     */
    public void synchTerminal() {
        List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll("");
        List<BroadcastTerminalV2Entity> server;
        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            server = broadcastTerminalV2EntityMapper.listAll(null);
        } else {
            server = broadcastTerminalV2EntityMapper.listAll(SecurityUtils.getUserId());
        }

        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
        System.out.println(list);
        list.stream().forEach(item -> {
@@ -56,7 +66,6 @@
                b.setStreetlightId(0L);
                b.setExist(1);
                save(b);
//                broadcastTerminalV2EntityMapper.insert(b);
            }
        });
    }
@@ -67,7 +76,7 @@
        }

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

@@ -84,11 +93,9 @@
            }
        } else {
            if (SecurityUtils.getClientId() == null) {
                broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
                        , null, broadcastTerminalV2Param.getBindingState());
                broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), null, broadcastTerminalV2Param.getBindingState());
            } else {
                broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword()
                        , SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
                broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(broadcastTerminalV2Param.getKeyword(), SecurityUtils.getUserId(), broadcastTerminalV2Param.getBindingState());
            }
        }

@@ -187,8 +194,42 @@
    /**
     * 终端详情
     */
    public TerminalVO getIpTerminalDetail(Integer id) {
        return TerminalAPIUtils.getTerminalInfo(id);
    public EquipmentInfomation getIpTerminalDetail(String id) {
        EquipmentInfomation equipmentInfo = new EquipmentInfomation();
        equipmentInfo.setEquipmentType("IP音柱");
        if (id == null || id.trim().length() == 0) {
            return equipmentInfo;
        }
        BroadcastTerminalV2Entity one = getOne(Wrappers.lambdaQuery(BroadcastTerminalV2Entity.class).eq(BroadcastTerminalV2Entity::getId, id));
        if (one != null) {
            equipmentInfo.setEquipmentMac(id);
            equipmentInfo.setEquipmentName(one.getTerminalName());
        }
        TerminalVO terminalInfo = TerminalAPIUtils.getTerminalInfo(Integer.valueOf(id));
        if (terminalInfo != null) {
            //空闲 1、   工作中 2 或者 4、     断线 0，    报 错 8
            switch (terminalInfo.getStatus()) {
                case 1:
                    equipmentInfo.setEquipmentState("空闲");
                    break;
                case 2:
                case 4:
                    equipmentInfo.setEquipmentState("工作中");
                    break;
                case 0:
                    equipmentInfo.setEquipmentState("断线");
                    break;
                case 8:
                    equipmentInfo.setEquipmentState("报错");
                    break;
                default:
                    equipmentInfo.setEquipmentState("未知");

            }
        } else {
            equipmentInfo.setEquipmentState("未知");
        }
        return equipmentInfo;
    }


@@ -204,6 +245,10 @@
        if (byId == null) {
            throw new BusinessException("终端不存在");
        }
        boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(String.valueOf(byId.getId()), PoleBindingEnums.IPVOLUME);
        if (!belong) {
            throw new RuntimeException("该设备不属于您,不能修改设备信息");
        }
        byId.setTerminalName(name);
        return updateById(byId);
    }