修改光伏告警接口

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -855,8 +855,8 @@ public class MonitorFanIdxController extends BaseController {
     public ResponseModel<ResultsData> getEventByEquipIndex(@RequestParam(value = "current") int current,
                                                            @RequestParam(value = "size") int size,
                                                            @RequestParam(value = "stationId") String stationId,
-                                                           @RequestParam(value = "equipIndex") String equipIndex,
-                                                           @RequestParam(value = "frontModule") String frontModule) {
+                                                           @RequestParam(value = "equipIndex",required = false) String equipIndex,
+                                                           @RequestParam(value = "frontModule",required = false) String frontModule) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getFanGatewayId();
         ResultsData resultsData = equipAlarmEventService.getEventByEquipIndex(gatewayId, current, size, equipIndex, frontModule);

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.biz.dto.ColModel;
@@ -29,12 +31,20 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
     public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex, String frontModule) {
         List<EquipAlarmEvent> equipAlarmEvents = new ArrayList<>();
         LambdaQueryWrapper<EquipAlarmEvent> queryWrapper = new LambdaQueryWrapper<>();
+        if(equipIndex!=null) 
+        {
             queryWrapper.eq(EquipAlarmEvent::getEquipIndex, equipIndex);
+        }
         queryWrapper.eq(EquipAlarmEvent::getGatewayId, gatewayId);
+        if(frontModule!=null) 
+        {
             queryWrapper.eq(EquipAlarmEvent::getFrontModule, frontModule);
+        }
         queryWrapper.orderByDesc(EquipAlarmEvent::getCreatedTime);
-        equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
-
+        IPage<EquipAlarmEvent> p = new Page<>(current, size);
+        IPage<EquipAlarmEvent>  page = equipAlarmEventMapper.selectPage(p, queryWrapper);
+     //   equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
+        equipAlarmEvents=page.getRecords();
         DataGridMock DataGridMock = new DataGridMock(current, equipAlarmEvents.size(), false, current, equipAlarmEvents.subList((current - 1) * size, current * size));
         ColModel colModelEventMovement = new ColModel("equipName", "equipName", "设备名", "设备名", "dataGrid", "equipName");
         ColModel colModelStationName = new ColModel("alarmDesc", "alarmDesc", "事件描述", "事件描述", "dataGrid", "alarmDesc");