--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/audiolibrary/AudioLibraryMapper.java

@@ -70,7 +70,7 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 		    + "</script>")
 	List<AudioLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
 	@Select("<script>"
-			+ "SELECT count(*) FROM res_Pdf_Library WHERE name = #{name}"
+			+ "SELECT count(*) FROM res_Audio_Library WHERE name = #{name}"
 			+ " and id !=#{id}"
 			+ "</script>")
 	Integer isRepeat(String pdfName);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/pdffilelibrary/PdfLibraryMapper.java

@@ -53,4 +53,9 @@ public interface PdfLibraryMapper extends BaseMapper<PdfLibrary> {
 		    + "</if>"
 		    + "</script>")
 	List<PdfLibraryListVO> query(@Param("form")QueryPdfLibraryForm form);
+	@Select("<script>"
+			+ "SELECT count(*) FROM res_Pdf_Library WHERE name = #{name}"
+			+ " and id !=#{id}"
+			+ "</script>")
+	Integer isRepeat(String pdfName);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoLibraryMapper.java

@@ -73,4 +73,9 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 			+ "</if>" 
 		    + "</script>")
 	List<VideoLibraryListVO> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm entity);
+	@Select("<script>"
+			+ "SELECT count(*) FROM res_Video_Library WHERE name = #{name}"
+			+ " and id !=#{id}"
+			+ "</script>")
+	Integer isRepeat(String pdfName);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibrarySerivceImpl.java

@@ -74,6 +74,48 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,St
 			entity.setStatus(LibraryStatusEnum.STATUS_0.getCode());
 			entity.setUploadTime(new Date()); 
 			entity.setBrowseNum(50);	//浏览数量
+			if(form.getPdfName()!=null) {
+				Integer count = pdfLibraryMapper.isRepeat(form.getPdfName());
+				if(count==0){
+					PdfLibrary pdf=new PdfLibrary();
+					pdf.setPdf(form.getPdf());
+					pdf.setName(form.getPdfName());
+					pdf.setObjectId(entity.getId());
+					pdf.setIsDelete(1);
+					pdfLibraryMapper.insertSelective(pdf);	
+					entity.setPdf(pdf.getPdf());
+			     }else {
+			    	 entity.setPdf(form.getPdf());
+			     }
+			}
+			if(form.getVideoName()!=null) {
+				Integer count = videoLibraryMapper.isRepeat(form.getPdfName());
+				if(count==0){
+					VideoLibrary video=new VideoLibrary();
+					video.setVideo(form.getVideo());
+					video.setName(form.getVideoName());
+					video.setObjectId(entity.getId());
+					video.setIsDelete(1);
+					videoLibraryMapper.insertSelective(video);	
+					entity.setVideo(form.getVideo());
+			     }else {
+			    	 entity.setPdf(form.getPdf());
+			     }
+			}
+			if(form.getAudioName()!=null) {
+				Integer count = audioLibraryMapper.isRepeat(form.getPdfName());
+				if(count==0){
+					AudioLibrary audio=new AudioLibrary();
+					audio.setAudio(form.getAudio());
+					audio.setName(form.getAudioName());
+					audio.setObjectId(entity.getId());
+					audio.setIsDelete(1);
+					audioLibraryMapper.insertSelective(audio);	
+					entity.setAudio(form.getAudio());
+			     }else {
+			    	 entity.setAudio(form.getAudio());
+			     }
+			}
 			mapper.insert(entity);
 		}else{
 			//修改
@@ -82,6 +124,48 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,St
 			entity.setUpdateTime(new Date());
 			entity.setIsDelete(1);
 			entity.setResourceType(2);
+			if(form.getPdfName()!=null) {
+				Integer count = pdfLibraryMapper.isRepeat(form.getPdfName());
+				if(count==0){
+					PdfLibrary pdf=new PdfLibrary();
+					pdf.setPdf(form.getPdf());
+					pdf.setName(form.getPdfName());
+					pdf.setObjectId(entity.getId());
+					pdf.setIsDelete(1);
+					pdfLibraryMapper.insertSelective(pdf);	
+					entity.setPdf(pdf.getPdf());
+			     }else {
+			    	 entity.setPdf(form.getPdf());
+			     }
+			}
+			if(form.getVideoName()!=null) {
+				Integer count = videoLibraryMapper.isRepeat(form.getPdfName());
+				if(count==0){
+					VideoLibrary video=new VideoLibrary();
+					video.setVideo(form.getVideo());
+					video.setName(form.getVideoName());
+					video.setObjectId(entity.getId());
+					video.setIsDelete(1);
+					videoLibraryMapper.insertSelective(video);	
+					entity.setVideo(form.getVideo());
+			     }else {
+			    	 entity.setPdf(form.getPdf());
+			     }
+			}
+			if(form.getAudioName()!=null) {
+				Integer count = audioLibraryMapper.isRepeat(form.getPdfName());
+				if(count==0){
+					AudioLibrary audio=new AudioLibrary();
+					audio.setAudio(form.getAudio());
+					audio.setName(form.getAudioName());
+					audio.setObjectId(entity.getId());
+					audio.setIsDelete(1);
+					audioLibraryMapper.insertSelective(audio);	
+					entity.setAudio(form.getAudio());
+			     }else {
+			    	 entity.setAudio(form.getAudio());
+			     }
+			}
 			mapper.updateByPrimaryKey(entity1);
 			//删除当前对象与自定义分类的关系
 			ArticleLibraryDiyType old = new ArticleLibraryDiyType();
@@ -94,20 +178,6 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,St
 			list.forEach(li -> li.setAlId(entity.getId()));
 			adrMapper.insertList(list);
 		}
-		if(form.getPdfName()!=null) {
-			Integer count = audioLibraryMapper.isRepeat(form.getPdfName());
-			if(count==0){
-				PdfLibrary pdf=new PdfLibrary();
-				pdf.setPdf(form.getPdf());
-				pdf.setName(form.getPdfName());
-				pdf.setObjectId(entity.getId());
-				pdf.setIsDelete(1);
-				pdfLibraryMapper.insertSelective(pdf);	
-				entity.setPdf(pdf.getId());
-		     }else {
-		    	 entity.setPdf(form.getPdf());
-		     }
-		}
 		return true;
 	}
 	@Override