2021与蓝度共同重构项目,服务端
zhanzhiqin
2021-12-22 bb2b1a43c6e07b5defb8e5254dfe48096302cd81
摄像头
已修改2个文件
26 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.service.MonitorService;
@@ -78,8 +79,14 @@
            return ResponseUtil.success(addMonitorDto);
        } else if ("20017".equals(addMonitorDto.getCode())) {
            //已经被自己添加的摄像头需要添加到数据库
            getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
            return ResponseUtil.error(20017, addMonitorDto.getMsg());
            boolean falg = getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
            if (falg) {
                return ResponseUtil.success("添加摄像头成功!");
            } else {
                return ResponseUtil.fail("添加摄像头失败!");
            }
        } else {
            return ResponseUtil.fail(addMonitorDto.getMsg());
        }
@@ -124,7 +131,7 @@
     * @return
     */
    @GetMapping("/getYSYMonitorInfoAndaddMonitorToTable")
    public ResponseVO<Object> getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
    public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
        if ("200".equals(getMonitorDto.getCode())) {
@@ -137,20 +144,12 @@
            monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
            monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
            monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
            boolean flag = monitorService.addMonitorInfoToTable(monitor);
            if (flag) {
                return ResponseUtil.success("储存摄像头设备信息成功!");
            } else {
                return ResponseUtil.fail("储存摄像头设备信息失败!");
            }
            return monitorService.addMonitorInfoToTable(monitor);
        } else {
            return ResponseUtil.fail(getMonitorDto.getMsg());
            throw new BusinessException(getMonitorDto.getMsg());
        }
    }
    /**
     * 编辑摄像头设备信息
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -175,6 +175,7 @@
        if (one == null) {
            return save(monitor);
        } else {
            monitor.setId(one.getId());
            return updateById(monitor);
        }
    }