From f0c26b9f4a033e03dfe4710776c102440e44f9e8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 09 Aug 2023 17:13:34 +0800
Subject: [PATCH] 1、修改hst预测请求;2、大坝预测数据接口

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/feign/NkyClientImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/feign/NkyClientImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/feign/NkyClientImpl.java
index 8582a3a..06c71cc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/feign/NkyClientImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/feign/NkyClientImpl.java
@@ -7,8 +7,12 @@
 import cn.gistack.nky.service.IHstPredictService;
 import cn.gistack.nky.service.INkyService;
 import cn.gistack.nky.vo.AlarmGetVO;
+import cn.gistack.nky.vo.PageVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -71,4 +75,22 @@
 	public List<AlarmGetVO> getAlarmDetail(AlarmGetVO alarmGet) {
 		return alarmGetService.getAlarmDetail(alarmGet);
 	}
+
+	@Override
+	@PostMapping(GET_ALARM_DETAIL_PAGE)
+	public PageVO<AlarmGetVO> getAlarmDetailPage(Integer current, Integer size, AlarmGetVO alarmGet) {
+		Query query = new Query();
+		query.setCurrent(current);
+		query.setSize(size);
+		IPage<AlarmGetVO> alarmDetailPage = alarmGetService.getAlarmDetailPage(Condition.getPage(query), alarmGet);
+
+		PageVO<AlarmGetVO> pageVO = new PageVO();
+
+		pageVO.setData(alarmDetailPage.getRecords());
+		pageVO.setTotal(alarmDetailPage.getTotal());
+		pageVO.setCurrent(alarmDetailPage.getCurrent());
+		pageVO.setSize(alarmDetailPage.getSize());
+
+		return pageVO;
+	}
 }

--
Gitblit v1.9.3