Commit 6a121bd7 LN

兼容20851Sp只有回温文档和制冷温度,没有temperature

1 个父辈 bc2948f2
...@@ -954,10 +954,15 @@ public class BaseDeviceHandler implements IDeviceHandler { ...@@ -954,10 +954,15 @@ public class BaseDeviceHandler implements IDeviceHandler {
String temperature = boxStatus.getTemperature(); String temperature = boxStatus.getTemperature();
String codeAirTemp = boxStatus.getCodeAirTemp(); String codeAirTemp = boxStatus.getCodeAirTemp();
String codeAirTemp2=boxStatus.getCodeAirTemp2(); String codeAirTemp2=boxStatus.getCodeAirTemp2();
if (!Strings.isNullOrEmpty(humidity) && !Strings.isNullOrEmpty(temperature)) { if (!Strings.isNullOrEmpty(humidity) || !Strings.isNullOrEmpty(temperature)||!Strings.isNullOrEmpty(codeAirTemp)) {
if(ObjectUtil.isNotEmpty(humidity)){
humiture.setHumidity(humidity); humiture.setHumidity(humidity);
}if(ObjectUtil.isNotEmpty(temperature)) {
humiture.setTemperature(temperature); humiture.setTemperature(temperature);
}
if(ObjectUtil.isNotEmpty(codeAirTemp)) {
humiture.setCodeAirTemp(codeAirTemp); humiture.setCodeAirTemp(codeAirTemp);
}
if(ObjectUtil.isNotEmpty(codeAirTemp2)){ if(ObjectUtil.isNotEmpty(codeAirTemp2)){
humiture.setCodeAirTemp2(codeAirTemp2); humiture.setCodeAirTemp2(codeAirTemp2);
} }
......
...@@ -20,11 +20,11 @@ public class Humiture extends BasePo implements Serializable { ...@@ -20,11 +20,11 @@ public class Humiture extends BasePo implements Serializable {
/// <summary> /// <summary>
/// 温度/锡膏料仓为冷藏区温度 /// 温度/锡膏料仓为冷藏区温度
/// </summary> /// </summary>
public String temperature; public String temperature="";
/// <summary> /// <summary>
/// 湿度/锡膏料仓为冷藏区湿度 /// 湿度/锡膏料仓为冷藏区湿度
/// </summary> /// </summary>
public String humidity; public String humidity="";
/** /**
* 制冷温度1 * 制冷温度1
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!