From b468cde8bfd9d6e1d7ae7ccc535fc7e8ffb9f818 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 26 七月 2024 22:34:44 +0800
Subject: [PATCH] 电磁锁报警查询提交
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java
index d0af9ea..ee4a60d 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java
@@ -121,9 +121,14 @@
for(int i = 0;i <= data.length() - 4;i = i + 2){
String str = data.substring(i, i + 2);
sum = sum + Integer.parseInt(str, 16);
- }
+ }//姹傚拰
String checkNum = data.substring(data.length() - 2, data.length());
- if(!checkNum.equals(Integer.toHexString(sum).toUpperCase())){//鏍￠獙涓嶉�氳繃锛屽氨杩斿洖
+ String checkNumComputed = Integer.toHexString(sum).toUpperCase();//璁＄畻鏍￠獙
+ //褰撴牎楠屾暟鎹ぇ浜�2涓瓧绗︼紝鎴彇鏈�鍚庝袱浣�
+ if(checkNumComputed.length() != 2){
+ checkNumComputed = checkNumComputed.substring(checkNumComputed.length() - 2,checkNumComputed.length());
+ }
+ if(!checkNum.equals(checkNumComputed)){//鏍￠獙涓嶉�氳繃锛屽氨杩斿洖
return;
}
@@ -196,9 +201,6 @@
}
long cha = now.getTime() - sdf.parse(time).getTime();
- /*System.out.println("////////////////");
- System.out.println(time);
- System.out.println(cha);*/
if(Math.abs(cha) >= 5 * 1000){
//鏃堕棿鏍″噯
/*String url = "http://" + ip + ":9999";
@@ -328,9 +330,9 @@
ardTankLockState.setUniqueMark(uniqueMark);
((ArdTankLockStateServiceImpl)SpringUtils.getBean("ardTankLockStateServiceImpl")).insertOrUpdateArdTankLockState(ardTankLockState);
}
- }else if(code.equals("06")){//鍔熻兘鐮�06涓洪攣鍘嗗彶鎶ヨ
+ }/*else if(code.equals("06")){//鍔熻兘鐮�06涓洪攣鍘嗗彶鎶ヨ
- }
+ }*/
}catch (Exception e){
e.printStackTrace();
return;//寮鸿浆澶辫触杩斿洖
--
Gitblit v1.9.3