Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
===================================================================
diff -u -r16052 -r16681
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java	(.../UploadImageFileAction.java)	(revision 16052)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java	(.../UploadImageFileAction.java)	(revision 16681)
@@ -153,23 +153,23 @@
      
 	public void uploadImage() {
 		objectID = StrutsParamUtils.getPraramValue("objectId", null);
-	    objectType =	StrutsParamUtils.getPraramValue("imageType", null);
-	    boolean success = true;
-	    String msg = "上传成功！";
-	    boolean isSavePathExist = supplyRoomConfigManager.isSavePathExist();
-	    if(isSavePathExist == false)
-	    {
-	    	success = false;
-	    	msg = "文件保存目录不存在.";
-	    }
+		objectType = StrutsParamUtils.getPraramValue("imageType", null);
+		boolean success = true;
+		String msg = "上传成功！";
+		boolean isSavePathExist = supplyRoomConfigManager.isSavePathExist();
+		if (isSavePathExist == false) {
+			success = false;
+			msg = "文件保存目录不存在.";
+		}
 		try {
-			if(StringUtils.isNotBlank(objectID) && StringUtils.isNotBlank(objectType) && isSavePathExist){
-				//上传图片
+			if (StringUtils.isNotBlank(objectID)
+					&& StringUtils.isNotBlank(objectType) && isSavePathExist) {
+				// 上传图片
 				List<ImageFile> uploadImageList = new ArrayList<ImageFile>();
-				for(int i = 0,size = uploadFiles.length;i<size;i++){
-			        File file = uploadFiles[i];
-			        InputStream fileStream =null;
-			        ByteArrayOutputStream outStream = null;
+				for (int i = 0, size = uploadFiles.length; i < size; i++) {
+					File file = uploadFiles[i];
+					InputStream fileStream = null;
+					ByteArrayOutputStream outStream = null;
 					if (file != null) {
 						try {
 							fileStream = new FileInputStream(file);
@@ -187,14 +187,14 @@
 							uploadImageList.add(image);
 						} catch (Exception e) {
 							e.printStackTrace();
-						}finally{
-							if(fileStream!=null){
+						} finally {
+							if (fileStream != null) {
 								try {
 									fileStream.close();
 								} catch (IOException e) {
 									e.printStackTrace();
-								}finally{
-									if(outStream!=null){
+								} finally {
+									if (outStream != null) {
 										try {
 											outStream.close();
 										} catch (IOException e) {
@@ -204,144 +204,100 @@
 								}
 							}
 						}
-					}         
-			    }
-				//图片关联记录(图片上传模式：一次上传3张图片，请求三次action)
-				if(ImageFile.IMAGE_TYPE_TOUSSE.equals(objectType) || ImageFile.IMAGE_TYPE_SPECIFICATION.equals(objectType)){
-					TousseDefinition tousse = tousseDefinitionManager.getTousseDefinitionById(objectID);
-					if(tousse != null){
+					}
+				}
+				// 图片关联记录(图片上传模式：一次上传3张图片，请求三次action)
+				if (ImageFile.IMAGE_TYPE_TOUSSE.equals(objectType)
+						|| ImageFile.IMAGE_TYPE_SPECIFICATION
+								.equals(objectType)) {
+					TousseDefinition tousse = tousseDefinitionManager
+							.getTousseDefinitionById(objectID);
+					if (tousse != null) {
 
 						for (ImageFile imageFile : uploadImageList) {
 							imageFileManager.setImageFileOrder(imageFile);
-							
+
 							imageFile.setTousseDefinition_id(tousse.getId());
-							
+
 							imageFileManager.saveImage(imageFile);
 						}
 						tousse.setIsUploadImage("是");
-						
+
 						objectDao.saveOrUpdate(tousse);
 					}
-				}else if(ImageFile.IMAGE_TYPE_MATERIAL.equals(objectType)){
-					MaterialDefinition material = materialDefinitionManager.getMaterialDefinitionById(objectID);
-					if(material != null){
-						
+				} else if (ImageFile.IMAGE_TYPE_MATERIAL.equals(objectType)) {
+					MaterialDefinition material = materialDefinitionManager
+							.getMaterialDefinitionById(objectID);
+					if (material != null) {
+
 						for (ImageFile imageFile : uploadImageList) {
 							imageFileManager.setImageFileOrder(imageFile);
-							
-							imageFile.setMaterialDefinition_id(material.getId());
-							
+
+							imageFile
+									.setMaterialDefinition_id(material.getId());
+
 							imageFileManager.saveImage(imageFile);
 						}
 						material.setIsUploadImage("是");
 						objectDao.saveOrUpdate(material);
 					}
-				}else if(ImageFile.IMAGE_TYPE_TOUSSEPACKING.equals(objectType)){
-					TousseDefinition tousse = tousseDefinitionManager.getTousseDefinitionById(objectID);
-					if(tousse != null){
+				} else if (ImageFile.IMAGE_TYPE_TOUSSEPACKING
+						.equals(objectType)) {
+					TousseDefinition tousse = tousseDefinitionManager
+							.getTousseDefinitionById(objectID);
+					if (tousse != null) {
 						for (ImageFile imageFile : uploadImageList) {
-							imageFileManager.setImageFileOrder(imageFile);						
-							imageFile.setToussePackingTeaching_id(tousse.getId());
-							
+							imageFileManager.setImageFileOrder(imageFile);
+							imageFile.setToussePackingTeaching_id(tousse
+									.getId());
+
 							imageFileManager.saveImage(imageFile);
 
 						}
 
 					}
-				}else if(ImageFile.IMAGE_TYPE_QUALITYMONITORING.equals(objectType)){
+				} else if (ImageFile.IMAGE_TYPE_QUALITYMONITORING
+						.equals(objectType)) {
 					QualityMonitoringInstance qualityMonitor = (QualityMonitoringInstance) objectDao
-							.getByProperty(QualityMonitoringInstance.class.getSimpleName(), "id",
-									Long.valueOf(objectID));
-					if(qualityMonitor != null){
-						List<ImageFile> imageFileList = qualityMonitor.getImages();
-						if(imageFileList.size() == 0){
+							.getByProperty(QualityMonitoringInstance.class
+									.getSimpleName(), "id", Long
+									.valueOf(objectID));
+					if (qualityMonitor != null) {
+						List<ImageFile> imageFileList = qualityMonitor
+								.getImages();
+						if (imageFileList.size() == 0) {
 							imageFileList = new ArrayList<ImageFile>();
 						}
-						for(ImageFile imageFile : uploadImageList){
+						for (ImageFile imageFile : uploadImageList) {
 							imageFileManager.setImageFileOrder(imageFile);
 							imageFileManager.saveImage(imageFile);
 							imageFileList.add(imageFile);
 						}
 						qualityMonitor.setImages(imageFileList);
 						objectDao.saveOrUpdate(qualityMonitor);
 					}
-			}else if( ImageFile.IMAGE_TYPE_STAFFARCHIVE.equals(objectType))
-			{
-				for (ImageFile imageFile : uploadImageList) {				
-					imageFileManager.saveImage(imageFile);
-				}
-			}else if( ImageFile.IMAGE_TYPE_STERILIZATION.equals(objectType))
-			{
-				for (ImageFile imageFile : uploadImageList) {
-					imageFileManager.setImageFileOrder(imageFile);
-					imageFileManager.saveImage(imageFile);
+				} else if (ImageFile.IMAGE_TYPE_STAFFARCHIVE.equals(objectType)) {
+					for (ImageFile imageFile : uploadImageList) {
+						imageFileManager.saveImage(imageFile);
 					}
-			}else {
-				success = false;
-				msg = "对不起，请先保存质量监测记录后再上传图片!";
-//			if(StringUtils.isNotBlank(objectType)){
-				//上传图片
-//			String uploadImageObjIds = "";
-//			String uploadImageObjNames = "";
-//			for(int i = 0,size = uploadFiles.length;i<size;i++){
-//	            File file = uploadFiles[i];
-//	            InputStream fileStream = null;
-//	            ByteArrayOutputStream outStream = null;
-//	    		if (file != null) {
-//	    			try {
-//	    				fileStream = new FileInputStream(file);
-//	    				outStream = new ByteArrayOutputStream();
-//	    				byte[] data = new byte[4096];
-//	    				int count = -1;
-//	    				while ((count = fileStream.read(data, 0, 4096)) != -1) {
-//	    					outStream.write(data, 0, count);
-//	    				}
-//	    				ImageFile image = new ImageFile();
-//	    				image.setImage(outStream.toByteArray());
-//	    				image.setImageType(objectType);
-//	    				//image.setObjectId(objectID);
-//	    				image.setImageName(uploadFilesFileName[i]);
-//	    				//imageFileManager.saveOrUpdateImageFileObj(image);
-//	    				imageFileManager.saveImage(image);
-//	    				uploadImageObjIds += (image.getId());
-//	    				uploadImageObjNames += (uploadFilesFileName[i]);
-//	    			} catch (Exception e) {
-//	    				e.printStackTrace();
-//	    			}finally{
-//	    				if(fileStream!=null){
-//	    					try {
-//								fileStream.close();
-//							}catch (IOException e) {
-//								e.printStackTrace();
-//							}finally{
-//								if(outStream!=null){
-//									try {
-//										outStream.close();
-//									} catch (IOException e) {
-//										e.printStackTrace();
-//									}
-//								}
-//							}
-//	    				}
-//	    			}
-//	    		}         
-//	        }
-//			try {
-//				String jsonData = "{success:true,data:'成功',uploadImageIds:'"+uploadImageObjIds+"',uploadImageObjNames:'"+uploadImageObjNames+"'}";
-//				StrutsParamUtils.getResponse().setCharacterEncoding("GBK");
-//				StrutsParamUtils.getResponse().getWriter().print(jsonData);
-//			} catch (IOException e) {
-//				e.printStackTrace();
-//			}
+				} else if (ImageFile.IMAGE_TYPE_STERILIZATION
+						.equals(objectType)) {
+					for (ImageFile imageFile : uploadImageList) {
+						imageFileManager.setImageFileOrder(imageFile);
+						imageFileManager.saveImage(imageFile);
+					}
+				} else {
+					success = false;
+					msg = "对不起，请先保存质量监测记录后再上传图片!";
+				}
 			}
-			}
-		}catch (Throwable e) {
+		} catch (Throwable e) {
 			e.printStackTrace();
 			success = false;
 			msg = e.getMessage();
-		}	
-		StrutsResponseUtils.output(success, msg);        
-    }
+		}
+		StrutsResponseUtils.output(success, msg);
+	}
 	
 	
 	public void deleteImageFile(){