添加新闻来源

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -43,6 +43,7 @@ import com.mortals.xhx.module.matter.model.MatterEntity;
 import com.mortals.xhx.module.matter.model.MatterQuery;
 import com.mortals.xhx.module.matter.service.MatterService;
 import com.mortals.xhx.module.pubdatum.model.PubdatumEntity;
+import com.mortals.xhx.module.pubdatum.model.PubdatumQuery;
 import com.mortals.xhx.module.pubdatum.service.PubdatumService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
@@ -116,6 +117,11 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
     private void addPubdatum(MatterDatumEntity entity, Context context) {
         if (!ObjectUtils.isEmpty(entity.getPub()) && entity.getPub() == YesNoEnum.YES.getValue()) {
+            int count = pubdatumService.count(new PubdatumQuery().materialName(entity.getMaterialName()), context);
+            if(count>0){
+                throw new AppException("当前公共库已存在当前材料名！");
+            }
+
             //添加到公共库
             PubdatumEntity pubdatumEntity = new PubdatumEntity();
             pubdatumEntity.initAttrValue();
@@ -147,6 +153,12 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         if (StringUtils.isEmpty(entity.getTemplatePath())) {
             throw new AppException("样表模板地址不能为空");
         }
+        //校验材料名是否重复
+        int count = this.count(new MatterDatumQuery().materialName(entity.getMaterialName()), context);
+        if(count>0){
+            throw new AppException("当前材料名称已存在！");
+        }
+
         //生成样表预览图片
         String rootPath = this.filePath.endsWith("/") ? this.filePath : this.filePath + "/";
         String samplePath = rootPath + entity.getSamplePath();
@@ -162,7 +174,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         WordUtil.convertWordToJPEG(samplePath, filePathAll);
 
         entity.setPreViewPath(prePath + newName);
-        //校验模板变量正确性 todo
+        //校验模板变量正确性
         if (!ObjectUtils.isEmpty(entity.getTemplatePath())) {
             parseDocxToJson(entity);
         }