autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-10 00:48:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 修改crc校验方法

Browse Source
This commit is contained in:
Lemon
2023-06-29 09:16:50 +08:00
parent f742f08fba
commit caddcd9fd9
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java
View File

@@ -49,12 +49,17 @@ public class YKCUtils {
String sourceCRC = String.format("%04x", BytesUtil.bytesToInt(crcByte, 0)); String sourceCRC = String.format("%04x", BytesUtil.bytesToInt(crcByte, 0));
String targetCRC = String.format("%04x", CRC16Util.calcCrc16(data)); String targetCRC = String.format("%04x", CRC16Util.calcCrc16(data));
String oldTargetCRC = String.format("%04x", CRC16Util.calcCrc16Old(data)); String oldTargetCRC = String.format("%04x", CRC16Util.calcCrc16Old(data));
if (!sourceCRC.equalsIgnoreCase(targetCRC)) { // 将高低位位置反转，得出新的crc
log.error("CRC校验不通过, 源crc:{}, 计算得出crc:{}, 老crc计算:{}, 帧类型:{}, 报文：{}, msg:{}" String lowString = StringUtils.substring(targetCRC, 0, 2);
, sourceCRC, targetCRC, oldTargetCRC, YKCUtils.frameType2Str(frameType), BytesUtil.binary(msg, 16), Arrays.toString(msg)); String highString = StringUtils.substring(targetCRC, 2, 4);
return false; String crc = highString + lowString;
// 若目标crc和高低位反转前/后的crc都不一致，则校验不通过
if (sourceCRC.equalsIgnoreCase(targetCRC) || sourceCRC.equalsIgnoreCase(crc)) {
return true;
} }
return true; log.error("CRC校验不通过, 源crc:{}, 计算得出crc:{}, 老crc计算:{}, 高低位反转后crc:{}, 帧类型:{}, 报文：{}, msg:{}"
, sourceCRC, targetCRC, oldTargetCRC, crc, YKCUtils.frameType2Str(frameType), BytesUtil.binary(msg, 16), Arrays.toString(msg));
return false;
} }
/** /**
@@ -127,6 +132,11 @@ public class YKCUtils {
// System.out.println(binary); // System.out.println(binary);
// System.out.println(aaa); // System.out.println(aaa);
String targetCRC = "0abb";
String substring = StringUtils.substring(targetCRC, 0, 2);
String substring1 = StringUtils.substring(targetCRC, 2, 4);
String crc = substring1 + substring;
String hexString = "4f"; String hexString = "4f";
byte[] bytes = new byte[]{0x4f}; byte[] bytes = new byte[]{0x4f};

28
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileSimInfoServiceImpl.java
View File

@@ -74,20 +74,20 @@ public class PileSimInfoServiceImpl implements IPileSimInfoService {
} }
dto.setExpiredTime(expiredTime); dto.setExpiredTime(expiredTime);
List<SimCardInfoVO> simInfoList = pileSimInfoMapper.getSimInfoList(dto); List<SimCardInfoVO> simInfoList = pileSimInfoMapper.getSimInfoList(dto);
if (expiredTime == null) { // if (expiredTime == null) {
// 为空说明后管查询列表页没有选择筛选条件 // // 为空说明后管查询列表页没有选择筛选条件
List<String> iccids = simInfoList.stream() // List<String> iccids = simInfoList.stream()
.map(SimCardInfoVO::getIccId) // .map(SimCardInfoVO::getIccId)
.collect(Collectors.toList()); // .collect(Collectors.toList());
// 查出最新的卡信息 // // 查出最新的卡信息
List<SimCardVO> simCardList = simCardService.searchByLoop(iccids); // List<SimCardVO> simCardList = simCardService.searchByLoop(iccids);
if (CollectionUtils.isNotEmpty(simCardList)) { // if (CollectionUtils.isNotEmpty(simCardList)) {
// 批量修改存库 // // 批量修改存库
pileSimInfoMapper.updateSimCardInfoBatch(simCardList); // pileSimInfoMapper.updateSimCardInfoBatch(simCardList);
//
simInfoList = pileSimInfoMapper.getSimInfoList(dto); // simInfoList = pileSimInfoMapper.getSimInfoList(dto);
} // }
} // }
if (CollectionUtils.isEmpty(simInfoList)) { if (CollectionUtils.isEmpty(simInfoList)) {
return new ArrayList<>(); return new ArrayList<>();