From 594f3b1b0028e39da7618e510ffbae8f8f1c84c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=98=9F?= Date: Sun, 18 Jun 2023 11:28:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90=E6=96=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=91=E6=A1=88=E4=BE=8B=E7=AE=A1=E7=90=86=20-=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=96=B0=E5=A2=9E=E6=9C=80=E4=BD=B3?= =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=9D=A1=E4=BB=B6=E7=AD=9B=E9=80=89=E3=80=8C?= =?UTF-8?q?=E6=9C=80=E4=BD=B3=E6=A1=88=E4=BE=8B=E3=80=8D=E5=92=8C=E3=80=8C?= =?UTF-8?q?=E9=9D=9E=E6=9C=80=E4=BD=B3=E6=A1=88=E4=BE=8B=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/boecase/dto/CasesFiledVo.java | 2 ++ .../xboe/module/boecase/service/impl/CasesServiceImpl.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java index 0f425963..108bc494 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dto/CasesFiledVo.java @@ -16,4 +16,6 @@ public class CasesFiledVo { private String authorId; private String authorName; + + private Boolean excellent; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index b56c4e1c..8a82edf0 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -214,6 +214,9 @@ public class CasesServiceImpl implements ICasesService { if(caseVo.getIsTop()!=null) { query.addFilter(FieldFilters.eq("isTop",caseVo.getIsTop())); } + if(caseVo.getExcellent()!=null) { + query.addFilter(FieldFilters.eq("excellent",caseVo.getExcellent())); + } OrderCondition order=null; if(StringUtils.isNotBlank(caseVo.getOrderField())) { if(caseVo.getOrderAsc()==null || caseVo.getOrderAsc()) { @@ -227,7 +230,7 @@ public class CasesServiceImpl implements ICasesService { query.addOrder(order); query.setPageIndex(pageIndex); query.setPageSize(pageSize); - query.addFields("id","title","coverUrl","authorId","authorName","companyId"); + query.addFields("id","title","coverUrl","authorId","authorName","companyId", "excellent"); try { PageList pageFields = casesDao.findPageFields(query.builder()); for (Object[] o:pageFields.getList()) { @@ -238,6 +241,7 @@ public class CasesServiceImpl implements ICasesService { casesFiledVo.setAuthorId((String) o[3]); casesFiledVo.setAuthorName((String) o[4]); casesFiledVo.setCompanyId((String) o[5]); + casesFiledVo.setExcellent((Boolean) o[6]); pageList.getList().add(casesFiledVo); } pageList.setPageSize(pageSize); From c5d1e1a871262c5c5fbc688c1e502a96de4c90e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=98=9F?= Date: Sun, 18 Jun 2023 13:31:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E6=96=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=91=E6=A1=88=E4=BE=8B=E7=AE=A1=E7=90=86=EF=BC=9A=20=20=20?= =?UTF-8?q?=20=20=201=E3=80=81=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E9=87=8F=E3=80=81=E7=82=B9=E8=B5=9E=E9=87=8F?= =?UTF-8?q?=E3=80=81=E5=88=86=E4=BA=AB=E9=87=8F=E3=80=81=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E9=87=8F=E4=B8=8E=E6=95=99=E5=B8=88=E7=AB=AF=E3=80=8C=E6=88=91?= =?UTF-8?q?=E7=9A=84=E6=A1=88=E4=BE=8B=E8=AE=B0=E5=BD=95=E3=80=8D=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E5=AD=97=E6=AE=B5=E4=B8=80=E8=87=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2、【新增】评论量与管理端「报表 - 案例详细数据」读取字段一致； 3、【新增】推荐量统计推荐功能的推荐次数，案例每推送成功一次即计算一次； 4、【新增】引用量读取案例统计数据库相关字段（待确认具体字段） --- .../java/com/xboe/module/boecase/entity/Cases.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java index 38302726..2373dd24 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/Cases.java @@ -82,20 +82,33 @@ public class Cases extends BaseEntity { @Column(name = "status",length = 1) private Integer status; + // 浏览量 @Column(name = "views", nullable = false) private Integer views; + // 评论量 @Column(name = "comments", nullable = false) private Integer comments; + // 点赞量 @Column(name = "praises", nullable = false) private Integer praises; + // 分享量 @Column(name = "shares", nullable = false) private Integer shares; + // 收藏量 @Column(name = "favorites", nullable = false) private Integer favorites; + + // 推荐量 + @Column(name = "recommends", nullable = false) + private Integer recommends; + + // 引用量 + @Column(name = "cites", nullable = false) + private Integer cites; /**摘要,对应数据对接中的，caseSummary字段*/ @Column(name = "summary", nullable = true, columnDefinition = "text") From 36e2b892d30fd48c9e01de4891c52da4957335cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=98=9F?= Date: Sun, 18 Jun 2023 17:12:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E6=96=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=91=E6=A1=88=E4=BE=8B=E7=AE=A1=E7=90=86=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E6=A1=88?= =?UTF-8?q?=E4=BE=8B=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA=EF=BC=8C=E6=AD=A4?= =?UTF-8?q?=E5=A4=84=E5=8F=AF=E5=AF=BC=E5=87=BA=E6=A1=88=E4=BE=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9A=E6=B5=8F=E8=A7=88=E9=87=8F=E3=80=81=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E9=87=8F=E3=80=81=E5=BC=95=E7=94=A8=E9=87=8F=E3=80=81?= =?UTF-8?q?=E7=82=B9=E8=B5=9E=E9=87=8F=E3=80=81=E8=AF=84=E8=AE=BA=E9=87=8F?= =?UTF-8?q?=E3=80=81=E5=88=86=E4=BA=AB=E9=87=8F=EF=BC=8C=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E9=87=8F=E3=80=81=E5=AF=BC=E5=87=BA=E6=97=B6=E9=97=B4=E3=80=81?= =?UTF-8?q?=E4=BD=9C=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xboe/module/boecase/api/CasesApi.java | 47 +++++++++++++++++++ .../xboe/module/boecase/vo/CaseExportVo.java | 27 +++++++---- 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index 53eee909..504d5bdb 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -1,6 +1,7 @@ package com.xboe.module.boecase.api; import java.io.OutputStream; +import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -16,6 +17,7 @@ import com.xboe.module.boecase.vo.CaseExportVo; import com.xboe.module.dict.entity.DictItem; import com.xboe.module.excel.ExportsExcelSenderUtil; +import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -139,6 +141,51 @@ public class CasesApi extends ApiBaseController { return success(casesPageList); } + /** + * 导出案例数据 + * */ + @PostMapping("/exportCase") + public void exportCase(Pagination pager, CaseVo caseVo,HttpServletResponse response){ + OutputStream OutputStream=null; + try { + OutputStream = response.getOutputStream(); + LinkedHashMap map = new LinkedHashMap<>(); + map.put("浏览量","views"); + map.put("推荐量","recommends"); + map.put("引用量","cites"); + map.put("点赞量","praises"); + map.put("评论量","comments"); + map.put("分享量","shares"); + map.put("收藏量","favorites"); + map.put("导出时间","exportDate"); + map.put("作者","authorName"); + List list = casesService.managerList(pager.getPageIndex(), pager.getPageSize(), caseVo).getList(); + List exportVos = new ArrayList<>(); + LocalDateTime now = LocalDateTime.now(); + for (Cases c:list){ + CaseExportVo caseExportVo = new CaseExportVo(); + caseExportVo.setViews(c.getViews()); + caseExportVo.setRecommends(c.getRecommends()); + caseExportVo.setCites(c.getCites()); + caseExportVo.setPraises(c.getPraises()); + caseExportVo.setComments(c.getComments()); + caseExportVo.setShares(c.getShares()); + caseExportVo.setFavorites(c.getFavorites()); + caseExportVo.setExportDate(now); + caseExportVo.setAuthorName(c.getAuthorName()); + + + exportVos.add(caseExportVo); + } + + response.setContentType("application/octet-stream"); + response.setHeader("Content-disposition", "attachment;filename=cases.xlsx"); + ExportsExcelSenderUtil.export(map,exportVos, OutputStream,"yyyy-MM-dd HH:mm:ss"); + }catch (Exception e){ + log.error("导出失败",e.getMessage()); + } + } + /** * 导出我的案例 * */ diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseExportVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseExportVo.java index 7c04eb2d..6a5bcef9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseExportVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CaseExportVo.java @@ -8,21 +8,30 @@ import java.time.LocalDateTime; @Data public class CaseExportVo { + private Integer views; + + private Integer recommends; + + private Integer cites; + + private Integer praises; + + private Integer comments; + + private Integer shares; + + private Integer favorites; + + private LocalDateTime exportDate; + + private String authorName; private String title; private String status; - private LocalDateTime endTime; - private String caseScope; - private Integer views; - - private Integer praises; - - private Integer shares; - - private Integer favorites; + private LocalDateTime endTime; } From 670d2926b3d71a28c8f28dbfa608928dd7c97919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=98=9F?= Date: Tue, 20 Jun 2023 12:40:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E6=96=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=91=E6=A1=88=E4=BE=8B=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA.xls=E5=90=8E=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/module/boecase/api/CasesApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java index 82ced16e..d0effddd 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java @@ -214,7 +214,7 @@ public class CasesApi extends ApiBaseController { } response.setContentType("application/octet-stream"); - response.setHeader("Content-disposition", "attachment;filename=cases.xlsx"); + response.setHeader("Content-disposition", "attachment;filename=cases.xls"); ExportsExcelSenderUtil.export(map,exportVos, OutputStream,"yyyy-MM-dd HH:mm:ss"); }catch (Exception e){ log.error("导出失败",e.getMessage());