diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index d5971b8c5..99e045b03 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -90,6 +90,12 @@ rocketmq-spring-boot-starter 2.0.3 + + com.esua.epdc.shibei + epdc-oss-client + 1.0.0 + compile + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java index 687cb01b4..1cb174464 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java @@ -2,9 +2,12 @@ package com.elink.esua.epdc.modules.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UploadDTO; import com.elink.esua.epdc.modules.feign.fallback.OssFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -27,4 +30,12 @@ public interface OssFeignClient { */ @PostMapping(value = "oss/file/compressImg") Result> compressImg(List imgUrlList); + + /** + * 下载url的图片，上传到oss + * @param avatarUrl 图片url，入参示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/image/2023-05-26/3618657367924684031.jpg + * @return 下载avatarUrl图片，返参示例：https://epdc-shibei.elinkservice.cn/files-pro/20230530/8ed41af545e04e0cae0d4398d80c704e.jpg + */ + @GetMapping(value="oss/file/saveWeChatFaceImg") + Result saveWeChatFaceImg(@RequestParam("avatarUrl")String avatarUrl); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java index d6c395f37..5e93aeabb 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UploadDTO; import com.elink.esua.epdc.modules.feign.OssFeignClient; import org.springframework.stereotype.Component; @@ -19,4 +20,9 @@ public class OssFeignClientFallback implements OssFeignClient { public Result> compressImg(List imgUrlList) { return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "compressImg", imgUrlList); } + + @Override + public Result saveWeChatFaceImg(String avatarUrl) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "saveWeChatFaceImg", avatarUrl); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 78b240976..f9700100f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -5569,6 +5569,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(XxxdEventEntity::getId, xxxdEventEntityId); try { + //处理图片和语音，上传到市北的oss + if(CollectionUtils.isNotEmpty(submitItemFormDTO.getImages())){ + List images=getEpdcImgUrl(submitItemFormDTO.getImages()); + submitItemFormDTO.setImages(images); + } + if(StringUtils.isNotBlank(submitItemFormDTO.getItemVoice())){ + String voiceUrl=getVoiceUrl(submitItemFormDTO.getItemVoice()); + submitItemFormDTO.setItemVoice(voiceUrl); + } // 查询网格信息 GisFormDTO gisFormDTO = new GisFormDTO(); gisFormDTO.setLongitude(longitude); @@ -5649,4 +5658,32 @@ public class ItemServiceImpl extends BaseServiceImpl implem return dtoList; } + /** + * 新新向党的语音url，上传到本地url + * @param itemVoice,新新向党语音url示例： + * @return 返回示例： + */ + private String getVoiceUrl(String itemVoice) { + String url=""; + //todo + return url; + } + + /** + * 新新向党的图片url上传到本地的oss + * @param images:新新向党图片url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/image/2023-05-26/3618657367924684031.jpg + * @return 返回示例：https://epdc-shibei.elinkservice.cn/files-pro/20230530/8ed41af545e04e0cae0d4398d80c704e.jpg + */ + private List getEpdcImgUrl(List images) { + List urlList = new ArrayList<>(); + for (String url : images) { + Result ossRes = ossFeignClient.saveWeChatFaceImg(url); + if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData().getUrl())) { + urlList.add(ossRes.getData().getUrl()); + } + } + return urlList; + } + + }