changes

liuhaonan

2022-11-04 2611d27616bdbea6331f75a0147bd67c95f2eb0e

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

@@ -32,7 +32,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 +43,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);