修改代码

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -241,7 +241,7 @@ public class MonitorFanIdxController extends BaseController {
         }
 
         String num = monitorFanIndicator.getFJCount(gatewayId);
-        columnMap.put("风机台数",num);
+        columnMap.put("风机台数",Double.valueOf(num).intValue());
 
         Double capacityl = commonServiceImpl.getStationCapactityByStationWerks(stationBasic.getStationNumber());
         columnMap.put("装机容量",String.format("%.2f",capacityl));
@@ -256,16 +256,17 @@ public class MonitorFanIdxController extends BaseController {
         for (Map map : list) {
             String key = map.get("title").toString();
             if (map.containsKey("action")){
+                map.put("title", columnMap.get(key)==null?0.00:columnMap.get(key));
+                map.put("title2",map.get("title"));
                 if (key.equals("日利用小时")){
-                    map.put("title", map.get("action").toString().replace("*","日发电量").replace("-","装机容量"));
+                    String format = String.format("%.2f", ((Double.parseDouble(columnMap.get("日发电量").toString())*10)/ (Double.parseDouble(columnMap.get("装机容量").toString()))));
+                    map.put("title", format);
                     map.put("title2",map.get("title"));
                 }else {
-                    map.put("title", map.get("action").toString().replace("*",columnMap.get(key).toString()));
+                    map.put("title",String.format("%.2f",Double.parseDouble(columnMap.get(key).toString())/1000));
                     map.put("title2",map.get("title"));
                 }
             }
-            map.put("title", columnMap.get(key)==null?0.00:columnMap.get(key));
-            map.put("title2",map.get("title"));
 
         }