mdc设备运行参数超限算法更新

Lius

2024-03-01 faa87b7860247e7d748896367b487f7fb7952b94

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcOverrunAlarmController.java

@@ -11,6 +11,7 @@
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.entity.MdcOverrunAlarm;
import org.jeecg.modules.mdc.service.IMdcOverrunAlarmService;
import org.springframework.web.bind.annotation.*;
@@ -39,7 +40,7 @@
    /**
     * 分页列表查询
     *
     * @param mdcOverrunAlarm
     * @param mdcEquipment
     * @param pageNo
     * @param pageSize
     * @param req
@@ -48,13 +49,13 @@
    @AutoLog(value = "mdc超限报警-分页列表查询")
    @ApiOperation(value = "mdc超限报警-分页列表查询", notes = "mdc超限报警-分页列表查询")
    @GetMapping(value = "/list")
    public Result<?> queryPageList(MdcOverrunAlarm mdcOverrunAlarm,
    public Result<?> queryPageList(MdcEquipment mdcEquipment,
                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                   HttpServletRequest req) {
        QueryWrapper<MdcOverrunAlarm> queryWrapper = QueryGenerator.initQueryWrapper(mdcOverrunAlarm, req.getParameterMap());
        //QueryWrapper<MdcOverrunAlarm> queryWrapper = QueryGenerator.initQueryWrapper(mdcOverrunAlarm, req.getParameterMap());
        Page<MdcOverrunAlarm> page = new Page<MdcOverrunAlarm>(pageNo, pageSize);
        IPage<MdcOverrunAlarm> pageList = mdcOverrunAlarmService.page(page, queryWrapper);
        IPage<MdcOverrunAlarm> pageList = mdcOverrunAlarmService.pageList(page, mdcEquipment, req);
        return Result.OK(pageList);
    }