changes

liuhaonan

2022-11-04 e55c8b0a92eb9715edd90c31dfd4de51a47b588b

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

@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
@@ -8,7 +9,6 @@
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.security.PermissionConfig;
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.enums.MenuEnum;
import lombok.AllArgsConstructor;
@@ -34,32 +34,38 @@
     * @return
     */
    @PostMapping("/listMonitor")
    public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
    public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO,
                                                   @RequestParam(value = "order", required = false) Integer order,
                                                   @RequestParam(value = "seq", required = false) Integer seq,
                                                   @RequestBody(required = false) MonitorParam monitorParam) {
        if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }

        //返回查询的摄像头信息列表
        List<MonitorBo> listresult;
        CommonPage commonPage;
        if (monitorParam == null) {
            listresult = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO, order, seq, new MonitorParam());
        } else {
            listresult = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO, order, seq, monitorParam);
        }

        return ResponseUtil.successPage(listresult);
        return ResponseUtil.success(commonPage);
    }


    /**
     * 删除数据库中萤石云摄像头
     *
     * @param id
     * @param
     * @return
     */
    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteMonitor(@PathVariable Long id) {
        boolean result = monitorService.deleteMonitor(id);
    @PostMapping("/delete")
    public ResponseVO<Object> deleteMonitor(@RequestBody List<Long> ids) {
        if (!permissionConfig.check(MenuEnum.MONITOR_DELETE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = monitorService.deleteMonitor(ids);
        if (result) {
            return ResponseUtil.success(null);
        } else {
@@ -85,6 +91,9 @@
     */
    @PostMapping("/addYSYMonitor")
    public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
        if (!permissionConfig.check(MenuEnum.MONITOR_ADD.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        if (monitorParam == null || monitorParam.getDeviceSerial() == null) {
            throw new BusinessException("参数不正确！");
        }
@@ -103,6 +112,9 @@
     */
    @PostMapping("/getYSYMonitorInfo")
    public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
        if (!permissionConfig.check(MenuEnum.MONITOR_INFO.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(getMonitorDto.getCode())) {
@@ -128,6 +140,9 @@
     */
    @PostMapping("/getMonitorVideoUrl")
    public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
        if (!permissionConfig.check(MenuEnum.MONITOR_VIDEO_URL.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String URL = monitorService.getMonitorVideoUrl(monitorService.getAccessToken(),
                monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());

@@ -143,6 +158,9 @@
     */
    @PostMapping("/updateNotes")
    public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
        if (!permissionConfig.check(MenuEnum.MONITOR_NOTES.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
        if (flag) {
            return ResponseUtil.success("修改备注成功！");