品牌授权part3

src/main/java/com/caimei/modules/zplm/entity/CmBrandAuthProduct.java

@@ -20,6 +20,7 @@ public class CmBrandAuthProduct extends DataEntity<CmBrandAuthProduct> {
 	private String name;		// 商品名称
 	private String snCode;		// sn码
 	private String image;		// 商品图片
+    private String certificateImage;    //授权牌照
 	private Date createTime;		// 创建时间
 	private String createUserName;	//创建人名称
 
@@ -68,6 +69,15 @@ public class CmBrandAuthProduct extends DataEntity<CmBrandAuthProduct> {
 	public void setImage(String image) {
 		this.image = image;
 	}
+
+	@Length(min=0, max=255, message="授权牌照长度必须介于 0 和 255 之间")
+	public String getCertificateImage() {
+		return certificateImage;
+	}
+
+	public void setCertificateImage(String certificateImage) {
+		this.certificateImage = certificateImage;
+	}
 	
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	public Date getCreateTime() {

src/main/java/com/caimei/modules/zplm/service/CmBrandAuthProductService.java

@@ -46,12 +46,12 @@ public class CmBrandAuthProductService extends CrudService<CmBrandAuthProductDao
 	
 	@Transactional(readOnly = false)
 	public void save(CmBrandAuthProduct cmBrandAuthProduct) {
-		//保存图片
-		String logo = cmBrandAuthProduct.getImage();
-		if(StringUtils.isNotBlank(logo) && !logo.startsWith("http")){
+		//保存商品图片
+		String image = cmBrandAuthProduct.getImage();
+		if(StringUtils.isNotBlank(image) && !image.startsWith("http")){
 			String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
-			logo= Encodes.urlDecode(logo);
-			String realPath = UploadImageUtils.getAbsolutePath(logo);
+			image= Encodes.urlDecode(image);
+			String realPath = UploadImageUtils.getAbsolutePath(image);
 			int pointerIndex = realPath.lastIndexOf(".");
 			ImageUploadInfo saveImageSerivce;
 			try {
@@ -61,6 +61,21 @@ public class CmBrandAuthProductService extends CrudService<CmBrandAuthProductDao
 				logger.error("图片上传错误:"+e.toString(),e);
 			}
 		}
+		//保存授权牌照
+		String certificateImage = cmBrandAuthProduct.getCertificateImage();
+		if(StringUtils.isNotBlank(certificateImage) && !certificateImage.startsWith("http")){
+			String photoServer = Global.getConfig("photoServer");//获取文件服务器地址
+			certificateImage= Encodes.urlDecode(certificateImage);
+			String realPath = UploadImageUtils.getAbsolutePath(certificateImage);
+			int pointerIndex = realPath.lastIndexOf(".");
+			ImageUploadInfo saveImageSerivce;
+			try {
+				saveImageSerivce = ImagePathUtils.saveImageSerivce(realPath, pointerIndex,realPath);
+				cmBrandAuthProduct.setCertificateImage(photoServer+saveImageSerivce.getSource());
+			} catch (Exception e) {
+				logger.error("图片上传错误:"+e.toString(),e);
+			}
+		}
 		if (cmBrandAuthProduct.getIsNewRecord()) {
 			cmBrandAuthProduct.setCreateBy(UserUtils.getUser());
 			cmBrandAuthProduct.setCreateTime(new Date());

src/main/java/com/caimei/modules/zplm/web/CmBrandAuthProductController.java

@@ -73,14 +73,14 @@ public class CmBrandAuthProductController extends BaseController {
 		}
 		cmBrandAuthProductService.save(cmBrandAuthProduct);
 		addMessage(redirectAttributes, "保存品牌授权商品成功");
-		return "redirect:"+Global.getAdminPath()+"/zplm/cmBrandAuthProduct/?repage&authorizationId="+cmBrandAuthProduct.getAuthId();
+		return "redirect:"+Global.getAdminPath()+"/zplm/cmBrandAuthProduct/?repage&authId="+cmBrandAuthProduct.getAuthId();
 	}
 	
 	@RequestMapping(value = "delete")
 	public String delete(CmBrandAuthProduct cmBrandAuthProduct, RedirectAttributes redirectAttributes) {
 		cmBrandAuthProductService.delete(cmBrandAuthProduct);
 		addMessage(redirectAttributes, "删除品牌授权商品成功");
-		return "redirect:"+Global.getAdminPath()+"/zplm/cmBrandAuthProduct/?repage&authorizationId="+cmBrandAuthProduct.getAuthId();
+		return "redirect:"+Global.getAdminPath()+"/zplm/cmBrandAuthProduct/?repage&authId="+cmBrandAuthProduct.getAuthId();
 	}
 
 	private boolean checkValidator(Model model, CmBrandAuthProduct cmBrandAuthProduct) {

src/main/resources/mappings/modules/zplm/CmBrandAuthProductMapper.xml

@@ -8,6 +8,7 @@
 		a.name AS "name",
 		a.snCode AS "snCode",
 		a.image AS "image",
+        a.certificateImage AS "certificateImage",
 		a.createTime AS "createTime",
 		a.createBy AS "createBy.id",
 		su.login_name AS "createUserName"
@@ -85,6 +86,7 @@
 			name,
 			snCode,
 			image,
+            certificateImage,
 			createTime,
 			createBy
 		) VALUES (
@@ -92,6 +94,7 @@
 			#{name},
 			#{snCode},
 			#{image},
+			#{certificateImage},
 			#{createTime},
 			#{createBy.id}
 		)
@@ -103,10 +106,10 @@
 
 	<update id="update">
 		UPDATE cm_brand_auth_product SET 	
-			authId = #{authId},
 			name = #{name},
 			snCode = #{snCode},
-			image = #{image}
+			image = #{image},
+            certificateImage = #{certificateImage}
 		WHERE id = #{id}
 	</update>
 	

src/main/webapp/WEB-INF/views/modules/zplm/cmBrandAuthProductForm.jsp

@@ -114,7 +114,18 @@
 					<form:hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
 					<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
 					<br>
-					<label style="margin-left: 150px">建议图片分辨率252px*252px</label>
+					<label style="margin-left: 150px">建议图片分辨率128px*88px</label>
+				</div>
+			</div>
+		</div>
+		<div class="control-group iconBox">
+			<label class="control-label">*授权牌照：</label>
+			<div class="controls upload-content" id="certificateImageBox">
+				<div class="conList">
+					<form:hidden id="certificateImage" path="certificateImage" htmlEscape="false" maxlength="255" class="input-xlarge required"/>
+					<sys:ckfinder input="certificateImage" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+					<br>
+					<label style="margin-left: 150px">建议图片分辨率128px*88px</label>
 				</div>
 			</div>
 		</div>
@@ -150,6 +161,7 @@
 			$('.upload-content .conList .btn:nth-of-type(2)').after('<img class="cancel-upload" src="/static/images/close-btn1.png">').remove();
 			$('.upload-content .conList').find('.cancel-upload').hide();
 			var observeEle = document.getElementsByClassName('upload-content')[0];
+			var observeEle1 = document.getElementsByClassName('upload-content')[1];
 			var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
 			var MutationObserverConfig = {
 				childList: true,
@@ -172,6 +184,7 @@
 				})
 			});
 			observer.observe(observeEle, MutationObserverConfig);
+			observer.observe(observeEle1, MutationObserverConfig);
 
 			$('body').on('click', '.cancel-upload', function () {
 				var wrapper = $(this).closest('.conList');
@@ -196,6 +209,13 @@
 							$(ele).parents(".conList").next().removeClass("hide-pic")
 						}
 					})
+					$("#certificateImageBox").find("input.input-xlarge").each(function (i, ele) {
+						if ($(ele).val()) {
+							$(ele).next().find("li").css("z-index", "99");
+							$(ele).parents(".conList").find(".cancel-upload").show();
+							$(ele).parents(".conList").next().removeClass("hide-pic")
+						}
+					})
 				}, 200);
 			});