Browse Source

百科V1.3.3百科词条,供应商词条功能开发

JiangChongBo 2 năm trước cách đây
mục cha
commit
eb447b6e77

+ 5 - 0
src/main/java/com/caimei/modules/baike/dao/CmBaikeProductDao.java

@@ -42,6 +42,9 @@ public interface CmBaikeProductDao extends CrudDao<CmBaikeProduct> {
 
     void delMaterialinfoBYProductId(String id);
 
+    void delTextListByEntryId(String id);
+
+
 
     void insertProductImage(@Param("authImage") String authImage, @Param("produtId") String productId, @Param("imageType") int imageType);
 
@@ -79,6 +82,8 @@ public interface CmBaikeProductDao extends CrudDao<CmBaikeProduct> {
 
     void upMaterialinfo(CmBaikeReferenceInfo cmBaikeReferenceInfo);
 
+    void insertText(CmBaikeTextInfo cmBaikeTextInfo);
+
 
     List<CmBaikeReferenceInfo> getMaterialInfo(@Param("productId") Integer productId);
 

+ 5 - 5
src/main/java/com/caimei/modules/baike/entity/CmBaikeProduct.java

@@ -74,14 +74,14 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 	private Integer topFlag;	//是否置顶标识:0否,1是
 	private String typeName;	//分类名称
 	private List<CmBaikeProductParam> paramList;	// 参数列表
-	private List<CmBaikeTextInfo> textInfo;
+	private List<CmBaikeTextInfo> textInfolist;
 
-	public List<CmBaikeTextInfo> getTextInfo() {
-		return textInfo;
+	public List<CmBaikeTextInfo> getTextInfolist() {
+		return textInfolist;
 	}
 
-	public void setTextInfo(List<CmBaikeTextInfo> textInfo) {
-		this.textInfo = textInfo;
+	public void setTextInfolist(List<CmBaikeTextInfo> textInfolist) {
+		this.textInfolist = textInfolist;
 	}
 
 	private List<CmBaikeTextInfo> paramListall;//正文列表

+ 9 - 1
src/main/java/com/caimei/modules/baike/service/CmBaikeProductService.java

@@ -125,8 +125,8 @@ public class CmBaikeProductService extends CrudService<CmBaikeProductDao, CmBaik
 		if (!cmBaikeProduct.getIsNewRecord()) {
 			cmBaikeProductDao.deleteParamsByProductId(cmBaikeProduct.getId());
 			cmBaikeProductDao.deleteImagesByProductId(cmBaikeProduct.getId());
-			cmBaikeProductDao.deleteQuestionsByProductId(cmBaikeProduct.getId());
 			cmBaikeProductDao.delMaterialinfoBYProductId(cmBaikeProduct.getId());
+			cmBaikeProductDao.delTextListByEntryId(cmBaikeProduct.getId());//正文
 
 		}
 		// 保存上市时间和nmpa时间
@@ -210,6 +210,14 @@ public class CmBaikeProductService extends CrudService<CmBaikeProductDao, CmBaik
 				cmBaikeProductDao.saveMaterialinfo(param);
 		});
 		}
+		//保存正文
+		List<CmBaikeTextInfo> textInfolist = cmBaikeProduct.getTextInfolist();
+		if(null!=textInfolist&&textInfolist.size()>0){
+			textInfolist.forEach(param->{
+				param.setProductId(productId);
+				cmBaikeProductDao.insertText(param);
+			});
+		}
 		// 保存问题
 //		List<CmBaikeProductQuestion> questionList = cmBaikeProduct.getQuestionList();
 //		questionList.forEach(question->{

+ 2 - 1
src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -143,7 +143,7 @@ public class CmBaikeProductController extends BaseController {
 		String sensitiveWords = infoDao.getSensitiveWords(4);
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
-		cmBaikeProduct.setTextInfo(textInfo);
+		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){
 			List<CmBaikeReferenceInfo> materialInfo = cmBaikeProductDao.getMaterialInfo(Integer.valueOf(cmBaikeProduct.getId()));
@@ -436,6 +436,7 @@ public class CmBaikeProductController extends BaseController {
 		}
 		model.addAttribute("sensitiveWords", sensitiveWords);
 		model.addAttribute("materialInfo", materialInfo);
+		model.addAttribute("materialInfo", materialInfo);
 
 		return "modules/baikePage/auditBaikeProductPage";
 	}

+ 8 - 0
src/main/resources/mappings/modules/baike/CmBaikeProductMapper.xml

@@ -353,6 +353,9 @@
 	<delete id="delMaterialinfoBYProductId">
 		delete from cm_baike_reference_info where productId=#{id}
 	</delete>
+	<delete id="delTextListByEntryId">
+		delete from cm_baike_text_info where productId=#{id}
+	</delete>
 	<delete id="deleteProductFile">
 		delete from cm_baike_product_file where id = #{fileId}
 	</delete>
@@ -385,6 +388,11 @@
 			imageUrl=#{imageUrl}
 			where id=#{id}
 	</update>
+
+	<insert id="insertText">
+		insert into cm_baike_text_info(textType,productId,dictionaryContent,referenceId,parentId,dictionaryType)
+		values(#{textType},#{productId},#{dictionaryContent},#{referenceId},#{parentId},#{dictionaryType})
+	</insert>
 	<select id="getMaterialInfo" resultType="com.caimei.modules.baike.entity.CmBaikeReferenceInfo">
 		select * from cm_baike_reference_info where productId=#{productId}
 	</select>

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 208 - 534
src/main/webapp/WEB-INF/views/modules/baikePage/auditBaikeProductPage.jsp


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 235 - 554
src/main/webapp/WEB-INF/views/modules/baikePage/checkBaikePage.jsp


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 271 - 567
src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductForm.jsp


+ 1 - 1
src/main/webapp/WEB-INF/views/modules/baikePage/shopBaikeProductList.jsp

@@ -121,7 +121,7 @@
 					<a href="${ctx}/baike/cmBaikeProduct/toAuditPage?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}&entryId=2"
 					   style="display: ${cmBaikeProduct.auditStatus eq 1 or cmBaikeProduct.auditStatus eq 3?'':'none'}">审核</a>
 					<a href="${ctx}/baike/cmBaikeProduct/check?id=${cmBaikeProduct.id}
-					&commodityType=${cmBaikeProduct.commodityType}&publishSource=2">查看</a>
+					&commodityType=1&publishSource=2">查看</a>
 					<c:if test="${cmBaikeProduct.onlineStatus eq 2}">
 						<a href="javascript:;" onclick="offline(${cmBaikeProduct.id})">下线</a>
 					</c:if>

+ 10 - 2
src/main/webapp/static/content-edit.js

@@ -26,13 +26,18 @@ class ContentEdit {
           markCountKey: 'markCount',
           ...options
       }
-      this.container = document.querySelector(options.el)
+      if(typeof this.options.el === 'string'){
+          this.container = document.querySelector(this.options.el)
+      }else{
+          this.container = this.options.el
+      }
       this.hiddenMark = options.hiddenMark
       this.selection = null
       this.range = null
       this.ctrid = '' // 当前标记id
       this.ctridList = []
       this.registEventListener()
+      this.initCtridList()
   }
 
   get innerHTML() {
@@ -312,6 +317,9 @@ class ContentEditInput {
                 this.realInput.attr('value', html)
             },
         })
+        if(this.edit){
+            this.setBubbleNum(this.edit.ctridList.length)
+        }
     }
 
     setBubbleNum(num) {
@@ -397,4 +405,4 @@ class ContentEditInput {
     bubbleClick = () => {
         this.literature.toggle()
     }
-}
+}

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác