From 474ba1ebf60b9ffc28274437e75cab8a6c4663e9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 04 Nov 2023 17:22:38 +0800
Subject: [PATCH] 位移测点名称修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
index f8205b9..7cecbdb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
@@ -110,8 +110,16 @@
@Override
public IPage<AlarmGetVO> pageMonitor(AlarmGetVO alarmGet, IPage<AlarmGetVO> page) {
- List<AlarmGetVO> list = damSecurityMapper.pageMonitor(page,alarmGet);
- return page.setRecords(list);
+
+ //位移
+ if (alarmGet.getType().equals("3")){
+ List<AlarmGetVO> list = damSecurityMapper.pageMonitorWy(page,alarmGet);
+ return page.setRecords(list);
+ }else{
+ List<AlarmGetVO> list = damSecurityMapper.pageMonitor(page,alarmGet);
+ return page.setRecords(list);
+ }
+
}
--
Gitblit v1.9.3