From dc1bbcce07e0b1d9211edcafd6b0b39c13be395b Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 三月 2022 10:47:06 +0800
Subject: [PATCH] 灯杆倾斜fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
index 080201f..dee7a4e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java
@@ -17,7 +17,6 @@
import com.sandu.ximon.dao.mapper.LightPoleHeelingMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -27,16 +26,6 @@
private LightPoleHeelingMapper lightPoleHeelingMapper;
/**
- * 鏌ヨ鍏ㄩ儴鐏潌鍊句晶鍛婅
- */
- public List<LightPoleHeeling> listLightPoleHeeling() {
- LambdaQueryWrapper<LightPoleHeeling> wrapper = Wrappers.lambdaQuery(LightPoleHeeling.class);
- List<LightPoleHeeling> list = list(wrapper);
-
- return list;
- }
-
- /**
* 妯＄硦鏌ヨ
*/
public List<LightPoleHeeling> listLightPoleHeelingByKeyword(BaseConditionVO baseConditionVO, LightPoleHeelingListParam lightPoleHeelingListParam) {
@@ -44,8 +33,15 @@
if (lightPoleHeelingListParam == null) {
lightPoleHeelingListParam = new LightPoleHeelingListParam();
}
+
+ //鍏抽敭瀛楀幓闄ょ┖鏍�
+ if (lightPoleHeelingListParam.getKeyword() != null) {
+ lightPoleHeelingListParam.setKeyword(lightPoleHeelingListParam.getKeyword().trim());
+ }
+
List<LightPoleHeeling> lightPoleHeelings
= lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword(), lightPoleHeelingListParam.getProcessingState());
+
return lightPoleHeelings;
}
@@ -195,12 +191,12 @@
lightPoleHeeling.setTheYAxis(heartBeatDataPackage.getTheYAxis());
lightPoleHeeling.setTheZAxis(heartBeatDataPackage.getTheZAxis());
if (Math.abs(heartBeatDataPackage.getTheXAxis()) >= 10 || Math.abs(heartBeatDataPackage.getTheYAxis()) >= 10) {
- lightPoleHeeling.setWarningLevel("涓�绾ц鍛�");
+ lightPoleHeeling.setWarningLevel(1);//涓�绾ц鍛�
} else if ((Math.abs(heartBeatDataPackage.getTheXAxis()) >= 5 && Math.abs(heartBeatDataPackage.getTheXAxis()) < 10)
|| (Math.abs(heartBeatDataPackage.getTheYAxis()) >= 5 && Math.abs(heartBeatDataPackage.getTheYAxis()) < 10)) {
- lightPoleHeeling.setWarningLevel("浜岀骇璀﹀憡");
+ lightPoleHeeling.setWarningLevel(2);//浜岀骇璀﹀憡
} else {
- lightPoleHeeling.setWarningLevel("姝ｅ父");
+ lightPoleHeeling.setWarningLevel(0);//姝ｅ父
}
return save(lightPoleHeeling);
--
Gitblit v1.9.3