From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java
index 21f0850..ea8fad4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java
@@ -10,6 +10,7 @@
import cn.gistack.nky.service.INkyService;
import cn.gistack.nky.service.IZtApiService;
import cn.gistack.nky.vo.AlarmGetVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -29,7 +30,7 @@
List<DataResPo> cdList = getResCdList(type);
cdList.forEach(dataResPo -> {
- if (dataResPo.getChildren() != null){
+ if (dataResPo.getChildren() != null && dataResPo.getChildren().size()>0){
BatchDataPo batchDataPo = new BatchDataPo(dataResPo, type);
nkyService.batchData(batchDataPo);
}
@@ -55,6 +56,16 @@
return baseMapper.getAlarmDetail(alarmGet);
}
+ @Override
+ public IPage<AlarmGetVO> getAlarmDetailPage(IPage<AlarmGetVO> page, AlarmGetVO alarmGet) {
+ return page.setRecords(baseMapper.getAlarmDetailPage(page,alarmGet));
+ }
+
+ @Override
+ public AlarmGetVO getAlarmVO(AlarmGetVO alarmGet) {
+ return baseMapper.getAlarmVo(alarmGet);
+ }
+
/**
* 获取水库集
*
@@ -68,7 +79,7 @@
cdList = ztApiService.getResSy();
} else if (type.equals("2")) {
//获取渗流测点
- return null;
+ cdList=ztApiService.getResSl();
} else if (type.equals("3") || type.equals("4") || type.equals("5")) {
//获取位移测点
cdList = ztApiService.getResWy();
--
Gitblit v1.9.3