From b97d997812695c811132ed23a64b3132c5be7123 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 22 五月 2025 10:53:17 +0800
Subject: [PATCH] 复制接口增加专业参数
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java | 3 ++-
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsGasPipelineCapacityPlanService.java | 2 +-
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelineMoController.java | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelinePredictionController.java | 1 +
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java | 6 ++++--
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java | 2 +-
7 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
index fae1314..744750a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsGasPipelineCapacityPlanController.java
@@ -109,11 +109,12 @@
// 鏍煎紡锛歽yyy-MM
@RequestParam String date,
@RequestParam String factory,
+ @RequestParam String major,
// 鏍煎紡锛歽yyy-MM
@RequestParam String toStart,
// 鏍煎紡锛歽yyy-MM
@RequestParam String toEnd) {
- apsGasPipelineCapacityPlanService.copyPlan(date, factory, toStart, toEnd);
+ apsGasPipelineCapacityPlanService.copyPlan(date, factory, major, toStart, toEnd);
return success();
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelineMoController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelineMoController.java
index 11da781..f99787f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelineMoController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelineMoController.java
@@ -137,6 +137,7 @@
byte[] file = IOUtils.resourceToByteArray("/templates/姘斾綋宸ュ崟鏁版嵁妯℃澘v1.0.xlsx");
ByteArrayResource resource = new ByteArrayResource(file);
return ResponseEntity.ok()
+ .header("Access-Control-Expose-Headers", HttpHeaders.CONTENT_DISPOSITION)
.header(HttpHeaders.CONTENT_DISPOSITION,
String.format("attachment;filename=%s", URLEncoder.encode("姘斾綋宸ュ崟鏁版嵁妯℃澘.xlsx", StandardCharsets.UTF_8)))
.header(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelinePredictionController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelinePredictionController.java
index cd1dc52..faf5e0a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelinePredictionController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipelinePredictionController.java
@@ -77,6 +77,7 @@
byte[] file = IOUtils.resourceToByteArray("/templates/姘斾綋棰勬祴鏁版嵁妯℃澘v1.0.xlsx");
ByteArrayResource resource = new ByteArrayResource(file);
return ResponseEntity.ok()
+ .header("Access-Control-Expose-Headers", HttpHeaders.CONTENT_DISPOSITION)
.header(HttpHeaders.CONTENT_DISPOSITION,
String.format("attachment;filename=%s", URLEncoder.encode("姘斾綋棰勬祴鏁版嵁妯℃澘.xlsx", StandardCharsets.UTF_8)))
.header(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
index dbb9450..29aa8fd 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsGasPipelineCapacityPlanMapper.java
@@ -62,5 +62,5 @@
*/
public int deleteApsGasPipelineCapacityPlanByIds(Long[] ids);
- void deleteByDateAndFactory(String year, String month, String factory);
+ void deleteByDateAndFactory(String year, String month, String factory, String major);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsGasPipelineCapacityPlanService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsGasPipelineCapacityPlanService.java
index 4ca18ef..722bb30 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsGasPipelineCapacityPlanService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsGasPipelineCapacityPlanService.java
@@ -60,5 +60,5 @@
*/
public int deleteApsGasPipelineCapacityPlanById(Long id);
- void copyPlan(String date, String factory, String toStart, String toEnd);
+ void copyPlan(String date, String factory, String major, String toStart, String toEnd);
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
index 0f16f88..742e2bf 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsGasPipelineCapacityPlanServiceImpl.java
@@ -101,7 +101,7 @@
@SneakyThrows
@Override
@Transactional(rollbackFor = Exception.class)
- public void copyPlan(String date, String factory, String toStart, String toEnd) {
+ public void copyPlan(String date, String factory, String major, String toStart, String toEnd) {
String[] dtSrc = date.split("-");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
@@ -116,6 +116,7 @@
plan.setYear(Integer.valueOf(dtSrc[0]).toString());
plan.setMonth(Integer.valueOf(dtSrc[1]).toString());
plan.setOrgCode(factory);
+ plan.setMajor(major);
List<ApsGasPipelineCapacityPlan> templatePlans = apsGasPipelineCapacityPlanMapper.selectApsGasPipelineCapacityPlanList(plan);
while (dtStart.before(dtEnd)) {
String year = dtStart.get(Calendar.YEAR) + "";
@@ -123,7 +124,8 @@
apsGasPipelineCapacityPlanMapper.deleteByDateAndFactory(
year,
month,
- factory
+ factory,
+ major
);
templatePlans.forEach(p -> {
p.setYear(year);
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
index e5943da..6c48117 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipelineCapacityPlanMapper.xml
@@ -139,5 +139,6 @@
where year = #{year}
and month = #{month}
and org_code = #{factory}
+ and major = #{major}
</delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3