From 836ec39fdad422b1a148699a4c5fb8c5b4d395f0 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 11:04:33 +0800
Subject: [PATCH] feat(card): 添加管理类型卡写卡功能并优化卡片相关逻辑- 在 OperateTypeENUM 中添加 SUPPLEMENT 和 MANAGEMENT_CARD_WRITE 枚举值 - 在 SeManagementCard 中添加 cancelTime 和 state 字段 - 更新相关 mapper 和 XML 文件以支持新增字段 - 修改 CardSv 中的回调处理逻辑，支持管理类型卡写卡 - 优化 CreateManagementCardDto 中识别码的示例值

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportCtrl.java |  113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportCtrl.java
index e3cdcda..4294b2b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportCtrl.java
@@ -5,7 +5,11 @@
 import com.dy.common.webUtil.BaseResponseUtils;
 import com.dy.common.webUtil.QueryResultVo;
 import com.dy.pipIrrGlobal.voRm.VoOnHour;
-import com.dy.pipIrrRemote.report.qo.ReportQO;
+import com.dy.pipIrrGlobal.voRm.VoOpenCloseValve;
+import com.dy.pipIrrGlobal.voRm.VoTiming;
+import com.dy.pipIrrGlobal.voRm.VoWork;
+import com.dy.pipIrrRemote.report.qo.OnHourQO;
+import com.dy.pipIrrRemote.report.qo.OpenCloseValveQO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,11 +39,116 @@
      */
     @GetMapping(path = "/on_hour_report_history")
     @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoOnHour>>> getOnHourReportHistory(ReportQO qo){
+    public BaseResponse<QueryResultVo<List<VoOnHour>>> getOnHourReportHistory(OnHourQO qo){
         try {
             return BaseResponseUtils.buildSuccess(reportSv.getOnHourReportsHistory(qo));
         } catch (Exception e) {
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鏁寸偣鎶ユ渶鏂拌褰�
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/on_hour_report_last")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoOnHour>>> getOnHourReportLast(OnHourQO qo){
+        try {
+            return BaseResponseUtils.buildSuccess(reportSv.getOnHourReportsLast(qo));
+        } catch (Exception e) {
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ュ巻鍙茶褰�
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/opem_close_valve_report_history")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoOpenCloseValve>>> getOpenCloseValveReportHistory(OpenCloseValveQO qo){
+        try {
+            return BaseResponseUtils.buildSuccess(reportSv.getOpenCloseValveReports_history(qo));
+        } catch (Exception e) {
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍏抽榾鎶ユ渶鏂拌褰�
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/opem_close_valve_report_last")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoOpenCloseValve>>> getOpenCloseValveReportLast(OpenCloseValveQO qo){
+        try {
+            return BaseResponseUtils.buildSuccess(reportSv.getOpenCloseValveReports_last(qo));
+        } catch (Exception e) {
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瀹氭椂鎶ュ巻鍙茶褰�
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/timing_report_history")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoTiming>>> getTimingReportHistory(OnHourQO qo){
+        try {
+            return BaseResponseUtils.buildSuccess(reportSv.getTimingReportsHistory(qo));
+        } catch (Exception e) {
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇瀹氭椂鎶ユ渶鏂拌褰�
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/timing_report_last")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoTiming>>> getTimingReportLast(OnHourQO qo){
+        try {
+            return BaseResponseUtils.buildSuccess(reportSv.getTimingReportsLast(qo));
+        } catch (Exception e) {
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇宸ヤ綔鎶ュ巻鍙茶褰�
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/work_report_history")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoWork>>> getWorkReportHistory(OnHourQO qo){
+        try {
+            return BaseResponseUtils.buildSuccess(reportSv.getWorkReportsHistory(qo));
+        } catch (Exception e) {
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鑾峰彇宸ヤ綔鎶ユ渶鏂拌褰�
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/work_report_last")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoWork>>> getWorkReportLast(OnHourQO qo){
+        try {
+            return BaseResponseUtils.buildSuccess(reportSv.getWorkReportsLast(qo));
+        } catch (Exception e) {
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
 }

--
Gitblit v1.8.0