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 104406c..6c0e0ea 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,11 +1,14 @@ package com.chinaunicom.mall.ebtp.extend.feign.client; 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; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 连接山分的文档中心服务 * @@ -34,4 +37,14 @@ public interface DocumentCenterService { @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadStream") String getFileObjectDetail(@RequestParam("fileId") String fileId); + /** + * 统计查询 sys_storage表中数据 + * + * @param list + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/queryReturn") + List 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 4a3ffd2..5594aae 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,10 +1,13 @@ package com.chinaunicom.mall.ebtp.extend.feign.client.fallback; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.util.List; + /** * 熔断 * @@ -27,4 +30,11 @@ public class DocumentCenterServiceFallbackImpl implements DocumentCenterService public String getFileObjectDetail(String fileId) { return null; } + + @Override + public List queryReturn(List list) { + return null; + } + + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/DocumentDataVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/DocumentDataVO.java new file mode 100644 index 0000000..9427e0d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/DocumentDataVO.java @@ -0,0 +1,27 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 DocumentDataVO + * + * @author yss + */ +@Data +@Accessors(chain = true) +public class DocumentDataVO implements Serializable { + + private static final long serialVersionUID = 1L; + + + private String fileId; + private String objectId; + private String originalName; + private String filePath; + private String fileSize; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index 25d1ea3..a310929 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -52,9 +52,9 @@ public class PartyMemberEventController { @ApiOperation("活动联系人列表-按公司分组") - @GetMapping("/eventContact/group") - public BaseResponse>> getEventContactGroup(@RequestParam(value = "param", required = false) String param) { - return BaseResponse.success(eventContactService.getEventContactGroup(param)); + @PostMapping("/eventContact/group") + public BaseResponse>> getEventContactGroup(@RequestBody(required = false) EventQueryInVO inVO) { + return BaseResponse.success(eventContactService.getEventContactGroup(inVO)); } @ApiOperation("活动联系人列表") diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java index 38340c5..3f96ac1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java @@ -111,5 +111,10 @@ public class EventStyle implements Serializable { @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) private java.time.LocalDateTime sendTime; - + /** + * 文件地址 + */ + @ApiModelProperty(value = "文件地址") + @TableField(exist = false) + private String filePath; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java index cf59738..fa7903d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import java.util.List; import java.util.Map; @@ -15,7 +16,7 @@ public interface EventContactService extends IService{ - Map> getEventContactGroup(String param); + Map> getEventContactGroup(EventQueryInVO inVO); List getEventContactList(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java index 9a5a103..27a318d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventContactMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactService; import org.springframework.stereotype.Service; @@ -25,11 +27,11 @@ public class EventContactServiceImpl extends ServiceImpl> getEventContactGroup(String param) { + public Map> getEventContactGroup(EventQueryInVO inVO) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventContact::getStatus, "1"); - if (StrUtil.isNotBlank(param)) { - query.eq(EventContact::getContactUnit, param); + if (ObjectUtil.isNotNull(inVO) && StrUtil.isNotBlank(inVO.getParam())) { + query.eq(EventContact::getContactUnit, inVO.getParam()); } return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit,LinkedHashMap::new,Collectors.toList())); } 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 37ef2fd..a443f67 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 @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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; @@ -14,8 +16,12 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventStyleServi import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 对数据表 event_style 操作的 serviceImpl @@ -25,6 +31,8 @@ import java.util.List; @Service public class EventStyleServiceImpl extends ServiceImpl implements EventStyleService { + @Resource + private DocumentCenterService documentCenterService; @Override public List getEventStyle(String type, EventQueryInVO inVO) { @@ -33,13 +41,19 @@ public class EventStyleServiceImpl extends ServiceImpl list; if ("banner".equals(type)) { query.eq(EventStyle::getBanner, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); - return this.list(query); } else { query.eq(EventStyle::getBanner, "0").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); - return this.list(query); } + list = this.list(query); + List imageIdList = list.stream().map(EventStyle::getImage).collect(Collectors.toList()); + List queryReturn = documentCenterService.queryReturn(imageIdList); + Map collect = queryReturn.stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, DocumentDataVO::getFilePath)); + + list.forEach(l -> l.setFilePath(collect.get(l.getImage()))); + return list; } @Override