From a1db2cd9fd44cb58518fdf3e95ea1531711ffc07 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Thu, 27 Apr 2023 17:41:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 现在报表添加接口，会同时将报表文件的内容存入数据库 --- .../controller/ReportManageConroller.java | 2 +- .../adc/da/report/service/IReportService.java | 3 +- .../service/impl/IReportServiceImpl.java | 11 +- .../mapper/mysql/ReportManageMapper.xml | 127 ++---------------- 4 files changed, 24 insertions(+), 119 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 43e756a..f203b8c 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java @@ -79,7 +79,7 @@ public class ReportManageConroller { @ApiOperation("新增或编辑报告") @PostMapping("/add") @ReportLog(description = "新增或编辑") - public ResponseMessage add(@RequestBody ReportVo vo) { + public ResponseMessage add(@RequestBody ReportVo vo) throws IOException { ReportEntity entity = new ReportEntity(); BeanUtils.copyProperties(vo, entity); String name = reportService.insert(entity, vo.getLabelList()); diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java index 30bb799..52281eb 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java @@ -5,6 +5,7 @@ import com.adc.da.report.vo.ReportQueryVo; import com.adc.da.report.vo.ReportVo; import com.baomidou.mybatisplus.core.metadata.IPage; +import java.io.IOException; import java.util.List; /** @@ -20,7 +21,7 @@ public interface IReportService { * @param labelList * @return 报告名称 */ - String insert(ReportEntity entity, List labelList); + String insert(ReportEntity entity, List labelList) throws IOException; /** * 报告列表展示 diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index bfcefaf..c36cb2a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -11,6 +11,7 @@ import com.adc.da.report.eo.FileEntity; import com.adc.da.report.eo.ReportEntity; import com.adc.da.report.eo.ReportLabelEntity; import com.adc.da.report.eo.ReportUserEntity; +import com.adc.da.report.service.IReportContentService; import com.adc.da.report.service.IReportLabelService; import com.adc.da.report.service.IReportService; import com.adc.da.report.service.ITreeLabelService; @@ -40,6 +41,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -93,6 +95,9 @@ public class IReportServiceImpl extends ServiceImpl @Autowired private RoleEODao roleEODao; + @Resource + private IReportContentService iReportContentService; + @Autowired private LocalFileUtil localFileUtil; @@ -105,7 +110,7 @@ public class IReportServiceImpl extends ServiceImpl */ @Override @Transactional(rollbackFor = Exception.class) - public String insert(ReportEntity entity, List labelList) { + public String insert(ReportEntity entity, List labelList) throws IOException { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (StringUtils.isEmpty(entity.getId())) { @@ -130,6 +135,9 @@ public class IReportServiceImpl extends ServiceImpl reportLabelDao.insert(reportLabelEntity); }); + //插入报表内容表 + iReportContentService.insertReportContent(entity.getId() ,entity.getFileId()); + CommonUtils.threadPoolExecutor().execute(() -> { //生成html try { @@ -223,7 +231,6 @@ public class IReportServiceImpl extends ServiceImpl idSet.add(reportLabelEntity.getReportId()); }); } - // TODO ES模糊查询 IPage list = reportDao.list(page, vo, idSet); diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 6b52bac..2ddcf03 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -2,124 +2,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -