Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
===================================================================
diff -u -r27838 -r27852
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java	(.../UploadImageFileAction.java)	(revision 27838)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java	(.../UploadImageFileAction.java)	(revision 27852)
@@ -549,337 +549,359 @@
 	}
 	
 	/**
-	 * 检查器械包定义和材料定义的异常图片(包定义图片、装配教学图片、说明书图片、材料图片)
+	 * 检查器械包定义和材料定义的异常图片(包定义图片、装配教学图片、说明书图片、材料图片)(只检查存储到文件夹中的图片)
 	 */
 	public void checkImageFiles(){
-		String sql = String.format(" where po.imageType in ('%s','%s','%s','%s') ", 
-				ImageFile.IMAGE_TYPE_TOUSSE, ImageFile.IMAGE_TYPE_TOUSSEPACKING,
-				ImageFile.IMAGE_TYPE_SPECIFICATION, ImageFile.IMAGE_TYPE_MATERIAL);
-		List<ImageFile> tdAndMDImageList = imageFileManager.getImageFileBySql(sql);
-		
-		// 器械包定义id关联错误图片的map
-		Map<String, List<ImageFile>> tdIdToErrorOriginalMap = new LinkedHashMap<String, List<ImageFile>>();
-		Map<String, List<ImageFile>> tdIdToErrorThumbnailMap = new LinkedHashMap<String, List<ImageFile>>();
-		
-		// 材料定义id关联错误图片的map
-		Map<String, List<ImageFile>> mdIdToErrorOriginalMap = new LinkedHashMap<String, List<ImageFile>>();
-		Map<String, List<ImageFile>> mdIdToErrorThumbnailMap = new LinkedHashMap<String, List<ImageFile>>();
-		
-		// 数据库ImageFile表记录的图片名称
-		List<String> originalImageNameListDB = new ArrayList<String>();
-		List<String> thumbnailImageNameListDB = new ArrayList<String>();
-		
-		// 文件夹下的图片名称--去除后缀
-		List<String> simpleOriginalImageNameListFS = new ArrayList<String>();
-		List<String> simpleThumbnailImageNameListFS = new ArrayList<String>();
-		// 文件夹下的图片名称--包含后缀(方便显示)
-		List<String> originalImageNameListFS = new ArrayList<String>();
-		List<String> thumbnailImageNameListFS = new ArrayList<String>();
-		SupplyRoomConfig systemParamsObj = supplyRoomConfigManager
-				.getSystemParamsObj();
-		String saveImagePath = systemParamsObj.getSaveImagePath();// 默认的保存路径
-		String originalPath = saveImagePath + "\\original";
-		String thumbnailPath = saveImagePath + "\\thumbnail";
-		// 获取图片文件夹下的图片文件名称
-		String[] originalArray = new File(originalPath).list();
-		String[] thumbnailArray= new File(thumbnailPath).list();
-		if(originalArray != null){
-			for(int i=0;i<originalArray.length;i++){
-				String original = originalArray[i];
-				originalImageNameListFS.add(original);
-				simpleOriginalImageNameListFS.add(original.substring(0, original.lastIndexOf(".")));
+		try {
+			String sql = String.format(" where po.imageType in ('%s','%s','%s','%s') and po.image is null ", 
+					ImageFile.IMAGE_TYPE_TOUSSE, ImageFile.IMAGE_TYPE_TOUSSEPACKING,
+					ImageFile.IMAGE_TYPE_SPECIFICATION, ImageFile.IMAGE_TYPE_MATERIAL);
+			List<ImageFile> tdAndMDImageList = imageFileManager.getImageFileBySql(sql);
+
+			// 器械包定义id关联错误图片的map
+			Map<String, List<ImageFile>> tdIdToErrorOriginalMap = new LinkedHashMap<String, List<ImageFile>>();
+			Map<String, List<ImageFile>> tdIdToErrorThumbnailMap = new LinkedHashMap<String, List<ImageFile>>();
+
+			// 材料定义id关联错误图片的map
+			Map<String, List<ImageFile>> mdIdToErrorOriginalMap = new LinkedHashMap<String, List<ImageFile>>();
+			Map<String, List<ImageFile>> mdIdToErrorThumbnailMap = new LinkedHashMap<String, List<ImageFile>>();
+
+			// 数据库ImageFile表记录的图片名称
+			List<String> originalImageNameListDB = new ArrayList<String>();
+			List<String> thumbnailImageNameListDB = new ArrayList<String>();
+
+			// 文件夹下的图片名称--去除后缀
+			List<String> simpleOriginalImageNameListFS = new ArrayList<String>();
+			List<String> simpleThumbnailImageNameListFS = new ArrayList<String>();
+			// 文件夹下的图片名称--包含后缀(方便显示)
+			List<String> originalImageNameListFS = new ArrayList<String>();
+			List<String> thumbnailImageNameListFS = new ArrayList<String>();
+			SupplyRoomConfig systemParamsObj = supplyRoomConfigManager
+					.getSystemParamsObj();
+			String saveImagePath = systemParamsObj.getSaveImagePath();// 默认的保存路径
+			String originalPath = saveImagePath + "\\original";
+			String thumbnailPath = saveImagePath + "\\thumbnail";
+			// 获取图片文件夹下的图片文件名称
+			String[] originalArray = new File(originalPath).list();
+			String[] thumbnailArray= new File(thumbnailPath).list();
+			if(originalArray == null || (originalArray != null && originalArray.length == 0)){
+				throw new RuntimeException("图片文件夹为空：" + originalPath);
 			}
-		}
-		if(thumbnailArray != null){
-			for(int i=0;i<thumbnailArray.length;i++){
-				String thumbnail = thumbnailArray[i];
-				thumbnailImageNameListFS.add(thumbnail);
-				simpleThumbnailImageNameListFS.add(thumbnail.substring(0, thumbnail.lastIndexOf(".")));
+			if(thumbnailArray == null || (thumbnailArray != null && thumbnailArray.length == 0)){
+				throw new RuntimeException("图片文件夹 为空：" + thumbnailPath);
 			}
-		}
-		
-		if(CollectionUtils.isNotEmpty(tdAndMDImageList)){
-			for (ImageFile image : tdAndMDImageList) {
-				String original = image.getUUIDImageName();
-				String thumbnail = image.getUUIDAndImageName();
-				// 去除图片文件后缀，避免后缀大小写不一致的情况
-				original = StringUtils.isEmpty(original) ? "" : original.substring(0, original.lastIndexOf("."));
-				thumbnail = StringUtils.isEmpty(thumbnail) ? "" : thumbnail.substring(0, thumbnail.lastIndexOf("."));
-				originalImageNameListDB.add(original);
-				thumbnailImageNameListDB.add(thumbnail);
-				
-				// 材料图片
-				if(StringUtils.equals(image.getImageType(), ImageFile.IMAGE_TYPE_MATERIAL)){
+			if(originalArray != null){
+				for(int i=0;i<originalArray.length;i++){
+					String original = originalArray[i];
+					originalImageNameListFS.add(original);
+					simpleOriginalImageNameListFS.add(original.contains(".") ? original.substring(0, original.lastIndexOf(".")) : original);
+				}
+			}
+			if(thumbnailArray != null){
+				for(int i=0;i<thumbnailArray.length;i++){
+					String thumbnail = thumbnailArray[i];
+					thumbnailImageNameListFS.add(thumbnail);
+					simpleThumbnailImageNameListFS.add(thumbnail.contains(".") ? thumbnail.substring(0, thumbnail.lastIndexOf(".")) : thumbnail);
+				}
+			}
+
+			if(CollectionUtils.isNotEmpty(tdAndMDImageList)){
+				for (ImageFile image : tdAndMDImageList) {
+					String original = image.getUUIDImageName() == null ? "" : image.getUUIDImageName();
+					String thumbnail = image.getUUIDAndImageName() == null ? "" : image.getUUIDAndImageName();
+					// 去除图片文件后缀，避免后缀大小写不一致的情况
+					original = original.contains(".") ? original.substring(0, original.lastIndexOf(".")) : original;
+					thumbnail = thumbnail.contains(".") ? thumbnail.substring(0, thumbnail.lastIndexOf(".")) : thumbnail;
+					originalImageNameListDB.add(original);
+					thumbnailImageNameListDB.add(thumbnail);
+
+					// 材料图片
+					if(StringUtils.equals(image.getImageType(), ImageFile.IMAGE_TYPE_MATERIAL)){
+						if(CollectionUtils.isNotEmpty(simpleOriginalImageNameListFS)){
+							if(!simpleOriginalImageNameListFS.contains(original)){
+								List<ImageFile> errorOriginalList = mdIdToErrorOriginalMap.get(image.getObjectId());
+								if(errorOriginalList == null){
+									errorOriginalList = new ArrayList<ImageFile>();
+								}
+								errorOriginalList.add(image);
+								mdIdToErrorOriginalMap.put(image.getObjectId(), errorOriginalList);
+							}
+						}
+
+						if(CollectionUtils.isNotEmpty(simpleThumbnailImageNameListFS)){
+							if(!simpleThumbnailImageNameListFS.contains(thumbnail)){
+								List<ImageFile> errorThumbnailList = mdIdToErrorThumbnailMap.get(image.getObjectId());
+								if(errorThumbnailList == null){
+									errorThumbnailList = new ArrayList<ImageFile>();
+								}
+								errorThumbnailList.add(image);
+								mdIdToErrorThumbnailMap.put(image.getObjectId(), errorThumbnailList);
+							}
+						}
+						continue;
+					}
+
+					// 器械包定义图片、装配教学图片、说明书图片
 					if(CollectionUtils.isNotEmpty(simpleOriginalImageNameListFS)){
 						if(!simpleOriginalImageNameListFS.contains(original)){
-							List<ImageFile> errorOriginalList = mdIdToErrorOriginalMap.get(image.getObjectId());
+							List<ImageFile> errorOriginalList = tdIdToErrorOriginalMap.get(image.getObjectId());
 							if(errorOriginalList == null){
 								errorOriginalList = new ArrayList<ImageFile>();
 							}
 							errorOriginalList.add(image);
-							mdIdToErrorOriginalMap.put(image.getObjectId(), errorOriginalList);
+							tdIdToErrorOriginalMap.put(image.getObjectId(), errorOriginalList);
 						}
 					}
-					
+
 					if(CollectionUtils.isNotEmpty(simpleThumbnailImageNameListFS)){
 						if(!simpleThumbnailImageNameListFS.contains(thumbnail)){
-							List<ImageFile> errorThumbnailList = mdIdToErrorThumbnailMap.get(image.getObjectId());
+							List<ImageFile> errorThumbnailList = tdIdToErrorThumbnailMap.get(image.getObjectId());
 							if(errorThumbnailList == null){
 								errorThumbnailList = new ArrayList<ImageFile>();
 							}
 							errorThumbnailList.add(image);
-							mdIdToErrorThumbnailMap.put(image.getObjectId(), errorThumbnailList);
+							tdIdToErrorThumbnailMap.put(image.getObjectId(), errorThumbnailList);
 						}
 					}
-					continue;
 				}
-				
-				// 器械包定义图片、装配教学图片、说明书图片
-				if(CollectionUtils.isNotEmpty(simpleOriginalImageNameListFS)){
-					if(!simpleOriginalImageNameListFS.contains(original)){
-						List<ImageFile> errorOriginalList = tdIdToErrorOriginalMap.get(image.getObjectId());
-						if(errorOriginalList == null){
-							errorOriginalList = new ArrayList<ImageFile>();
+			}
+
+			// 器械包定义关联图片的map，方便获取包定义信息和图片信息
+			Map<TousseDefinition, List<ImageFile>> tdToErrorOriginalMap = new LinkedHashMap<TousseDefinition, List<ImageFile>>();
+			Map<TousseDefinition, List<ImageFile>> tdToErrorThumbnailMap = new LinkedHashMap<TousseDefinition, List<ImageFile>>();
+			List<String> tdIdList1 = new ArrayList<String>(tdIdToErrorOriginalMap.keySet());
+			List<String> tdIdList2 = new ArrayList<String>(tdIdToErrorThumbnailMap.keySet());
+
+			Set<String> tdIdSet = new HashSet<String>();
+			tdIdSet.addAll(tdIdList1);
+			tdIdSet.addAll(tdIdList2);
+
+			if(CollectionUtils.isNotEmpty(tdIdSet)){
+				String tdSql = String.format(" %s ", SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", tdIdSet));
+				List<TousseDefinition> tdList = tousseDefinitionManager.getByHql(tdSql);
+				if(CollectionUtils.isNotEmpty(tdList)){
+					for (TousseDefinition td : tdList) {
+						List<ImageFile> tempList = tdIdToErrorOriginalMap.get(td.getId().toString());
+						if(CollectionUtils.isNotEmpty(tempList)){
+							tdToErrorOriginalMap.put(td, tempList);
 						}
-						errorOriginalList.add(image);
-						tdIdToErrorOriginalMap.put(image.getObjectId(), errorOriginalList);
+						tempList = tdIdToErrorThumbnailMap.get(td.getId().toString());
+						if(CollectionUtils.isNotEmpty(tempList)){
+							tdToErrorThumbnailMap.put(td, tempList);
+						}
 					}
 				}
-				
-				if(CollectionUtils.isNotEmpty(simpleThumbnailImageNameListFS)){
-					if(!simpleThumbnailImageNameListFS.contains(thumbnail)){
-						List<ImageFile> errorThumbnailList = tdIdToErrorThumbnailMap.get(image.getObjectId());
-						if(errorThumbnailList == null){
-							errorThumbnailList = new ArrayList<ImageFile>();
+			}
+
+			// 材料定义关联图片的map，方便获取材料定义id和名称
+			Map<MaterialDefinition, List<ImageFile>> mdToErrorOriginalMap = new LinkedHashMap<MaterialDefinition, List<ImageFile>>();
+			Map<MaterialDefinition, List<ImageFile>> mdToErrorThumbnailMap = new LinkedHashMap<MaterialDefinition, List<ImageFile>>();
+			List<String> mdIdList1 = new ArrayList<String>(mdIdToErrorOriginalMap.keySet());
+			List<String> mdIdList2 = new ArrayList<String>(mdIdToErrorThumbnailMap.keySet());
+			Set<String> mdIdSet = new HashSet<String>();
+			mdIdSet.addAll(mdIdList1);
+			mdIdSet.addAll(mdIdList2);
+			if(CollectionUtils.isNotEmpty(mdIdSet)){
+				String mdSql = String.format(" %s ", SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", mdIdSet));
+				List<MaterialDefinition> mdList = materialDefinitionManager.getByHql(mdSql);
+				if(CollectionUtils.isNotEmpty(mdList)){
+					for (MaterialDefinition md : mdList) {
+						List<ImageFile> tempList = mdIdToErrorOriginalMap.get(md.getId().toString());
+						if(CollectionUtils.isNotEmpty(tempList)){
+							mdToErrorOriginalMap.put(md, tempList);
 						}
-						errorThumbnailList.add(image);
-						tdIdToErrorThumbnailMap.put(image.getObjectId(), errorThumbnailList);
+						tempList = mdIdToErrorThumbnailMap.get(md.getId().toString());
+						if(CollectionUtils.isNotEmpty(tempList)){
+							mdToErrorThumbnailMap.put(md, tempList);
+						}
 					}
 				}
 			}
-		}
-		
-		// 器械包定义关联图片的map，方便获取包定义信息和图片信息
-		Map<TousseDefinition, List<ImageFile>> tdToErrorOriginalMap = new LinkedHashMap<TousseDefinition, List<ImageFile>>();
-		Map<TousseDefinition, List<ImageFile>> tdToErrorThumbnailMap = new LinkedHashMap<TousseDefinition, List<ImageFile>>();
-		List<String> tdIdList1 = new ArrayList<String>(tdIdToErrorOriginalMap.keySet());
-		List<String> tdIdList2 = new ArrayList<String>(tdIdToErrorThumbnailMap.keySet());
-		
-		Set<String> tdIdSet = new HashSet<String>();
-		tdIdSet.addAll(tdIdList1);
-		tdIdSet.addAll(tdIdList2);
-		
-		if(CollectionUtils.isNotEmpty(tdIdSet)){
-			String tdSql = String.format(" %s ", SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", tdIdSet));
-			List<TousseDefinition> tdList = tousseDefinitionManager.getByHql(tdSql);
-			if(CollectionUtils.isNotEmpty(tdList)){
-				for (TousseDefinition td : tdList) {
-					List<ImageFile> tempList = tdIdToErrorOriginalMap.get(td.getId().toString());
-					if(CollectionUtils.isNotEmpty(tempList)){
-						tdToErrorOriginalMap.put(td, tempList);
+
+			// 处理文件夹存在，但数据库不存在的记录
+			List<String> errorOriginalImages = new ArrayList<String>();
+			List<String> errorThumbnailImages = new ArrayList<String>();
+			// 数据库ImageFile表的图片名称(不包含文件后缀)
+			List<String> allOriginalImagesDB = new ArrayList<String>();
+			List<String> allThumbnailImagesDB = new ArrayList<String>();
+			String sql2 = " where po.image is null ";
+			List<ImageFile> imageList2 = imageFileManager.getImageFileBySql(sql2);
+			if(CollectionUtils.isNotEmpty(imageList2)){
+				// 数据库存在的图片记录
+				for (ImageFile imageFile : imageList2) {
+					String original = imageFile.getUUIDImageName();
+					original = original == null ? "" : original;
+					String thumbnail = imageFile.getUUIDAndImageName();
+					thumbnail = thumbnail == null ? "" : thumbnail;
+					allOriginalImagesDB.add(original.contains(".") ? original.substring(0, original.lastIndexOf(".")) : original);
+					allThumbnailImagesDB.add(thumbnail.contains(".") ? thumbnail.substring(0, thumbnail.lastIndexOf(".")) : thumbnail);
+				}
+				// 和文件夹图片名称列表对比，如果文件名称不在数据库，就是有问题的图片
+				for (String originalFileName : originalImageNameListFS) {
+					String originalName = originalFileName.contains(".") ? originalFileName.substring(0, originalFileName.lastIndexOf(".")) : originalFileName;
+					if(!allOriginalImagesDB.contains(originalName)){
+						errorOriginalImages.add(originalFileName);
 					}
-					tempList = tdIdToErrorThumbnailMap.get(td.getId().toString());
-					if(CollectionUtils.isNotEmpty(tempList)){
-						tdToErrorThumbnailMap.put(td, tempList);
-					}
 				}
-			}
-		}
-		
-		// 材料定义关联图片的map，方便获取材料定义id和名称
-		Map<MaterialDefinition, List<ImageFile>> mdToErrorOriginalMap = new LinkedHashMap<MaterialDefinition, List<ImageFile>>();
-		Map<MaterialDefinition, List<ImageFile>> mdToErrorThumbnailMap = new LinkedHashMap<MaterialDefinition, List<ImageFile>>();
-		List<String> mdIdList1 = new ArrayList<String>(mdIdToErrorOriginalMap.keySet());
-		List<String> mdIdList2 = new ArrayList<String>(mdIdToErrorThumbnailMap.keySet());
-		Set<String> mdIdSet = new HashSet<String>();
-		mdIdSet.addAll(mdIdList1);
-		mdIdSet.addAll(mdIdList2);
-		if(CollectionUtils.isNotEmpty(mdIdSet)){
-			String mdSql = String.format(" %s ", SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", mdIdSet));
-			List<MaterialDefinition> mdList = materialDefinitionManager.getByHql(mdSql);
-			if(CollectionUtils.isNotEmpty(mdList)){
-				for (MaterialDefinition md : mdList) {
-					List<ImageFile> tempList = mdIdToErrorOriginalMap.get(md.getId().toString());
-					if(CollectionUtils.isNotEmpty(tempList)){
-						mdToErrorOriginalMap.put(md, tempList);
+
+				for (String thumbnailFileName : thumbnailImageNameListFS) {
+					String thumbnailName = thumbnailFileName.contains(".") ? thumbnailFileName.substring(0, thumbnailFileName.lastIndexOf(".")) : thumbnailFileName;
+					if(!allThumbnailImagesDB.contains(thumbnailName)){
+						errorThumbnailImages.add(thumbnailFileName);
 					}
-					tempList = mdIdToErrorThumbnailMap.get(md.getId().toString());
-					if(CollectionUtils.isNotEmpty(tempList)){
-						mdToErrorThumbnailMap.put(md, tempList);
-					}
 				}
 			}
-		}
-		
-		// 处理文件夹存在，但数据库不存在的记录
-		List<String> errorOriginalImages = new ArrayList<String>();
-		List<String> errorThumbnailImages = new ArrayList<String>();
-		// 数据库ImageFile表的图片名称(不包含文件后缀)
-		List<String> allOriginalImagesDB = new ArrayList<String>();
-		List<String> allThumbnailImagesDB = new ArrayList<String>();
-		String sql2 = " where (1=1)";
-		List<ImageFile> imageList2 = imageFileManager.getImageFileBySql(sql2);
-		if(CollectionUtils.isNotEmpty(imageList2)){
-			// 数据库存在的图片记录
-			for (ImageFile imageFile : imageList2) {
-				String original = imageFile.getUUIDImageName();
-				original = original == null ? "" : original;
-				String thumbnail = imageFile.getUUIDAndImageName();
-				thumbnail = thumbnail == null ? "" : thumbnail;
-				allOriginalImagesDB.add(original.substring(0, original.lastIndexOf(".")));
-				allThumbnailImagesDB.add(thumbnail.substring(0, thumbnail.lastIndexOf(".")));
-			}
-			// 和文件夹图片名称列表对比，如果文件名称不在数据库，就是有问题的图片
-			for (String originalFileName : originalImageNameListFS) {
-				String originalName = originalFileName.substring(0, originalFileName.lastIndexOf("."));
-				if(!allOriginalImagesDB.contains(originalName)){
-					errorOriginalImages.add(originalFileName);
-				}
-			}
-			
-			for (String thumbnailFileName : thumbnailImageNameListFS) {
-				String thumbnailName = thumbnailFileName.substring(0, thumbnailFileName.lastIndexOf("."));
-				if(!allThumbnailImagesDB.contains(thumbnailName)){
-					errorThumbnailImages.add(thumbnailFileName);
-				}
-			}
-		}
-		
-		JSONArray errorTousseImageArray = new JSONArray();
-		SimpleDateFormat sdf = new SimpleDateFormat(DateTools.COMMON_DATE_HMS);
-		for (TousseDefinition td : tdToErrorOriginalMap.keySet()) {
-			List<ImageFile> originnalList = tdToErrorOriginalMap.get(td);
-			List<ImageFile> thumbnailList = tdToErrorOriginalMap.get(td);
-			if(CollectionUtils.isNotEmpty(originnalList) || CollectionUtils.isNotEmpty(thumbnailList)){
-				JSONObject tempJSON = new JSONObject();
-				tempJSON.put("tousseDefinitionID", td.getId());
-				tempJSON.put("tousseDefinitionName", td.getName());
-				JSONArray imageArray = new JSONArray();
-				if(CollectionUtils.isNotEmpty(originnalList)){
-					for (ImageFile imageFile : originnalList) {
-						JSONObject img = new JSONObject();
-						img.put("id", imageFile.getId());
-						img.put("imageType", imageFile.getImageType());
-						img.put("imageName", imageFile.getImageName());
-						img.put("UUIDImageName", imageFile.getUUIDImageName());
-						img.put("uploadDateTime", "");
-						if(imageFile.getUploadDateTime() != null){
-							img.put("uploadDateTime", sdf.format(imageFile.getUploadDateTime()));
+
+			JSONArray errorTousseImageArray = new JSONArray();
+			SimpleDateFormat sdf = new SimpleDateFormat(DateTools.COMMON_DATE_HMS);
+			Set<TousseDefinition> tdSet = new HashSet<TousseDefinition>();
+			List<TousseDefinition> tdList1 = new ArrayList<TousseDefinition>(tdToErrorOriginalMap.keySet());
+			List<TousseDefinition> tdList2 = new ArrayList<TousseDefinition>(tdToErrorThumbnailMap.keySet());
+			tdSet.addAll(tdList1);
+			tdSet.addAll(tdList2);
+			for (TousseDefinition td : tdSet) {
+				List<ImageFile> originnalList = tdToErrorOriginalMap.get(td);
+				List<ImageFile> thumbnailList = tdToErrorThumbnailMap.get(td);
+				if(CollectionUtils.isNotEmpty(originnalList) || CollectionUtils.isNotEmpty(thumbnailList)){
+					JSONObject tempJSON = new JSONObject();
+					tempJSON.put("tousseDefinitionID", td.getId());
+					tempJSON.put("tousseDefinitionName", td.getName());
+					JSONArray imageArray = new JSONArray();
+					if(CollectionUtils.isNotEmpty(originnalList)){
+						for (ImageFile imageFile : originnalList) {
+							JSONObject img = new JSONObject();
+							img.put("id", imageFile.getId());
+							img.put("imageType", imageFile.getImageType());
+							img.put("imageName", imageFile.getImageName() == null ? "" : imageFile.getImageName());
+							img.put("UUIDImageName", imageFile.getUUIDImageName() == null ? "" : imageFile.getUUIDImageName());
+							img.put("uploadDateTime", "");
+							if(imageFile.getUploadDateTime() != null){
+								img.put("uploadDateTime", sdf.format(imageFile.getUploadDateTime()));
+							}
+							imageArray.add(img);
 						}
-						imageArray.add(img);
 					}
-				}
-				tempJSON.put("originalImageArray", imageArray);
-				imageArray = new JSONArray();
-				if(CollectionUtils.isNotEmpty(thumbnailList)){
-					for (ImageFile imageFile : originnalList) {
-						JSONObject img = new JSONObject();
-						img.put("id", imageFile.getId());
-						img.put("imageType", imageFile.getImageType());
-						img.put("imageName", imageFile.getImageName());
-						img.put("UUIDAndImageName", imageFile.getUUIDAndImageName());
-						img.put("uploadDateTime", "");
-						if(imageFile.getUploadDateTime() != null){
-							img.put("uploadDateTime", sdf.format(imageFile.getUploadDateTime()));
+					tempJSON.put("originalImageArray", imageArray);
+					imageArray = new JSONArray();
+					if(CollectionUtils.isNotEmpty(thumbnailList)){
+						for (ImageFile imageFile : thumbnailList) {
+							JSONObject img = new JSONObject();
+							img.put("id", imageFile.getId());
+							img.put("imageType", imageFile.getImageType());
+							img.put("imageName", imageFile.getImageName() == null ? "" : imageFile.getImageName());
+							img.put("UUIDAndImageName", imageFile.getUUIDAndImageName() == null ? "" : imageFile.getUUIDAndImageName());
+							img.put("uploadDateTime", "");
+							if(imageFile.getUploadDateTime() != null){
+								img.put("uploadDateTime", sdf.format(imageFile.getUploadDateTime()));
+							}
+							imageArray.add(img);
 						}
-						imageArray.add(img);
 					}
+					tempJSON.put("thumbnailImageArray", imageArray);
+					errorTousseImageArray.add(tempJSON);
 				}
-				tempJSON.put("thumbnailImageArray", imageArray);
-				errorTousseImageArray.add(tempJSON);
 			}
-		}
-		
-		JSONArray materialImage = new JSONArray();
-		for(MaterialDefinition md : mdToErrorOriginalMap.keySet()){
-			List<ImageFile> originalImgs = mdToErrorOriginalMap.get(md);
-			List<ImageFile> thumbnailImgs = mdToErrorThumbnailMap.get(md);
-			if(CollectionUtils.isNotEmpty(originalImgs) || CollectionUtils.isNotEmpty(thumbnailImgs)){
-				JSONObject tempJSON = new JSONObject();
-				tempJSON.put("materialDefinitionId", md.getId());
-				tempJSON.put("materialDefinitionIdName", md.getName());
-				JSONArray imageArray = new JSONArray();
-				if(CollectionUtils.isNotEmpty(originalImgs)){
-					for (ImageFile imageFile : originalImgs) {
-						JSONObject img = new JSONObject();
-						img.put("id", imageFile.getId());
-						img.put("imageType", imageFile.getImageType());
-						img.put("imageName", imageFile.getImageName());
-						img.put("UUIDImageName", imageFile.getUUIDImageName());
-						img.put("uploadDateTime", "");
-						if(imageFile.getUploadDateTime() != null){
-							img.put("uploadDateTime", sdf.format(imageFile.getUploadDateTime()));
+
+			JSONArray materialImage = new JSONArray();
+			Set<MaterialDefinition> mdSet = new HashSet<MaterialDefinition>();
+			List<MaterialDefinition> mdList1 = new ArrayList<MaterialDefinition>(mdToErrorOriginalMap.keySet());
+			List<MaterialDefinition> mdList2 = new ArrayList<MaterialDefinition>(mdToErrorThumbnailMap.keySet());
+			mdSet.addAll(mdList1);
+			mdSet.addAll(mdList2);
+			for(MaterialDefinition md : mdSet){
+				List<ImageFile> originalImgs = mdToErrorOriginalMap.get(md);
+				List<ImageFile> thumbnailImgs = mdToErrorThumbnailMap.get(md);
+				if(CollectionUtils.isNotEmpty(originalImgs) || CollectionUtils.isNotEmpty(thumbnailImgs)){
+					JSONObject tempJSON = new JSONObject();
+					tempJSON.put("materialDefinitionId", md.getId());
+					tempJSON.put("materialDefinitionIdName", md.getName());
+					JSONArray imageArray = new JSONArray();
+					if(CollectionUtils.isNotEmpty(originalImgs)){
+						for (ImageFile imageFile : originalImgs) {
+							JSONObject img = new JSONObject();
+							img.put("id", imageFile.getId());
+							img.put("imageType", imageFile.getImageType());
+							img.put("imageName", imageFile.getImageName() == null ? "" : imageFile.getImageName());
+							img.put("UUIDImageName", imageFile.getUUIDImageName() == null ? "" : imageFile.getUUIDImageName());
+							img.put("uploadDateTime", "");
+							if(imageFile.getUploadDateTime() != null){
+								img.put("uploadDateTime", sdf.format(imageFile.getUploadDateTime()));
+							}
+							imageArray.add(img);
 						}
-						imageArray.add(img);
 					}
-				}
-				tempJSON.put("originalImageArray", imageArray);
-				imageArray = new JSONArray();
-				if(CollectionUtils.isNotEmpty(thumbnailImgs)){
-					for (ImageFile imageFile : thumbnailImgs) {
-						JSONObject img = new JSONObject();
-						img.put("id", imageFile.getId());
-						img.put("imageType", imageFile.getImageType());
-						img.put("imageName", imageFile.getImageName());
-						img.put("UUIDAndImageName", imageFile.getUUIDAndImageName());
-						img.put("uploadDateTime", "");
-						if(imageFile.getUploadDateTime() != null){
-							img.put("uploadDateTime", sdf.format(imageFile.getUploadDateTime()));
+					tempJSON.put("originalImageArray", imageArray);
+					imageArray = new JSONArray();
+					if(CollectionUtils.isNotEmpty(thumbnailImgs)){
+						for (ImageFile imageFile : thumbnailImgs) {
+							JSONObject img = new JSONObject();
+							img.put("id", imageFile.getId());
+							img.put("imageType", imageFile.getImageType());
+							img.put("imageName", imageFile.getImageName() == null ? "" : imageFile.getImageName());
+							img.put("UUIDAndImageName", imageFile.getUUIDAndImageName() == null ? "" : imageFile.getUUIDAndImageName());
+							img.put("uploadDateTime", "");
+							if(imageFile.getUploadDateTime() != null){
+								img.put("uploadDateTime", sdf.format(imageFile.getUploadDateTime()));
+							}
+							imageArray.add(img);
 						}
-						imageArray.add(img);
 					}
+					tempJSON.put("thumbnailImageArray", imageArray);
+					materialImage.add(tempJSON);
 				}
-				tempJSON.put("thumbnailImageArray", imageArray);
-				materialImage.add(tempJSON);
 			}
-		}
-		
-		JSONObject errorImage = new JSONObject();
-		// 原始图片文件夹中，图片文件存在，但是数据库记录不存在的错误图片
-		JSONArray errorOriginalImageArr = new JSONArray();
-		if(CollectionUtils.isNotEmpty(errorOriginalImages)){
-			for (String imageName : errorOriginalImages) {
-				JSONObject imageJSON = new JSONObject();
-				imageJSON.put("imageName", imageName);
-				File file = new File(originalPath + "\\" + imageName);
-				imageJSON.put("lastModifyTime", "");
-				if(file.exists()){
-			        Calendar cal = Calendar.getInstance();
-			        long time = file.lastModified(); 
-			        cal.setTimeInMillis(time); 
-			        imageJSON.put("lastModifyTime", DateTools.formatTime(cal, DateTools.COMMON_DATE_HMS));
+
+			JSONObject errorImage = new JSONObject();
+			// 原始图片文件夹中，图片文件存在，但是数据库记录不存在的错误图片
+			JSONArray errorOriginalImageArr = new JSONArray();
+			if(CollectionUtils.isNotEmpty(errorOriginalImages)){
+				for (String imageName : errorOriginalImages) {
+					JSONObject imageJSON = new JSONObject();
+					imageJSON.put("imageName", imageName);
+					File file = new File(originalPath + "\\" + imageName);
+					imageJSON.put("lastModifyTime", "");
+					if(file.exists()){
+						Calendar cal = Calendar.getInstance();
+						long time = file.lastModified(); 
+						cal.setTimeInMillis(time); 
+						imageJSON.put("lastModifyTime", DateTools.formatTime(cal, DateTools.COMMON_DATE_HMS));
+					}
+					errorOriginalImageArr.add(imageJSON);
 				}
-				errorOriginalImageArr.add(imageJSON);
 			}
-		}
-		// 缩略图片文件夹中，图片文件存在，但是数据库记录不存在的错误图片
-		JSONArray errorThumbnailImageArr = new JSONArray();
-		if(CollectionUtils.isNotEmpty(errorThumbnailImages)){
-			for (String imageName : errorThumbnailImages) {
-				JSONObject imageJSON = new JSONObject();
-				imageJSON.put("imageName", imageName);
-				File file = new File(thumbnailPath + "\\" + imageName);
-				imageJSON.put("lastModifyTime", "");
-				if(file.exists()){
-			        Calendar cal = Calendar.getInstance();
-			        long time = file.lastModified(); 
-			        cal.setTimeInMillis(time); 
-			        imageJSON.put("lastModifyTime", DateTools.formatTime(cal, DateTools.COMMON_DATE_HMS));
+			// 缩略图片文件夹中，图片文件存在，但是数据库记录不存在的错误图片
+			JSONArray errorThumbnailImageArr = new JSONArray();
+			if(CollectionUtils.isNotEmpty(errorThumbnailImages)){
+				for (String imageName : errorThumbnailImages) {
+					JSONObject imageJSON = new JSONObject();
+					imageJSON.put("imageName", imageName);
+					File file = new File(thumbnailPath + "\\" + imageName);
+					imageJSON.put("lastModifyTime", "");
+					if(file.exists()){
+						Calendar cal = Calendar.getInstance();
+						long time = file.lastModified(); 
+						cal.setTimeInMillis(time); 
+						imageJSON.put("lastModifyTime", DateTools.formatTime(cal, DateTools.COMMON_DATE_HMS));
+					}
+					errorThumbnailImageArr.add(imageJSON);
 				}
-				errorThumbnailImageArr.add(imageJSON);
 			}
+			errorImage.put("errorOriginalImage", errorOriginalImageArr);
+			errorImage.put("errorThumbnailImage", errorThumbnailImageArr);
+
+			JSONObject data = new JSONObject();
+			data.put("errorTousseImage", errorTousseImageArray);
+			data.put("errorMaterialImage", materialImage);
+			data.put("errorImage", errorImage);
+
+			JSONObject json = JSONUtil.buildJsonObject(true, data);
+			StrutsResponseUtils.output(json);
+		} catch (Exception e) {
+			JSONObject json = JSONUtil.buildJsonObject(false, e.getMessage());
+			StrutsResponseUtils.output(json);
+			e.printStackTrace();
 		}
-		errorImage.put("errorOriginalImage", errorOriginalImageArr);
-		errorImage.put("errorThumbnailImage", errorThumbnailImageArr);
 		
-		JSONObject data = new JSONObject();
-		data.put("errorTousseImage", errorTousseImageArray);
-		data.put("errorMaterialImage", materialImage);
-		data.put("errorImage", errorImage);
-		
-		JSONObject json = JSONUtil.buildJsonObject(true, data);
-		StrutsResponseUtils.output(json);
-		
 	}
 	
 }