设备归属

liuhaonan

2022-05-11 7545924f23beb4db5f68a76f5f432d3bf2de523c

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

@@ -8,14 +8,17 @@
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.MonitorParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -99,6 +102,11 @@
            }
        }

        if (baseConditionVO == null) {
            baseConditionVO = new BaseConditionVO();
            baseConditionVO.setPageSize(null);
            baseConditionVO.setPageNo(null);
        }
        CommonPage commonPage = ListPagingUtils.pages(temp, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        return commonPage;
    }
@@ -206,20 +214,40 @@
     *
     * @return
     */
    public YSY_MonitorDto.MonitorDto getMonitorInfo(String deviceSerial) {
    public EquipmentInfomation getMonitorInfo(String deviceSerial) {
        EquipmentInfomation equipmentInfo = new EquipmentInfomation();
        equipmentInfo.setEquipmentType("摄像头");
        if (deviceSerial == null || deviceSerial.trim().length() == 0) {
            return equipmentInfo;
        }

        Monitor one = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
        if (one != null) {
            equipmentInfo.setEquipmentCreateTime(one.getAddTime());
            equipmentInfo.setEquipmentMac(one.getDeviceSerial());
            equipmentInfo.setEquipmentName(one.getDeviceName());
        }

        String token = getAccessToken();
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", token);
        paramMap.put("deviceSerial", deviceSerial);
        String s = HttpUtil.post(YSY_URL + GET_DEVICE_URL, paramMap);
        YSY_MonitorDto monitorDto = null;

        try {
            monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
            return monitorDto.getData();
            YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
            if (monitorDto != null) {
                //在线状态：0-不在线，1-在线
                if (monitorDto.getData().getStatus() == 1) {
                    equipmentInfo.setEquipmentState("在线");
                } else {
                    equipmentInfo.setEquipmentState("离线");
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return null;
        return equipmentInfo;
    }

    /**
@@ -371,6 +399,11 @@
            throw new BusinessException("修改备注参数有误！");
        }
        Monitor one = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));

        boolean belong = SpringContextHolder.getBean(PoleBindingService.class).isBelong(one.getDeviceSerial(), PoleBindingEnums.MONITOR);
        if (!belong) {
            throw new BusinessException("该设备不属于您,不能修改设备信息");
        }
        if (one != null) {
            one.setNote(notes);
            return updateById(one);