fix

zhanzhiqin

2022-04-28 620a3be8596434a8796469a8213a0066c836a1d4

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

@@ -11,7 +11,6 @@
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.enums.MenuEnum;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -26,7 +25,6 @@
public class MonitorController {
    private final MonitorService monitorService;

    private final MonitorMapper monitorMapper;
    private PermissionConfig permissionConfig;


@@ -80,17 +78,6 @@
    }

    /**
     * 获取萤石云摄像头信息
     *
     * @param
     * @return
     */
    @GetMapping("/getYSYInfo/{deviceSerial}")
    public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
        return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
    }

    /**
     * 添加萤石云摄像头
     *
     * @param monitorParam 添加摄像头结果
@@ -101,41 +88,13 @@
        if (monitorParam == null || monitorParam.getDeviceSerial() == null) {
            throw new BusinessException("参数不正确！");
        }
        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorService.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
//        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
        boolean flag = monitorService.addYSYMonitor(monitorParam.getDeviceSerial(), monitorParam.getValidateCode());

        if ("200".equals(addMonitorDto.getCode())) {
            getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
            return ResponseUtil.success(addMonitorDto);
        } else if ("20017".equals(addMonitorDto.getCode())) {
            //已经被自己添加的摄像头需要添加到数据库
            boolean falg = getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
            if (falg) {
        if (flag) {
                return ResponseUtil.success("添加摄像头成功！");

            } else {
                return ResponseUtil.fail("添加摄像头失败！");
            }

        } else {
            return ResponseUtil.fail(addMonitorDto.getMsg());
        }
    }

    /**
     * 删除萤石云摄像头
     *
     * @param monitorParam 添加摄像头结果
     * @return
     */
    @PostMapping("/deleteYSYMonitor")
    public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorService.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(addMonitorDto.getCode())) {
            return ResponseUtil.success(addMonitorDto);
        } else {
            return ResponseUtil.fail(addMonitorDto.getMsg());
        }
    }

@@ -161,40 +120,6 @@
            return ResponseUtil.success(getMonitorDto.getData());
        } else {
            return ResponseUtil.fail(getMonitorDto.getMsg());
        }
    }


    /**
     * 获取单个设备信息并且存储到数据库
     *
     * @param monitorParam
     * @return
     */
    @PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
    public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
        Monitor monitor = monitorService.getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
        return monitorService.addMonitorInfoToTable(monitor);
    }

    /**
     * 编辑摄像头设备信息
     */
    @PostMapping("/UpDateMonitorInfo")
    public ResponseVO<Object> UpDateMonitorInfo(@RequestBody MonitorParam monitorParam) {
        Monitor monitor = new Monitor();
        monitor.setId(monitorParam.getId());
        monitor.setDeviceSerial(monitorParam.getDeviceSerial());
        monitor.setDevicesCode(monitorParam.getDevicesCode());
        monitor.setWorkState(monitorParam.getWorkState());
        monitor.setNote(monitorParam.getNote());

        boolean falg = monitorService.upDateMonitorInfo(monitorParam);

        if (falg) {
            return ResponseUtil.success("更新数据成功");
        } else {
            return ResponseUtil.fail("更新数据失败");
        }
    }