From cf4afcc8902efc85f1e71f26073404a0a7a4f204 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期三, 31 七月 2024 09:48:41 +0800
Subject: [PATCH] 修改：异步async指定线程池
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 104 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 79 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..3ed0961 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,89 @@
};
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);
+
+ Timer lockRestartStateTimer = new Timer();//瀹氭椂鍚勪釜閿佺殑澶嶄綅鐘舵��
+ TimerTask lockRestartStateTask =new TimerTask(){
+ @Override
+ public void run(){
+ Thread thread = new Thread(){
+ @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;
+
+ List<ArdTankLock> result = ardTankLockService.getArdTankLockAllWithState();//鏌ヨ鍏ㄩ儴鐢电閿佸強鏈�缁堢姸鎬�
+ for(ArdTankLock ardTankLock : result){
+ String restartState = ardTankLock.getRestartState();
+ String sRestartState = "";
+ if(ardTankLock.getArdTankLockState() != null){
+ sRestartState = ardTankLock.getArdTankLockState().getRestartState();
+ }
+
+ if(sRestartState.equals("")){
+ continue;
+ }else{
+ sRestartState = sRestartState.substring(0,2);
+ if(!restartState.equals(sRestartState)){
+ Thread lockThread = new Thread(finalSyURL){
+ @Override
+ public void run() {
+ String process = "";
+ if(restartState.equals("寮�閿�")){
+ process = "01";
+ }else if(restartState.equals("鍏抽攣")){
+ process = "02";
+ }else{
+ return;
+ }
+
+ String lockNumHead = ardTankLock.getLockNum().substring(0,2);
+ String lockNumTail = ardTankLock.getLockNum().substring(2,4);
+ //璁＄畻鏍￠獙
+ String checkNum = Integer.toHexString(Integer.parseInt(lockNumHead, 16) + Integer.parseInt(lockNumTail, 16) + Integer.parseInt("03", 16) + Integer.parseInt(process, 16));
+
+ if(checkNum.length() == 1){
+ checkNum = "0" + checkNum;
+ }else if(checkNum.length() > 2){
+ checkNum = checkNum.substring(checkNum.length() - 2,checkNum.length());
+ }
+
+ String paramsStr = "%7B%22type%22%3A%22ff%22%2C%22dataCnt%22%3A%22" + ardTankLock.getLockNum() + "03" + process + checkNum + "%22%7D";
+
+ sendCmd(finalSyURL,userId,ardTankLock.getCarId(),199,"DataDownTransfer", paramsStr,sessionId);
+ }
+ };
+ lockThread.start();
+ }
+ }
+ }
+ }
+ };
+ thread.start();
+ }
+ };
+ lockRestartStateTimer.scheduleAtFixedRate(lockRestartStateTask,date,9000);
}
--
Gitblit v1.9.3