2021与蓝度共同重构项目,服务端
liuhaonan
2022-05-16 8b4c0b2fbbad5dfedeaf1c295088d6df243d2cd0
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -9,14 +9,15 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
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.security.SecurityUtils;
import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
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;
@@ -162,6 +163,16 @@
            //删除摄像头设备前需要先解绑
            poleBindingService.unBindPole(null, monitor.getDeviceSerial());
        }
        /**
         * 删除摄像头日志记录开始
         */
        String content = "{摄像头Code:" + monitor.getDeviceSerial() + ", 摄像头名称:" + monitor.getDeviceName() + " }";
        List<String> listCode = new ArrayList<>();
        listCode.add(monitor.getDeviceSerial());
        StoreOperationRecordsUtils.storeOperationData(listCode, null, "删除摄像头", content);
        /**
         * 删除摄像头日志记录结束
         */
        return removeById(Id);
    }
@@ -266,6 +277,7 @@
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
        YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
        boolean result;
        if ("200".equals(monitorDto.getCode()) || "20017".equals(monitorDto.getCode())) {
            Monitor monitor = new Monitor();
            monitor.setDeviceSerial(monitorDto.getData().getDeviceSerial());
@@ -275,10 +287,23 @@
            monitor.setIsEncrypt(monitorDto.getData().getIsEncrypt());
            monitor.setDeviceType(monitorDto.getData().getModel());
            monitor.setNetAddress(monitorDto.getData().getNetAddress());
            return addMonitorInfoToTable(monitor);
            result = addMonitorInfoToTable(monitor);
            /**
             * 新增摄像头开始
             */
            String content = "{摄像头Code:" + monitor.getDeviceSerial() + ", 摄像头名称:" + monitor.getDeviceName() + " }";
            List<String> listCode = new ArrayList<>();
            listCode.add(monitor.getDeviceSerial());
            StoreOperationRecordsUtils.storeOperationData(listCode, null, "新增摄像头", content);
            /**
             * 新增摄像头结束
             */
        } else {
            return false;
            result = false;
        }
        return result;
    }
    /**
@@ -406,6 +431,17 @@
        }
        if (one != null) {
            one.setNote(notes);
            /**
             * 添加摄像头备注日志记录开始
             */
            String content = "编辑摄像头:" +deviceSerial+"编辑内容:"+notes;
            List<String> list  = new ArrayList<>();
            list.add(deviceSerial);
            StoreOperationRecordsUtils.storeOperationData(list, null, "编辑摄像头", content);
            /**
             * 添加摄像头备注日志记录结束
             */
            return updateById(one);
        } else {
            throw new BusinessException("摄像头设备不存在!");