fix

zhanzhiqin

2022-04-13 0143b00ead241cc2b894745eff9d8ed5493b0b68

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

@@ -5,6 +5,7 @@
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.SerializationUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
@@ -54,7 +55,6 @@
     * 模糊查询
     */
    public List<MonitorBo> listMonitorByKeyword(BaseConditionVO baseConditionVO, MonitorParam monitorParam) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<MonitorBo> monitorList;
        //绑定状态：已绑定/未绑定/全部
@@ -67,7 +67,15 @@
            monitorParam.setEquipmentState(2);
        }

        monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());

        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword()
                    , monitorParam.getBindingState(), monitorParam.getEquipmentState(), null);
        } else {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword()
                    , monitorParam.getBindingState(), monitorParam.getEquipmentState(), SecurityUtils.getUserId());
        }

        return monitorList;
    }
@@ -85,7 +93,7 @@
        }

        //删除摄像头设备前需要先解绑
        poleBindingService.unBindPole(monitor.getDeviceSerial());
        poleBindingService.unBindPole(null, monitor.getDeviceSerial());
        return removeById(Id);
    }

@@ -107,15 +115,17 @@
     *
     * @param accessToken  授权过程获取的access_token
     * @param deviceSerial 设备序列号,存在英文字母的设备序列号，字母需为大写
//     * @param validateCode 设备验证码，设备机身上的六位大写字母
     *                     //     * @param validateCode 设备验证码，设备机身上的六位大写字母
     */
//    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
//    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {

        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", accessToken);
        paramMap.put("deviceSerial", deviceSerial);
//        paramMap.put("validateCode", validateCode);
        if (validateCode != null) {
            paramMap.put("validateCode", validateCode);
        }
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
        System.out.println(s);
        YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
@@ -222,5 +232,28 @@
        }
    }

    /**
     * 修改设备绑定状态
     *
     * @param flag true为绑定  false 为解绑
     */
    public void updateBingdingState(boolean flag, String deviceCode) {
        if (flag) {//绑定
            Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceCode));
            if (monitor == null) {
                return;
            }
            monitor.setBindingState(1);
            updateById(monitor);
        } else {//解绑
            Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceCode));
            if (monitor == null) {
                return;
            }
            monitor.setBindingState(0);
            updateById(monitor);
        }
    }


}