From 6bce1b35246ed695a4272c24254c7073a524818a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 30 七月 2024 13:33:12 +0800
Subject: [PATCH] 电磁锁查询加入状态修改提交
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 89 insertions(+), 6 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..c88f32e 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,8 +330,89 @@
ardTankLockState.setUniqueMark(uniqueMark);
((ArdTankLockStateServiceImpl)SpringUtils.getBean("ardTankLockStateServiceImpl")).insertOrUpdateArdTankLockState(ardTankLockState);
}
- }else if(code.equals("06")){//鍔熻兘鐮�06涓洪攣鍘嗗彶鎶ヨ
+ }else if(code.equals("05")){//鍔熻兘鐮�05涓鸿鍙栭攣瀵嗙爜
+ Set<String> passwordAndTimeSet = new HashSet();
+ for(int i = 1;i <= 10;i++){
+ String passwordAndTime = data.substring(6 + 24*(i - 1),6 + 24 * i);
+ passwordAndTimeSet.add(passwordAndTime);//鎷嗗垎鍑哄瘑鐮佸拰浣跨敤鏃堕棿
+ }
+ if(passwordAndTimeSet.size() == 1){//鍏ㄩ儴涓哄垵濮嬪瘑鐮侊紝鍒欎粠鏂拌缃�
+ Set<String> passwordSet = new HashSet();
+ while(passwordSet.size() != 10){
+ String password = "";
+ for(int i = 0;i <= 5;i++){
+ password = password + String.valueOf(10 * Math.random()).split("\\.")[0];
+ }
+ passwordSet.add(password);
+ }
+ if(PositionContainer.getCarLockPasswordMap().get(lockNum) == null){
+ PositionContainer.getCarLockPasswordMap().put(lockNum,passwordSet);
+ }
+ }else{//鏌ョ湅鍝簺瀵嗙爜浣跨敤杩�
+ for(String passwordAndTime : passwordAndTimeSet){
+ String time = passwordAndTime.substring(12,24);
+ if(!time.equals("FFFFFFFFFFFF")){
+ String passwordHex = passwordAndTime.substring(0,12);//16杩涘埗瀵嗙爜
+ String password = "";//瀹為檯瀵嗙爜
+ for(int i = 0;i <= 10;i = i + 2){
+ String passwordHexByte = passwordHex.substring(i, i+2);
+ password = password + passwordHexByte.split("")[1];
+ }
+ String useTimeHex = passwordAndTime.substring(12,24);//16杩涘埗鏃堕棿
+ String yearHex = useTimeHex.substring(0, 2);
+ String monthHex = useTimeHex.substring(2, 4);
+ String dayHex = useTimeHex.substring(4, 6);
+ String hourHex = useTimeHex.substring(6, 8);
+ String minuteHex = useTimeHex.substring(8, 10);
+ String secondHex = useTimeHex.substring(10, 12);
+
+ String useTime = "";
+ Integer yearNum = Integer.parseInt(yearHex, 16);
+ if(yearNum <= 9){
+ useTime = "200" + yearNum + "-";
+ }else{
+ useTime = "20" + yearNum + "-";
+ }
+
+ Integer monthNum = Integer.parseInt(monthHex, 16);
+ if(monthNum <= 9){
+ useTime = useTime + "0" + monthNum + "-";
+ }else{
+ useTime = useTime + monthNum + "-";
+ }
+
+ Integer dayNum = Integer.parseInt(dayHex, 16);
+ if(dayNum <= 9){
+ useTime = useTime + "0" + dayNum + " ";
+ }else{
+ useTime = useTime + dayNum + " ";
+ }
+
+ Integer hourNum = Integer.parseInt(hourHex, 16);
+ if(hourNum <= 9){
+ useTime = useTime + "0" + hourNum + ":";
+ }else{
+ useTime = useTime + hourNum + ":";
+ }
+
+ Integer minuteNum = Integer.parseInt(minuteHex, 16);
+ if(minuteNum <= 9){
+ useTime = useTime + "0" + minuteNum + ":";
+ }else{
+ useTime = useTime + minuteNum + ":";
+ }
+
+ Integer secondNum = Integer.parseInt(secondHex, 16);
+ if(secondNum <= 9){
+ useTime = useTime + "0" + secondNum;
+ }else{
+ useTime = useTime + secondNum;
+ }
+ ((ArdTankLockPasswordServiceImpl)SpringUtils.getBean("ardTankLockPasswordServiceImpl")).updateArdTankLockPasswordByLockNum(lockNum,password,useTime);
+ }
+ }
+ }
}
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.9.3