From 7aaff8e196d61cfc26d4fefa39cb4f6a9d7cf42a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 13 四月 2022 18:11:43 +0800
Subject: [PATCH] 灯杆倾斜设备表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingService.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 a6c5139..d147868 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
@@ -13,11 +13,13 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LightPoleHeelingListParam;
+import com.sandu.ximon.dao.domain.Light;
import com.sandu.ximon.dao.domain.LightPoleHeeling;
+import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment;
+import com.sandu.ximon.dao.domain.PoleBinding;
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;
@@ -25,6 +27,7 @@
@AllArgsConstructor
public class LightPoleHeelingService extends BaseServiceImpl<LightPoleHeelingMapper, LightPoleHeeling> {
private LightPoleHeelingMapper lightPoleHeelingMapper;
+ private LightPoleHeelingEquipmentService lightPoleHeelingEquipmentService;
/**
* 妯＄硦鏌ヨ
@@ -34,8 +37,15 @@
if (lightPoleHeelingListParam == null) {
lightPoleHeelingListParam = new LightPoleHeelingListParam();
}
+
+ //鍏抽敭瀛楀幓闄ょ┖鏍�
+ if (lightPoleHeelingListParam.getKeyword() != null) {
+ lightPoleHeelingListParam.setKeyword(lightPoleHeelingListParam.getKeyword().trim());
+ }
+
List<LightPoleHeeling> lightPoleHeelings
- = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword().trim(), lightPoleHeelingListParam.getProcessingState());
+ = lightPoleHeelingMapper.listLightPoleHeeling(lightPoleHeelingListParam.getKeyword(), lightPoleHeelingListParam.getProcessingState());
+
return lightPoleHeelings;
}
@@ -131,7 +141,7 @@
LightPoleHeelingSetHeartbeatPacketTimeReqInnerFrame setHeartbeatPacketTimeReqInnerFrame =
new LightPoleHeelingSetHeartbeatPacketTimeReqInnerFrame(setTime);
- A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setHeartbeatPacketTimeReqInnerFrame);
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_POLE_MONITOR_DATA.getCode(), setHeartbeatPacketTimeReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(devicesName, a5Frame);
@@ -155,7 +165,7 @@
LightPoleHeelingSetSensorStateReqInnerFrame setSensorStateReqInnerFrame =
new LightPoleHeelingSetSensorStateReqInnerFrame();
- A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_C3_DATA.getCode(), setSensorStateReqInnerFrame);
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_POLE_MONITOR_DATA.getCode(), setSensorStateReqInnerFrame);
System.out.println(a5Frame + " -----a5Frame");
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(devicesName, a5Frame);
@@ -185,12 +195,21 @@
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);//姝ｅ父
+ }
+ /**
+ * 灏嗙伅鏉嗗�炬枩纭欢娣诲姞鍒扮‖浠惰〃
+ */
+ LightPoleHeelingEquipment one = lightPoleHeelingEquipmentService.getOne(Wrappers.lambdaQuery(LightPoleHeelingEquipment.class).eq(LightPoleHeelingEquipment::getMac, deviceName));
+ if (one == null) {
+ LightPoleHeelingEquipment equipment = new LightPoleHeelingEquipment();
+ equipment.setMac(deviceName);
+ lightPoleHeelingEquipmentService.save(equipment);
}
return save(lightPoleHeeling);
--
Gitblit v1.9.3