From 2debc39d13bdce031221294b19750eea8ed53d49 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 26 六月 2025 16:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
index f0eca64..70bebe0 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/entity/CokingOverviewEntity.java
@@ -67,6 +67,10 @@
      */
 	private BigDecimal powerC;
     /**
+     * 电力产生
+     */
+	private BigDecimal powerP;
+    /**
      * 电力单耗
      */
 	private BigDecimal powerOnlyC;
@@ -75,9 +79,17 @@
      */
     private BigDecimal powerCStandard;
     /**
-     * 空转时间
+     * 停机时间
      */
 	private BigDecimal idleTime;
+    /**
+     * 运行时间
+     */
+    private BigDecimal runTime;
+    /**
+     * 作业率
+     */
+    private BigDecimal workRatio;
     /**
      * BFG消耗/总耗
      */
@@ -107,7 +119,32 @@
     private BigDecimal gxls;
 
     /**
-     * 峰谷占比
+     * 峰时占比
      */
-    private BigDecimal fgRatio;
+    private BigDecimal fsRatio;
+
+    /**
+     * 谷时占比
+     */
+    private BigDecimal gsRatio;
+
+    /**
+     * 平时占比
+     */
+    private BigDecimal psRatio;
+
+    /**
+     * 峰时占比-月累计
+     */
+    private BigDecimal fsRatioMonth;
+
+    /**
+     * 谷时占比-月累计
+     */
+    private BigDecimal gsRatioMonth;
+
+    /**
+     * 平时占比-月累计
+     */
+    private BigDecimal psRatioMonth;
 }
\ No newline at end of file

--
Gitblit v1.9.3