Browse Source

修改设备图片问题

konghl 4 years ago
parent
commit
14516e0630

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

132
			}
132
			}
133
		}
133
		}
134
134
135
		if (resultMap.get("pictureUrl") == null || "#".equals(resultMap.get("pictureUrl").toString())) {
135
		if (resultMap.get("pictureUrl") == null) {
136
			resultMap.put("toolPictureUrl", "");
136
			resultMap.put("toolPictureUrl", "");
137
			resultMap.put("isExistPicture", "0");
137
			resultMap.put("isExistPicture", "0");
138
		} else {
138
		} else {
175
			return CommonResponse.fail("502", "设备编号已存在");
175
			return CommonResponse.fail("502", "设备编号已存在");
176
		}
176
		}
177
177
178
		if (StringUtils.isEmpty(resourceTool.getPictureUrl())) {
179
			resourceTool.setPictureUrl("#");
180
		}
181
		if (StringUtils.isEmpty(resourceTool.getVideoUrl())) {
182
			resourceTool.setVideoUrl("#");
183
		}
184
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
178
		CommonRequest<ResourceTool> request = new CommonRequest<ResourceTool>(resourceTool);
185
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
179
		return resourceToolCommand.saveWorkToolWithNoMapArea(request);
186
	}
180
	}
255
249
256
	@Override
250
	@Override
257
	public Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception {
251
	public Map<String, String> uploadResourceToolPicture(MultipartFile meFile, String pictureUrl) throws Exception {
258
		/*if (StringUtils.isNotBlank(pictureUrl) && !"#".equals(pictureUrl)) {
252
		/*if (StringUtils.isNotBlank(pictureUrl)) {
259
		 	//删除照片
253
		 	//删除照片
260
			uploadFileService.removeFile(pictureUrl, minioConfig.getBucketToolImage());
254
			uploadFileService.removeFile(pictureUrl, minioConfig.getBucketToolImage());
261
		}*/
255
		}*/

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

1
package com.ai.bss.security.protection.service.impl;
1
package com.ai.bss.security.protection.service.impl;
2
2
3
import java.util.ArrayList;
3
import java.util.Date;
4
import java.util.Date;
4
import java.util.HashMap;
5
import java.util.HashMap;
5
import java.util.List;
6
import java.util.List;
101
			return null;
102
			return null;
102
		}
103
		}
103
104
104
		String minioFileName = minioFileNameList.get(0);
105
		List<String> urlList = new ArrayList<String>();
106
		for (String minioFileName : minioFileNameList) {
107
			urlList.add(getFileUrl(minioFileName));
108
		}
105
109
106
		return getFileUrlForList(minioFileNameList, getBucketName(minioFileName));
110
		return urlList;
107
	}
111
	}
108
112
109
	@Override
113
	@Override