Ver código fonte

首页功率统计增加炼钢厂的数据

lingpeng.li 4 meses atrás
pai
commit
7fb98a8383

+ 13 - 0
zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/controller/DeviceRegionController.java

@@ -225,6 +225,19 @@ public class DeviceRegionController extends JeecgController<DeviceRegion, IDevic
             );
             result.add(ironData);
 
+
+            // 提取并格式化 "炼钢" 数据
+            String lgData = String.format(
+                    "炼钢, 实时%skWh, 累计%skWh, 尖%s, 峰%s, 平%s, 谷%s",
+                    map.getOrDefault("炼钢厂实时总功率", "0"),
+                    map.getOrDefault("炼钢厂累计总功率", "0"),
+                    map.getOrDefault("炼钢厂尖时段总功率占比", "0"),
+                    map.getOrDefault("炼钢厂峰时段总功率占比", "0"),
+                    map.getOrDefault("炼钢厂平时段总功率占比", "0"),
+                    map.getOrDefault("炼钢厂谷时段总功率占比", "0")
+            );
+            result.add(lgData);
+
             // 提取并格式化 "轧钢" 数据
             String zgData = String.format(
                     "轧钢, 实时%skWh, 累计%skWh, 尖%s, 峰%s, 平%s, 谷%s",

+ 1 - 1
zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/deviceLesm/service/impl/DeviceRegionServiceImpl.java

@@ -73,7 +73,7 @@ public class DeviceRegionServiceImpl extends ServiceImpl<DeviceRegionMapper, Dev
         Date startOfDay = sdf.parse(startOfDayString);
         Date endOfDay = sdf.parse(endOfDayString);
 
-        List<String> regionTitles = Arrays.asList("轧钢厂", "炼铁厂");
+        List<String> regionTitles = Arrays.asList("轧钢厂", "炼铁厂", "炼钢厂");
 
 
         Map<String, Object> powerMap = new HashMap<>();