|
|
@ -205,7 +205,7 @@ public void analysisCloudOrder485(final String data, final DeviceCodeParamEntity |
|
|
|
System.out.println("插入时间30" + dateStr); |
|
|
|
System.out.println("插入时间30" + dateStr); |
|
|
|
} |
|
|
|
} |
|
|
|
try { |
|
|
|
try { |
|
|
|
if (registerAddr.equals("0004") || registerAddr.equals("0014")) { |
|
|
|
if (registerAddr.equals("0004") || registerAddr.equals("0020")) { |
|
|
|
dataResultCh.setDeviceAddr(cloudId); |
|
|
|
dataResultCh.setDeviceAddr(cloudId); |
|
|
|
dataResultCh.setDeviceType(deviceCodeParam.getDeviceType()); |
|
|
|
dataResultCh.setDeviceType(deviceCodeParam.getDeviceType()); |
|
|
|
dataResultCh.setFunCode(deviceCodeParam.getFunCode()); |
|
|
|
dataResultCh.setFunCode(deviceCodeParam.getFunCode()); |
|
|
@ -221,7 +221,7 @@ public void analysisCloudOrder485(final String data, final DeviceCodeParamEntity |
|
|
|
log.info("冷量计==>{},寄存器地址==>{},读数==>{},项目名称==>{}", cloudId, registerAddr, dataResultCh.getCurValue(), projectName); |
|
|
|
log.info("冷量计==>{},寄存器地址==>{},读数==>{},项目名称==>{}", cloudId, registerAddr, dataResultCh.getCurValue(), projectName); |
|
|
|
dataResultService.saveDataResultCh(dataResultCh); |
|
|
|
dataResultService.saveDataResultCh(dataResultCh); |
|
|
|
log.info("冷量计瞬时冷量/流量保存数据库成功!项目名称:{}", projectName); |
|
|
|
log.info("冷量计瞬时冷量/流量保存数据库成功!项目名称:{}", projectName); |
|
|
|
} else if (registerAddr.equals("0050")) { |
|
|
|
} else if (registerAddr.equals("0080")) { |
|
|
|
dataResultCl.setDeviceAddr(cloudId); |
|
|
|
dataResultCl.setDeviceAddr(cloudId); |
|
|
|
dataResultCl.setDeviceType(deviceCodeParam.getDeviceType()); |
|
|
|
dataResultCl.setDeviceType(deviceCodeParam.getDeviceType()); |
|
|
|
dataResultCl.setCurDate(sdf1.parse(dateStr)); |
|
|
|
dataResultCl.setCurDate(sdf1.parse(dateStr)); |
|
|
|