hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-10 03:16:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Boolean
2023-06-19 07:24:09 +08:00
parent 1d1d70f151 d4490ce508
commit f8847ec290
3 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java
View File

@@ -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());
}

2
servers/boe-server-all/src/main/java/com/xboe/module/boecase/entity/CasesRecommend.java
View File

@@ -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;

2
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java
View File

@@ -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<String> caseIds = new ArrayList<>();