From 6cfa75fdb47841660e417227da412beec220253c Mon Sep 17 00:00:00 2001 From: Guava Date: Fri, 23 Jun 2023 17:38:17 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/data/dto/ImportData.java | 19 +++++++++++++++++++ .../module/boecase/api/CasesRecommendApi.java | 7 ++++--- .../ICasesRecommendLaunchImportService.java | 3 ++- ...CasesRecommendLaunchImportServiceImpl.java | 12 +++++++++--- 4 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java b/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java new file mode 100644 index 00000000..ff68df14 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java @@ -0,0 +1,19 @@ +package com.xboe.data.dto; + +import lombok.Data; + +import java.util.List; + +/** + * @author : civism + * @version 1.0 + * @date 2023/6/23 17:32 + */ +@Data +public class ImportData { + + private String importId; + + + private List caseIdList; +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java index 0d26a02a..e8027cc8 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java @@ -10,6 +10,7 @@ import cn.hutool.poi.excel.ExcelWriter; import com.xboe.common.PageList; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; +import com.xboe.data.dto.ImportData; import com.xboe.enums.CasesRecommendLaunchTypeEnum; import com.xboe.module.boecase.entity.CasesRecommend; import com.xboe.module.boecase.entity.CasesRecommendLaunchImport; @@ -108,11 +109,11 @@ public class CasesRecommendApi extends ApiBaseController { * @throws Exception */ @PostMapping("/import") - public JsonResponse excelImport(@RequestParam("file") MultipartFile file) throws Exception { + public JsonResponse excelImport(@RequestParam("file") MultipartFile file) throws Exception { ExcelReader reader = ExcelUtil.getReader(file.getInputStream()); List> read = reader.read(); - String s = iCasesRecommendLaunchImportService.importData(read); - return success(s); + ImportData importData = iCasesRecommendLaunchImportService.importData(read); + return success(importData); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportService.java index 9348c66d..5ac01aab 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportService.java @@ -1,6 +1,7 @@ package com.xboe.module.boecase.service; +import com.xboe.data.dto.ImportData; import com.xboe.module.boecase.entity.CasesRecommendLaunchImport; import java.util.List; @@ -13,7 +14,7 @@ public interface ICasesRecommendLaunchImportService { * @param dataList * @return */ - String importData(List> dataList); + ImportData importData(List> dataList); /** diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java index 653a0257..b2555caa 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java @@ -4,6 +4,7 @@ package com.xboe.module.boecase.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import com.xboe.core.orm.FieldFilters; +import com.xboe.data.dto.ImportData; import com.xboe.module.boecase.dao.CasesDao; import com.xboe.module.boecase.dao.CasesRecommendLaunchImportDao; import com.xboe.module.boecase.dao.CasesRecommendLaunchImportDataDao; @@ -15,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -32,7 +34,7 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau private CasesDao casesDao; @Override - public String importData(List> dataList) { + public ImportData importData(List> dataList) { if (CollectionUtil.isEmpty(dataList) || dataList.size() < 1) { throw new RuntimeException("导入数据为空"); } @@ -40,7 +42,9 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau int successNum = 0; int failNum = 0; String importId = IdUtil.getSnowflakeNextId() + ""; - + ImportData importData = new ImportData(); + importData.setImportId(importId); + List caseIds = new ArrayList<>(); for (int i = 1; i < dataList.size(); i++) { String caseTitle = dataList.get(i).get(0).toString(); CasesRecommendLaunchImportData casesRecommendLaunchImportData = new CasesRecommendLaunchImportData(); @@ -51,12 +55,14 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau failNum++; casesRecommendLaunchImportData.setStatus(2); } else { + caseIds.add(cases.getId()); casesRecommendLaunchImportData.setStatus(1); casesRecommendLaunchImportData.setCaseTitle(caseTitle); } casesRecommendLaunchImportDataDao.save(casesRecommendLaunchImportData); successNum++; } + importData.setCaseIdList(caseIds); CasesRecommendLaunchImport casesRecommendLaunchImport = new CasesRecommendLaunchImport(); casesRecommendLaunchImport.setFailNum(failNum); casesRecommendLaunchImport.setImportId(importId); @@ -64,7 +70,7 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau casesRecommendLaunchImport.setTotalNum(totalNum); casesRecommendLaunchImport.setProcessStatus(1); casesRecommendLaunchImportDao.save(casesRecommendLaunchImport); - return importId; + return importData; } From 95d3c05ccfef9949e69c8b51cbbd27d3eeae4fa0 Mon Sep 17 00:00:00 2001 From: Guava Date: Fri, 23 Jun 2023 17:40:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CasesRecommendLaunchImportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java index b2555caa..d36aade1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java @@ -86,7 +86,7 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau @Override public CasesRecommendLaunchImport getByImportId(String importId) { - return casesRecommendLaunchImportDao.findOne(FieldFilters.eq("import_id", importId)); + return casesRecommendLaunchImportDao.findOne(FieldFilters.eq("importId", importId)); } } From f57e7deb49756eca7077e4b69fac370849126b99 Mon Sep 17 00:00:00 2001 From: Guava Date: Fri, 23 Jun 2023 18:58:18 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=89=8D10=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/data/dto/ImportData.java | 2 ++ .../impl/CasesRecommendLaunchImportServiceImpl.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java b/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java index ff68df14..04193074 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java @@ -16,4 +16,6 @@ public class ImportData { private List caseIdList; + + private List caseTitleList; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java index d36aade1..3ffc6107 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java @@ -45,8 +45,13 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau ImportData importData = new ImportData(); importData.setImportId(importId); List caseIds = new ArrayList<>(); + + List caseTitleList = new ArrayList<>(); for (int i = 1; i < dataList.size(); i++) { String caseTitle = dataList.get(i).get(0).toString(); + if (caseTitleList.size() < 10) { + caseTitleList.add(caseTitle); + } CasesRecommendLaunchImportData casesRecommendLaunchImportData = new CasesRecommendLaunchImportData(); casesRecommendLaunchImportData.setImportId(importId); casesRecommendLaunchImportData.setCaseTitle(caseTitle); @@ -58,9 +63,9 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau caseIds.add(cases.getId()); casesRecommendLaunchImportData.setStatus(1); casesRecommendLaunchImportData.setCaseTitle(caseTitle); + successNum++; } casesRecommendLaunchImportDataDao.save(casesRecommendLaunchImportData); - successNum++; } importData.setCaseIdList(caseIds); CasesRecommendLaunchImport casesRecommendLaunchImport = new CasesRecommendLaunchImport(); @@ -77,7 +82,8 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau @Override public List downFailData(String importId) { - List dataList = casesRecommendLaunchImportDataDao.findList(FieldFilters.eq("importId", importId)); + List dataList = casesRecommendLaunchImportDataDao.findList(FieldFilters.eq("importId", importId) + , FieldFilters.eq("status", 2)); if (CollectionUtil.isEmpty(dataList)) { return null; } From 25dfca07880cd4cdf2b8c1b24a9fd0a72b93333b Mon Sep 17 00:00:00 2001 From: Guava Date: Fri, 23 Jun 2023 19:00:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=89=8D10=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CasesRecommendLaunchImportServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java index 3ffc6107..176f8683 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java @@ -49,9 +49,7 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau List caseTitleList = new ArrayList<>(); for (int i = 1; i < dataList.size(); i++) { String caseTitle = dataList.get(i).get(0).toString(); - if (caseTitleList.size() < 10) { - caseTitleList.add(caseTitle); - } + CasesRecommendLaunchImportData casesRecommendLaunchImportData = new CasesRecommendLaunchImportData(); casesRecommendLaunchImportData.setImportId(importId); casesRecommendLaunchImportData.setCaseTitle(caseTitle); @@ -60,6 +58,9 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau failNum++; casesRecommendLaunchImportData.setStatus(2); } else { + if (caseTitleList.size() < 10) { + caseTitleList.add(caseTitle); + } caseIds.add(cases.getId()); casesRecommendLaunchImportData.setStatus(1); casesRecommendLaunchImportData.setCaseTitle(caseTitle); From 832defe20139cbff668f44393bda559bcf3999bc Mon Sep 17 00:00:00 2001 From: Guava Date: Fri, 23 Jun 2023 19:03:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=89=8D10=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CasesRecommendLaunchImportServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java index 176f8683..bc663e1e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java @@ -68,6 +68,7 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau } casesRecommendLaunchImportDataDao.save(casesRecommendLaunchImportData); } + importData.setCaseTitleList(caseTitleList); importData.setCaseIdList(caseIds); CasesRecommendLaunchImport casesRecommendLaunchImport = new CasesRecommendLaunchImport(); casesRecommendLaunchImport.setFailNum(failNum); From 81dfbfe747c3c41e7c8acec40ac045d0a2396840 Mon Sep 17 00:00:00 2001 From: Guava Date: Fri, 23 Jun 2023 19:12:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/data/dto/ImportData.java | 16 +++++++++++++++- .../CasesRecommendLaunchImportServiceImpl.java | 4 ++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java b/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java index 04193074..19af8e90 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/dto/ImportData.java @@ -1,6 +1,8 @@ package com.xboe.data.dto; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; @@ -17,5 +19,17 @@ public class ImportData { private List caseIdList; - private List caseTitleList; + + private List caseTitleList; + + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class CasesTitle { + + private String caseId; + + private String caseTitle; + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java index bc663e1e..047c599f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java @@ -46,7 +46,7 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau importData.setImportId(importId); List caseIds = new ArrayList<>(); - List caseTitleList = new ArrayList<>(); + List caseTitleList = new ArrayList<>(); for (int i = 1; i < dataList.size(); i++) { String caseTitle = dataList.get(i).get(0).toString(); @@ -59,7 +59,7 @@ public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLau casesRecommendLaunchImportData.setStatus(2); } else { if (caseTitleList.size() < 10) { - caseTitleList.add(caseTitle); + caseTitleList.add(new ImportData.CasesTitle(cases.getId(), cases.getTitle())); } caseIds.add(cases.getId()); casesRecommendLaunchImportData.setStatus(1);