|
@@ -411,6 +411,7 @@ public class NanShaWsdServiceImpl extends WsdBaseServiceImpl implements NanShaWs
|
|
|
}
|
|
}
|
|
|
tempObj.put("range",tempRange);
|
|
tempObj.put("range",tempRange);
|
|
|
tempObj.put("result",df.format(calculate));
|
|
tempObj.put("result",df.format(calculate));
|
|
|
|
|
+ tempObj.put("value",value);
|
|
|
tempObj.put("status",status);
|
|
tempObj.put("status",status);
|
|
|
tempObj.put("unit",type.equals("温度")?"℃":"%");
|
|
tempObj.put("unit",type.equals("温度")?"℃":"%");
|
|
|
tempObj.put("label", time +"点"+ type);
|
|
tempObj.put("label", time +"点"+ type);
|
|
@@ -479,8 +480,8 @@ public class NanShaWsdServiceImpl extends WsdBaseServiceImpl implements NanShaWs
|
|
|
calculate = value + shiDuXiuZheng;
|
|
calculate = value + shiDuXiuZheng;
|
|
|
}
|
|
}
|
|
|
tempObj.put("range",tempRange);
|
|
tempObj.put("range",tempRange);
|
|
|
- tempObj.put("value",df.format(calculate));
|
|
|
|
|
- tempObj.put("result",value);
|
|
|
|
|
|
|
+ tempObj.put("value",value);
|
|
|
|
|
+ tempObj.put("result",df.format(calculate));
|
|
|
tempObj.put("status",status);
|
|
tempObj.put("status",status);
|
|
|
tempObj.put("unit",type.equals("温度")?"℃":"%");
|
|
tempObj.put("unit",type.equals("温度")?"℃":"%");
|
|
|
tempObj.put("label", time +"点"+ type);
|
|
tempObj.put("label", time +"点"+ type);
|