From ad8664d0a1f70615441b2aa75f99fd454f2a67b1 Mon Sep 17 00:00:00 2001 From: yzj <2239426921@qq.com> Date: Mon, 27 Jun 2022 23:00:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E6=9E=9C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/domain/AchievementsExcel.java | 63 +++++++++++++++++++ .../impl/export/AchievementsExport.java | 54 ++++++++++++++++ .../service/impl/{ => export}/BookExport.java | 2 +- .../{ => export}/ComplementReportExport.java | 15 ++--- .../impl/{ => export}/DefultExport.java | 2 +- .../service/impl/{ => export}/DeptExport.java | 2 +- .../impl/{ => export}/ProjectExport.java | 2 +- .../impl/{ => export}/ReportExport.java | 2 +- .../impl/{ => export}/SpecialExport.java | 2 +- .../impl/{ => export}/TopicExport.java | 2 +- 10 files changed, 132 insertions(+), 14 deletions(-) create mode 100644 Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/AchievementsExcel.java create mode 100644 Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/AchievementsExport.java rename Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/{ => export}/BookExport.java (98%) rename Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/{ => export}/ComplementReportExport.java (98%) rename Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/{ => export}/DefultExport.java (94%) rename Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/{ => export}/DeptExport.java (98%) rename Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/{ => export}/ProjectExport.java (99%) rename Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/{ => export}/ReportExport.java (98%) rename Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/{ => export}/SpecialExport.java (99%) rename Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/{ => export}/TopicExport.java (99%) diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/AchievementsExcel.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/AchievementsExcel.java new file mode 100644 index 00000000..da58df1c --- /dev/null +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/domain/AchievementsExcel.java @@ -0,0 +1,63 @@ +package com.ruoyi.project.domain; + +import com.ruoyi.common.annotation.Excel; + +/** + * @version 1.0 + * @ClassName AchievementsExcel + * @Author yzj + * @Description //TODO 成果表格信息 + * @Date 2022/6/27 21:55 + **/ +public class AchievementsExcel { + @Excel(name = "项目编号*") + private String code; + @Excel(name = "标题*") + private String title; + @Excel(name = "文件名称*") + private String fileName; + @Excel(name = "详情*") + private String info; + @Excel(name = "密集*") + private String secrecylevel; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getInfo() { + return info; + } + + public void setInfo(String info) { + this.info = info; + } + + public String getSecrecylevel() { + return secrecylevel; + } + + public void setSecrecylevel(String secrecylevel) { + this.secrecylevel = secrecylevel; + } +} diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/AchievementsExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/AchievementsExport.java new file mode 100644 index 00000000..ad43165a --- /dev/null +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/AchievementsExport.java @@ -0,0 +1,54 @@ +package com.ruoyi.project.service.impl.export; + +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtilPL; +import com.ruoyi.project.domain.AchievementsExcel; +import com.ruoyi.project.domain.AttachmentExcel; +import com.ruoyi.project.mapper.PaProjectInfoMapper; +import com.ruoyi.project.service.BaseExport; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import java.io.IOException; +import java.util.List; + +/** + * @version 1.0 + * @ClassName AchievementsExport + * @Author yzj + * @Description //TODO 成果导入 + * @Date 2022/6/27 22:29 + **/ +@Service +public class AchievementsExport extends BaseExport { + @Resource + private PaProjectInfoMapper paProjectInfoMapper; + @Override + public AjaxResult addData(MultipartFile file, boolean updateSupport) { + + try { + ExcelUtilPL achievementsExcel = null; + List reportSheet = achievementsExcel.importExcel("成果信息", AchievementsExcel.class); + achievementsExcel = new ExcelUtilPL(file.getInputStream()); + String uploadPath = RuoYiConfig.getUploadPath()+"/complementReportExport"; + } catch (IOException e) { + e.printStackTrace(); + } catch (Exception e){ + + } + + return null; + } + + @Override + public AjaxResult modifyData(MultipartFile file, boolean updateSupport) { + return null; + } + + @Override + public AjaxResult getTemplate() { + return null; + } +} diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BookExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/BookExport.java similarity index 98% rename from Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BookExport.java rename to Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/BookExport.java index 77c3e4aa..6403a2e4 100644 --- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BookExport.java +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/BookExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.service.impl; +package com.ruoyi.project.service.impl.export; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ComplementReportExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ComplementReportExport.java similarity index 98% rename from Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ComplementReportExport.java rename to Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ComplementReportExport.java index 4d1ddfb5..09f3f3d6 100644 --- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ComplementReportExport.java +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ComplementReportExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.service.impl; +package com.ruoyi.project.service.impl.export; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.domain.AjaxResult; @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.io.File; import java.io.IOException; import java.util.List; @@ -35,14 +36,14 @@ import static java.util.concurrent.Executors.newFixedThreadPool; @Service public class ComplementReportExport extends BaseExport { - @Autowired + @Resource private PaProjectInfoMapper paProjectInfoMapper; - @Autowired + @Resource private PaTopicMapper paTopicMapper; - @Autowired + @Resource private PaAttachmentMapper paAttachmentMapper; - @Autowired + @Resource private PaSpecialSubjectMapper paSpecialSubjectMapper; @Override public AjaxResult addData(MultipartFile file, boolean updateSupport) { @@ -239,12 +240,12 @@ public class ComplementReportExport extends BaseExport { @Override public AjaxResult modifyData(MultipartFile file, boolean updateSupport) { - return null; + return AjaxResult.error("暂不支持该功能"); } @Override public AjaxResult getTemplate() { - return null; + return AjaxResult.error("暂不支持该功能"); } diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DefultExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/DefultExport.java similarity index 94% rename from Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DefultExport.java rename to Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/DefultExport.java index a70f263b..e7b8a51d 100644 --- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DefultExport.java +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/DefultExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.service.impl; +package com.ruoyi.project.service.impl.export; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DeptExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/DeptExport.java similarity index 98% rename from Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DeptExport.java rename to Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/DeptExport.java index 55adbcb8..b1a1aee4 100644 --- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/DeptExport.java +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/DeptExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.service.impl; +package com.ruoyi.project.service.impl.export; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ProjectExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ProjectExport.java similarity index 99% rename from Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ProjectExport.java rename to Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ProjectExport.java index ed14cb10..13e456af 100644 --- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ProjectExport.java +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ProjectExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.service.impl; +package com.ruoyi.project.service.impl.export; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils; diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ReportExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ReportExport.java similarity index 98% rename from Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ReportExport.java rename to Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ReportExport.java index 113d7579..847117c1 100644 --- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ReportExport.java +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/ReportExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.service.impl; +package com.ruoyi.project.service.impl.export; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.poi.ExcelUtil; diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpecialExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/SpecialExport.java similarity index 99% rename from Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpecialExport.java rename to Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/SpecialExport.java index e6d36c4a..bc66810b 100644 --- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/SpecialExport.java +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/SpecialExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.service.impl; +package com.ruoyi.project.service.impl.export; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils; diff --git a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/TopicExport.java b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/TopicExport.java similarity index 99% rename from Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/TopicExport.java rename to Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/TopicExport.java index 6a62366f..192940d0 100644 --- a/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/TopicExport.java +++ b/Rk-progect/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/export/TopicExport.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.service.impl; +package com.ruoyi.project.service.impl.export; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils;