修改上传照片的功能

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

@@ -9,6 +9,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -82,7 +83,6 @@ public class ResourceToolManageController {
		}
		return ResourceToolManageService.queryOneResourceTool(resourceToolId);
	}
	/**
@@ -93,13 +93,13 @@ public class ResourceToolManageController {
	 */
	@ResponseBody
	@RequestMapping("/createResourceTool")
	public CommonResponse<ResourceTool> createResourceTool(@RequestParam(value="file",required=false) MultipartFile meFile, ResourceTool resourceTool) throws Exception {
	public CommonResponse<ResourceTool> createResourceTool(@RequestBody ResourceTool resourceTool) throws Exception {
		if (resourceTool == null || StringUtils.isEmpty(resourceTool.getResourceToolCode())
				|| StringUtils.isEmpty(resourceTool.getResourceToolName())) {
			return CommonResponse.fail("500", "新增失败");
		}
		return ResourceToolManageService.createResourceTool(meFile,resourceTool);
		return ResourceToolManageService.createResourceTool(resourceTool);
	}
	/**
@@ -110,14 +110,14 @@ public class ResourceToolManageController {
	 */
	@ResponseBody
	@RequestMapping("/modifyResourceTool")
	public CommonResponse<ResourceTool> modifyResourceTool(@RequestParam(value="file",required=false) MultipartFile meFile, ResourceTool resourceTool) throws Exception {
	public CommonResponse<ResourceTool> modifyResourceTool(@RequestBody ResourceTool resourceTool) throws Exception {
		if (resourceTool == null || resourceTool.getResourceToolId() == null
				|| StringUtils.isEmpty(resourceTool.getResourceToolCode())
				|| StringUtils.isEmpty(resourceTool.getResourceToolName())) {
			return CommonResponse.fail("500", "修改失败");
		}
		return ResourceToolManageService.modifyResourceTool(meFile,resourceTool);
		return ResourceToolManageService.modifyResourceTool(resourceTool);
	}
	/**
@@ -139,4 +139,24 @@ public class ResourceToolManageController {
		return ResourceToolManageService.deleteResourceTool(resourceToolIds);
	}
	/**
	 * 上传设备照片
	 * @param meFile
	 * @return
	 * @throws Exception
	 */
	@ResponseBody
	@RequestMapping("/uploadResourceToolPicture")
	public CommonResponse<Map<String, String>> uploadResourceToolPicture(
			@RequestParam(value = "picture") MultipartFile meFile, @RequestParam(required = false) String pictureUrl)
			throws Exception {
		if (meFile == null || StringUtils.isEmpty(meFile.getOriginalFilename())) {
			return CommonResponse.fail("500", "上传失败");
		}
		Map<String, String> resultMap = ResourceToolManageService.uploadResourceToolPicture(meFile, pictureUrl);
		return CommonResponse.ok(resultMap);
	}
}

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

@@ -102,7 +102,7 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
		if (CollectionUtils.isEmpty(response.getData().getData())
				|| CollectionUtils.isEmpty(response.getData().getData().get(0))) {
			return response.fail("504", "获取设备信息失败");
			return CommonResponse.fail("504", "获取设备信息失败");
		}
		Map<String, Object> resultMap = response.getData().getData().get(0);
@@ -116,47 +116,31 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
		if (resultMap.get("pictureUrl") == null || "#".equals(resultMap.get("pictureUrl").toString())) {
			resultMap.put("toolPictureUrl", "");
			resultMap.put("isExistPicture", "0");
		} else {
			String pictureUrl = minioService.getObjectUrl(minioConfig.getBucketWorkToolImage(),
					resultMap.get("pictureUrl").toString());
			resultMap.put("toolPictureUrl", pictureUrl);
			resultMap.put("isExistPicture", "1");
		}
		return CommonResponse.ok(resultMap);
	}
	@Override
	public CommonResponse<ResourceTool> createResourceTool(MultipartFile meFile, ResourceTool resourceTool) {
		if (meFile != null) {
			String fileName = meFile.getOriginalFilename();
			String fileType = fileName.substring(fileName.lastIndexOf("."), fileName.length());
			String minioFileName = UUID.fastUUID().toString() + fileType;
			minioService.putObject(minioConfig.getBucketWorkToolImage(), meFile, minioFileName);
			resourceTool.setPictureUrl(minioFileName);
		} else {
	public CommonResponse<ResourceTool> createResourceTool(ResourceTool resourceTool) {
		if (StringUtils.isEmpty(resourceTool.getPictureUrl())) {
			resourceTool.setPictureUrl("#");
		}
		resourceTool.setVideoUrl("#");
		if (StringUtils.isEmpty(resourceTool.getVideoUrl())) {
			resourceTool.setVideoUrl("#");
		}
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
	}
	@Override
	public CommonResponse<ResourceTool> modifyResourceTool(MultipartFile meFile, ResourceTool resourceTool) {
		if (meFile != null) {
			String fileName = meFile.getOriginalFilename();
			String fileType = fileName.substring(fileName.lastIndexOf("."), fileName.length());
			String minioFileName = UUID.fastUUID().toString() + fileType;
			minioService.putObject(minioConfig.getBucketWorkToolImage(), meFile, minioFileName);
			/*if (StringUtils.isNotBlank(resourceTool.getPictureUrl()) && !"#".equals(resourceTool.getPictureUrl())) {
				minioService.removeObject(minioConfig.getBucketWorkToolImage(), resourceTool.getPictureUrl());
			}*/
			resourceTool.setPictureUrl(minioFileName);
		}
	public CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool) {
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
	}
@@ -173,4 +157,23 @@ public class ResourceToolManageServiceImpl implements ResourceToolManageService
		}
	}
	@Override
	public Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception {
		if (StringUtils.isNotBlank(pictureUrl) && !"#".equals(pictureUrl)) {
			minioService.removeObject(minioConfig.getBucketWorkToolImage(), pictureUrl);
		}
		String fileName = meFile.getOriginalFilename();
		String fileType = fileName.substring(fileName.lastIndexOf("."), fileName.length());
		String minioFileName = UUID.fastUUID().toString() + fileType;
		minioService.putObject(minioConfig.getBucketWorkToolImage(), meFile, minioFileName);
		String toolPictureUrl = minioService.getObjectUrl(minioConfig.getBucketWorkToolImage(), minioFileName);
		Map<String, String> resultMap = new HashMap<String, String>();
		resultMap.put("pictureUrl", minioFileName);
		resultMap.put("toolPictureUrl", toolPictureUrl);
		return resultMap;
	}
}

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

@@ -47,14 +47,14 @@ public interface ResourceToolManageService {
	 * @param resourceTool
	 * @return
	 */
	CommonResponse<ResourceTool> createResourceTool(MultipartFile meFile,ResourceTool resourceTool);
	CommonResponse<ResourceTool> createResourceTool(ResourceTool resourceTool);
	/**
	 * 修改设备信息
	 * @param resourceTool
	 * @return
	 */
	CommonResponse<ResourceTool> modifyResourceTool(MultipartFile meFile,ResourceTool resourceTool);
	CommonResponse<ResourceTool> modifyResourceTool(ResourceTool resourceTool);
	/**
	 * 删除设备信息
@@ -63,4 +63,12 @@ public interface ResourceToolManageService {
	 */
	CommonResponse<Void> deleteResourceTool(List<String> resourceToolIds);
	/**
	 * 上传设备照片
	 * @param meFile
	 * @param pictureUrl
	 * @return
	 * @throws Exception
	 */
	Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception;
}