bugfix

src/main/java/com/caimei/modules/baike/service/CmBaikeProductService.java

@@ -112,10 +112,10 @@ public class CmBaikeProductService extends CrudService<CmBaikeProductDao, CmBaik
 	@Transactional(readOnly = false)
 	public void save(CmBaikeProduct cmBaikeProduct) {
 		// 保存商品图片
-//		String mainImage = cmBaikeProduct.getImage();
-//		if (StringUtils.isNotEmpty(mainImage) && !mainImage.startsWith("http:")) {
-//			cmBaikeProduct.setImage(UploadPicUtils.saveImageToServer(mainImage));
-//		}
+		String mainImage = cmBaikeProduct.getImage();
+		if (StringUtils.isNotEmpty(mainImage) && !mainImage.startsWith("http:")) {
+			cmBaikeProduct.setImage(UploadPicUtils.saveImageToServer(mainImage));
+		}
 		// 保存正品认证二维码
 //		String authQrCode = cmBaikeProduct.getAuthQrCode();
 //		if (StringUtils.isNotEmpty(authQrCode) && !authQrCode.startsWith("http:")) {

src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -390,13 +390,40 @@ public class CmBaikeProductController extends BaseController {
 		});
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
+		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
-		List<CmBaikeReferenceInfo> materialInfo=null;
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){
-			materialInfo = cmBaikeProductDao.getMaterialInfo(Integer.valueOf(cmBaikeProduct.getId()));
+			List<CmBaikeReferenceInfo> materialInfo = cmBaikeProductDao.getMaterialInfo(Integer.valueOf(cmBaikeProduct.getId()));
+			if(null!=materialInfo&&materialInfo.size()>0){
+				materialInfo.forEach(material->{
+					SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					//时间格式转换（引文时间）
+					if(null!=material.getAcitationTime()){
+						String acitationTimeStr=simpleDateFormat.format(material.getAcitationTime());
+						material.setAcitationTimeStr(acitationTimeStr);
+						material.setAcitationTime(null);
+					}
+					//时间格式转换（发表时间）
+					if(null!=material.getPublishTime()){
+						String publishTimeStr=simpleDateFormat.format(material.getPublishTime());
+						material.setPublishTimeStr(publishTimeStr);
+						material.setPublishTime(null);
+					}
+					//时间格式转换（出版年）
+					if(null!=material.getPublicationYear()){
+						String publicationYearStr=simpleDateFormat.format(material.getPublicationYear());
+						material.setPublicationYearStr(publicationYearStr);
+						material.setPublicationYear(null);
+					}
+				});
+				cmBaikeProduct.setMaterialInfo(materialInfo);
+				Gson g=new Gson();
+				String refrence=g.toJson(materialInfo);
+				cmBaikeProduct.setReferenceList(refrence);
+			}
 		}
 		cmBaikeProduct.setVideoList(videoList);
-		model.addAttribute("materialInfo", materialInfo);
+//		model.addAttribute("materialInfo", materialInfo);
 		model.addAttribute("commodityType", commodityType);
 		return "modules/baikePage/checkBaikePage";
 	}
@@ -456,14 +483,41 @@ public class CmBaikeProductController extends BaseController {
 		String sensitiveWords = infoDao.getSensitiveWords(4);
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
+		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
-		List<CmBaikeReferenceInfo> materialInfo=null;
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){
-			materialInfo = cmBaikeProductDao.getMaterialInfo(Integer.valueOf(cmBaikeProduct.getId()));
+			List<CmBaikeReferenceInfo> materialInfo = cmBaikeProductDao.getMaterialInfo(Integer.valueOf(cmBaikeProduct.getId()));
+			if(null!=materialInfo&&materialInfo.size()>0){
+				materialInfo.forEach(material->{
+					SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+					//时间格式转换（引文时间）
+					if(null!=material.getAcitationTime()){
+						String acitationTimeStr=simpleDateFormat.format(material.getAcitationTime());
+						material.setAcitationTimeStr(acitationTimeStr);
+						material.setAcitationTime(null);
+					}
+					//时间格式转换（发表时间）
+					if(null!=material.getPublishTime()){
+						String publishTimeStr=simpleDateFormat.format(material.getPublishTime());
+						material.setPublishTimeStr(publishTimeStr);
+						material.setPublishTime(null);
+					}
+					//时间格式转换（出版年）
+					if(null!=material.getPublicationYear()){
+						String publicationYearStr=simpleDateFormat.format(material.getPublicationYear());
+						material.setPublicationYearStr(publicationYearStr);
+						material.setPublicationYear(null);
+					}
+				});
+				cmBaikeProduct.setMaterialInfo(materialInfo);
+				Gson g=new Gson();
+				String refrence=g.toJson(materialInfo);
+				cmBaikeProduct.setReferenceList(refrence);
+			}
 		}
 		model.addAttribute("sensitiveWords", sensitiveWords);
-		model.addAttribute("materialInfo", materialInfo);
-		model.addAttribute("materialInfo", materialInfo);
+//		model.addAttribute("materialInfo", materialInfo);
+//		model.addAttribute("materialInfo", materialInfo);
 
 		return "modules/baikePage/auditBaikeProductPage";
 	}

src/main/java/com/caimei/modules/baike/web/CmBaikeTypeController.java

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.caimei.modules.baike.dao.CmBaikeTypeDao;
+import com.caimei.modules.miniprogram.utils.UploadPicUtils;
 import com.caimei.modules.opensearch.GenerateUtils;
 import com.google.common.collect.Maps;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -77,6 +78,14 @@ public class CmBaikeTypeController extends BaseController {
 		if (!beanValidator(model, cmBaikeType)){
 			return form(cmBaikeType, model);
 		}
+		String pcimg=cmBaikeType.getPcBanner();
+		if (StringUtils.isNotEmpty(pcimg) && !pcimg.startsWith("http:")) {
+			cmBaikeType.setPcBanner(UploadPicUtils.saveImageToServer(pcimg));
+		}
+		String appimg=cmBaikeType.getAppBanner();
+		if (StringUtils.isNotEmpty(appimg) && !appimg.startsWith("http:")) {
+			cmBaikeType.setAppBanner(UploadPicUtils.saveImageToServer(appimg));
+		}
 		cmBaikeTypeService.save(cmBaikeType);
 		addMessage(redirectAttributes, "保存分类成功");
 		cleanRedisCache();

src/main/webapp/WEB-INF/views/modules/baikePage/auditBaikeProductPage.jsp

@@ -986,17 +986,17 @@
 				</div>
 				<div class="control-group" style="margin-top: 28px">
 					<label class="control-label">图片上传：</label>
-					<div class="main-image-list" style="display: flex;flex-wrap: wrap">
-						<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">
-							<div class="conList">
-								<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
-								<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
-											  maxHeight="100"/>
-								<br>
-								<label style="margin-left: 150px">请上传引用的图片资源，需同时上传资料的封面、以及含有对应具体内容的图片；注意：图片需要保证完整、不可遮挡且清晰</label>
-							</div>
-						</div>
-					</div>
+<%--					<div class="main-image-list" style="display: flex;flex-wrap: wrap">--%>
+<%--						<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">--%>
+<%--							<div class="conList">--%>
+<%--								<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>--%>
+<%--								<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"--%>
+<%--											  maxHeight="100"/>--%>
+<%--								<br>--%>
+<%--								<label style="margin-left: 150px">请上传引用的图片资源，需同时上传资料的封面、以及含有对应具体内容的图片；注意：图片需要保证完整、不可遮挡且清晰</label>--%>
+<%--							</div>--%>
+<%--						</div>--%>
+<%--					</div>--%>
 				</div>
 			</div>
 
@@ -1253,7 +1253,7 @@
 		<div class="main-image-list" style="display: flex;flex-wrap: wrap">
 			<div class="controls upload-content iconBox mainIgeBox" id="mainIgeBox">
 				<div class="conList">
-					<form:hidden id="" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+					<form:hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
 					<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
 								  maxHeight="100"/>
 					<br>

src/main/webapp/WEB-INF/views/modules/baikePage/checkBaikePage.jsp

@@ -986,17 +986,17 @@
 				</div>
 				<div class="control-group" style="margin-top: 28px">
 					<label class="control-label">图片上传：</label>
-					<div class="main-image-list" style="display: flex;flex-wrap: wrap">
-						<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">
-							<div class="conList">
-								<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
-								<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
-											  maxHeight="100"/>
-								<br>
-								<label style="margin-left: 150px">请上传引用的图片资源，需同时上传资料的封面、以及含有对应具体内容的图片；注意：图片需要保证完整、不可遮挡且清晰</label>
-							</div>
-						</div>
-					</div>
+<%--					<div class="main-image-list" style="display: flex;flex-wrap: wrap">--%>
+<%--						<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">--%>
+<%--							<div class="conList">--%>
+<%--								<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>--%>
+<%--								<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"--%>
+<%--											  maxHeight="100"/>--%>
+<%--								<br>--%>
+<%--								<label style="margin-left: 150px">请上传引用的图片资源，需同时上传资料的封面、以及含有对应具体内容的图片；注意：图片需要保证完整、不可遮挡且清晰</label>--%>
+<%--							</div>--%>
+<%--						</div>--%>
+<%--					</div>--%>
 				</div>
 			</div>
 
@@ -1253,7 +1253,7 @@
 		<div class="main-image-list" style="display: flex;flex-wrap: wrap">
 			<div class="controls upload-content iconBox mainIgeBox" id="mainIgeBox">
 				<div class="conList">
-					<form:hidden id="" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+					<form:hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
 					<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
 								  maxHeight="100"/>
 					<br>

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductForm.jsp

@@ -986,17 +986,17 @@
 					</div>
 					<div class="control-group" style="margin-top: 28px">
 						<label class="control-label">图片上传：</label>
-						<div class="main-image-list" style="display: flex;flex-wrap: wrap">
-							<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">
-								<div class="conList">
-									<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
-									<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
-												  maxHeight="100"/>
-									<br>
-									<label style="margin-left: 150px">请上传引用的图片资源，需同时上传资料的封面、以及含有对应具体内容的图片；注意：图片需要保证完整、不可遮挡且清晰</label>
-								</div>
-							</div>
-						</div>
+<%--						<div class="main-image-list" style="display: flex;flex-wrap: wrap">--%>
+<%--							<div class="controls upload-content iconBox mainImageBox" id="mainImageBox">--%>
+<%--								<div class="conList">--%>
+<%--									<hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>--%>
+<%--									<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"--%>
+<%--												  maxHeight="100"/>--%>
+<%--									<br>--%>
+<%--									<label style="margin-left: 150px">请上传引用的图片资源，需同时上传资料的封面、以及含有对应具体内容的图片；注意：图片需要保证完整、不可遮挡且清晰</label>--%>
+<%--								</div>--%>
+<%--							</div>--%>
+<%--						</div>--%>
 					</div>
 				</div>
 
@@ -1253,7 +1253,7 @@
 			<div class="main-image-list" style="display: flex;flex-wrap: wrap">
 				<div class="controls upload-content iconBox mainIgeBox" id="mainIgeBox">
 					<div class="conList">
-						<form:hidden id="" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
+						<form:hidden id="image" path="image" htmlEscape="false" maxlength="255" class="input-xlarge "/>
 						<sys:ckfinder input="image" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100"
 									  maxHeight="100"/>
 						<br>

src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductList.jsp

@@ -121,7 +121,7 @@
 					</c:if>
 				</td>
 				<td>
-					<a target="_blank" href="${fns:getConfig('wwwServer')}encyclopedia/${cmBaikeProduct.commodityType eq 1?'product':'instrument'}-${cmBaikeProduct.id}.html">查看</a>
+					<a target="_blank" href="${fns:getConfig('wwwServer')}encyclopedia/detail-${cmBaikeProduct.id}.html">查看</a>
     				<a href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&entryId=2">编辑</a>
 					<a href="${ctx}/baike/cmBaikeProduct/delete?id=${cmBaikeProduct.id}" onclick="return confirmx('确认要删除该产品吗？', this.href)">删除</a>
 <%--					<a onclick="showTopSelect(${index.index},'open')" href="javascript:void(0)">首页置顶</a>--%>