From a17551833794cceabddff337bf185dbfb97b44ae Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 25 七月 2024 10:33:01 +0800
Subject: [PATCH] 电磁锁打印注释提交

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 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 1412e50..de58874 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
@@ -206,7 +206,8 @@
                 thread.start();
             }
         };
-        lockStateTimer.scheduleAtFixedRate(lockStateTask,date,3000);
+        //lockStateTimer.scheduleAtFixedRate(lockStateTask,date,3000);
+        lockStateTimer.scheduleAtFixedRate(lockStateTask,date,5000);
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Timer lockCheckTimeTimer = new Timer();//瀹氭椂鏍″噯鏃堕棿
@@ -289,34 +290,17 @@
                 }
             }
         };
-        lockCheckTimeTimer.scheduleAtFixedRate(lockCheckTimeTask,date,10000);
+        lockCheckTimeTimer.scheduleAtFixedRate(lockCheckTimeTask,date,13000);
 
         Timer sendTimer = new Timer();//瀹氭椂鍙戦�侀攣鐘舵��
-        TimerTask sendLockStateTask =new TimerTask(){
+        TimerTask sendLockStateTask = new TimerTask(){
             @Override
             public void run() {
-                SysConfig config = new SysConfig();
-                config.setConfigKey("syCarPT");
-                List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config);
-                String syURL = "";
-
-                if(sysConfigResult.size() == 0){
-                    return;
-                }else{
-                    syURL = sysConfigResult.get(0).getConfigValue();
-                }
-                String passwordMd5 = DigestUtils.md5Hex(password);
-                Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, userId);
-                String sessionId = (String) LogInResult.get("sessionId");
-
-                String finalSyURL = syURL;
-
                 for (String key : ONLINE_USER_SESSIONS.keySet()){
-                    Thread lockThread = new Thread(finalSyURL) {
+                    Thread lockThread = new Thread() {
                         @Override
                         public void run() {
-                            String usersId = key.split("_")[0];
-                            ardTankLockService.sendLockState(usersId,userId,password);
+                            ardTankLockService.sendLockState(key,userId,password);
                         }
                     };
                     lockThread.start();
@@ -325,6 +309,27 @@
         };
         sendTimer.scheduleAtFixedRate(sendLockStateTask,date,3000);
 
+        try{
+            Thread.sleep(3000);
+        }catch(Exception e){
+
+        }
+
+
+        Timer alarmTimer = new Timer();//瀹氭椂鑾峰彇鎶ヨ
+        TimerTask alarmTask = new TimerTask(){
+            @Override
+            public void run() {
+                Thread alarmThread = new Thread() {
+                    @Override
+                    public void run() {
+                        ardTankLockService.getAlarm(userId,password);
+                    }
+                };
+                alarmThread.start();
+            }
+        };
+        alarmTimer.scheduleAtFixedRate(alarmTask,date,3000);
 
     }
 

--
Gitblit v1.9.3