From b78295e8da96c3e5e76befeef9582ce5273dbb74 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期二, 29 九月 2026 13:10:23 +0800
Subject: [PATCH] 按代码规范检查整改实体注释、Service Javadoc 与分层边界
---
ruoyi-admin/src/main/java/com/battery/business/web/FormationReportController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 9617a90..0afcc72 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
@@ -1,10 +1,10 @@
package com.battery.business.web;
import java.util.List;
-import com.battery.business.report.FormationReportRepository;
-import com.battery.business.report.FormationReportService;
-import com.battery.business.report.FormationReportRequest;
-import com.battery.business.report.CompareReportEditRequest;
+import com.battery.business.service.report.FormationReportRepository;
+import com.battery.business.service.report.FormationReportService;
+import com.battery.business.service.report.FormationReportRequest;
+import com.battery.business.service.report.CompareReportEditRequest;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import jakarta.validation.Valid;
@@ -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,21 @@
/** 指定历史版本只读，不提供回滚。 */
@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')")
+ public AjaxResult print(@PathVariable long id, @PathVariable int versionNo) { return success(service.get(id, versionNo)); }
/** 普通编辑不接受来源或测量快照。 */
@PostMapping("/{id}/versions") @PreAuthorize("@ss.hasPermi('system:formation-report:edit')")
--
Gitblit v1.7.1