设备上报问题修改

src/main/java/com/zehong/gassdevicereport/netty/handler/TCPServerHandler.java

@@ -79,9 +79,9 @@ public class TCPServerHandler extends ChannelInboundHandlerAdapter {
         String msgStr = HexUtils.bytesToHex(bytes1);
         logger.info("receiveTCPMsgstr======="+msgStr);
         byte[] bytes = HexUtils.hexToByteArray( msgStr.substring(0,msgStr.length()-4));
-        int checkVule = CrcUtil.getCrcToHex(bytes,true);
+        String checkVule = CrcUtil.getCrcToHex(bytes,true);
         String checkCode = msgStr.substring(msgStr.length()-4,msgStr.length());
-        if(checkVule != Integer.parseInt(checkCode, 16)){
+        if(!checkVule.equals(checkCode)){
             logger.error("接收数据校验失败");
             throw new Exception("接收数据校验失败");
         }

src/main/java/com/zehong/gassdevicereport/netty/handler/UDPServerHandler.java

@@ -44,9 +44,9 @@ public class UDPServerHandler extends SimpleChannelInboundHandler<DatagramPacket
         String msgStr = HexUtils.bytesToHex(bytes1);
         logger.info("receiveUPDMsgstr======="+msgStr);
         byte[] bytes = HexUtils.hexToByteArray( msgStr.substring(0,msgStr.length()-4));
-        int checkVule = CrcUtil.getCrcToHex(bytes,true);
+        String checkVule = CrcUtil.getCrcToHex(bytes,true);
         String checkCode = msgStr.substring(msgStr.length()-4,msgStr.length());
-        if(checkVule != Integer.parseInt(checkCode, 16)){
+        if(!checkVule.equals(checkCode)){
             logger.error("接收数据校验失败");
             throw new Exception("接收数据校验失败");
         }

src/main/java/com/zehong/gassdevicereport/utils/CrcUtil.java

@@ -39,15 +39,14 @@ public class CrcUtil {
      * @param reverse 是否转换高低位
      * @return
      */
-    public static int getCrcToHex(byte[] bytes,boolean reverse) {
+    public static String getCrcToHex(byte[] bytes,boolean reverse) {
         int CRC = getCRC(bytes);
         //高低位转换，看情况使用（譬如本人这次对led彩屏的通讯开发就规定校验码高位在前低位在后，也就不需要转换高低位)
         if(reverse){
             CRC = ( (CRC & 0x0000FF00) >> 8) | ( (CRC & 0x000000FF ) << 8);
         }
-        return CRC;
+        return Integer.toHexString(CRC);
     }
-
 }