|
|
@ -46,7 +46,7 @@ public class AnalysisReceiveOrder485 { |
|
|
|
|
|
|
|
|
|
|
|
//解析冷量表
|
|
|
|
//解析冷量表
|
|
|
|
public void analysisCloudOrder485(final String dataStr1, final DeviceCodeParamEntity deviceCodeParam) { |
|
|
|
public void analysisCloudOrder485(final String dataStr1, final DeviceCodeParamEntity deviceCodeParam) { |
|
|
|
threadPoolService.execute(() -> { |
|
|
|
// threadPoolService.execute(() -> {
|
|
|
|
// 去掉空格
|
|
|
|
// 去掉空格
|
|
|
|
String dataStr = dataStr1.replace(" ", "").toUpperCase(); |
|
|
|
String dataStr = dataStr1.replace(" ", "").toUpperCase(); |
|
|
|
// 检验报文
|
|
|
|
// 检验报文
|
|
|
@ -59,7 +59,7 @@ public class AnalysisReceiveOrder485 { |
|
|
|
if (checkWord.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4))) { |
|
|
|
if (checkWord.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4))) { |
|
|
|
//创建SimpleDateFormat对象,指定样式 2019-05-13 22:39:30
|
|
|
|
//创建SimpleDateFormat对象,指定样式 2019-05-13 22:39:30
|
|
|
|
Date date = new Date(); |
|
|
|
Date date = new Date(); |
|
|
|
String dateStr = ""; |
|
|
|
String dateStr = sdf1.format(date);; |
|
|
|
//保留两位小数处理
|
|
|
|
//保留两位小数处理
|
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("0.00"); |
|
|
|
DecimalFormat decimalFormat = new DecimalFormat("0.00"); |
|
|
|
// 表号
|
|
|
|
// 表号
|
|
|
@ -75,12 +75,10 @@ public class AnalysisReceiveOrder485 { |
|
|
|
DataResultClEntity dataResultCl = new DataResultClEntity(); |
|
|
|
DataResultClEntity dataResultCl = new DataResultClEntity(); |
|
|
|
String registerAddr = deviceCodeParam.getRegisterAddr(); |
|
|
|
String registerAddr = deviceCodeParam.getRegisterAddr(); |
|
|
|
if (ExchangeStringUtil.isInDate(date, "00:00:00", "00:00:30")) { |
|
|
|
if (ExchangeStringUtil.isInDate(date, "00:00:00", "00:00:30")) { |
|
|
|
dateStr = sdf1.format(date); |
|
|
|
|
|
|
|
dateStr = dateStr.substring(0, 17) + "00"; |
|
|
|
dateStr = dateStr.substring(0, 17) + "00"; |
|
|
|
|
|
|
|
|
|
|
|
System.out.println("插入时间00" + dateStr); |
|
|
|
System.out.println("插入时间00" + dateStr); |
|
|
|
} else if (ExchangeStringUtil.isInDate(date, "00:00:30", "00:00:59")) { |
|
|
|
} else if (ExchangeStringUtil.isInDate(date, "00:00:30", "00:00:59")) { |
|
|
|
dateStr = sdf1.format(date); |
|
|
|
|
|
|
|
dateStr = dateStr.substring(0, 17) + "30"; |
|
|
|
dateStr = dateStr.substring(0, 17) + "30"; |
|
|
|
|
|
|
|
|
|
|
|
System.out.println("插入时间30" + dateStr); |
|
|
|
System.out.println("插入时间30" + dateStr); |
|
|
@ -128,7 +126,7 @@ public class AnalysisReceiveOrder485 { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
log.info("冷量计校验失败===>" + dataStr); |
|
|
|
log.info("冷量计校验失败===>" + dataStr); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
// });
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public String analysisCloudQueue(QueueParam queueParam) { |
|
|
|
public String analysisCloudQueue(QueueParam queueParam) { |
|
|
|