From 15c5686fd26706e78143b455e47782d52bd836e4 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 24 七月 2024 11:25:10 +0800
Subject: [PATCH] bug修改提交
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java | 356 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 293 insertions(+), 63 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java
index 180acbe..666b8bb 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java
@@ -14,24 +14,30 @@
import com.gps31.push.util.MapUtil;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyCarLock;
import com.ruoyi.sy.domain.ArdSyCarRtu;
import com.ruoyi.sy.domain.ArdTankLock;
+import com.ruoyi.sy.domain.ArdTankLockState;
import com.ruoyi.sy.service.ArdSyCarLockService;
import com.ruoyi.sy.service.ArdSyCarRtuService;
-import com.ruoyi.sy.service.impl.ArdSyCarDayServiceImpl;
-import com.ruoyi.sy.service.impl.ArdSyCarServiceImpl;
-import com.ruoyi.sy.service.impl.ArdTankAbnormalParkAlarmServiceImpl;
-import com.ruoyi.sy.service.impl.ArdTankLockServiceImpl;
+import com.ruoyi.sy.service.impl.*;
import com.ruoyi.system.service.impl.SysConfigServiceImpl;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.qymqtt.newM.EmqClient;
import com.ruoyi.utils.qymqtt.newM.QosEnum;
import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.eclipse.paho.client.mqttv3.MqttException;
+import java.io.IOException;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -41,73 +47,20 @@
* @author chencq
* @version 1.0
*/
-@Slf4j(topic = "mqttCar")
public class PushClientImplSerialPort extends PushClient implements Runnable {
-// private static final Log log = LogFactory.getLog(PushClientImplPosition.class);
+ private static final Log log = LogFactory.getLog(PushClientImplSerialPort.class);
- private String ip;
+ private static String ip;
- private String userId;
+ private static String userId;
- private String password;
-
- private Timer lockStateTimer;
+ private static String password;
public PushClientImplSerialPort(String ip, String userId, String password) {
this.ip = ip;
this.userId = userId;
this.password = password;
-
- /*Date date = new Date();
- this.lockStateTimer = new Timer();//瀹氭椂鑾峰彇鍚勪釜閿佺殑鐘舵��
- TimerTask lockStateTask =new TimerTask(){
- @Override
- public void run(){
- SysConfig config = new SysConfig();
- config.setConfigKey("syCarPT");
- List<SysConfig> sysConfigResult = ((SysConfigServiceImpl)SpringUtils.getBean("sysConfigServiceImpl")).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)SpringUtils.getBean("sYClient")).logIn(syURL, passwordMd5, userId);
- String sessionId = (String) LogInResult.get("sessionId");
-
- String finalSyURL = syURL;
- Thread thread = new Thread(finalSyURL){
- @Override
- public void run() {
- List<ArdTankLock> result = ((ArdTankLockServiceImpl)SpringUtils.getBean("ardTankLockServiceImpl")).getArdTankLockAll();//鏌ヨ鍏ㄩ儴鐢电閿�
- for(ArdTankLock ardTankLock : result){
- //Thread LockThread = new Thread(finalSyURL){
- 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";
-
- //Map<String,Object> result = ((SYClient)SpringUtils.getBean("sYClient")).sendCmd(finalSyURL,userId,ardTankLock.getCarId(),199,"DataDownTransfer", paramsStr,sessionId);
- //};
- //LockThread.start();
- }
- }
- };
- thread.start();
- }
- };
- lockStateTimer.scheduleAtFixedRate(lockStateTask,date,1000);*/
}
public PushClientImplSerialPort() {
@@ -151,8 +104,224 @@
*/
}else if("0401".equals(pushMsg.getCmd())) {//閫忎紶娑堟伅
Map<String,Object> dataMap = pushMsg.getJsonMap();
- String carName = MapUtil.getStrVal(dataMap, "carName","");//鑾峰彇杞︾墝鍙�
+ //String carName = MapUtil.getStrVal(dataMap, "carName","");//鑾峰彇杞︾墝鍙�
//log.error(String.format(" ---->鏀跺埌閫忎紶鏁版嵁:%s",JSON.toJSONString(dataMap)));
+ Thread thread = new Thread(){
+ @Override
+ public void run() {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date now = new Date();
+ try {
+ String data = (String) dataMap.get("data");
+ String lockNum = data.substring(0, 4);
+ String code = data.substring(4, 6);
+ if(code.equals("01")){//鍔熻兘鐮�01涓洪攣瀹炴椂鐘舵��
+ String lockState = data.substring(6, 8);
+ String lockPositionState = data.substring(8, 10);
+ String lockShellState = data.substring(10, 12);
+ String restartState = data.substring(12, 14);
+ String batterVoltage = data.substring(14, 18);
+ String powerVoltage = data.substring(18, 22);
+ String time = data.substring(22, 34);
+ //璁＄畻鏃堕棿
+ String year = time.substring(0, 2);
+ String month = time.substring(2, 4);
+ String day = time.substring(4, 6);
+ String hour = time.substring(6, 8);
+ String minute = time.substring(8, 10);
+ String second = time.substring(10, 12);
+
+ Integer yearNum = Integer.parseInt(year, 16);
+ if(yearNum <= 9){
+ time = "200" + yearNum + "-";
+ }else{
+ time = "20" + yearNum + "-";
+ }
+
+ Integer monthNum = Integer.parseInt(month, 16);
+ if(monthNum <= 9){
+ time = time + "0" + monthNum + "-";
+ }else{
+ time = time + monthNum + "-";
+ }
+
+ Integer dayNum = Integer.parseInt(day, 16);
+ if(dayNum <= 9){
+ time = time + "0" + dayNum + " ";
+ }else{
+ time = time + dayNum + " ";
+ }
+
+ Integer hourNum = Integer.parseInt(hour, 16);
+ if(hourNum <= 9){
+ time = time + "0" + hourNum + ":";
+ }else{
+ time = time + hourNum + ":";
+ }
+
+ Integer minuteNum = Integer.parseInt(minute, 16);
+ if(minuteNum <= 9){
+ time = time + "0" + minuteNum + ":";
+ }else{
+ time = time + minuteNum + ":";
+ }
+
+ Integer secondNum = Integer.parseInt(second, 16);
+ if(secondNum <= 9){
+ time = time + "0" + secondNum;
+ }else{
+ time = time + secondNum;
+ }
+
+ ArdTankLock ardTankLock = new ArdTankLock();
+ ardTankLock.setLockNum(lockNum);
+ List<ArdTankLock> ardTankLockResult = ((ArdTankLockServiceImpl)SpringUtils.getBean("ardTankLockServiceImpl")).selectArdTankLockList(ardTankLock);
+
+ if(ardTankLockResult.isEmpty()){//閿佹病鏈夊綍鍏ュ垯杩斿洖
+ return;
+ }
+
+ long cha = now.getTime() - sdf.parse(time).getTime();
+ /*System.out.println("////////////////");
+ System.out.println(time);
+ System.out.println(cha);*/
+ if(Math.abs(cha) >= 5 * 1000){
+ //鏃堕棿鏍″噯
+ /*String url = "http://" + ip + ":9999";
+ String passwordMd5 = DigestUtils.md5Hex(password);
+ Map<String, Object> LogInResult = loginIn(url, userId, passwordMd5);
+ String sessionId = (String) LogInResult.get("sessionId");
+ //鑾峰彇鏃堕棿骞舵媶鍒嗗勾鏈堟棩鏃跺垎绉�
+ String nowTime = sdf.format(now);
+ 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 = ardTankLockResult.get(0).getLockNum().substring(0,2);
+ String lockNumTail = ardTankLockResult.get(0).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";
+ System.out.println(ardTankLock.getLockNum() + "08" + timeHex + checkNum);
+ sendCmd(url,userId,ardTankLockResult.get(0).getCarId(),199,"DataDownTransfer", paramsStr,sessionId);*/
+ return;
+ }else{
+ ArdTankLockState ardTankLockState = new ArdTankLockState();
+ ardTankLockState.setId(IdUtils.simpleUUID());
+ ardTankLockState.setLockId(ardTankLockResult.get(0).getId());
+ ardTankLockState.setLockNum(lockNum);
+ switch (lockState) {//閿佽姱鐘舵��
+ case "01": ardTankLockState.setLockState("寮�閿佺姸鎬�");break;
+ case "02": ardTankLockState.setLockState("鍏抽攣鐘舵��");break;
+ case "03": ardTankLockState.setLockState("寮傚父鐘舵��");break;
+ case "04": ardTankLockState.setLockState("鍔ㄤ綔鐘舵��");break;
+ default:
+ break;
+ }
+ switch (lockPositionState) {//浣嶇疆鐘舵��
+ case "01": ardTankLockState.setLockPositionState("姝ｅ父");break;
+ case "02": ardTankLockState.setLockPositionState("寮傚父");break;
+ default:
+ break;
+ }
+ switch (lockShellState) {//澶栧３鐘舵��
+ case "01": ardTankLockState.setLockShellState("姝ｅ父");break;
+ case "02": ardTankLockState.setLockShellState("寮傚父");break;
+ default:
+ break;
+ }
+ switch (restartState) {//澶嶄綅鐘舵��
+ case "01": ardTankLockState.setRestartState("寮�閿佺姸鎬�");break;
+ case "02": ardTankLockState.setRestartState("鍏抽攣鐘舵��");break;
+ default:
+ break;
+ }
+ Number batterVoltageNum = Integer.parseInt(batterVoltage,16) * 0.1;
+ String batterVoltageStr = String.valueOf(batterVoltageNum);
+ if(batterVoltageStr.length() > 4){
+ batterVoltageStr = batterVoltageStr.substring(0,4);
+ }
+ if(batterVoltageStr.contains(".")){//鍥涜垗浜斿叆
+ String decimalPart = batterVoltageStr.split("\\.")[1];
+ if(Integer.parseInt(decimalPart) > 5){
+ batterVoltageStr = batterVoltageStr.split("\\.")[0] + ".5";
+ }else if(Integer.parseInt(decimalPart) <= 5){
+ batterVoltageStr = batterVoltageStr.split("\\.")[0] + ".0";
+ }
+ }else{
+ batterVoltageStr = batterVoltageStr + ".0";
+ }
+ ardTankLockState.setBatterVoltage(batterVoltageStr);
+
+
+ Number powerVoltageNum = Integer.parseInt(powerVoltage,16) * 0.1;
+ String powerVoltageStr = String.valueOf(powerVoltageNum);
+ if(powerVoltageStr.length() > 4){
+ powerVoltageStr = powerVoltageStr.substring(0,4);
+ }
+ if(powerVoltageStr.contains(".")){//鍥涜垗浜斿叆
+ String decimalPart = powerVoltageStr.split("\\.")[1];
+ if(Integer.parseInt(decimalPart) > 5){
+ powerVoltageStr = powerVoltageStr.split("\\.")[0] + ".5";
+ }else if(Integer.parseInt(decimalPart) <= 5){
+ powerVoltageStr = powerVoltageStr.split("\\.")[0] + ".0";
+ }
+ }else{
+ powerVoltageStr = powerVoltageStr + ".0";
+ }
+ ardTankLockState.setPowerVoltage(powerVoltageStr);
+
+ String uniqueMark = lockNum + "," + lockState + "," + lockPositionState + "," + lockShellState
+ + "," + restartState + "," + batterVoltageStr + "," + powerVoltageStr;
+
+ ardTankLockState.setUploadTime(time);
+ ardTankLockState.setUniqueMark(uniqueMark);
+ ((ArdTankLockStateServiceImpl)SpringUtils.getBean("ardTankLockStateServiceImpl")).insertOrUpdateArdTankLockState(ardTankLockState);
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ return;//寮鸿浆澶辫触杩斿洖
+ }
+ }
+ };
+ thread.start();
/**
*
* 璇峰姞鍏ヤ笁鏂归泦鎴愭柟鐨勪笟鍔￠�昏緫
@@ -164,7 +333,7 @@
public void sendMassage() {
try {
PushClientImplSerialPort client = new PushClientImplSerialPort();
- client.setLog(true);//鏄惁鎵撳嵃鏄庢枃
+ client.setLog(false);//鏄惁鎵撳嵃鏄庢枃
client.setHost(this.ip);//鏈嶅姟鍣↖P
client.setPort(10100);//鏈嶅姟鍣ㄧ鍙�
client.setUserName(this.userId);//绯荤粺鐢ㄦ埛鍚�
@@ -185,4 +354,65 @@
sendMassage();
}
+ public static Map<String,Object> loginIn(String syURL,String userId,String password){//鐧诲綍
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ String passwordMd5 = DigestUtils.md5Hex(password);
+
+ Request request = new Request.Builder()
+ .url(syURL + "/gps-web/api/login.jsp?"+"password="+passwordMd5+"&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN")
+ .build();
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ response.headers(); //鍝嶅簲澶�
+
+ okhttp3.ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
+ map.put("passwordMd5", passwordMd5);
+ //System.out.println(message);
+ return map;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
+ 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