From 6bab172dc8767e93c8889c15a146c76e4d38e9c0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 27 七月 2024 09:23:04 +0800
Subject: [PATCH] 电磁锁报警查询bug修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 68 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
index 670b9f5..622e4ae 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
@@ -535,13 +535,13 @@
}else{
lockMap.put("onlineTime",ardTankLock.getOnlineTime());
}
- Map<String,Object> ardTankLockState = new HashMap();
+ //Map<String,Object> ardTankLockState = new HashMap();
ArdTankLockState ardTankLockStateResult = ardTankLockStateMapper.selectArdTankLockStateByLockIdLimitOne(ardTankLock.getId());
if(ardTankLockStateResult == null){
- ardTankLockState.put("id","");
+ /*ardTankLockState.put("id","");
ardTankLockState.put("lockId","");
- ardTankLockState.put("lockNum","");
- ardTankLockState.put("lockState","");
+ ardTankLockState.put("lockNum","");*/
+ /*ardTankLockState.put("lockState","");
ardTankLockState.put("lockPositionState","");
ardTankLockState.put("lockShellState","");
ardTankLockState.put("restartState","");
@@ -552,12 +552,25 @@
ardTankLockState.put("uploadTime","");
ardTankLockState.put("uniqueMark","");
ardTankLockState.put("lockStateMark",false);
- lockMap.put("ardTankLockState",ardTankLockState);
+ lockMap.put("ardTankLockState",ardTankLockState);*/
+ lockMap.put("lockState","");
+ lockMap.put("lockPositionState","");
+ lockMap.put("lockShellState","");
+ lockMap.put("restartState","");
+ lockMap.put("batterVoltage","");
+ lockMap.put("batterVoltageAlarm",false);
+ lockMap.put("powerVoltage","");
+ lockMap.put("powerVoltageAlarm",false);
+ lockMap.put("uploadTime","");
+ lockMap.put("uniqueMark","");
+ lockMap.put("lockStateMark",false);
+ lockMap.put("alarmMark",false);
+ lockMap.put("alarmInfo","");
}else{
- ardTankLockState.put("id",ardTankLockStateResult.getId());
+ /*ardTankLockState.put("id",ardTankLockStateResult.getId());
ardTankLockState.put("lockId",ardTankLockStateResult.getLockId());
- ardTankLockState.put("lockNum",ardTankLockStateResult.getLockNum());
- ardTankLockState.put("lockState",ardTankLockStateResult.getLockState());
+ ardTankLockState.put("lockNum",ardTankLockStateResult.getLockNum());*/
+ /*ardTankLockState.put("lockState",ardTankLockStateResult.getLockState());
ardTankLockState.put("lockPositionState",ardTankLockStateResult.getLockPositionState());
ardTankLockState.put("lockShellState",ardTankLockStateResult.getLockShellState());
ardTankLockState.put("restartState",ardTankLockStateResult.getRestartState());
@@ -576,7 +589,44 @@
ardTankLockState.put("uploadTime",ardTankLockStateResult.getUploadTime());
ardTankLockState.put("uniqueMark",ardTankLockStateResult.getUniqueMark());
ardTankLockState.put("lockStateMark",ardTankLockStateResult.getLockStateMark());
- lockMap.put("ardTankLockState",ardTankLockState);
+ lockMap.put("ardTankLockState",ardTankLockState);*/
+ String alarmInfo = "";
+ lockMap.put("lockState",ardTankLockStateResult.getLockState());
+ if(ardTankLockStateResult.getLockState().equals("寮傚父鐘舵��")){
+ alarmInfo = alarmInfo + "閿佽姱寮傚父;";
+ }
+ lockMap.put("lockPositionState",ardTankLockStateResult.getLockPositionState());
+ if(ardTankLockStateResult.getLockPositionState().equals("寮傚父")){
+ alarmInfo = alarmInfo + "浣嶇疆寮傚父;";
+ }
+ lockMap.put("lockShellState",ardTankLockStateResult.getLockShellState());
+ if(ardTankLockStateResult.getLockShellState().equals("寮傚父")){
+ alarmInfo = alarmInfo + "澶栧３寮傚父;";
+ }
+ lockMap.put("restartState",ardTankLockStateResult.getRestartState());
+ lockMap.put("batterVoltage",ardTankLockStateResult.getBatterVoltage());
+ if(Double.parseDouble(ardTankLockStateResult.getBatterVoltage()) <= lockBatteryVoltage){
+ lockMap.put("batterVoltageAlarm",true);
+ alarmInfo = alarmInfo + "鐢垫睜鐢靛帇浣庝簬" + lockBatteryVoltage + ";";
+ }else{
+ lockMap.put("batterVoltageAlarm",false);
+ }
+ lockMap.put("powerVoltage",ardTankLockStateResult.getPowerVoltage());
+ if(Double.parseDouble(ardTankLockStateResult.getPowerVoltage()) <= lockPowerVoltage){
+ lockMap.put("powerVoltageAlarm",true);
+ alarmInfo = alarmInfo + "鐢垫簮鐢靛帇浣庝簬" + lockBatteryVoltage + ";";
+ }else{
+ lockMap.put("powerVoltageAlarm",false);
+ }
+ lockMap.put("uploadTime",ardTankLockStateResult.getUploadTime());
+ lockMap.put("uniqueMark",ardTankLockStateResult.getUniqueMark());
+ lockMap.put("lockStateMark",ardTankLockStateResult.getLockStateMark());
+ if(alarmInfo.equals("")){
+ lockMap.put("alarmMark",false);
+ }else{
+ lockMap.put("alarmMark",true);
+ }
+ lockMap.put("alarmInfo",alarmInfo);
}
lockList.add(lockMap);
}
--
Gitblit v1.9.3