From 00c17a3a10a2856c847757e7021e60135b6ea894 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 27 七月 2024 23:55:43 +0800
Subject: [PATCH] 电磁锁密码提交

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java |   29 ++++-------------------------
 1 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index d3d2fbd..25dfa7a 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -195,12 +195,8 @@
                                     String paramsStr = "%7B%22type%22%3A%22ff%22%2C%22dataCnt%22%3A%22" + ardTankLock.getLockNum() + "01" + checkNum + "%22%7D";
 
                                     sendCmd(finalSyURL,userId,ardTankLock.getCarId(),199,"DataDownTransfer", paramsStr,sessionId);
-                                    PositionContainer.getCarThreadMap().remove(ardTankLock.getCarId());//鍙戦�佸畬锛屼粠瀹瑰櫒鍘婚櫎
                                 }
                             };
-                            if(PositionContainer.getCarThreadMap().get(ardTankLock.getCarId()) != null){//瀹瑰櫒涓棤绾跨▼锛屾斁鍏ュ鍣�
-                                PositionContainer.getCarThreadMap().put(ardTankLock.getCarId(),lockThread);
-                            }
                             lockThread.start();
                         }
                     }
@@ -286,12 +282,8 @@
                         String paramsStr = "%7B%22type%22%3A%22ff%22%2C%22dataCnt%22%3A%22" + ardTankLock.getLockNum() + "08" + timeHex + checkNum + "%22%7D";
 
                         sendCmd(finalSyURL,userId,ardTankLock.getCarId(),199,"DataDownTransfer", paramsStr,sessionId);
-                        PositionContainer.getCarThreadMap().remove(ardTankLock.getCarId());//鍙戦�佸畬锛屼粠瀹瑰櫒鍘婚櫎
                     }
                 };
-                if(PositionContainer.getCarThreadMap().get(ardTankLock.getCarId()) != null){//瀹瑰櫒涓棤绾跨▼锛屾斁鍏ュ鍣�
-                    PositionContainer.getCarThreadMap().put(ardTankLock.getCarId(),lockThread);
-                }
                 lockThread.start();
             }
             }
@@ -315,27 +307,14 @@
         };
         sendTimer.scheduleAtFixedRate(sendLockStateTask,date,3000);
 
-        try{
-            Thread.sleep(3000);
-        }catch(Exception e){
-
-        }
-
-
-        /*Timer alarmTimer = new Timer();//瀹氭椂鑾峰彇鎶ヨ
-        TimerTask alarmTask = new TimerTask(){
+        Timer passwordTimer = new Timer();//瀹氭椂鏌ョ湅鐢电閿佸瘑鐮佺姸鎬�
+        TimerTask passwordTask = new TimerTask(){
             @Override
             public void run() {
-                Thread alarmThread = new Thread() {
-                    @Override
-                    public void run() {
-                        ardTankLockService.getAlarm(userId,password);
-                    }
-                };
-                alarmThread.start();
+                ardTankLockService.readPassword(userId,password);
             }
         };
-        alarmTimer.scheduleAtFixedRate(alarmTask,date,3000);*/
+        passwordTimer.scheduleAtFixedRate(passwordTask,date,11000);
 
     }
 

--
Gitblit v1.9.3