From f54b0dff8157c7ef2547ac912d70cab63de50626 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 09 九月 2026 20:47:18 +0800
Subject: [PATCH] 按需读取化成旧报表摘要与循环曲线
---
ruoyi-admin/src/main/java/com/battery/business/web/FormationReportController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/battery/business/web/FormationReportController.java b/ruoyi-admin/src/main/java/com/battery/business/web/FormationReportController.java
index 2564723..9d3f8ca 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/web/FormationReportController.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/web/FormationReportController.java
@@ -39,11 +39,11 @@
/** 重开最新保存版本，不读取来源测试。 */
@GetMapping("/{id}") @PreAuthorize("@ss.hasPermi('system:formation-report:query')")
- public AjaxResult get(@PathVariable long id) { return success(service.get(id, null)); }
+ public AjaxResult get(@PathVariable long id) { return success(service.page(id, null)); }
/** 编辑权限独立读取最新基准。 */
@GetMapping("/{id}/editing") @PreAuthorize("@ss.hasPermi('system:formation-report:edit')")
- public AjaxResult editing(@PathVariable long id) { return success(service.get(id, null)); }
+ public AjaxResult editing(@PathVariable long id) { return success(service.page(id, null)); }
/** 查看历史版本的操作人、时间和说明。 */
@GetMapping("/{id}/versions") @PreAuthorize("@ss.hasPermi('system:formation-report:query')")
@@ -51,7 +51,17 @@
/** 指定历史版本只读，不提供回滚。 */
@GetMapping("/{id}/versions/{versionNo}") @PreAuthorize("@ss.hasPermi('system:formation-report:query')")
- public AjaxResult version(@PathVariable long id, @PathVariable int versionNo) { return success(service.get(id, versionNo)); }
+ public AjaxResult version(@PathVariable long id, @PathVariable int versionNo) { return success(service.page(id, versionNo)); }
+
+ /** 查看曲线必须沿用首屏固定版本，不能在切换循环时重读最新来源。 */
+ @GetMapping("/{id}/versions/{versionNo}/cycles/{cycleNo}") @PreAuthorize("@ss.hasPermi('system:formation-report:query')")
+ public AjaxResult cycle(@PathVariable long id, @PathVariable int versionNo, @PathVariable int cycleNo)
+ { return success(service.cycleCurves(id, versionNo, cycleNo)); }
+
+ /** 编辑动作可独立读取已打开基准的曲线，不额外要求查询权限。 */
+ @GetMapping("/{id}/editing/versions/{versionNo}/cycles/{cycleNo}") @PreAuthorize("@ss.hasPermi('system:formation-report:edit')")
+ public AjaxResult editingCycle(@PathVariable long id, @PathVariable int versionNo, @PathVariable int cycleNo)
+ { return success(service.cycleCurves(id, versionNo, cycleNo)); }
/** 导出权限独立读取指定快照，打开打印不记录下载成功。 */
@GetMapping("/{id}/versions/{versionNo}/print") @PreAuthorize("@ss.hasPermi('system:formation-report:export')")
--
Gitblit v1.7.1