From e8df7cd4f6b46bf6fd0c9c22f0cdb358c101b78c Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Fri, 23 Jan 2026 13:41:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=83=BD=E8=80=97=E8=A1=A5?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dataAnalysisController.java | 22 +++++++++++++++++++ .../energy/report/domain/ReportPointDnb.java | 6 ++--- .../report/mapper/ReportPointDnbMapper.java | 7 ++++++ .../report/service/IDataAnalysisService.java | 3 +++ .../service/impl/DataAnalysisServiceImpl.java | 12 ++++++++++ 5 files changed, 47 insertions(+), 3 deletions(-) diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/controller/dataAnalysisController.java b/op-modules/op-energy/src/main/java/com/op/energy/report/controller/dataAnalysisController.java index 7db82206d..779248c3c 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/controller/dataAnalysisController.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/controller/dataAnalysisController.java @@ -13,11 +13,13 @@ import com.op.energy.base.utils.ExportExcelUtil; import com.op.energy.base.utils.SpringUtils; import com.op.energy.report.domain.ExportReport; import com.op.energy.report.domain.ReportOrderEnergyDTO; +import com.op.energy.report.domain.ReportPointDnb; import com.op.energy.report.service.IDataAnalysisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; @@ -280,4 +282,24 @@ public class dataAnalysisController extends BaseController { util.exportExcel(response, orderEnergyList, "单耗统计数据"); } + + /** + * 能耗补录模版 + * **/ + @PostMapping("/energyTemplate") + public void energyTemplate(HttpServletResponse response) { + ExcelUtil util = new ExcelUtil<>(ReportPointDnb.class); + util.importTemplateExcel(response, "能耗补录-导入模板"); + } + + /** + * 能耗补录 + * **/ + @PostMapping("/energyImport") + public AjaxResult energyImport(MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil<>(ReportPointDnb.class); + List list = util.importExcel(file.getInputStream()); + return AjaxResult.success(dataAnalysisService.importReportPointDnb(list)); + } + } diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportPointDnb.java b/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportPointDnb.java index cd6136866..4dc4289eb 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportPointDnb.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/domain/ReportPointDnb.java @@ -56,7 +56,7 @@ public class ReportPointDnb extends BaseEntity { /** * 计量设备位置 */ - @Excel(name = "计量设备位置") + @Excel(name = "计量设备位置", type = Excel.Type.EXPORT) private String address; /** @@ -68,7 +68,7 @@ public class ReportPointDnb extends BaseEntity { /** * 价格 */ - @Excel(name = "价格") + @Excel(name = "价格", type = Excel.Type.EXPORT) private BigDecimal price; /** @@ -95,7 +95,7 @@ public class ReportPointDnb extends BaseEntity { * 记录时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Excel.Type.EXPORT) private Date recordTime; /** diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/mapper/ReportPointDnbMapper.java b/op-modules/op-energy/src/main/java/com/op/energy/report/mapper/ReportPointDnbMapper.java index 7d7c9ddd6..da27a7b44 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/mapper/ReportPointDnbMapper.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/mapper/ReportPointDnbMapper.java @@ -4,6 +4,7 @@ package com.op.energy.report.mapper; import com.op.energy.report.domain.ReportOrderEnergyDTO; import com.op.energy.report.domain.ReportPointDnb; import com.op.energy.report.domain.ReportPointDnbDTO; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -90,4 +91,10 @@ public interface ReportPointDnbMapper { List selectPointDnbGroupList(ReportPointDnb pointDnb); List> datePointDnbGroupList(ReportPointDnb lineDnb); + + Integer fixWwEnergyData(@Param("params") Map params); + + int batchInsertReportPointDnb(@Param("list") List list); + + } diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/IDataAnalysisService.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/IDataAnalysisService.java index cde409d23..24c09ab7d 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/IDataAnalysisService.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/IDataAnalysisService.java @@ -3,6 +3,7 @@ package com.op.energy.report.service; import com.op.energy.base.domain.BaseLineLoss; import com.op.energy.report.domain.ExportReport; import com.op.energy.report.domain.ReportOrderEnergyDTO; +import com.op.energy.report.domain.ReportPointDnb; import java.util.List; import java.util.Map; @@ -108,4 +109,6 @@ public interface IDataAnalysisService { List classificationExportReport(Map paramMap); public List OrderEnergyList(ReportOrderEnergyDTO reportOrderEnergyDTO); + + String importReportPointDnb(List list); } diff --git a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java index d2fc2fa37..95dd0d12d 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/report/service/impl/DataAnalysisServiceImpl.java @@ -22,6 +22,7 @@ import com.op.energy.report.domain.ReportPointWater; import com.op.energy.report.mapper.ReportPointDnbMapper; import com.op.energy.report.mapper.ReportPointWaterMapper; import com.op.energy.report.service.IDataAnalysisService; +import org.apache.commons.collections4.ListUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -1047,4 +1048,15 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { return reportOrderEnergyDTOList; } + + @Override + @DS("#header.poolName") + public String importReportPointDnb(List importList) { + if (importList.isEmpty()){ + throw new RuntimeException("导入数据为空"); + } + int successCount = reportPointDnbMapper.batchInsertReportPointDnb(importList); + + return String.format("导入成功。上传数量：%d，导入数量：%d", importList.size(), successCount); + } }