|
|
@ -2,6 +2,7 @@ package com.mh.user.utils; |
|
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson2.JSON; |
|
|
|
import com.alibaba.fastjson2.JSON; |
|
|
|
import com.mh.common.utils.StringUtils; |
|
|
|
import com.mh.common.utils.StringUtils; |
|
|
|
|
|
|
|
import com.mh.user.constants.Constant; |
|
|
|
import com.mh.user.entity.*; |
|
|
|
import com.mh.user.entity.*; |
|
|
|
import com.mh.user.service.*; |
|
|
|
import com.mh.user.service.*; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
@ -205,7 +206,8 @@ public class AnalysisReceiveOrder485 { |
|
|
|
Date date = new Date(); |
|
|
|
Date date = new Date(); |
|
|
|
String data = ""; |
|
|
|
String data = ""; |
|
|
|
String meterId = ""; |
|
|
|
String meterId = ""; |
|
|
|
if (dataStr.length() == 44 || dataStr.length() == 70) { |
|
|
|
// 68 10 3987835C03000081B31CDA1C006502002C006502002C0000000000000000FF3416
|
|
|
|
|
|
|
|
if (dataStr.length() == 44 || dataStr.length() == 70 || dataStr.length() == 72) { |
|
|
|
String checkStr = dataStr.substring(0, dataStr.length() - 4);//减去校验码
|
|
|
|
String checkStr = dataStr.substring(0, dataStr.length() - 4);//减去校验码
|
|
|
|
String checkNum = ExchangeStringUtil.makeChecksum(checkStr); //生成校验码
|
|
|
|
String checkNum = ExchangeStringUtil.makeChecksum(checkStr); //生成校验码
|
|
|
|
if (checkNum.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4, dataStr.length() - 2))) { |
|
|
|
if (checkNum.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4, dataStr.length() - 2))) { |
|
|
@ -223,6 +225,7 @@ public class AnalysisReceiveOrder485 { |
|
|
|
data = data.substring(0, 6) + "." + data.substring(6, 8); |
|
|
|
data = data.substring(0, 6) + "." + data.substring(6, 8); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
log.info("水表报文检验失败: " + dataStr); |
|
|
|
log.info("水表报文检验失败: " + dataStr); |
|
|
|
|
|
|
|
return data; |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (dataStr.length() == 18) { |
|
|
|
} else if (dataStr.length() == 18) { |
|
|
|
String checkStr = dataStr.substring(0, dataStr.length() - 4);//检验报文
|
|
|
|
String checkStr = dataStr.substring(0, dataStr.length() - 4);//检验报文
|
|
|
@ -237,6 +240,7 @@ public class AnalysisReceiveOrder485 { |
|
|
|
} |
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
log.info("水表报文检验失败: " + dataStr); |
|
|
|
log.info("水表报文检验失败: " + dataStr); |
|
|
|
|
|
|
|
return data; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
log.info("水表表号: " + meterId + ",水表读数:" + data); |
|
|
|
log.info("水表表号: " + meterId + ",水表读数:" + data); |
|
|
@ -516,6 +520,7 @@ public class AnalysisReceiveOrder485 { |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (checkStr.substring(2, 4).equalsIgnoreCase("10")) { |
|
|
|
} else if (checkStr.substring(2, 4).equalsIgnoreCase("10")) { |
|
|
|
log.info("时间: " + dateStr + ",热泵ID: " + addr + ",操作成功! "); |
|
|
|
log.info("时间: " + dateStr + ",热泵ID: " + addr + ",操作成功! "); |
|
|
|
|
|
|
|
return Constant.SUCCESS; |
|
|
|
} |
|
|
|
} |
|
|
|
rtData = sValue; |
|
|
|
rtData = sValue; |
|
|
|
} else if (brand.equals("美的2")) { |
|
|
|
} else if (brand.equals("美的2")) { |
|
|
@ -588,6 +593,7 @@ public class AnalysisReceiveOrder485 { |
|
|
|
rtData = sValue; |
|
|
|
rtData = sValue; |
|
|
|
} else if (checkStr.substring(2, 4).equalsIgnoreCase("06")) { |
|
|
|
} else if (checkStr.substring(2, 4).equalsIgnoreCase("06")) { |
|
|
|
log.info("时间: " + dateStr + ",热泵ID: " + addr + ",操作成功! "); |
|
|
|
log.info("时间: " + dateStr + ",热泵ID: " + addr + ",操作成功! "); |
|
|
|
|
|
|
|
return Constant.SUCCESS; |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (brand.equals("瑞星")) { |
|
|
|
} else if (brand.equals("瑞星")) { |
|
|
|
if (checkStr.substring(2, 4).equalsIgnoreCase("03")) {//读
|
|
|
|
if (checkStr.substring(2, 4).equalsIgnoreCase("03")) {//读
|
|
|
@ -651,6 +657,7 @@ public class AnalysisReceiveOrder485 { |
|
|
|
} |
|
|
|
} |
|
|
|
} else if (checkStr.substring(2, 4).equalsIgnoreCase("10")) { |
|
|
|
} else if (checkStr.substring(2, 4).equalsIgnoreCase("10")) { |
|
|
|
log.info("时间: " + dateStr + ",热泵ID: " + addr + ",操作成功! "); |
|
|
|
log.info("时间: " + dateStr + ",热泵ID: " + addr + ",操作成功! "); |
|
|
|
|
|
|
|
return Constant.SUCCESS; |
|
|
|
} |
|
|
|
} |
|
|
|
rtData = sValue; |
|
|
|
rtData = sValue; |
|
|
|
} |
|
|
|
} |
|
|
|