Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_voice_share_point

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -272,4 +272,21 @@ public class OssController {
 		return ossService.extUpload(filse,fileName);
 	}
 
+	/**
+	 * @param file
+	 * @Description 上传语音文件
+	 * @Author sun
+	 **/
+	@PostMapping("uploadvoice")
+	public Result<UploadImgResultDTO> uploadVoice(@RequestParam("file") MultipartFile file) {
+		// 校验文件体积,不超过20M
+		long maxSize = 20 * 1024 * 1024;
+		long size = file.getSize();
+		if (size > maxSize) {
+			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode(),
+				EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
+		}
+		return ossService.uploadVoice(file);
+	}
+
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java

@@ -31,4 +31,6 @@ public interface OssService extends BaseService<OssEntity> {
 	Result<UploadImgResultDTO> uploadImg(MultipartFile file);
 
 	Result<UploadImgResultDTO> extUpload(MultipartFile file, String fileName);
+
+    Result<UploadImgResultDTO> uploadVoice(MultipartFile file);
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -104,4 +104,36 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		dto.setUrl(url);
 		return new Result<UploadImgResultDTO>().ok(dto);
 	}
+
+	/**
+	 * @param file
+	 * @Description 上传语音
+	 * @Author sun
+	 **/
+	@Override
+	public Result<UploadImgResultDTO> uploadVoice(MultipartFile file) {
+		if (file.isEmpty()) {
+			return new Result<UploadImgResultDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
+		}
+		//上传文件
+		String extension = FilenameUtils.getExtension(file.getOriginalFilename());
+		String url = null;
+		try {
+			url = OssFactory.build().uploadSuffix(file.getBytes(), extension);
+		} catch (IOException e) {
+			e.printStackTrace();
+			logger.error("语音上传异常");
+			throw new RenException("语音上传异常");
+
+		}
+		//保存文件信息
+		OssEntity ossEntity = new OssEntity();
+		ossEntity.setUrl(url);
+		baseDao.insert(ossEntity);
+		//文件信息
+		UploadImgResultDTO dto = new UploadImgResultDTO();
+		dto.setUrl(url);
+		return new Result<UploadImgResultDTO>().ok(dto);
+	}
+
 }