diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java index 6c0e0ea..418f86f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.feign.client; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.feign.client.factory.DocumentCenterServiceFallbackFactory; import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import org.springframework.cloud.openfeign.FeignClient; @@ -44,7 +45,8 @@ public interface DocumentCenterService { * @return */ @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/queryReturn") - List queryReturn(@RequestParam("objectIdList") List list); + BaseResponse> queryReturn(@RequestParam("objectIdList") List list); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java index 5594aae..626e93e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.feign.client.fallback; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import lombok.Setter; @@ -32,7 +33,7 @@ public class DocumentCenterServiceFallbackImpl implements DocumentCenterService } @Override - public List queryReturn(List list) { + public BaseResponse> queryReturn(List list) { return null; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/enums/PartyEventExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/enums/PartyEventExceptionEnum.java index 11364ba..da7d85b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/enums/PartyEventExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/enums/PartyEventExceptionEnum.java @@ -11,6 +11,7 @@ public enum PartyEventExceptionEnum implements BusinessExceptionAssert { * 没有党支部信息 */ FRAME_EXCEPTION_NO_BRANCH_INFO_FAIL(2200001, "没有党支部信息!"), + FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL(2200002, "文档中心异常!"), diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index 81020ab..f13f984 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -6,12 +6,14 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventStyleMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventStyle; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.enums.PartyEventExceptionEnum; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventStyleService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -50,9 +52,10 @@ public class EventStyleServiceImpl extends ServiceImpl imageIdList = list.stream().map(EventStyle::getImage).collect(Collectors.toList()); - List queryReturn = documentCenterService.queryReturn(imageIdList); + BaseResponse> queryReturn = documentCenterService.queryReturn(imageIdList); + PartyEventExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess()); log.info("文档中心返回:{}", queryReturn.toString()); - Map collect = queryReturn.stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity())); + Map collect = queryReturn.getData().stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity())); list.forEach(l -> l.setFilePath(collect.get(l.getImage()).getFilePath())); return list;