From ef3670726de44c326043f762dda8f3a142d2e953 Mon Sep 17 00:00:00 2001 From: civism Date: Fri, 16 Jun 2023 11:19:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=BC=C3=A5=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=8E=A8=E8=8D=90=C2=85=C2=A5=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 5 +++ .../xboe/module/boecase/api/RecommendApi.java | 41 +++++++++++------ .../dao/CasesRecommendLaunchImportDao.java | 9 ++++ .../CasesRecommendLaunchImportDataDao.java | 9 ++++ .../entity/CasesRecommendLaunchImport.java | 45 +++++++++++++++++++ .../CasesRecommendLaunchImportData.java | 45 +++++++++++++++++++ ...CasesRecommendLaunchImportDataService.java | 7 +++ .../ICasesRecommendLaunchImportService.java | 16 +++++++ ...sRecommendLaunchImportDataServiceImpl.java | 10 +++++ ...CasesRecommendLaunchImportServiceImpl.java | 16 +++++++ 10 files changed, 189 insertions(+), 14 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecommendLaunchImportDao.java create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecommendLaunchImportDataDao.java create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendLaunchImport.java create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendLaunchImportData.java create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportDataService.java create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportService.java create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportDataServiceImpl.java create mode 100644 servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index e0f2844b..faacfc00 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -17,6 +17,11 @@ 1.8 + + cn.hutool + hutool-all + 5.8.16 + com.xboe xboe-api diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/RecommendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/RecommendApi.java index c23a7d55..f0323512 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/RecommendApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/RecommendApi.java @@ -1,13 +1,15 @@ package com.xboe.module.boecase.api; +import java.math.BigDecimal; import java.util.List; import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import cn.hutool.poi.excel.ExcelReader; +import cn.hutool.poi.excel.ExcelUtil; +import io.netty.util.internal.ObjectUtil; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; import com.xboe.common.utils.StringUtil; import com.xboe.core.JsonResponse; @@ -18,10 +20,11 @@ import com.xboe.module.boecase.entity.Recommend; import com.xboe.module.boecase.service.IRecommendService; import lombok.extern.slf4j.Slf4j; +import org.springframework.web.multipart.MultipartFile; /** * 案例推荐表 - * */ + */ @Slf4j @RestController @RequestMapping(value = "xboe/m/boe/recommend") @@ -29,32 +32,42 @@ public class RecommendApi extends ApiBaseController { @Resource private IRecommendService recommendService; + /** * 推荐 - * */ + */ @PostMapping("/save") - @AutoLog(module = "案例推荐",action = "推荐案例",info = "推荐案例") - public JsonResponse save(String id, AcceptVo acceptVo){ - if(StringUtil.isBlank(id)){ + @AutoLog(module = "案例推荐", action = "推荐案例", info = "推荐案例") + public JsonResponse save(String id, AcceptVo acceptVo) { + if (StringUtil.isBlank(id)) { return badRequest("缺少案例id"); } try { - recommendService.save(id,acceptVo); + recommendService.save(id, acceptVo); return success(true); } catch (Exception e) { - log.error("推荐失败",e); - return error("推荐失败",e.getMessage()); + log.error("推荐失败", e); + return error("推荐失败", e.getMessage()); } } + /** * 推荐列表 - * */ + */ @GetMapping("/query") - public JsonResponse> selectRecommend(){ + public JsonResponse> selectRecommend() { List recommends = recommendService.selectRecommend(); return success(recommends); } + @PostMapping("/import") + public JsonResponse excelImport(@RequestParam("file") MultipartFile file) throws Exception { + ExcelReader reader = ExcelUtil.getReader(file.getInputStream()); + List> read = reader.read(); + + return success(null); + } + } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecommendLaunchImportDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecommendLaunchImportDao.java new file mode 100644 index 00000000..c350d138 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecommendLaunchImportDao.java @@ -0,0 +1,9 @@ +package com.xboe.module.boecase.dao; + +import com.xboe.core.orm.BaseDao; +import com.xboe.module.boecase.entity.CasesRecommendLaunchImport; +import org.springframework.stereotype.Repository; + +@Repository +public class CasesRecommendLaunchImportDao extends BaseDao { +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecommendLaunchImportDataDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecommendLaunchImportDataDao.java new file mode 100644 index 00000000..6d90bbb4 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRecommendLaunchImportDataDao.java @@ -0,0 +1,9 @@ +package com.xboe.module.boecase.dao; + +import com.xboe.core.orm.BaseDao; +import com.xboe.module.boecase.entity.CasesRecommendLaunchImportData; +import org.springframework.stereotype.Repository; + +@Repository +public class CasesRecommendLaunchImportDataDao extends BaseDao { +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendLaunchImport.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendLaunchImport.java new file mode 100644 index 00000000..8bf09093 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendLaunchImport.java @@ -0,0 +1,45 @@ +package com.xboe.module.boecase.entity; + +import com.xboe.core.SysConstant; +import com.xboe.core.orm.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * 案例推荐发起导入 + */ +@Data +@Entity +@EqualsAndHashCode(callSuper = false) +@Table(name = SysConstant.TABLE_PRE + "cases_recommend_launch_import") +public class CasesRecommendLaunchImport extends BaseEntity { + + /** + * 总条数 + */ + @Column(name = "total_num",length = 20) + private Long totalNum; + + /** + * 成功条数 + */ + @Column(name = "success_num",length = 20) + private Long successNum; + + /** + * 失败条数 + */ + @Column(name = "fail_num",length = 20) + private Long failNum; + + /** + * 上传状态1进行中2成功3失败 + */ + @Column(name = "process_status",length = 20) + private Integer processStatus; + +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendLaunchImportData.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendLaunchImportData.java new file mode 100644 index 00000000..66e342c5 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommendLaunchImportData.java @@ -0,0 +1,45 @@ +package com.xboe.module.boecase.entity; + +import com.xboe.core.SysConstant; +import com.xboe.core.orm.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * 案例推荐发起导入 + */ +@Data +@Entity +@EqualsAndHashCode(callSuper = false) +@Table(name = SysConstant.TABLE_PRE + "cases_recommend_launch_import") +public class CasesRecommendLaunchImportData extends BaseEntity { + + /** + * 导入id + */ + @Column(name = "import_id", length = 20) + private String importId; + + /** + * 导入类容第一例标题 + */ + @Column(name = "case_title") + private String caseTitle; + + /** + * 导入类容匹配的案例id + */ + @Column(name = "case_id") + private String caseId; + + /** + * 状态1成功2失败 + */ + @Column(name = "status") + private Integer status; + +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportDataService.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportDataService.java new file mode 100644 index 00000000..99b362aa --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportDataService.java @@ -0,0 +1,7 @@ +package com.xboe.module.boecase.service; + + + +public interface ICasesRecommendLaunchImportDataService { + +} 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 new file mode 100644 index 00000000..a7f0e3b2 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/ICasesRecommendLaunchImportService.java @@ -0,0 +1,16 @@ +package com.xboe.module.boecase.service; + + +import java.util.List; + +public interface ICasesRecommendLaunchImportService { + + /** + * 导入数据 + * + * @param dataList + * @return + */ + String importData(List> dataList); + +} diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportDataServiceImpl.java new file mode 100644 index 00000000..3de47775 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportDataServiceImpl.java @@ -0,0 +1,10 @@ +package com.xboe.module.boecase.service.impl; + + +import com.xboe.module.boecase.service.ICasesRecommendLaunchImportDataService; +import org.springframework.stereotype.Service; + +@Service +public class CasesRecommendLaunchImportDataServiceImpl implements ICasesRecommendLaunchImportDataService { + +} 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 new file mode 100644 index 00000000..5782a149 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendLaunchImportServiceImpl.java @@ -0,0 +1,16 @@ +package com.xboe.module.boecase.service.impl; + + +import com.xboe.module.boecase.service.ICasesRecommendLaunchImportService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class CasesRecommendLaunchImportServiceImpl implements ICasesRecommendLaunchImportService { + + @Override + public String importData(List> dataList) { + return null; + } +}