调整报表业务包目录结构

yeg

2026-09-09 9e332b9ea5f0866cf7ac03db5736d10469e5ed4a

调整报表业务包目录结构

将电池业务报表代码统一归入 service.report 包，更新相关 Java、测试和映射引用，保持业务逻辑与接口不变。

 battery-business/src/main/java/com/battery/business/service/report/CompareField.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRepository.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateRequest.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/CompareFieldTemplateService.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/CompareReportEditRequest.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/CompareReportRepository.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/CompareReportRequest.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/CompareReportService.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/FormationField.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/FormationFieldTemplateService.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/FormationReportCalculations.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/FormationReportRepository.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/FormationReportRequest.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/FormationReportService.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/ReportSourceDetail.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/ReportVersionRepository.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/SpliceField.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/SpliceFieldTemplateService.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/SpliceReportRepository.java

File was renamed from battery-business/src/main/java/com/battery/business/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

 battery-business/src/main/java/com/battery/business/service/report/SpliceReportRequest.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 battery-business/src/main/java/com/battery/business/service/report/SpliceReportService.java

File was renamed from battery-business/src/main/java/com/battery/business/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;

 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;

 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;

 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;

 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;

 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;}

 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.*;

 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.*;

 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.*;

 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.*;

 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.*;