changes

liuhaonan

2022-11-04 e55c8b0a92eb9715edd90c31dfd4de51a47b588b

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

@@ -14,6 +14,8 @@
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * 摄像头
 */
@@ -32,7 +34,10 @@
     * @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("缺少对应用户权限");
        }
@@ -40,9 +45,9 @@
        //返回查询的摄像头信息列表
        CommonPage commonPage;
        if (monitorParam == null) {
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO, order, seq, new MonitorParam());
        } else {
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
            commonPage = monitorService.listMonitorByKeyword(baseConditionVO, order, seq, monitorParam);
        }

        return ResponseUtil.success(commonPage);
@@ -52,15 +57,15 @@
    /**
     * 删除数据库中萤石云摄像头
     *
     * @param id
     * @param
     * @return
     */
    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteMonitor(@PathVariable Long 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(id);
        boolean result = monitorService.deleteMonitor(ids);
        if (result) {
            return ResponseUtil.success(null);
        } else {
@@ -153,9 +158,9 @@
     */
    @PostMapping("/updateNotes")
    public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
//        if (!permissionConfig.check(MenuEnum.MONITOR_NOTES.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
        if (!permissionConfig.check(MenuEnum.MONITOR_NOTES.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
        if (flag) {
            return ResponseUtil.success("修改备注成功！");