From 6bab172dc8767e93c8889c15a146c76e4d38e9c0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 27 七月 2024 09:23:04 +0800
Subject: [PATCH] 电磁锁报警查询bug修改提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 253 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 250 insertions(+), 3 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 6eb9d19..d3d2fbd 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
@@ -1,5 +1,6 @@
package com.ruoyi.sy.controller;
+import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -12,8 +13,14 @@
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.domain.ArdTankLock;
+import com.ruoyi.sy.gps31.PushClientImplSerialPort;
import com.ruoyi.sy.param.ArdSyCarParam;
+import com.ruoyi.sy.service.IArdTankAbnormalParkAlarmService;
+import com.ruoyi.sy.service.IArdTankLockService;
+import com.ruoyi.sy.service.impl.ArdTankLockServiceImpl;
import com.ruoyi.sy.vo.ArdSyCarVo;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.gps31.PositionContainer;
@@ -24,10 +31,14 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.system.service.impl.SysConfigServiceImpl;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -41,6 +52,8 @@
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import org.springframework.web.multipart.MultipartFile;
+
+import static com.ruoyi.utils.websocket.util.WebSocketUtils.ONLINE_USER_SESSIONS;
/**
* 涓変竴杞﹁締Controller
@@ -71,6 +84,12 @@
@Autowired
private ISysDeptService sysDeptService;
+ @Autowired
+ private IArdTankAbnormalParkAlarmService ardTankAbnormalParkAlarmService;
+
+ @Autowired
+ private IArdTankLockService ardTankLockService;
+
@Resource
private SYClient sYClient;
@@ -78,6 +97,12 @@
@Value("${syCar.enabled}")
private Boolean syCarEnabled;
+
+ @Value("${syCar.userId}")
+ private String userId;
+
+ @Value("${syCar.password}")
+ private String password;
@PostConstruct
public void init(){
@@ -101,7 +126,8 @@
{
return;
}
- PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ //PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,userId,password);
Thread pushClientImplPositionThread = new Thread(pushClientImplPosition);
pushClientImplPositionThread.start();
@@ -115,9 +141,202 @@
};
//carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//寮冪敤
//杞﹁締瀹炴椂鎶ヨ绾跨▼
- PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ //PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,userId,password);
Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
pushClientImplAlarmThread.start();
+ //涓插彛绾跨▼
+ PushClientImplSerialPort pushClientImplSerialPort = new PushClientImplSerialPort(ip,userId,password);
+ Thread pushClientImplSerialPortThread = new Thread(pushClientImplSerialPort);
+ pushClientImplSerialPortThread.start();
+
+ //鍒犻櫎缁撴潫鏃堕棿涓簄ull鐨勮褰�
+ int result = ardTankAbnormalParkAlarmService.deleteArdTankAbnormalParkAlarmByEndTime();
+
+ Timer lockStateTimer = new Timer();//瀹氭椂鑾峰彇鍚勪釜閿佺殑鐘舵��
+ TimerTask lockStateTask =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.getArdTankLockAll();//鏌ヨ鍏ㄩ儴鐢电閿�
+ for(ArdTankLock ardTankLock : result){
+ Thread lockThread = new Thread(finalSyURL){
+ @Override
+ public void run() {
+ 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("01", 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() + "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();
+ }
+ }
+ };
+ thread.start();
+ }
+ };
+ //lockStateTimer.scheduleAtFixedRate(lockStateTask,date,3000);
+ lockStateTimer.scheduleAtFixedRate(lockStateTask,date,5000);
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Timer lockCheckTimeTimer = new Timer();//瀹氭椂鏍″噯鏃堕棿
+ TimerTask lockCheckTimeTask =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;
+
+ List<ArdTankLock> result = ardTankLockService.getArdTankLockAll();//鏌ヨ鍏ㄩ儴鐢电閿�
+ for(ArdTankLock ardTankLock : result){
+ Thread lockThread = new Thread(finalSyURL){
+ @Override
+ public void run() {
+ //鑾峰彇鏃堕棿骞舵媶鍒嗗勾鏈堟棩鏃跺垎绉�
+ String nowTime = sdf.format(new Date());
+ String nowYear = nowTime.substring(2,4);
+ String nowMonth = nowTime.substring(5,7);
+ String nowDay = nowTime.substring(8,10);
+ String nowHour = nowTime.substring(11,13);
+ String nowMinute = nowTime.substring(14,16);
+ String nowSecond = nowTime.substring(17,19);
+
+ String nowYearHex = Integer.toHexString(Integer.parseInt(nowYear));
+ if(nowYearHex.length() == 1){
+ nowYearHex = "0" + nowYearHex;
+ }
+ String nowMonthHex = Integer.toHexString(Integer.parseInt(nowMonth));
+ if(nowMonthHex.length() == 1){
+ nowMonthHex = "0" + nowMonthHex;
+ }
+ String nowDayHex = Integer.toHexString(Integer.parseInt(nowDay));
+ if(nowDayHex.length() == 1){
+ nowDayHex = "0" + nowDayHex;
+ }
+ String nowHourHex = Integer.toHexString(Integer.parseInt(nowHour));
+ if(nowHourHex.length() == 1){
+ nowHourHex = "0" + nowHourHex;
+ }
+ String nowMinuteHex = Integer.toHexString(Integer.parseInt(nowMinute));
+ if(nowMinuteHex.length() == 1){
+ nowMinuteHex = "0" + nowMinuteHex;
+ }
+ String nowSecondHex = Integer.toHexString(Integer.parseInt(nowSecond));
+ if(nowSecondHex.length() == 1){
+ nowSecondHex = "0" + nowSecondHex;
+ }
+ //16杩涘埗鏃堕棿
+ String timeHex = nowYearHex + nowMonthHex + nowDayHex + nowHourHex + nowMinuteHex + nowSecondHex;
+ 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("08", 16) +
+ Integer.parseInt(nowYearHex, 16) + Integer.parseInt(nowMonthHex, 16) + Integer.parseInt(nowDayHex, 16) +
+ Integer.parseInt(nowHourHex, 16) + Integer.parseInt(nowMinuteHex, 16) + Integer.parseInt(nowSecondHex, 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() + "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();
+ }
+ }
+ };
+ lockCheckTimeTimer.scheduleAtFixedRate(lockCheckTimeTask,date,7000);
+
+ Timer sendTimer = new Timer();//瀹氭椂鍙戦�侀攣鐘舵��
+ TimerTask sendLockStateTask = new TimerTask(){
+ @Override
+ public void run() {
+ for (String key : ONLINE_USER_SESSIONS.keySet()){
+ Thread lockThread = new Thread() {
+ @Override
+ public void run() {
+ ardTankLockService.sendLockState(key,userId,password);
+ }
+ };
+ lockThread.start();
+ }
+ }
+ };
+ 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);*/
+
}
/**
@@ -369,7 +588,7 @@
SysUser sysUser = sysUserService.selectUserById(usersId);
Map<String, Map<String,Map<String,Object>>> deptPositionMap = PositionContainer.getDeptPositionMap();
if(deptPositionMap.isEmpty()){
- return Results.succeed("31骞冲彴鏃犺溅杈嗕綅缃繑鍥�");
+ return Results.error("31骞冲彴鏃犺溅杈嗕綅缃繑鍥�");
}else {
// return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()).get(map.get("carId")));
return Results.succeed(deptPositionMap.get(sysUser.getDeptId().toString()));
@@ -491,4 +710,32 @@
}
}
+ public Map<String,Object> sendCmd(String syURL,String userId,String carId,Integer cmdId,String cmd,String paramsStr,String sessionId){
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ Request request = new Request.Builder()
+ .url(syURL + "/gps-web/api/send_cmd.jsp?params="+paramsStr+"&userId="+userId+"&carId="+carId+"&cmdId="+cmdId+"&cmd="+cmd+"&sessionId="+sessionId)
+ .build();
+ //System.out.println("url = " + syURL + "/gps-web/api/send_cmd.jsp?params="+paramsStr+"&userId="+userId+"&carId="+carId+"&cmdId="+cmdId+"&cmd="+cmd+"&sessionId="+sessionId);
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ okhttp3.ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
+ return map;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
}
--
Gitblit v1.9.3