修改发电量单位

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

@@ -1061,7 +1061,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         ColModel colModelPower = new ColModel("power", "power", "有功功率(MW)", "有功功率(MW)", "dataGrid", "power");
         ColModel colModelWindSpeed = new ColModel("windSpeed", "windSpeed", "风速(m/s)", "风速(m/s)", "dataGrid", "windSpeed");
         ColModel colModelWind = new ColModel("wind", "wind", "风向(°)", "风向(°)", "dataGrid", "wind");
-        ColModel colModelElectricity = new ColModel("electricity", "electricity", "日发电量(万KWh)", "日发电量(万KWh)", "dataGrid", "electricity");
+        ColModel colModelElectricity = new ColModel("electricity", "electricity", "日发电量(万kWh)", "日发电量(万kWh)", "dataGrid", "electricity");
         List<ColModel> listColModel = Arrays.asList(colModelEquipmentNumber, colModelPower, colModelWindSpeed, colModelWind, colModelElectricity);
         ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
         return resultsData;

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

@@ -726,13 +726,13 @@ public class MonitoringServiceImpl {
             }
         });
         HashMap<String, String> dayHashMap = new HashMap<>();
-        dayHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, dailyPower.get()) + "万KWh");
+        dayHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, dailyPower.get()) + "万kWh");
         HashMap<String, String> monthHashMap = new HashMap<>();
-        monthHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, monthlyPower.get()) + "万KWh");
+        monthHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, monthlyPower.get()) + "万kWh");
         HashMap<String, String> annualHashMap = new HashMap<>();
-        annualHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, annualPower.get()) + "万KWh");
+        annualHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, annualPower.get()) + "万kWh");
         HashMap<String, String> totalHashMap = new HashMap<>();
-        totalHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, annualPower.get()) + "万KWh");
+        totalHashMap.put("title", String.format(CommonConstans.Fourdecimalplaces, annualPower.get()) + "万kWh");
         hashMapList.add(dayHashMap);
         hashMapList.add(monthHashMap);
         hashMapList.add(annualHashMap);