From 2799314298467be9ed68d9e19891e35cb3c3edad Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Thu, 01 Aug 2024 08:14:18 +0800
Subject: [PATCH] 电磁锁动作状态改为操控中...提交
---
ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml | 3
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java | 6 +
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplSerialPort.java | 253 ++++++++++++++-----------------------------------
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java | 2
4 files changed, 84 insertions(+), 180 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 c88f32e..798750f 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
@@ -57,6 +57,8 @@
private static String password;
+ private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
public PushClientImplSerialPort(String ip, String userId, String password) {
this.ip = ip;
this.userId = userId;
@@ -141,56 +143,8 @@
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;
- }
+ //String time = data.substring(22, 34);
+ String time = sdf.format(new Date());
ArdTankLock ardTankLock = new ArdTankLock();
ardTankLock.setLockNum(lockNum);
@@ -200,136 +154,77 @@
return;
}
- long cha = now.getTime() - sdf.parse(time).getTime();
- 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);
+ 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);
}else if(code.equals("05")){//功能码05为读取锁密码
Set<String> passwordAndTimeSet = new HashSet();
for(int i = 1;i <= 10;i++){
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
index f76dc25..0038f30 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
@@ -61,6 +61,8 @@
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ private Map<String,Timer> timerMap = new HashMap();
+
/**
* 查询罐车锁操控日志
*
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java
index 704a386..7a0c357 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java
@@ -109,9 +109,15 @@
ardTankLockMapper.updateArdTankLock(ardTankLock);//更改状态
}*/
try{
+ System.out.println("////////////");
+ System.out.println(ardTankLockState.getLockState());
+ System.out.println(ardTankLockState.getUniqueMark());
int result = ardTankLockStateMapper.insertArdTankLockState(ardTankLockState);
return result;
}catch(Exception e){
+ System.out.println("111111111111");
+ System.out.println(ardTankLockState.getLockState());
+ System.out.println(ardTankLockState.getUniqueMark());
int result = ardTankLockStateMapper.updateArdTankLockStateByUniqueMark(ardTankLockState.getUniqueMark(),ardTankLockState.getUploadTime());
return result;
}finally {
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml
index 2b33a47..19d3030 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml
@@ -118,7 +118,8 @@
case atls.lock_state
when '关锁状态' then false
when '异常状态' then false
- when '动作状态' then false
+ /*when '动作状态' then false*/
+ when '操控中...' then false
when '开锁状态' then true
end as lock_state_mark
from ard_tank_lock_state atls
--
Gitblit v1.9.3