From 9e332b9ea5f0866cf7ac03db5736d10469e5ed4a Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 09 九月 2026 22:46:09 +0800
Subject: [PATCH] 调整报表业务包目录结构
---
battery-business/src/main/java/com/battery/business/service/report/SpliceFieldTemplateService.java | 2
battery-business/src/main/java/com/battery/business/service/report/CompareField.java | 2
ruoyi-admin/src/test/java/com/battery/business/report/ReportTestDetailPersistenceTest.java | 2
battery-business/src/main/java/com/battery/business/service/report/FormationField.java | 2
battery-business/src/main/java/com/battery/business/service/report/ReportVersionRepository.java | 2
battery-business/src/main/java/com/battery/business/service/report/CompareReportService.java | 4 +-
battery-business/src/main/java/com/battery/business/service/report/SpliceReportRequest.java | 2
battery-business/src/main/java/com/battery/business/service/report/SpliceReportService.java | 2
ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java | 2
battery-business/src/main/java/com/battery/business/service/report/CompareReportEditRequest.java | 2
ruoyi-admin/src/test/java/com/battery/business/report/FormationReportReadMysqlTest.java | 2
battery-business/src/main/java/com/battery/business/service/report/FormationReportService.java | 6 +-
battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRepository.java | 2
ruoyi-admin/src/main/java/com/battery/business/web/FormationFieldTemplateController.java | 2
ruoyi-admin/src/main/java/com/battery/business/web/SpliceReportController.java | 2
battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRequest.java | 2
battery-business/src/main/java/com/battery/business/service/report/FormationReportCalculations.java | 2
battery-business/src/main/java/com/battery/business/service/report/FormationReportRequest.java | 2
battery-business/src/main/java/com/battery/business/service/report/SpliceField.java | 2
ruoyi-admin/src/test/java/com/battery/business/report/CompareMergedSourcesTest.java | 2
battery-business/src/main/java/com/battery/business/service/report/CompareReportRequest.java | 2
ruoyi-admin/src/main/java/com/battery/business/web/SpliceFieldTemplateController.java | 2
battery-business/src/main/java/com/battery/business/service/report/FormationFieldTemplateService.java | 2
ruoyi-admin/src/main/java/com/battery/business/web/FormationReportController.java | 8 ++--
ruoyi-admin/src/test/java/com/battery/business/report/SpliceProjectCyclesTest.java | 2
battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateService.java | 2
battery-business/src/main/java/com/battery/business/service/report/SpliceReportRepository.java | 2
battery-business/src/main/java/com/battery/business/service/report/ReportSourceDetail.java | 2
battery-business/src/main/java/com/battery/business/service/report/CompareReportRepository.java | 2
ruoyi-admin/src/main/java/com/battery/business/web/CompareReportController.java | 14 +++---
battery-business/src/main/java/com/battery/business/service/report/FormationReportRepository.java | 2
31 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareField.java b/battery-business/src/main/java/com/battery/business/service/report/CompareField.java
similarity index 96%
rename from battery-business/src/main/java/com/battery/business/report/CompareField.java
rename to battery-business/src/main/java/com/battery/business/service/report/CompareField.java
index 48418b4..e62c7bd 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareField.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/CompareField.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.ruoyi.common.exception.ServiceException;
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateRepository.java b/battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRepository.java
similarity index 98%
rename from battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateRepository.java
rename to battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRepository.java
index 67530b4..f638589 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateRepository.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRepository.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.exception.ServiceException;
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateRequest.java b/battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRequest.java
similarity index 94%
rename from battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateRequest.java
rename to battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRequest.java
index dfd2d4d..d4c526a 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateRequest.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRequest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.ruoyi.common.exception.ServiceException;
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateService.java b/battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateService.java
similarity index 98%
rename from battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateService.java
rename to battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateService.java
index 1fdc87f..d1eb9c7 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareFieldTemplateService.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateService.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import com.battery.business.domain.TBatteryGroupField;
import com.battery.business.service.ITBatteryGroupFieldService;
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareReportEditRequest.java b/battery-business/src/main/java/com/battery/business/service/report/CompareReportEditRequest.java
similarity index 96%
rename from battery-business/src/main/java/com/battery/business/report/CompareReportEditRequest.java
rename to battery-business/src/main/java/com/battery/business/service/report/CompareReportEditRequest.java
index ca84e20..c530cc6 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareReportEditRequest.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/CompareReportEditRequest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.ruoyi.common.exception.ServiceException;
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareReportRepository.java b/battery-business/src/main/java/com/battery/business/service/report/CompareReportRepository.java
similarity index 88%
rename from battery-business/src/main/java/com/battery/business/report/CompareReportRepository.java
rename to battery-business/src/main/java/com/battery/business/service/report/CompareReportRepository.java
index 866c240..47478e2 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareReportRepository.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/CompareReportRepository.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import javax.sql.DataSource;
import org.springframework.stereotype.Repository;
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareReportRequest.java b/battery-business/src/main/java/com/battery/business/service/report/CompareReportRequest.java
similarity index 97%
rename from battery-business/src/main/java/com/battery/business/report/CompareReportRequest.java
rename to battery-business/src/main/java/com/battery/business/service/report/CompareReportRequest.java
index a45b15a..db2dec6 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareReportRequest.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/CompareReportRequest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.util.List;
import java.util.Map;
diff --git a/battery-business/src/main/java/com/battery/business/report/CompareReportService.java b/battery-business/src/main/java/com/battery/business/service/report/CompareReportService.java
similarity index 99%
rename from battery-business/src/main/java/com/battery/business/report/CompareReportService.java
rename to battery-business/src/main/java/com/battery/business/service/report/CompareReportService.java
index f3cc618..04016d4 100644
--- a/battery-business/src/main/java/com/battery/business/report/CompareReportService.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/CompareReportService.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.util.ArrayList;
import java.util.Comparator;
@@ -16,7 +16,7 @@
import com.battery.business.domain.TTestBattery;
import com.battery.business.domain.TTestLogicStepMapping;
import com.battery.business.domain.TTestConsoleDetail;
-import com.battery.business.report.CompareReportRequest.Selection;
+import com.battery.business.service.report.CompareReportRequest.Selection;
import com.battery.business.service.ITTestService;
import com.battery.business.service.ITestDataQueryService;
import com.ruoyi.common.exception.ServiceException;
diff --git a/battery-business/src/main/java/com/battery/business/report/FormationField.java b/battery-business/src/main/java/com/battery/business/service/report/FormationField.java
similarity index 97%
rename from battery-business/src/main/java/com/battery/business/report/FormationField.java
rename to battery-business/src/main/java/com/battery/business/service/report/FormationField.java
index dad7df3..b2a1c66 100644
--- a/battery-business/src/main/java/com/battery/business/report/FormationField.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/FormationField.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonAnySetter;
diff --git a/battery-business/src/main/java/com/battery/business/report/FormationFieldTemplateService.java b/battery-business/src/main/java/com/battery/business/service/report/FormationFieldTemplateService.java
similarity index 98%
rename from battery-business/src/main/java/com/battery/business/report/FormationFieldTemplateService.java
rename to battery-business/src/main/java/com/battery/business/service/report/FormationFieldTemplateService.java
index e55af41..39afc95 100644
--- a/battery-business/src/main/java/com/battery/business/report/FormationFieldTemplateService.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/FormationFieldTemplateService.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.sql.Timestamp;
import java.util.List;
diff --git a/battery-business/src/main/java/com/battery/business/report/FormationReportCalculations.java b/battery-business/src/main/java/com/battery/business/service/report/FormationReportCalculations.java
similarity index 98%
rename from battery-business/src/main/java/com/battery/business/report/FormationReportCalculations.java
rename to battery-business/src/main/java/com/battery/business/service/report/FormationReportCalculations.java
index 100d84e..b030318 100644
--- a/battery-business/src/main/java/com/battery/business/report/FormationReportCalculations.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/FormationReportCalculations.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.math.BigDecimal;
import java.math.MathContext;
diff --git a/battery-business/src/main/java/com/battery/business/report/FormationReportRepository.java b/battery-business/src/main/java/com/battery/business/service/report/FormationReportRepository.java
similarity index 98%
rename from battery-business/src/main/java/com/battery/business/report/FormationReportRepository.java
rename to battery-business/src/main/java/com/battery/business/service/report/FormationReportRepository.java
index c837a10..07ca792 100644
--- a/battery-business/src/main/java/com/battery/business/report/FormationReportRepository.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/FormationReportRepository.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import javax.sql.DataSource;
import java.util.List;
diff --git a/battery-business/src/main/java/com/battery/business/report/FormationReportRequest.java b/battery-business/src/main/java/com/battery/business/service/report/FormationReportRequest.java
similarity index 98%
rename from battery-business/src/main/java/com/battery/business/report/FormationReportRequest.java
rename to battery-business/src/main/java/com/battery/business/service/report/FormationReportRequest.java
index 9c67e83..8dad92b 100644
--- a/battery-business/src/main/java/com/battery/business/report/FormationReportRequest.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/FormationReportRequest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.util.List;
import java.util.Map;
diff --git a/battery-business/src/main/java/com/battery/business/report/FormationReportService.java b/battery-business/src/main/java/com/battery/business/service/report/FormationReportService.java
similarity index 99%
rename from battery-business/src/main/java/com/battery/business/report/FormationReportService.java
rename to battery-business/src/main/java/com/battery/business/service/report/FormationReportService.java
index 4944949..9ff42b5 100644
--- a/battery-business/src/main/java/com/battery/business/report/FormationReportService.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/FormationReportService.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.math.BigDecimal;
import java.math.MathContext;
@@ -21,8 +21,8 @@
import com.battery.business.domain.TTest;
import com.battery.business.domain.TTestBattery;
import com.battery.business.domain.TTestConsoleDetail;
-import com.battery.business.report.FormationReportRequest.Selection;
-import com.battery.business.report.FormationReportRequest.Settings;
+import com.battery.business.service.report.FormationReportRequest.Selection;
+import com.battery.business.service.report.FormationReportRequest.Settings;
import com.battery.business.service.ITBatteryGroupFieldService;
import com.battery.business.service.ITTestService;
import com.battery.business.service.ITestDataQueryService;
diff --git a/battery-business/src/main/java/com/battery/business/report/ReportSourceDetail.java b/battery-business/src/main/java/com/battery/business/service/report/ReportSourceDetail.java
similarity index 97%
rename from battery-business/src/main/java/com/battery/business/report/ReportSourceDetail.java
rename to battery-business/src/main/java/com/battery/business/service/report/ReportSourceDetail.java
index e51bce2..c43905d 100644
--- a/battery-business/src/main/java/com/battery/business/report/ReportSourceDetail.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/ReportSourceDetail.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.util.HashSet;
import java.util.List;
diff --git a/battery-business/src/main/java/com/battery/business/report/ReportVersionRepository.java b/battery-business/src/main/java/com/battery/business/service/report/ReportVersionRepository.java
similarity index 99%
rename from battery-business/src/main/java/com/battery/business/report/ReportVersionRepository.java
rename to battery-business/src/main/java/com/battery/business/service/report/ReportVersionRepository.java
index 66443b2..c9a1ac6 100644
--- a/battery-business/src/main/java/com/battery/business/report/ReportVersionRepository.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/ReportVersionRepository.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.sql.Timestamp;
import java.util.List;
diff --git a/battery-business/src/main/java/com/battery/business/report/SpliceField.java b/battery-business/src/main/java/com/battery/business/service/report/SpliceField.java
similarity index 96%
rename from battery-business/src/main/java/com/battery/business/report/SpliceField.java
rename to battery-business/src/main/java/com/battery/business/service/report/SpliceField.java
index b5f3112..47a060f 100644
--- a/battery-business/src/main/java/com/battery/business/report/SpliceField.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/SpliceField.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.ruoyi.common.exception.ServiceException;
diff --git a/battery-business/src/main/java/com/battery/business/report/SpliceFieldTemplateService.java b/battery-business/src/main/java/com/battery/business/service/report/SpliceFieldTemplateService.java
similarity index 98%
rename from battery-business/src/main/java/com/battery/business/report/SpliceFieldTemplateService.java
rename to battery-business/src/main/java/com/battery/business/service/report/SpliceFieldTemplateService.java
index 6711bf4..e497d4b 100644
--- a/battery-business/src/main/java/com/battery/business/report/SpliceFieldTemplateService.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/SpliceFieldTemplateService.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.sql.Timestamp;
import java.util.HashSet;
diff --git a/battery-business/src/main/java/com/battery/business/report/SpliceReportRepository.java b/battery-business/src/main/java/com/battery/business/service/report/SpliceReportRepository.java
similarity index 85%
rename from battery-business/src/main/java/com/battery/business/report/SpliceReportRepository.java
rename to battery-business/src/main/java/com/battery/business/service/report/SpliceReportRepository.java
index 9f09ee5..fc79b0d 100644
--- a/battery-business/src/main/java/com/battery/business/report/SpliceReportRepository.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/SpliceReportRepository.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import javax.sql.DataSource;
import org.springframework.stereotype.Repository;
@Repository
diff --git a/battery-business/src/main/java/com/battery/business/report/SpliceReportRequest.java b/battery-business/src/main/java/com/battery/business/service/report/SpliceReportRequest.java
similarity index 93%
rename from battery-business/src/main/java/com/battery/business/report/SpliceReportRequest.java
rename to battery-business/src/main/java/com/battery/business/service/report/SpliceReportRequest.java
index ce4a63e..230c8c8 100644
--- a/battery-business/src/main/java/com/battery/business/report/SpliceReportRequest.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/SpliceReportRequest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.util.List;
import java.util.Map;
import jakarta.validation.Valid;
diff --git a/battery-business/src/main/java/com/battery/business/report/SpliceReportService.java b/battery-business/src/main/java/com/battery/business/service/report/SpliceReportService.java
similarity index 99%
rename from battery-business/src/main/java/com/battery/business/report/SpliceReportService.java
rename to battery-business/src/main/java/com/battery/business/service/report/SpliceReportService.java
index ecd1a66..3f3732b 100644
--- a/battery-business/src/main/java/com/battery/business/report/SpliceReportService.java
+++ b/battery-business/src/main/java/com/battery/business/service/report/SpliceReportService.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import java.math.BigDecimal;
import java.math.MathContext;
diff --git a/ruoyi-admin/src/main/java/com/battery/business/web/CompareReportController.java b/ruoyi-admin/src/main/java/com/battery/business/web/CompareReportController.java
index 755e479..30c9d77 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/web/CompareReportController.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/web/CompareReportController.java
@@ -1,12 +1,12 @@
package com.battery.business.web;
-import com.battery.business.report.CompareReportRepository;
-import com.battery.business.report.CompareReportService;
-import com.battery.business.report.CompareReportRequest;
-import com.battery.business.report.CompareReportEditRequest;
-import com.battery.business.report.CompareFieldTemplateRepository;
-import com.battery.business.report.CompareFieldTemplateRequest;
-import com.battery.business.report.CompareFieldTemplateService;
+import com.battery.business.service.report.CompareReportRepository;
+import com.battery.business.service.report.CompareReportService;
+import com.battery.business.service.report.CompareReportRequest;
+import com.battery.business.service.report.CompareReportEditRequest;
+import com.battery.business.service.report.CompareFieldTemplateRepository;
+import com.battery.business.service.report.CompareFieldTemplateRequest;
+import com.battery.business.service.report.CompareFieldTemplateService;
import jakarta.validation.Valid;
import java.util.List;
import com.ruoyi.common.core.controller.BaseController;
diff --git a/ruoyi-admin/src/main/java/com/battery/business/web/FormationFieldTemplateController.java b/ruoyi-admin/src/main/java/com/battery/business/web/FormationFieldTemplateController.java
index 4302ae2..4e3d35d 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/web/FormationFieldTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/web/FormationFieldTemplateController.java
@@ -1,6 +1,6 @@
package com.battery.business.web;
-import com.battery.business.report.FormationFieldTemplateService;
+import com.battery.business.service.report.FormationFieldTemplateService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import jakarta.validation.Valid;
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 9d3f8ca..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;
diff --git a/ruoyi-admin/src/main/java/com/battery/business/web/SpliceFieldTemplateController.java b/ruoyi-admin/src/main/java/com/battery/business/web/SpliceFieldTemplateController.java
index fcb7456..52061a9 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/web/SpliceFieldTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/web/SpliceFieldTemplateController.java
@@ -1,6 +1,6 @@
package com.battery.business.web;
-import com.battery.business.report.SpliceFieldTemplateService;
+import com.battery.business.service.report.SpliceFieldTemplateService;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import jakarta.validation.Valid;
diff --git a/ruoyi-admin/src/main/java/com/battery/business/web/SpliceReportController.java b/ruoyi-admin/src/main/java/com/battery/business/web/SpliceReportController.java
index 54a7215..8aeb87b 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/web/SpliceReportController.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/web/SpliceReportController.java
@@ -1,5 +1,5 @@
package com.battery.business.web;
-import java.util.List; import com.battery.business.report.*; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*;
+import java.util.List; import com.battery.business.service.report.*; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import jakarta.validation.Valid; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*;
/** 拼接报表正式 API，所有来源与统计由后端校验并冻结。 */
@RestController @RequestMapping("/system/splice-report") public class SpliceReportController extends BaseController {
private final SpliceReportService service; private final SpliceReportRepository reports; public SpliceReportController(SpliceReportService s,SpliceReportRepository r){service=s;reports=r;}
diff --git a/ruoyi-admin/src/test/java/com/battery/business/report/CompareMergedSourcesTest.java b/ruoyi-admin/src/test/java/com/battery/business/report/CompareMergedSourcesTest.java
index c6b5faf..b9bad6e 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/report/CompareMergedSourcesTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/report/CompareMergedSourcesTest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
diff --git a/ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java b/ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java
index ee6b528..58fb664 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/report/FormationRealReportTest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
diff --git a/ruoyi-admin/src/test/java/com/battery/business/report/FormationReportReadMysqlTest.java b/ruoyi-admin/src/test/java/com/battery/business/report/FormationReportReadMysqlTest.java
index ad2dc3f..412a093 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/report/FormationReportReadMysqlTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/report/FormationReportReadMysqlTest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import static org.junit.jupiter.api.Assertions.*;
import java.util.*;
diff --git a/ruoyi-admin/src/test/java/com/battery/business/report/ReportTestDetailPersistenceTest.java b/ruoyi-admin/src/test/java/com/battery/business/report/ReportTestDetailPersistenceTest.java
index 5db5d8a..a2a35fc 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/report/ReportTestDetailPersistenceTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/report/ReportTestDetailPersistenceTest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
diff --git a/ruoyi-admin/src/test/java/com/battery/business/report/SpliceProjectCyclesTest.java b/ruoyi-admin/src/test/java/com/battery/business/report/SpliceProjectCyclesTest.java
index e1de86d..79c53ea 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/report/SpliceProjectCyclesTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/report/SpliceProjectCyclesTest.java
@@ -1,4 +1,4 @@
-package com.battery.business.report;
+package com.battery.business.service.report;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
--
Gitblit v1.7.1