fix

zhanzhiqin

2022-09-28 a0d2c6cd651c547fd07fb3639a23ca700d3b2091

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

@@ -12,10 +12,13 @@
import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.redis.DeviceRedisKey;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.admin.vo.RedisDeviceStatus;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.PoleBinding;
@@ -56,10 +59,12 @@

    private final PoleBindingService poleBindingService;

    private final RedisUtils redisUtils;

    /**
     * 模糊查询
     * 摄像头列表模糊查询
     */
    public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO,Integer order,Integer seq, MonitorParam monitorParam) {
    public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO, Integer order, Integer seq, MonitorParam monitorParam) {
        //绑定状态：已绑定/未绑定/全部
        if (monitorParam.getBindingState() == null) {
            //全部
@@ -68,7 +73,7 @@
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq =OrderByEnums.ASC.getCode();
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
@@ -97,9 +102,9 @@

        List<MonitorBo> list;
        if (SecurityUtils.getClientId() == null) {
            list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
            list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState(), orderBy);
        } else {
            list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
            list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState(), orderBy);
        }

        //没有数据时候直接返回空数组
@@ -143,39 +148,26 @@
        return commonPage;
    }

    public Monitor getYSYMonitorInfoAndaddMonitorToTable(String deviceSerial) {
        YSY_MonitorDto getMonitorDto = getYSYMonitorInfo(getAccessToken(), deviceSerial);
    /**
     * 摄像头列表地（用于首页数据统计）
     *
     * @return
     */
    public List<MonitorBo> listMonitorOnHome() {

        if ("200".equals(getMonitorDto.getCode())) {
            Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
            if (monitor != null) {
                monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());

                monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
                monitor.setDeviceType(getMonitorDto.getData().getModel());
                monitor.setEquipmentState(getMonitorDto.getData().getStatus());
                monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
                monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
                monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
                //更新摄像头状态
                updateById(monitor);
            } else {
                monitor = new Monitor();
                monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
                monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
                monitor.setDeviceType(getMonitorDto.getData().getModel());
                monitor.setEquipmentState(getMonitorDto.getData().getStatus());
                monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
                monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
                monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
                //更新摄像头状态
                save(monitor);
            }

            return monitor;
        List<MonitorBo> list;
        if (SecurityUtils.getClientId() == null) {
            list = monitorMapper.listMonitorDeviceSerial1(null, null, 2, null);
        } else {
            return null;
            list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2, null);
        }

        //没有数据时候直接返回空数组
        if (list == null) {
            return new ArrayList<>();
        }

        return list;
    }

    /**
@@ -387,29 +379,6 @@
    }

    /**
     * 将摄像头设备相关信息更新到数据库
     *
     * @param monitor 摄像头对象
     * @return
     */
    public boolean upDateMonitorInfo(Monitor monitor) {
        if (monitor.getId() == null) {
            throw new BusinessException("缺少摄像头相关ID参数");
        }

        Monitor info = getById(monitor.getId());

        if (info == null) {
            throw new BusinessException("找不到相关摄像头");
        }
        if (!monitor.getDevicesCode().equals(info.getDevicesCode()) || !monitor.getDeviceSerial().equals(info.getDeviceSerial())) {
            throw new BusinessException("监控序列号或监控验证码不正确");
        }

        return updateById(monitor);
    }

    /**
     * 返回摄像头实时画面播放地址
     *
     * @param accessToken
@@ -496,4 +465,33 @@
    }


    /**
     * 向Redis中存入设备状态
     */
    public void setCacheData() {
        list().forEach(
                device -> {
                    RedisDeviceStatus deviceStatus = new RedisDeviceStatus();
                    deviceStatus.setDeviceId(device.getDeviceSerial());
                    if (device != null) {
                        EquipmentInfomation monitorInfo = getMonitorInfo(device.getDeviceSerial());
                        if (monitorInfo != null) {
                            if ("在线".equals(monitorInfo.getEquipmentState())) {
                                deviceStatus.setStatus(0);
                            } else {
                                deviceStatus.setStatus(1);
                            }

                        } else {
                            deviceStatus.setStatus(1);
                        }
                    }
                    redisUtils.set(DeviceRedisKey.MONITOR + device.getDeviceSerial(), JSON.toJSONString(deviceStatus));
//                    redisUtils.delete(DeviceRedisKey.MONITOR + device.getDeviceSerial());
                }
        );

    }


}