From 2f8eaa7c850445fde0cdca0e8ecddcb7e2a936a3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 05 Mar 2024 16:01:35 +0800
Subject: [PATCH] 洪水预报接口对接

---
 skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/feign/NkyClientImpl.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 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 15fa586..92bec2c 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
@@ -9,6 +9,7 @@
 import cn.gistack.nky.vo.AlarmGetVO;
 import cn.gistack.nky.vo.PageVO;
 import cn.gistack.sm.patrol.feign.PatrolTaskClient;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -83,10 +84,14 @@
 
 	@Override
 	@PostMapping(GET_ALARM_DETAIL_PAGE)
-	public PageVO<AlarmGetVO> getAlarmDetailPage(Integer current, Integer size, AlarmGetVO alarmGet) {
+	public PageVO<AlarmGetVO> getAlarmDetailPage(Integer current, Integer size, AlarmGetVO alarmGet,
+												 String ascs,
+												 String descs) {
 		Query query = new Query();
 		query.setCurrent(current);
 		query.setSize(size);
+		query.setAscs(ascs);
+		query.setDescs(descs);
 		IPage<AlarmGetVO> alarmDetailPage = alarmGetService.getAlarmDetailPage(Condition.getPage(query), alarmGet);
 
 		PageVO<AlarmGetVO> pageVO = new PageVO();
@@ -132,4 +137,25 @@
 		alarmGet.setTaskId(taskId);
 		return alarmGetService.updateById(alarmGet);
 	}
+
+	@Override
+	@PostMapping(UPDATE_ALARM_GET_STATUS)
+	public Boolean updateStatus(AlarmGet alarmGet) {
+		return alarmGetService.updateById(alarmGet);
+	}
+
+	@Override
+	@GetMapping(FINISH_TASK)
+	public Boolean finishTask(String taskId) {
+
+		AlarmGet alarmGet = alarmGetService.getOne(new QueryWrapper<AlarmGet>().eq("TASK_ID", taskId));
+
+		if (alarmGet != null){
+			//设置预警为已处理
+			alarmGet.setStatus("1");
+			Boolean aBoolean = updateStatus(alarmGet);
+			return  aBoolean;
+		}
+		return false;
+	}
 }

--
Gitblit v1.9.3