Merge remote-tracking branch 'origin/master'

security-protection-service/src/main/java/com/ai/bss/security/protection/controller/UploadFileController.java

package com.ai.bss.security.protection.controller;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.abc.api.model.CommonResponse;
import com.ai.bss.security.protection.service.interfaces.UploadFileService;
@Controller
@RequestMapping("/uploadFile")
public class UploadFileController {
	@Autowired
	private UploadFileService uploadFileService;
	/**
	 * 上传设备照片
	 * @param meFile
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/getFileUrl")
	public CommonResponse<String> getFileUrl(@RequestParam String fileName) throws Exception {
		if (StringUtils.isEmpty(fileName)) {
			return CommonResponse.fail("501", "获取失败");
		}
		String minioFileUrl = uploadFileService.getFileUrl(fileName);
		return CommonResponse.ok(minioFileUrl);
	}
}

security-protection-service/src/main/java/com/ai/bss/security/protection/service/impl/UploadFileServiceImpl.java

	}
	@Override
	public List<Map<String, Object>> getFileUrl(List<Map<String, Object>> minioFileListMap, String mapkey,
	public List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey) throws Exception {
		if (CollectionUtils.isEmpty(minioFileListMap)) {
			log.debug("批量获取文件的url为空");
		String minioFileName = String.valueOf(minioFileListMap.get(0).get(mapkey));
		return getFileUrl(minioFileListMap, mapkey, minioFileUrlKey, getBucketName(minioFileName));
		return getFileUrlForListMap(minioFileListMap, mapkey, minioFileUrlKey, getBucketName(minioFileName));
	}
	@Override
	public List<Map<String, Object>> getFileUrl(List<Map<String, Object>> minioFileListMap, String mapkey,
	public List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey, String bucketName) throws Exception {
		if (CollectionUtils.isEmpty(minioFileListMap)) {
			log.debug("批量获取文件的url为空");

security-protection-service/src/main/java/com/ai/bss/security/protection/service/interfaces/UploadFileService.java

	/**
	 * 批量获取文件的url地址
	 * @param minioFileListMap
	 * @param mapkey
	 * @param minioFileUrlKey
	 * @param minioFileListMap 数据列表
	 * @param mapkey 数据列表中minioFileName的key
	 * @param minioFileUrlKey 数据列表中minioFileUrl的key
	 * @return
	 * @throws Exception
	 */
	List<Map<String,Object>> getFileUrl(List<Map<String,Object>> minioFileListMap,String mapkey,String minioFileUrlKey) throws Exception;
	
	List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey) throws Exception;
	/**
	 * 批量获取文件的url地址
	 * @param minioFileListMap
	 * @param key
	 * @param bucketName
	 * @param minioFileListMap 数据列表
	 * @param mapkey 数据列表中minioFileName的key
	 * @param minioFileUrlKey 数据列表中minioFileUrl的key
	 * @param bucketName 存储文件的桶名(文件夹)
	 * @return
	 * @throws Exception
	 */
	List<Map<String,Object>> getFileUrl(List<Map<String,Object>> minioFileListMap,String mapkey,String minioFileUrlKey, String bucketName) throws Exception;
	
	List<Map<String, Object>> getFileUrlForListMap(List<Map<String, Object>> minioFileListMap, String mapkey,
			String minioFileUrlKey, String bucketName) throws Exception;
	/**
	 * 移除文件
	 * @param minioFileName minio文件标识