attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw值解析bug修复

Browse Source
This commit is contained in:
attiya 2025-09-03 17:40:46 +08:00
parent 5cfb6858ca
commit 19877b00f0
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebike-common/src/main/java/com/cdzy/common/model/ResGPSDto.java
View File

@ -2,8 +2,6 @@ package com.cdzy.common.model;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author attiya
* @since 2025-03-20

12
ebike-report/src/main/java/com/cdzy/ebikereport/component/ReoprtHandler.java
View File

@ -13,8 +13,6 @@ import jakarta.annotation.Resource;
import org.springframework.data.geo.Point;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
/**
* @author attiya
@ -46,7 +44,9 @@ public class ReoprtHandler {
public void gpsMsgHandler(JSONObject param, String deviceId) {
Integer number = param.getInteger("sw");
String binary = BinaryUtil.to28BitBinary(number);
String binary = BinaryUtil.to32BitBinary(number);
//修复高低bug
binary = new StringBuilder(binary).reverse().toString();
char helmet = binary.charAt(BitSwitch.IS_HELMET_EXIT);
char acc = binary.charAt(BitSwitch.ACC_ON);
char wheelLocked = binary.charAt(BitSwitch.IS_WHEEL_LOCKED);
@ -55,7 +55,7 @@ public class ReoprtHandler {
char isWheelSpin = binary.charAt(BitSwitch.IS_WHEEL_SPIN);
char isMoving = binary.charAt(BitSwitch.IS_MOVING);
ResGPSDto resGpsDto = param.toJavaObject(ResGPSDto.class);
if (resGpsDto.getSoc() > 0 && resGpsDto.getSoc() < 20){
if (resGpsDto.getSoc() > 0 && resGpsDto.getSoc() < 20) {
maintenanceFeignClient.changeBattery(deviceId);
}
resGpsDto.setEcuSn(deviceId);
@ -68,10 +68,10 @@ public class ReoprtHandler {
resGpsDto.setIsMoving(isMoving);
redisUtil.set(deviceId, resGpsDto);
double[] doubles = CoordinateUtil.WGS84ToGCJ02(resGpsDto.getLongitude(), resGpsDto.getLatitude());
redisUtil.addLocation(new Point(doubles[0], doubles[1]),deviceId);
redisUtil.addLocation(new Point(doubles[0], doubles[1]), deviceId);
boolean outOfChina = CoordinateUtil.outOfChina(doubles[0], doubles[1]);
if (!outOfChina) {
EbikeTracking ebikeTracking = new EbikeTracking(deviceId,doubles[1], doubles[0]);
EbikeTracking ebikeTracking = new EbikeTracking(deviceId, doubles[1], doubles[0]);
operateFeignClient.saveEbikeTracking(ebikeTracking);
}
}

21
ebike-report/src/main/java/com/cdzy/ebikereport/utils/BinaryUtil.java
View File

@ -6,19 +6,18 @@ package com.cdzy.ebikereport.utils;
*/
public class BinaryUtil {
/**
* 将整数转换为28位二进制字符串，高位补零
* @param number 输入数字（范围0 ~ 2^28-1）
* @return 28位二进制字符串
* @throws IllegalArgumentException 输入超出范围时抛出异常
* 将整数转换为32位二进制字符串
* @param number 输入数字
* @return 32位二进制字符串
*/
public static String to28BitBinary(int number) {
// 验证范围：0 ≤ number ≤ 268,435,455 (即2^28 -1)
if (number < 0 || number > 0x1FFFFFFF) {
throw new IllegalArgumentException("输入数值超出28位无符号范围: " + number);
public static String to32BitBinary(int number) {
String binaryStr = Integer.toBinaryString(number);
// 补零到32位
if (binaryStr.length() < 32) {
return "0".repeat(32 - binaryStr.length()) + binaryStr;
}
// 转换为二进制并补零至28位
String binaryStr = Integer.toBinaryString(number);
return "0".repeat(29 - binaryStr.length()) + binaryStr;
return binaryStr;
}
}