新新向党过来url上传到oss。图片已完成

esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@@ -90,6 +90,12 @@
             <artifactId>rocketmq-spring-boot-starter</artifactId>
             <version>2.0.3</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc.shibei</groupId>
+            <artifactId>epdc-oss-client</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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<List<String>> compressImg(List<String> 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<UploadDTO> saveWeChatFaceImg(@RequestParam("avatarUrl")String avatarUrl);
 }

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<List<String>> compressImg(List<String> imgUrlList) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "compressImg", imgUrlList);
 	}
+
+	@Override
+	public Result<UploadDTO> saveWeChatFaceImg(String avatarUrl) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "saveWeChatFaceImg", avatarUrl);
+	}
 }

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<ItemDao, ItemEntity> implem
         LambdaUpdateWrapper<XxxdEventEntity> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(XxxdEventEntity::getId, xxxdEventEntityId);
         try {
+            //处理图片和语音，上传到市北的oss
+            if(CollectionUtils.isNotEmpty(submitItemFormDTO.getImages())){
+                List<String> 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<ItemDao, ItemEntity> 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<String> getEpdcImgUrl(List<String> images) {
+        List<String> urlList = new ArrayList<>();
+        for (String url : images) {
+            Result<UploadDTO> ossRes = ossFeignClient.saveWeChatFaceImg(url);
+            if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData().getUrl())) {
+                urlList.add(ossRes.getData().getUrl());
+            }
+        }
+        return urlList;
+    }
+
+
 }