fix

zhanzhiqin

2022-01-12 027d6d6bf597fa2d07c5a2310c951ba5c12e3d82

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java

@@ -1,11 +1,14 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.domain.YSY_MonitorDto;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -20,20 +23,19 @@
public class MonitorController {
    private final MonitorService monitorService;

    @GetMapping
    public ResponseVO<Object> listMonitor() {
        List<Monitor> list = monitorService.listMonitor();
        return ResponseUtil.successPage(list);
    }

    /**
     * 模糊查询
     *
     * @return
     */
    @GetMapping("/listMonitorByKeyword")
    public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
        List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
    @PostMapping("/listMonitor")
    public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
        List<MonitorBo> list;
        if (monitorParam == null) {
            list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
        } else {
            list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
        }
        return ResponseUtil.successPage(list);
    }

@@ -70,7 +72,7 @@
     * @param monitorParam 添加摄像头结果
     * @return
     */
    @GetMapping("/addYSYMonitor")
    @PostMapping("/addYSYMonitor")
    public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());

@@ -78,8 +80,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());
        }
@@ -91,7 +99,7 @@
     * @param monitorParam 添加摄像头结果
     * @return
     */
    @GetMapping("/deleteYSYMonitor")
    @PostMapping("/deleteYSYMonitor")
    public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

@@ -105,7 +113,7 @@
    /**
     * 获取单个设备信息   getYSYMonitorInfo
     */
    @GetMapping("/getYSYMonitorInfo")
    @PostMapping("/getYSYMonitorInfo")
    public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

@@ -123,8 +131,8 @@
     * @param monitorParam
     * @return
     */
    @GetMapping("/getYSYMonitorInfoAndaddMonitorToTable")
    public ResponseVO<Object> getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
    @PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
    public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(getMonitorDto.getCode())) {
@@ -137,20 +145,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());
        }
    }


    /**
     * 编辑摄像头设备信息
@@ -174,11 +174,12 @@
    }

    /**
     * 编辑摄像头设备信息
     * 获取摄像头URL播放地址
     */
    @GetMapping("/getMonitorVideoUrl")
    @PostMapping("/getMonitorVideoUrl")
    public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
        String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getProtocol());
        String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
                monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());

        return ResponseUtil.success(URL);
    }