增加单位

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

@@ -247,7 +247,7 @@ public class MonitorFanIdxController extends BaseController {
             queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("30秒平均风速"));
             queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
             List<ESEquipments> result2 = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
-            columnMap.put(column, String.format("%.2f", String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getAvagerByEquipmentIndxName(result2, "30秒平均风速"))));
+            columnMap.put(column, String.format("%.2f",  commonServiceImpl.getAvagerByEquipmentIndxName(result2, "30秒平均风速")));
 
         }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -97,14 +97,14 @@ public class MonitoringServiceImpl {
             List<ESEquipments> result2 = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
             value= String.format("%.2f",  commonServiceImpl.getAvagerByEquipmentIndxName(result2, "30秒平均风速"));
             map.put("name","风速/辐照度");
-            map.put("value",value);
+            map.put("value",value+"m/s");
         }else{
             queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("WTX-801_25_WTX-801_总辐射"));
             queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getBoosterGatewayId()));
             List<ESEquipments> result1 = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
             value= String.format("%.2f", commonServiceImpl.getSumByEquipmentIndxName(result1, "WTX-801_25_WTX-801_总辐射"));
             map.put("name","风速/辐照度");
-            map.put("value",value);
+            map.put("value",value+"W/㎡");
         }
 
 
@@ -119,7 +119,7 @@ public class MonitoringServiceImpl {
         String value= ObjectUtils.isEmpty(installCapacity) ? "0.00" :String.format("%.2f", installCapacity);
         Map<String,String> map=new HashMap<>();
         map.put("name","容量");
-        map.put("value",value);
+        map.put("value",value+"MW");
         return map;
     }