新新向党随手拍语音上传oss

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/OssFeignClient.java

@@ -38,4 +38,11 @@ public interface OssFeignClient {
 	 */
 	@GetMapping(value="oss/file/saveWeChatFaceImg")
 	Result<UploadDTO> saveWeChatFaceImg(@RequestParam("avatarUrl")String avatarUrl);
+
+	/**
+	 * @param itemVoiceUrl:新新向党语音url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/audio/2023-05-30/3619422864240813849.mp3
+	 * @return 上传到oss
+	 */
+	@GetMapping(value = "oss/file/uploadXxxdVoice")
+	Result<UploadDTO> uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/OssFeignClientFallback.java

@@ -25,4 +25,9 @@ public class OssFeignClientFallback implements OssFeignClient {
 	public Result<UploadDTO> saveWeChatFaceImg(String avatarUrl) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "saveWeChatFaceImg", avatarUrl);
 	}
+
+	@Override
+	public Result<UploadDTO> uploadXxxdVoice(String itemVoiceUrl) {
+		return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadXxxdVoice", itemVoiceUrl);
+	}
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -5660,13 +5660,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
 
     /**
      * 新新向党的语音url，上传到本地url
-     * @param itemVoice,新新向党语音url示例：
+     * @param itemVoiceUrl,新新向党语音url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/audio/2023-05-30/3619422864240813849.mp3
      * @return 返回示例：
      */
-    private String getVoiceUrl(String itemVoice) {
+    private String getVoiceUrl(String itemVoiceUrl) {
-        String url="";
+        Result<UploadDTO> ossRes = ossFeignClient.uploadXxxdVoice(itemVoiceUrl);
-        //todo
+        if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData().getUrl())) {
-        return url;
+            return ossRes.getData().getUrl();
+        }else{
+            log.error("新新向党随手拍语音上传oss失败,语音url："+itemVoiceUrl);
+        }
+        return null;
     }
 
     /**
@@ -5680,6 +5684,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
             Result<UploadDTO> ossRes = ossFeignClient.saveWeChatFaceImg(url);
             if (ossRes.success() && null != ossRes.getData() && StringUtils.isNotBlank(ossRes.getData().getUrl())) {
                 urlList.add(ossRes.getData().getUrl());
+            }else{
+                log.error("新新向党随手拍图片上传oss失败，图片url："+url);
             }
         }
         return urlList;

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/controller/OssController.java

@@ -334,4 +334,18 @@ public class OssController {
         uploadAll.setFileName(name);
         return new Result<UploadImgAllDTO>().ok(uploadAll);
     }
+
+    /**
+     * @param itemVoiceUrl:新新向党语音url示例：https://uni-oss.dtdjzx.gov.cn/resource-xxxd/uploads/audio/2023-05-30/3619422864240813849.mp3
+     * @return 上传到oss
+     */
+    @GetMapping(value = "uploadXxxdVoice")
+    public Result<UploadDTO> uploadXxxdVoice(@RequestParam("itemVoiceUrl") String itemVoiceUrl){
+        if(StringUtils.isBlank(itemVoiceUrl)){
+            return null;
+        }
+        return new Result<UploadDTO>().ok(ossService.uploadXxxdVoice(itemVoiceUrl));
+    }
+
+
 }

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/OssService.java

@@ -67,4 +67,6 @@ public interface OssService extends BaseService<OssEntity> {
      * @date 2020/02/27
      */
     Result<List<String>> compressImg(List<String> imgUrlList);
+
+    UploadDTO uploadXxxdVoice(String itemVoiceUrl);
 }

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/java/com/elink/esua/epdc/service/impl/OssServiceImpl.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.dao.OssDao;
 import com.elink.esua.epdc.dto.UploadDTO;
 import com.elink.esua.epdc.entity.OssEntity;
 import com.elink.esua.epdc.service.OssService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +35,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @Service
 public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implements OssService {
 
@@ -149,4 +151,24 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
         return new Result<List<String>>().ok(resultList);
     }
 
+
+    @Override
+    public UploadDTO uploadXxxdVoice(String itemVoiceUrl) {
+        String resultUr="";
+        try {
+            //实例化url
+            URL url1 = new URL(itemVoiceUrl);
+            //载入图片到输入流
+            DataInputStream dataInputStream = new DataInputStream(url1.openStream());
+            resultUr = OssFactory.build().uploadSuffix(dataInputStream, "mp3");
+            log.info("uploadXxxdVoice上传成功,url:::"+resultUr);
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        UploadDTO uploadDTO=new UploadDTO();
+        uploadDTO.setUrl(resultUr);
+        return uploadDTO;
+    }
 }