Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManager.java =================================================================== diff -u -r21816 -r22319 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManager.java (.../ImageFileManager.java) (revision 21816) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManager.java (.../ImageFileManager.java) (revision 22319) @@ -36,6 +36,8 @@ public void saveImage(ImageFile imageFile); public byte[] getImageByIdAndType(Long id,String type,String page); + + public byte[] getImageByIdAndType(Long id,String type,String page,boolean originalImg); /** * 获取图片的数量 * @param objectId Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java =================================================================== diff -u -r22265 -r22319 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java (.../ImageFileManagerImpl.java) (revision 22265) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java (.../ImageFileManagerImpl.java) (revision 22319) @@ -42,7 +42,6 @@ import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.expensivegoods.AuthorizationCertification; -import com.forgon.disinfectsystem.entity.expensivegoods.RelevancyGoodsAuthorization; import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance; import com.forgon.disinfectsystem.expensiveGoods.service.ExpensiveGoodsBillManager; import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; @@ -604,7 +603,12 @@ @Override @SuppressWarnings("unchecked") public byte[] getImageByIdAndType(Long id,String type, String page) { + return getImageByIdAndType(id, type, page, false); + } + + public byte[] getImageByIdAndType(Long id,String type,String page,boolean originalImg){ + SupplyRoomConfig systemParamsObj = supplyRoomConfigManager.getSystemParamsObj(); String saveImagePath = systemParamsObj.getSaveImagePath(); String saveImageMethod = systemParamsObj.getSaveImageMethod(); @@ -620,9 +624,16 @@ List imageFileList = objectDao.findBySql(ImageFile.class.getSimpleName(), sql); if (Integer.parseInt(page) <= imageFileList.size()) { ImageFile imageFile = imageFileList.get(Integer.parseInt(page) - 1); - String thumbnailImagePath = imageFile.getThumbnailImagePath(); - String uuidImageName = imageFile.getUUIDAndImageName(); - String path = saveImagePath+thumbnailImagePath+"\\"+uuidImageName; + String uuidImageName = null; + String imagePath = null; + if(originalImg){ + imagePath = imageFile.getImagePath(); + uuidImageName = imageFile.getUUIDImageName(); + }else{ + imagePath = imageFile.getThumbnailImagePath(); + uuidImageName = imageFile.getUUIDAndImageName(); + } + String path = saveImagePath + imagePath + "\\" + uuidImageName; try { img = FileUtils.readAllContentAsBytes(path); }catch (Exception e) { @@ -646,6 +657,7 @@ } return img; + } @Override public int getImagesCount(Long objectId, String imageType){ Index: forgon-tools/src/main/java/com/forgon/tools/StrutsParamUtils.java =================================================================== diff -u -r14750 -r22319 --- forgon-tools/src/main/java/com/forgon/tools/StrutsParamUtils.java (.../StrutsParamUtils.java) (revision 14750) +++ forgon-tools/src/main/java/com/forgon/tools/StrutsParamUtils.java (.../StrutsParamUtils.java) (revision 22319) @@ -31,6 +31,23 @@ return ServletActionContext.getResponse(); } + public static boolean getBoolPraramValue(String paramName, boolean defaultValue){ + if(StringUtils.isBlank(paramName)){ + return defaultValue; + } + String paramValue = getRequest().getParameter(paramName); + if(StringUtils.isBlank(paramValue)){ + return false; + } + if(StringUtils.equals(paramValue, "0")){ + return false; + } + if(StringUtils.equalsIgnoreCase(paramValue, "false")){ + return false; + } + return true; + } + public static String getPraramValue(String paramName, String defaultValue){ if(StringUtils.isBlank(paramName)){ return defaultValue; Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java =================================================================== diff -u -r21552 -r22319 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 21552) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java (.../PackingAction.java) (revision 22319) @@ -259,27 +259,27 @@ String id = StrutsParamUtils.getPraramValue("id", ""); String page = StrutsParamUtils.getPraramValue("page", "1"); String imageType = StrutsParamUtils.getPraramValue("imageType", ""); - + boolean originalImg = StrutsParamUtils.getBoolPraramValue("originalImg", false); if (DatabaseUtil.isPoIdValid(id)) { byte[] img = null; if (ImageFile.IMAGE_TYPE_TOUSSE.equals(imageType)) { PackingTask packingTask = packingManager.get(id); img = imageFileManager.getImageByIdAndType(packingTask .getTousseDefinition().getId(), - ImageFile.IMAGE_TYPE_TOUSSE, page); + ImageFile.IMAGE_TYPE_TOUSSE, page,originalImg); } else if (ImageFile.IMAGE_TYPE_MATERIAL.equals(imageType)) { img = imageFileManager.getImageByIdAndType(Long.parseLong(id), - ImageFile.IMAGE_TYPE_MATERIAL, page); + ImageFile.IMAGE_TYPE_MATERIAL, page,originalImg); } else if (ImageFile.IMAGE_TYPE_TOUSSEPACKING.equals(imageType)) { img = imageFileManager.getImageByIdAndType(Long.parseLong(id), - ImageFile.IMAGE_TYPE_TOUSSEPACKING, page); + ImageFile.IMAGE_TYPE_TOUSSEPACKING, page,originalImg); }else { img = imageFileManager.getImageByIdAndType(Long.parseLong(id), - imageType, page); + imageType, page,originalImg); } OutputStream outputStream = null;