Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java =================================================================== diff -u -r13784 -r13789 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 13784) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java (.../SupplyRoomConfigAction.java) (revision 13789) @@ -1,5 +1,6 @@ package com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.action; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -174,6 +175,19 @@ } public void saveSupplyRoomCongfig() { + try { + if( !supplyRoomConfigManager.isSavePathExist(saveImageMethod, saveImagePath) ) + { + String json = "{success:" + false + ",message:'" + "文件保存路径不存在." + "'}"; + HttpServletResponse response = StrutsParamUtils.getResponse(); + response.setCharacterEncoding("UTF-8"); + response.getWriter().print(json); + return ; + } + } catch (IOException e) { + e.printStackTrace(); + } + // 1级供应室 if (StringUtils.isNotBlank(supplyRoom_type_1)) { String[] rs = supplyRoom_type_1.split(";"); @@ -367,7 +381,8 @@ saveImagePath = "C:\\sterile\\uploadImage"; } supplyRoomConfig.setSaveImagePath(saveImagePath); - + // 创建保存文件目录 + supplyRoomConfigManager.createSavePath(); supplyRoomConfig.setInvoiceOrigin(invoiceOrigin); supplyRoomConfig.setDiposablePriceFluctuation(diposablePriceFluctuation); supplyRoomConfig.setToussePriceFluctuation(toussePriceFluctuation); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js =================================================================== diff -u -r12331 -r13789 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js (.../uploadImageManager.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js (.../uploadImageManager.js) (revision 13789) @@ -67,7 +67,7 @@ }); dialog.show(); - dialog.on('uploadcomplete',function(dialog){ + dialog.on('uploadsuccess',function(dialog){ showResult("文件上传成功!"); toussePackingTearchingStore.reload(); @@ -80,6 +80,18 @@ dialog.hide(); }); //定义上传完成回调函数 + dialog.on('uploadfailed',function(dialog){ + showResult("文件上传失败!"); + toussePackingTearchingStore.reload(); + + Ext.Ajax.request({ + url : WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!updateImageUploadStatus.do', + params : {id : id,imageType:imageType}, + success : function(response, options) {}, + failure : function(response, options) {} + }); + dialog.hide(); + }); //定义上传完成回调函数 } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java =================================================================== diff -u -r13744 -r13789 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 13744) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManager.java (.../SupplyRoomConfigManager.java) (revision 13789) @@ -100,4 +100,11 @@ * @return */ public boolean isSupplyRoomUser(); + /** + * 判断保存文件路径是否存在 + * @return + */ + public boolean isSavePathExist(); + public boolean isSavePathExist(String saveMethod,String saveDir); + public void createSavePath(); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java =================================================================== diff -u -r13744 -r13789 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 13744) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java (.../SupplyRoomConfigManagerImpl.java) (revision 13789) @@ -1,5 +1,6 @@ package com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service; +import java.io.File; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -523,4 +524,61 @@ public boolean isSupplyRoomUser() { return isSupplyRoomUser(AcegiHelper.getLoginUser()); } + + public boolean isSavePathExist(){ + SupplyRoomConfig supplyRoomConfig = getSystemParamsObj(); + String saveImageMethod = supplyRoomConfig.getSaveImageMethod(); + String saveImageDirectory = supplyRoomConfig.getSaveImagePath(); + try{ + if("保存到本地磁盘".equals(saveImageMethod)) + { + File file = new File(saveImageDirectory); + if(saveImageDirectory != null && file.exists()) + return true; + } + return false; + }catch(Exception ex) + { + ex.printStackTrace(); + return false; + } + } + + public boolean isSavePathExist(String saveMethod,String saveDir){ + // 配的目录为空,添加默认的目录 + if( !StringUtils.isNotBlank(saveDir)) + return true; + try{ + if("保存到本地磁盘".equals(saveMethod)) + { + File file = new File(saveDir); + if(!file.exists()) + return false; + } + return true; + }catch(Exception ex) + { + ex.printStackTrace(); + return false; + } + } + + public void createSavePath() + { + SupplyRoomConfig supplyRoomConfig = getSystemParamsObj(); + String saveImageDirectory = supplyRoomConfig.getSaveImagePath(); + try{ + if(StringUtils.isNotBlank(saveImageDirectory)) + { + File file = new File(saveImageDirectory); + if(!file.exists()) + { + file.mkdirs(); + } + } + }catch(Exception ex) + { + ex.printStackTrace(); + } + } } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r13784 -r13789 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 13784) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 13789) @@ -1562,7 +1562,7 @@ showResult('保存成功'); }, failure : function(form, action) { - showResult('保存失败'); + showResult('保存失败:' + action.result.message); } }); } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java =================================================================== diff -u -r13712 -r13789 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java (.../UploadImageFileAction.java) (revision 13712) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java (.../UploadImageFileAction.java) (revision 13789) @@ -158,8 +158,14 @@ 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)){ + if(StringUtils.isNotBlank(objectID) && StringUtils.isNotBlank(objectType) && isSavePathExist){ //上传图片 List uploadImageList = new ArrayList(); for(int i = 0,size = uploadFiles.length;i