Merge branch 'master' of http://39.105.213.67:3000/hwj_system/psdc

2 years ago · 759b3931cd
parent 30cbadbad0 442a758192
commit 759b3931cd
1 changed files with 6 additions and 3 deletions
--- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
@ -77,9 +77,12 @@ public class TotalElectricMeterController {
                    if (null != modelVo3){
                        b3 = true;
                    }
-                    map2.put("intemp", b1);
-                    map2.put("outtemp", b2);
-                    map2.put("temp", b3);
+                    map2.put("intemp", null);
+                    map2.put("outtemp", null);
+                    map2.put("temp", null);
+                    map2.put("inTemp", b1);
+                    map2.put("outTemp", b2);
+                    map2.put("Temp", b3);
                    maps2.add(map2);
                }
            } else {