liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-高质量运营2' into uat_code

Browse Source
This commit is contained in:
yss
2023-04-25 09:57:17 +08:00
parent a897a5b364 24e42fe932
commit 8ec481c718
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/controller/HighQualityClientController.java
View File

@ -52,7 +52,7 @@ public class HighQualityClientController {
@ApiOperation("活动风采轮播列表") @ApiOperation("活动风采轮播列表")
@GetMapping("/eventStyle/banner") @GetMapping("/eventStyle/banner")
public BaseResponse<List<HighQualityStyle>> getHighQualityStyleBanner() { public BaseResponse<List<HighQualityStyle>> getHighQualityStyleBanner() {
return BaseResponse.success(highQualityStyleService.getHighQualityStyle("banner",null)); return BaseResponse.success(highQualityStyleService.getHighQualityStyle("1",null));
} }
@ApiOperation("活动联系人列表-按公司分组") @ApiOperation("活动联系人列表-按公司分组")
@ -74,10 +74,16 @@ public class HighQualityClientController {
} }
@ApiOperation("活动风采列表") @ApiOperation("工作风采")
@PostMapping("/eventStyle/list") @PostMapping("/eventStyle/list")
public BaseResponse<List<HighQualityStyle>> getHighQualityStyleList(@RequestBody(required = false) HighQualityQueryInVO inVO) { public BaseResponse<List<HighQualityStyle>> getHighQualityStyleList(@RequestBody(required = false) HighQualityQueryInVO inVO) {
return BaseResponse.success(highQualityStyleService.getHighQualityStyle("list", inVO)); return BaseResponse.success(highQualityStyleService.getHighQualityStyle("2", inVO));
}
@ApiOperation("运营提升小课堂")
@PostMapping("/eventStyle/classlist")
public BaseResponse<List<HighQualityStyle>> getHighQualityClassList(@RequestBody(required = false) HighQualityQueryInVO inVO) {
return BaseResponse.success(highQualityStyleService.getHighQualityStyle("4", inVO));
} }

26
src/main/java/com/chinaunicom/mall/ebtp/extend/highquality/service/impl/HighQualityStyleServiceImpl.java
View File

@ -42,9 +42,6 @@ public class HighQualityStyleServiceImpl extends ServiceImpl<HighQualityStyleMap
@Resource @Resource
private DocumentCenterService documentCenterService; private DocumentCenterService documentCenterService;
@Resource
private IUploadOssService iUploadOssService;
@Override @Override
public List<HighQualityStyle> getHighQualityStyle(String type, HighQualityQueryInVO inVO) { public List<HighQualityStyle> getHighQualityStyle(String type, HighQualityQueryInVO inVO) {
@ -54,20 +51,17 @@ public class HighQualityStyleServiceImpl extends ServiceImpl<HighQualityStyleMap
} }
query.orderByDesc(HighQualityStyle::getCreateTime); query.orderByDesc(HighQualityStyle::getCreateTime);
List<HighQualityStyle> list; List<HighQualityStyle> list;
if ("banner".equals(type)) { query.eq(HighQualityStyle::getCategory, type);
query.eq(HighQualityStyle::getCategory, "1").eq(HighQualityStyle::getStatus, "1").orderByAsc(HighQualityStyle::getSort); query.ne(HighQualityStyle::getDeleteFlag, "1").eq(HighQualityStyle::getStatus, "1").orderByAsc(HighQualityStyle::getSort);
} else {
query.eq(HighQualityStyle::getCategory, "2").eq(HighQualityStyle::getStatus, "1").orderByAsc(HighQualityStyle::getSort);
}
query.ne(HighQualityStyle::getDeleteFlag, "1");
list = this.list(query); list = this.list(query);
List<String> imageIdList = list.stream().map(HighQualityStyle::getImage).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList()); if(!type.equals("4")){
BaseResponse<List<DocumentDataVO>> queryReturn = documentCenterService.queryReturn(imageIdList); List<String> imageIdList = list.stream().map(HighQualityStyle::getImage).filter(StrUtil::isNotBlank).distinct().collect(Collectors.toList());
log.info("文档中心返回：{}", queryReturn.toString()); BaseResponse<List<DocumentDataVO>> queryReturn = documentCenterService.queryReturn(imageIdList);
HighQualityExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess()); log.info("文档中心返回：{}", queryReturn.toString());
Map<String, DocumentDataVO> collect = queryReturn.getData().stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity(),(o1,o2) -> o1)); HighQualityExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess());
Map<String, DocumentDataVO> collect = queryReturn.getData().stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity(),(o1,o2) -> o1));
list.forEach(l -> l.setFilePath(collect.get(l.getImage()) == null ? "" : collect.get(l.getImage()).getFilePath())); list.forEach(l -> l.setFilePath(collect.get(l.getImage()) == null ? "" : collect.get(l.getImage()).getFilePath()));
}
return list; return list;
} }