From 470b596ddce65dcbb8087e78f0a096d8ba1a429e Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 八月 2024 08:17:48 +0800
Subject: [PATCH] 电磁锁新增临时电子围栏提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 224 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 194 insertions(+), 30 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 f525c5c..b8f26ca 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
@@ -104,8 +104,6 @@
@Value("${syCar.password}")
private String password;
- private Timer lockStateTimer;
-
@PostConstruct
public void init(){
ardSyCarController = this;
@@ -155,7 +153,18 @@
//鍒犻櫎缁撴潫鏃堕棿涓簄ull鐨勮褰�
int result = ardTankAbnormalParkAlarmService.deleteArdTankAbnormalParkAlarmByEndTime();
- this.lockStateTimer = new Timer();//瀹氭椂鑾峰彇鍚勪釜閿佺殑鐘舵��
+ List<ArdSyCar> ardSyCarAndLockList = ardSyCarService.selectArdSyCarAndTankLock();//鏌ヨ鍏ㄩ儴缃愯溅鍙婁笅鎸傜數纾侀攣
+
+ for(ArdSyCar ardSyCar : ardSyCarAndLockList){//鏋勯�犲鍣�
+ Map<String,Map<String,Thread>> carMap = new HashMap();//杞﹁締瀹瑰櫒
+ for(ArdTankLock ardTankLock : ardSyCar.getArdTankLockList()){
+ Map<String,Thread> lockMap = new HashMap();//閿佸鍣�
+ carMap.put(ardTankLock.getLockNum(),lockMap);
+ }
+ PositionContainer.getCarLockProcessThreadMap().put(ardSyCar.getCarId(),carMap);
+ }
+
+ Timer lockStateTimer = new Timer();//瀹氭椂鑾峰彇鍚勪釜閿佺殑鐘舵��
TimerTask lockStateTask =new TimerTask(){
@Override
public void run(){
@@ -180,7 +189,7 @@
List<ArdTankLock> result = ardTankLockService.getArdTankLockAll();//鏌ヨ鍏ㄩ儴鐢电閿�
for(ArdTankLock ardTankLock : result){
- Thread LockThread = new Thread(finalSyURL){
+ Thread lockThread = new Thread(finalSyURL){
@Override
public void run() {
String lockNumHead = ardTankLock.getLockNum().substring(0,2);
@@ -195,11 +204,17 @@
}
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);
+ try{
+ sendCmd(finalSyURL,userId,ardTankLock.getCarId(),199,"DataDownTransfer", paramsStr,sessionId);
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).remove("lockState");
+ }catch(Exception e){
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).remove("lockState");
+ }
}
};
- LockThread.start();
+ //lockThread.start();
+ //灏嗙姸鎬佺嚎绋嬫斁鍏ュ鍣�
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockState",lockThread);
}
}
};
@@ -211,7 +226,7 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Timer lockCheckTimeTimer = new Timer();//瀹氭椂鏍″噯鏃堕棿
- TimerTask lockCheckTimeTask =new TimerTask(){
+ TimerTask lockCheckTimeTask = new TimerTask(){
@Override
public void run() {
SysConfig config = new SysConfig();
@@ -232,7 +247,7 @@
List<ArdTankLock> result = ardTankLockService.getArdTankLockAll();//鏌ヨ鍏ㄩ儴鐢电閿�
for(ArdTankLock ardTankLock : result){
- Thread LockThread = new Thread(finalSyURL){
+ Thread lockThread = new Thread(finalSyURL){
@Override
public void run() {
//鑾峰彇鏃堕棿骞舵媶鍒嗗勾鏈堟棩鏃跺垎绉�
@@ -282,15 +297,21 @@
checkNum = checkNum.substring(checkNum.length() - 2,checkNum.length());
}
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);
+ try{
+ sendCmd(finalSyURL,userId,ardTankLock.getCarId(),199,"DataDownTransfer", paramsStr,sessionId);
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).remove("lockTime");
+ }catch(Exception e){
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).remove("lockTime");
+ }
}
};
- LockThread.start();
+ //lockThread.start();
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockTime",lockThread);
}
}
};
- lockCheckTimeTimer.scheduleAtFixedRate(lockCheckTimeTask,date,7000);
+ //lockCheckTimeTimer.scheduleAtFixedRate(lockCheckTimeTask,date,7000);
+ lockCheckTimeTimer.scheduleAtFixedRate(lockCheckTimeTask,date,67000);
Timer sendTimer = new Timer();//瀹氭椂鍙戦�侀攣鐘舵��
TimerTask sendLockStateTask = new TimerTask(){
@@ -309,27 +330,170 @@
};
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);
+ passwordTimer.scheduleAtFixedRate(passwordTask,date,13000);
+
+ 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";
+ try{
+ sendCmd(finalSyURL,userId,ardTankLock.getCarId(),199,"DataDownTransfer", paramsStr,sessionId);
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).remove("lockRestart");
+ }catch (Exception e){
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).remove("lockRestart");
+ }
+ }
+ };
+ //lockThread.start();
+ PositionContainer.getCarLockProcessThreadMap().get(ardTankLock.getCarId()).get(ardTankLock.getLockNum()).put("lockRestart",lockThread);
+ }
+ }
+ }
+ }
+ };
+ thread.start();
+ }
+ };
+ lockRestartStateTimer.scheduleAtFixedRate(lockRestartStateTask,date,17000);
+
+ Set<String> lockNumSet = new HashSet();//瀛樻斁鍙戦�佽繃鐨勯攣缂栧彿
+
+ Timer mainLockTimer = new Timer();//涓诲畾鏃跺櫒
+ TimerTask mainLockTask = new TimerTask(){
+ @Override
+ public void run() {
+ Long count = ardTankLockService.getArdTankLockCount();
+ if(lockNumSet.size() >= count){//闃叉閿佽鍒犻櫎锛岄噰鐢ㄥぇ浜庣瓑浜�
+ lockNumSet.clear();//鍏ㄩ儴鎵ц杩囷紝娓呯┖瀹瑰櫒
+ }
+ for(String carId : PositionContainer.getCarLockProcessThreadMap().keySet()){
+ Thread thread = new Thread(){
+ @Override
+ public void run() {
+ Map<String, Map<String,Thread>> lockMap = PositionContainer.getCarLockProcessThreadMap().get(carId);
+ for(String lockNum : lockMap.keySet()){
+ if(lockNumSet.contains(lockNum)){//鑻ユ墽琛岃繃锛屾湰娆″拷鐣�
+ continue;
+ }
+ if(lockMap.get(lockNum).get("lockProcess") != null){
+ break;//閿佹搷浣滅骇鍒渶楂�
+ }else{
+ if(lockMap.get(lockNum).get("lockTime") != null){
+ if(lockMap.get(lockNum).get("lockTime").isAlive()){
+ lockNumSet.add(lockNum);
+ break;//閿佹牎鏃舵涔�
+ }else{
+ lockMap.get(lockNum).get("lockTime").start();
+ lockNumSet.add(lockNum);
+ break;//閿佹牎鏃舵涔�
+ }
+ }else{
+ if(lockMap.get(lockNum).get("lockPassword") != null){
+ if(lockMap.get(lockNum).get("lockPassword").isAlive()){
+ lockNumSet.add(lockNum);
+ break;//閿佸瘑鐮佹涔�
+ }else{
+ lockMap.get(lockNum).get("lockPassword").start();
+ lockNumSet.add(lockNum);
+ break;//閿佸瘑鐮佹涔�
+ }
+ }else{
+ if(lockMap.get(lockNum).get("lockRestart") != null) {
+ if(lockMap.get(lockNum).get("lockRestart").isAlive()){
+ lockNumSet.add(lockNum);
+ }else{
+ lockMap.get(lockNum).get("lockRestart").start();
+ lockNumSet.add(lockNum);
+ break;//閿佸浣嶆涔�
+ }
+ }else{
+ if(lockMap.get(lockNum).get("lockState") != null) {
+ if(lockMap.get(lockNum).get("lockState").isAlive()){
+ lockNumSet.add(lockNum);
+ }else{
+ lockMap.get(lockNum).get("lockState").start();
+ lockNumSet.add(lockNum);
+ break;//閿佺姸鎬佹涔�
+ }
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ };
+ thread.start();
+ }
+ }
+ };
+ mainLockTimer.scheduleAtFixedRate(mainLockTask,date,2000);
}
--
Gitblit v1.9.3