Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java =================================================================== diff -u -r20818 -r20820 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java (.../ImageFileManagerImpl.java) (revision 20818) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java (.../ImageFileManagerImpl.java) (revision 20820) @@ -30,7 +30,7 @@ import org.hibernate.Session; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; -import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificateManager; +import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificationManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.common.geom.SizeAndPosition; import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; @@ -68,7 +68,7 @@ private SupplierManager supplierManager; - private RegistrationCertificateManager supplierRegistrationCertificateManager; + private RegistrationCertificationManager registrationCertificationManager; public void setSupplyRoomConfigManager( SupplyRoomConfigManager supplyRoomConfigManager) { @@ -88,16 +88,12 @@ MaterialDefinitionManager materialDefinitionManager) { this.materialDefinitionManager = materialDefinitionManager; } - - public void setSupplierManager(SupplierManager supplierManager) { - this.supplierManager = supplierManager; + + public void setRegistrationCertificationManager( + RegistrationCertificationManager registrationCertificationManager) { + this.registrationCertificationManager = registrationCertificationManager; } - public void setSupplierRegistrationCertificateManager( - RegistrationCertificateManager supplierRegistrationCertificateManager) { - this.supplierRegistrationCertificateManager = supplierRegistrationCertificateManager; - } - @Override public ImageFile getImageFileById(String id) { if (StringUtils.isNotBlank(id)) { @@ -757,7 +753,7 @@ } }else if(ImageFile.IMAGE_TYPE_CERTIFICATION .equals(objectType)){ - RegistrationCertification registrationCertification = supplierRegistrationCertificateManager.getById(objectID); + RegistrationCertification registrationCertification = registrationCertificationManager.getById(objectID); for (ImageFile imageFile : uploadImageList) { setImageFileOrder(imageFile); imageFile.setObjectId(registrationCertification.getId().toString()); Fisheye: Tag 20820 refers to a dead (removed) revision in file `ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificateManager.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/RegistrationCertificateAction.java =================================================================== diff -u -r20818 -r20820 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/RegistrationCertificateAction.java (.../RegistrationCertificateAction.java) (revision 20818) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/RegistrationCertificateAction.java (.../RegistrationCertificationAction.java) (revision 20820) @@ -22,7 +22,7 @@ import com.forgon.disinfectsystem.basedatamanager.staffArchives.service.StaffArchiveManager; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; -import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificateManager; +import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificationManager; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.staffArchives.StaffArchive; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier; @@ -43,18 +43,18 @@ @ParentPackage(value = "default") @Namespace(value = "/disinfectSystem/baseData") @Action(value = "SupplierRegistrationCertificateAction") -public class RegistrationCertificateAction implements ModelDriven, Preparable { +public class RegistrationCertificationAction implements ModelDriven, Preparable { private RegistrationCertification supplierRegistrationCertificate; - private RegistrationCertificateManager supplierRegistrationCertificateManager; + private RegistrationCertificationManager supplierRegistrationCertificateManager; private String spell; public void setSupplierRegistrationCertificateManager( - RegistrationCertificateManager supplierRegistrationCertificateManager) { + RegistrationCertificationManager supplierRegistrationCertificateManager) { this.supplierRegistrationCertificateManager = supplierRegistrationCertificateManager; } public void setSpell(String spell) { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificateManagerImpl.java =================================================================== diff -u -r20818 -r20820 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificateManagerImpl.java (.../RegistrationCertificateManagerImpl.java) (revision 20818) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificateManagerImpl.java (.../RegistrationCertificationManagerImpl.java) (revision 20820) @@ -1,9 +1,6 @@ package com.forgon.disinfectsystem.basedatamanager.supplier.service; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -13,30 +10,16 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang.StringUtils; - -import com.forgon.Constants; -import com.forgon.directory.acegi.tools.AcegiHelper; -import com.forgon.directory.vo.LoginUserData; -import com.forgon.disinfectsystem.common.CssdUtils; -import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; -import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; -import com.forgon.disinfectsystem.entity.basedatamanager.staffArchives.StaffArchive; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification; -import com.forgon.security.tools.Util; -import com.forgon.tools.GB2Alpha; -import com.forgon.tools.GB2WB; -import com.forgon.tools.db.DatabaseUtil; +import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.hibernate.ObjectDao; -import com.forgon.tools.util.SqlUtils; /** * @author LiuLiBen 2017-11-9 下午03:10:28 */ -public class RegistrationCertificateManagerImpl implements RegistrationCertificateManager { +public class RegistrationCertificationManagerImpl extends BasePoManagerImpl implements RegistrationCertificationManager { private ObjectDao objectDao; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java =================================================================== diff -u -r16419 -r20820 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java (.../SupplierAction.java) (revision 16419) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java (.../SupplierAction.java) (revision 20820) @@ -1,17 +1,27 @@ package com.forgon.disinfectsystem.basedatamanager.supplier.action; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; +import java.io.OutputStream; import java.io.UnsupportedEncodingException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; +import net.sf.json.util.CycleDetectionStrategy; import net.sf.json.util.PropertyFilter; import org.apache.commons.lang.StringUtils; @@ -20,10 +30,22 @@ import org.apache.struts2.convention.annotation.ParentPackage; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; +import com.forgon.disinfectsystem.basedatamanager.supplier.service.RegistrationCertificationManager; +import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; +import com.forgon.disinfectsystem.common.CssdUtils; +import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile; +import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier; +import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; +import com.forgon.register.service.RegisterManagerImpl; import com.forgon.systemsetting.model.HttpOption; import com.forgon.systemsetting.service.HttpOptionManager; +import com.forgon.tools.FileSystemHelper; +import com.forgon.tools.ImageUtils; import com.forgon.tools.StrutsParamUtils; +import com.forgon.tools.db.DatabaseUtil; +import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; import com.forgon.tools.json.JsonPropertyFilter; import com.forgon.tools.util.PageUtil; import com.opensymphony.xwork2.ModelDriven; @@ -42,6 +64,9 @@ private SupplierManager supplierManager; private String supplierName; private HttpOptionManager httpOptionManager; + private RegistrationCertificationManager registrationCertificationManager; + private ObjectDao objectDao; + private SupplyRoomConfigManager supplyRoomConfigManager; public void setHttpOptionManager(HttpOptionManager httpOptionManager) { this.httpOptionManager = httpOptionManager; @@ -55,6 +80,24 @@ this.supplierName = supplierName; } + public void setRegistrationCertificationManager( + RegistrationCertificationManager registrationCertificationManager) { + this.registrationCertificationManager = registrationCertificationManager; + } + + public void setObjectDao(ObjectDao objectDao) { + this.objectDao = objectDao; + } + + public SupplyRoomConfigManager getSupplyRoomConfigManager() { + return supplyRoomConfigManager; + } + + public void setSupplyRoomConfigManager( + SupplyRoomConfigManager supplyRoomConfigManager) { + this.supplyRoomConfigManager = supplyRoomConfigManager; + } + /** * 保存前检查是否重复 * @return @@ -84,9 +127,14 @@ */ public String saveSupplier() { if (supplier != null) { + String registrationsConfigResult = StrutsParamUtils.getPraramValue( + "registrationsConfigResult", ""); if(supplier.getId() == 0){ supplier.setId(null); } + if (StringUtils.isNotBlank(registrationsConfigResult)) { + supplier.setRegistrationCertificate(registrationCertificationManager.getRegistrationCertificate(registrationsConfigResult,supplier)); + } supplierManager.saveOrUpdate(supplier); } return null; @@ -141,12 +189,13 @@ /** *添加修改 Supplier */ + @SuppressWarnings("unchecked") public void loadSupplier() { StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); JsonConfig config = new JsonConfig(); PropertyFilter propertyFilter = new JsonPropertyFilter(new String[] {}); config.setJsonPropertyFilter(propertyFilter); - + config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT); Map map = new HashMap(); map.put("success", true); map.put("data", supplier); @@ -236,4 +285,108 @@ public void prepare() throws Exception { iniInfo(); } + + /** + * 获取包上传图片总数 + */ + public void getSupplierUploadPicTotalPage() { + int count = supplier.getImagesCount(objectDao); + HttpServletResponse httpServletResponse = StrutsParamUtils + .getResponse(); + httpServletResponse.setCharacterEncoding("UTF-8"); + try { + httpServletResponse.getWriter().print(count); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 获取包上传图片总数 + */ + public void getTousseUploadPicTotalPage() { + int count = supplier.getImagesCount(objectDao); + HttpServletResponse httpServletResponse = StrutsParamUtils + .getResponse(); + httpServletResponse.setCharacterEncoding("UTF-8"); + try { + httpServletResponse.getWriter().print(count); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * 包图片 + */ + public void getSupplierPic() { + String page = StrutsParamUtils.getPraramValue("page", "1"); + byte[] img = null; + long imageId = 0; + ImageFile picture = null; + SupplyRoomConfig systemParamsObj = supplyRoomConfigManager + .getSystemParamsObj(); + String saveImagePath = systemParamsObj.getSaveImagePath(); + if (StringUtils.isNumeric(page) && supplier != null && DatabaseUtil.isPoIdValid(supplier.getId())) { + int index = Integer.parseInt(page); + int count = supplier.getImagesCount(objectDao); + if (index <= count) { + picture = supplier.getImageAt(objectDao, index - 1); + imageId = picture.getId(); + if (picture.getImage() != null) { + img = picture.getImage(); + } else { + img = new byte[4096 * 1024]; + + String thumbnailImagePath = picture.getThumbnailImagePath(); + String uuidImageName = picture.getUUIDAndImageName(); + String Directory = saveImagePath + thumbnailImagePath + + "\\" + uuidImageName; + FileInputStream fis = null; + try { + fis = new FileInputStream(new File(Directory)); + fis.read(img); + } catch (FileNotFoundException e) { + img = FileSystemHelper.readBlankImageBytes(StrutsParamUtils + .getServletContext().getRealPath("/")); + } catch (IOException e) { + img = FileSystemHelper.readBlankImageBytes(StrutsParamUtils + .getServletContext().getRealPath("/")); + } + finally { + if (fis != null) { + try { + fis.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + + } + } + OutputStream outputStream = null; + img = ImageUtils.defaultIfEmpty(img); + try { + HttpServletResponse response = StrutsParamUtils.getResponse(); + response.setContentType("image/jpeg"); + outputStream = response.getOutputStream(); + outputStream.write(img, 0, img.length); + + HttpSession session = StrutsParamUtils.getRequest().getSession(); + session.setAttribute("delImageID", "" + imageId); + } catch (IOException e) { + e.printStackTrace(); + } + finally { + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } } Fisheye: Tag 20820 refers to a dead (removed) revision in file `ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/RegistrationCertificateAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml =================================================================== diff -u -r20779 -r20820 --- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 20779) +++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 20820) @@ -254,6 +254,25 @@ + + + + + + + + + + PROPAGATION_REQUIRED + + + + + + + Fisheye: Tag 20820 refers to a dead (removed) revision in file `ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificateManagerImpl.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificateManager.java =================================================================== diff -u -r20818 -r20820 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificateManager.java (.../RegistrationCertificateManager.java) (revision 20818) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificateManager.java (.../RegistrationCertificationManager.java) (revision 20820) @@ -1,19 +1,18 @@ package com.forgon.disinfectsystem.basedatamanager.supplier.service; -import java.util.Collection; import java.util.List; -import java.util.Map; import net.sf.json.JSONObject; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier; import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification; +import com.forgon.tools.hibernate.BasePoManager; /** * @author LiuLiBen 2017-11-9 下午03:10:28 */ -public interface RegistrationCertificateManager { +public interface RegistrationCertificationManager extends BasePoManager { public RegistrationCertification getById(String id);