#app告警查询修改

hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/controller/HistoryController.java

@@ -5,7 +5,6 @@ import com.hnac.hzims.operational.history.service.AlarmService;
 import com.hnac.hzims.operational.history.service.PointService;
 import com.hnac.hzims.operational.history.vo.HistoricalCurveVo;
 import com.hnac.hzims.operational.history.vo.HistoryProjectAlarmVo;
-import com.hnac.hzinfo.sdk.v5.common.Query;
 import com.hnac.hzinfo.sdk.v5.device.vo.DeviceInstanceAttrVO;
 import com.hnac.hzinfo.sdk.v5.device.vo.DeviceInstanceVO;
 import com.hnac.hzinfo.sdk.v5.hzfac.vo.FacDeviceAttrVO;
@@ -16,6 +15,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
+import org.springblade.core.mp.support.Query;
 
 import java.util.List;
 import java.util.Map;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/AlarmService.java

@@ -1,7 +1,7 @@
 package com.hnac.hzims.operational.history.service;
 
 import com.hnac.hzims.operational.history.vo.HistoryProjectAlarmVo;
-import com.hnac.hzinfo.sdk.v5.common.Query;
+import org.springblade.core.mp.support.Query;
 
 import java.util.Map;
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/history/service/impl/AlarmServiceImpl.java

@@ -3,7 +3,7 @@ package com.hnac.hzims.operational.history.service.impl;
 import com.hnac.hzims.operational.history.service.AlarmService;
 import com.hnac.hzims.operational.history.vo.HistoryProjectAlarmVo;
 import com.hnac.hzinfo.sdk.core.response.Result;
-import com.hnac.hzinfo.sdk.v5.common.Query;
+import org.springblade.core.mp.support.Query;
 import com.hnac.hzinfo.sdk.v5.soe.SoeDataClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +39,8 @@ public class AlarmServiceImpl implements AlarmService {
                 alarm.getSoeType(),
                 alarm.getStartTime(),
                 alarm.getEndTime(),
-                query
+                query.getCurrent(),
+                query.getSize()
         );
         if(!result.isSuccess() || CollectionUtil.isEmpty(result.getData())){
             return new HashMap<>();