电磁锁实时状态加入报警详情提交

zhangnaisong

2024-07-26 1636f02b9cf3f408ebf8b3c4e377237e5b74bf4a

 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,41 @@
                    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());
                    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);
            }