From d4490ce50850c310baf22f0f2f42c56b06b4fbd8 Mon Sep 17 00:00:00 2001 From: wangwenchao Date: Sun, 18 Jun 2023 21:31:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=A1=88=E4=BE=8B=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=8D=E5=90=88=E7=90=86=E5=8F=8A=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/boecase/api/CasesRecommendApi.java | 52 ++++++++++--------- .../module/boecase/entity/CasesRecommend.java | 2 +- .../CasesRecommendPushRecordServiceImpl.java | 2 +- 3 files changed, 29 insertions(+), 27 deletions(-) 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 2c120fc9..03c97c71 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 @@ -186,29 +186,31 @@ public class CasesRecommendApi extends ApiBaseController { row.put("总查看时间", it.getReadEndTime()); return row; }).collect(Collectors.toList()); - // 通过工具类创建writer - try (ExcelWriter writer = ExcelUtil.getWriter(true); - // 输出流 - ServletOutputStream servletOutputStream = response.getOutputStream(); - ){ - // 一次性写出内容 - writer.write(rows, true); - // 微调一下每个列的宽度 - writer.setColumnWidth(0,50); - writer.setColumnWidth(1,16); - writer.setColumnWidth(2,24); - writer.setColumnWidth(3,34); - writer.setColumnWidth(4,10); - writer.setColumnWidth(5,20); - writer.setColumnWidth(6,20); - // 此处的response.setContentType 和教程里的不同 - response.setContentType("application/octet-stream"); - // filename就是表格的名字，这个无所谓，反正前端还会重命名 - response.setHeader("Content-Disposition","attachment;filename=test.xlsx"); + if (CollectionUtil.isNotEmpty(rows)){ + // 通过工具类创建writer + try (ExcelWriter writer = ExcelUtil.getWriter(true); + // 输出流 + ServletOutputStream servletOutputStream = response.getOutputStream() + ){ + // 一次性写出内容 + writer.write(rows, true); + // 微调一下每个列的宽度 + writer.setColumnWidth(0,50); + writer.setColumnWidth(1,16); + writer.setColumnWidth(2,24); + writer.setColumnWidth(3,34); + writer.setColumnWidth(4,10); + writer.setColumnWidth(5,20); + writer.setColumnWidth(6,20); + // 此处的response.setContentType 和教程里的不同 + response.setContentType("application/octet-stream"); + // filename就是表格的名字，这个无所谓，反正前端还会重命名 + response.setHeader("Content-Disposition","attachment;filename=推荐信息.xlsx"); - writer.flush(servletOutputStream,true); - }catch (Exception e){ - throw new RuntimeException(e.getMessage()); + writer.flush(servletOutputStream,true); + }catch (Exception e){ + throw new RuntimeException(e.getMessage()); + } } } @@ -227,11 +229,11 @@ public class CasesRecommendApi extends ApiBaseController { } // 查询 CasesRecommend db = iCasesRecommendService.findById(casesRecommendPushVo.getCasesRecommendId()); - if (CasesPushStatusEnum.PUSH_SUCCESS.name().equalsIgnoreCase(db.getPushProgress())){ + if (CasesPushStatusEnum.PUSH_SUCCESS.getStatus().equals(db.getPushProgress())){ // 当为推送成功时为 iCasesRecommendPushRecordService.rePushOrWithdraw(true, casesRecommendPushVo.getCasesRecommendId()); - }else if (CasesPushStatusEnum.PUSH_FAIL.name().equalsIgnoreCase(db.getPushProgress()) - || CasesPushStatusEnum.PUSH_REVOKE.name().equalsIgnoreCase(db.getPushProgress())){ + }else if (CasesPushStatusEnum.PUSH_FAIL.getStatus().equals(db.getPushProgress()) + || CasesPushStatusEnum.PUSH_REVOKE.getStatus().equals(db.getPushProgress())){ // 推送失败或者已撤回时 iCasesRecommendPushRecordService.rePushOrWithdraw(false, casesRecommendPushVo.getCasesRecommendId()); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java index 8ba103f8..bc4816e1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java @@ -42,7 +42,7 @@ public class CasesRecommend extends BaseEntity { private Integer userCount; /**推送进度*/ @Column(name = "push_progress", length = 255) - private String pushProgress; + private Integer pushProgress; /**查看率*/ @Column(name = "view_rate", length = 255) private String viewRate; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java index 30d6ec82..9cb93f9f 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java @@ -62,7 +62,7 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR casesRecommend.setCaseCount(casesRecommendLaunch.getCasesIdList().size()); casesRecommend.setUserCount(casesRecommendLaunch.getPushUserIdList().size()); casesRecommend.setRecommendOrgName(casesRecommendLaunch.getRecommendOrgName()); - casesRecommend.setPushProgress(CasesPushStatusEnum.WAIT_PUSH.name()); + casesRecommend.setPushProgress(CasesPushStatusEnum.WAIT_PUSH.getStatus()); casesRecommendDao.save(casesRecommend); List caseIds = new ArrayList<>();