From 5b89937212db0c507145187313eb5b326220f47b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 21 一月 2025 10:18:43 +0800
Subject: [PATCH] 修改RTU升级文件CRC16计算的bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 61 ++++++++++++++++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileParse.java | 76 +++++++-----------------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java | 19 +++---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java | 13 ++--
4 files changed, 100 insertions(+), 69 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java
index 26549ff..5600dd7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_1601_Down.java
@@ -87,12 +87,13 @@
ByteUtil.int2Bytes_BE(bs, vo.totalByte, 0);
bytes = ByteUtil.bytesMerge(bytes, bs) ;
- bs = new byte[2] ;
- ByteUtil.short2Bytes_BE(bs, (short)vo.softCrc, 0);
- bytes = ByteUtil.bytesMerge(bytes, bs) ;
-
- bs = new byte[2] ;
- ByteUtil.short2Bytes_BE(bs, (short)vo.softCrc, 0);
+ bs = new byte[4] ;
+ byte[] crcBs = new byte[4] ;
+ ByteUtil.int2Bytes_BE(crcBs, vo.softCrc, 0);
+ bs[0] = crcBs[2] ;
+ bs[1] = crcBs[3] ;
+ bs[2] = crcBs[2] ;
+ bs[3] = crcBs[3] ;
bytes = ByteUtil.bytesMerge(bytes, bs) ;
bs = new byte[4] ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileParse.java
index c294fe7..437d4a7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/parse/HexFileParse.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.HexUtil;
import com.dy.common.util.ByteUtil;
+import com.dy.common.util.CRC16;
import java.io.*;
import java.util.ArrayList;
@@ -17,19 +18,19 @@
private static final int hexFileMinLine = 4 ;
private static final int lineHeadEndIndex = 9 ;
- private static final int lineValidCharCount = 43 ;//姣忚鏈夋晥瀛楃锛堝啋鍙蜂笌鍗佸叚杩涘埗锛変釜鏁帮紝渚嬪:1096C000DC96010010020020203E00000441000052锛屼絾鍊掓暟绗�3琛屼笉鍙楅檺鍒�
+ private static final int lineValidCharCount = 43 ;//姣忚鏈夋晥瀛楃锛堝啋鍙蜂笌鍗佸叚杩涘埗锛変釜鏁帮紝渚嬪鈥�:1096C000DC96010010020020203E00000441000052鈥濓紝浣嗗�掓暟绗�3琛屼笉鍙楅檺鍒�
private static final int bytesSplitUnit512 = 512 ;
public static void main(String[] args) throws Exception{
- boolean fromBytes = true ;
+ boolean fromBytes = false ;
HexFileParse obj = new HexFileParse() ;
if(!fromBytes){
- String filePath = "D:\\hexFile\\YuanMu_edit241007_01.hex";
+ String filePath = "D:\\hexFile\\YuanMu_20250116_01.hex";
//File file = new File(filePath) ;
HexFileVo vo = obj.doParse(filePath) ;
System.out.println(vo.toString());
}else{
- String filePath = "D:\\hexFile\\YuanMu_edit241007_01.hex";
+ String filePath = "D:\\hexFile\\YuanMu_20250116_01.hex";
File file = new File(filePath) ;
byte[] fileContent = new byte[(int)file.length()] ;
FileInputStream fileInputStream = new FileInputStream(file) ;
@@ -67,7 +68,8 @@
HexFileVo vo = new HexFileVo() ;
this.checkAndCalculate(vo, lineList);
this.parse(vo, lineList);
- this.split(vo);
+ this.splitBytesByUnit512(vo);
+ this.calculateCrc(vo);
return vo ;
}
@@ -87,7 +89,8 @@
HexFileVo vo = new HexFileVo() ;
this.checkAndCalculate(vo, lineList);
this.parse(vo, lineList);
- this.split(vo);
+ this.splitBytesByUnit512(vo);
+ this.calculateCrc(vo);
return vo ;
}
@@ -108,7 +111,9 @@
if(vo.totalLines < hexFileMinLine){
throw new Exception("Hex鏂囦欢鍐呭琛屾暟" + vo.totalLines + "涓嶆纭�(鏈�灏忚鏁�" + hexFileMinLine +")") ;
}
- vo.calculateBytes = ((vo.totalLines - 4) * 32) / 1024 * 512 ;
+ vo.calculateBytes = ((((vo.totalLines - 4) * 32) / 1024)
+ + ((((vo.totalLines - 4) * 32) % 1024) > 0?1 : 0))
+ * 512 ;
}
/**
@@ -155,9 +160,6 @@
}
counter ++ ;
}
- if(vo.bytes != null && vo.bytes.length > 0){
- vo.bytesCrc16 = this.crc16(vo.bytes);
- }
}
/**
@@ -185,7 +187,7 @@
* 浠�512涓哄崟浣嶅垎鍓叉暟鎹寘
* @param vo
*/
- private void split(HexFileVo vo){
+ private void splitBytesByUnit512(HexFileVo vo){
if(vo.bytes != null && vo.bytes.length > 0){
vo.realBytes += vo.bytes.length ;
int index = 0 ;
@@ -203,50 +205,18 @@
}
/**
- * CRC16璁＄畻
- * @param buf
- * @return
+ * 璁＄畻CRC16
+ * @param vo
*/
- private Integer crc16(byte[] buf){
- int crc = -1 ;
- for(int i = 0; i < buf.length; ++i) {
- crc = (crc >> 8) ^ crc16_table[(crc ^ buf[i]) & 0x00FF];
+ private void calculateCrc(HexFileVo vo){
+ int crc = 0xffff ;
+ if(vo.listByte512 != null && vo.listByte512.size() > 0){
+ CRC16 crc16 = new CRC16() ;
+ for(byte[] bs : vo.listByte512){
+ crc = crc16.CRC16_table(bs.length, bs, crc) ;
+ }
}
- return crc ;
+ vo.bytesCrc16 = crc ;
}
- private Integer[] crc16_table = new Integer[]{
- 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
- 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
- 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
- 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
- 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
- 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
- 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
- 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
- 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
- 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
- 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
- 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
- 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
- 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
- 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
- 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
- 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
- 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
- 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
- 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
- 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
- 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
- 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
- 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
- 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
- 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
- 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
- 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
- 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
- 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
- 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
- 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
- };
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java
index d641b85..157257f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC16.java
@@ -94,7 +94,6 @@
* @param endIndex 鎴涓嬫爣
* @return CRC
*/
- @SuppressWarnings("unused")
public int CRC16_table(byte[] bs, int startIndex, int endIndex) {
int x ;
int crc = 0xffff;
@@ -106,18 +105,20 @@
}
return crc ;
}
+
/**
- * 16浣嶇殑CRC鍊� 锛屾煡琛ㄦ硶
+ * 16浣嶇殑CRC鍊兼槸鏃犵鍙蜂袱瀛楄妭鏁存暟锛�
+ * @param len 鏁扮粍闀垮害
* @param bs 瀛楄妭鏁扮粍
+ * @param crc 鍘熷crc鍊�
* @return CRC
*/
- public short CRC16_table(byte[] bs) {
- short x ;
- short crc = (short)0xffff;
- if(bs != null && bs.length > 0){
- for(byte b : bs){
- x = (short)(crc ^ b) ;
- crc = (short)((crc >> 8) ^ crc16_rev_table[x & 0x00FF]) ;
+ public int CRC16_table(int len, byte[] bs, int crc) {
+ int x ;
+ if(bs != null){
+ for (int i = 0 ; i < len; i++){
+ x = (crc ^ bs[i]) ;
+ crc = ((crc >> 8) ^ crc16_rev_table[x & 0x00FF]) ;
}
}
return crc ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
index ce1b11d..990d0a9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
@@ -1,9 +1,23 @@
package com.dy.pipIrrRemote.allRound;
+import com.alibaba.fastjson2.JSON;
+import com.dy.common.mw.protocol.Command;
+import com.dy.common.mw.protocol.CommandBackParam;
+import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote;
+import com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper;
+import com.dy.pipIrrGlobal.rtuMw.CodeLocal;
+import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw;
+import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.List;
/**
* @Author: liurunyu
@@ -12,13 +26,58 @@
*/
@Slf4j
@Service
-public class Ar4RemoteSv {
+public class Ar4RemoteSv extends Web2RtuMw {
+
+ @Autowired
+ private Ar4BaseMapper baseDao;
+
+ @Autowired
+ private Environment env;
+
+ @Autowired
+ private RestTemplate restTemplate;
/**
* 鍙栨按鍙ｅ熀鏈俊鎭�
* @return 鍙栨按鍙ｅ熀鏈俊鎭�
*/
public QueryResultVo<VoArIntakeRemote> intakeInfo(Long intakeId){
+ VoArIntakeRemote rVo = new VoArIntakeRemote() ;
+
+ String rtuAddr = null ;
+ List<String> rtuAddrs = baseDao.intakeRtuAddr(intakeId) ;
+ if(rtuAddrs != null && rtuAddrs.size() > 0){
+ rtuAddr = rtuAddrs.get(0) ;
+ }
+ if(rtuAddr != null){
+ //鍚戦�氫俊涓棿浠跺彂鍏冲懡浠わ紝鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌
+ Command com = this.createInnerCommand(CodeLocal.onLinePart);
+ com.setParam(rtuAddr) ;
+ String rqUrl = this.get2MwRequestUrl(this.env, ContextComSend) ;
+ BaseResponse res = sendPostRequest2Mw(restTemplate, rqUrl, com) ;
+ if(res != null){
+ if(res.isSuccess()){
+ Command reCom = JSON.parseObject(res.getContent() == null ? null : JSON.toJSONString(res.getContent()), Command.class) ;
+ CommandBackParam bakParam = JSON.parseObject((reCom== null || reCom.param == null) ? null : JSON.toJSONString(reCom.param), CommandBackParam.class) ;
+ if(bakParam != null){
+ if(bakParam.getSuccess().booleanValue()){
+ //閫氫俊涓棿浠舵垚鍔熻繑鍥炲懡浠ょ粨鏋�
+ HashMap<String, Boolean> onLineMap = JSON.parseObject(JSON.toJSONString(reCom.getAttachment()), HashMap.class);
+ if(onLineMap != null && onLineMap.size() > 0){
+ rVo.onLine = onLineMap.get(rtuAddr) ;
+ }
+ }
+ }else{
+ log.error("閫氫俊涓棿浠惰繑鍥炲唴閮ㄥ懡浠ょ粨鏋滀腑涓嶅寘鍚獵ommandBackParam绫诲瀷鍙傛暟");
+ }
+ }else{
+ log.error("閫氫俊涓棿浠惰繑鍥炲唴閮ㄥ懡浠ゆ墽琛屽け璐�" + (res.getMsg() == null? "" : ("锛�" + res.getMsg()))) ;
+ }
+ }else{
+ log.error("閫氫俊涓棿浠惰繑鍥炲唴閮ㄥ懡浠ょ粨鏋滀负null");
+ }
+ }
+
return null ;
}
}
--
Gitblit v1.8.0