From c62f3cee5e0dcbe7a42328a3ca76397763e1143e Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Wed, 5 Aug 2026 18:13:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E9=87=8F=E6=95=B0=E6=8D=AE=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qgc_export/processor/QiProcessor.java     | 25 +++++++++++++++++++
 .../qgc_export/processor/QoProcessor.java     | 25 +++++++++++++++++++
 .../service/impl/QgcExportServiceImpl.java    | 24 ++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 backend/src/main/java/com/yfd/platform/qgc_export/processor/QiProcessor.java
 create mode 100644 backend/src/main/java/com/yfd/platform/qgc_export/processor/QoProcessor.java

diff --git a/backend/src/main/java/com/yfd/platform/qgc_export/processor/QiProcessor.java b/backend/src/main/java/com/yfd/platform/qgc_export/processor/QiProcessor.java
new file mode 100644
index 00000000..efeac096
--- /dev/null
+++ b/backend/src/main/java/com/yfd/platform/qgc_export/processor/QiProcessor.java
@@ -0,0 +1,25 @@
+package com.yfd.platform.qgc_export.processor;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 入库流量(QI) 处理器
+ */
+@Component
+public class QiProcessor extends HydropwIndicatorProcessor {
+
+    @Override
+    public String getFieldName() {
+        return "QI";
+    }
+
+    @Override
+    public String getSheetName() {
+        return "入库流量";
+    }
+
+    @Override
+    public int getOrder() {
+        return 5;
+    }
+}
diff --git a/backend/src/main/java/com/yfd/platform/qgc_export/processor/QoProcessor.java b/backend/src/main/java/com/yfd/platform/qgc_export/processor/QoProcessor.java
new file mode 100644
index 00000000..e6481449
--- /dev/null
+++ b/backend/src/main/java/com/yfd/platform/qgc_export/processor/QoProcessor.java
@@ -0,0 +1,25 @@
+package com.yfd.platform.qgc_export.processor;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 出库流量(QO) 处理器
+ */
+@Component
+public class QoProcessor extends HydropwIndicatorProcessor {
+
+    @Override
+    public String getFieldName() {
+        return "QO";
+    }
+
+    @Override
+    public String getSheetName() {
+        return "出库流量";
+    }
+
+    @Override
+    public int getOrder() {
+        return 6;
+    }
+}
diff --git a/backend/src/main/java/com/yfd/platform/qgc_export/service/impl/QgcExportServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_export/service/impl/QgcExportServiceImpl.java
index bfd3ff67..cd3a3c41 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_export/service/impl/QgcExportServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_export/service/impl/QgcExportServiceImpl.java
@@ -120,6 +120,12 @@ public class QgcExportServiceImpl implements IQgcExportService {
     @Resource
     private DzVariationProcessor dzVariationProcessor;
 
+    // QI/QO 出入库流量相关（STTP=ENG）
+    @Resource
+    private QiProcessor qiProcessor;
+    @Resource
+    private QoProcessor qoProcessor;
+
     private static final SimpleDateFormat SDF_TIME = new SimpleDateFormat("dd日 HH时");
 
     /** 基础汇总指标（7个） */
@@ -299,6 +305,9 @@ public class QgcExportServiceImpl implements IQgcExportService {
         processorMap.put("v", vProcessor);
         processorMap.put("q", qProcessor);
         processorMap.put("z", zProcessor);
+        // 出入库流量（STTP=ENG，仅标准格式无日变幅）
+        processorMap.put("qi", qiProcessor);
+        processorMap.put("qo", qoProcessor);
 
         // WQ 别名：展开为全部水质指标
         List<String> expanded = new ArrayList<>();
@@ -321,6 +330,19 @@ public class QgcExportServiceImpl implements IQgcExportService {
                 result.add(dwtVariationProcessor);
                 continue;
             }
+
+//            // RZ 坝上水位 → 展开为标准格式 + 日变幅两个 Sheet
+//            if ("qi".equals(field)) {
+//                qiProcessor.setMappers(sdHydropwRMapper, sdHydropwdaySMapper);
+//                result.add(qiProcessor);
+//                continue;
+//            }
+//            // DZ 坝下水位 → 展开为标准格式 + 日变幅两个 Sheet
+//            if ("qo".equals(field)) {
+//                qoProcessor.setMappers(sdHydropwRMapper, sdHydropwdaySMapper);
+//                result.add(qoProcessor);
+//                continue;
+//            }
             // RZ 坝上水位 → 展开为标准格式 + 日变幅两个 Sheet
             if ("rz".equals(field)) {
                 rzProcessor.setMappers(sdHydropwRMapper, sdHydropwdaySMapper);
@@ -344,6 +366,8 @@ public class QgcExportServiceImpl implements IQgcExportService {
                     ((RiverIndicatorProcessor) p).setMappers(sdRiverRMapper, sdRiverdaySMapper);
                 } else if (p instanceof WqIndicatorProcessor) {
                     ((WqIndicatorProcessor) p).setMappers(sdWqRMapper, sdWqdaySMapper);
+                } else if (p instanceof HydropwIndicatorProcessor) {
+                    ((HydropwIndicatorProcessor) p).setMappers(sdHydropwRMapper, sdHydropwdaySMapper);
                 }
                 result.add(p);
             }