|
@@ -2,8 +2,10 @@ package cn.cslg.pas.service.novelty;
|
|
|
|
|
|
import cn.cslg.pas.common.dto.NoveltyProjectDTO.NoveltyCompareRecordDTO;
|
|
|
import cn.cslg.pas.common.model.cronModel.PersonnelVO;
|
|
|
+import cn.cslg.pas.common.model.request.StringRequest;
|
|
|
import cn.cslg.pas.common.utils.CacheUtils;
|
|
|
import cn.cslg.pas.common.utils.LoginUtils;
|
|
|
+import cn.cslg.pas.common.vo.NoveltyProjectVO.NoveltyCompareRecordVO;
|
|
|
import cn.cslg.pas.common.vo.PatentWithIdVO;
|
|
|
import cn.cslg.pas.domain.es.Marking;
|
|
|
import cn.cslg.pas.domain.es.Patent;
|
|
@@ -20,6 +22,7 @@ import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
|
|
|
@Service
|
|
|
@RequiredArgsConstructor
|
|
@@ -30,14 +33,17 @@ public class NoveltyCompareRecordService {
|
|
|
private final LoginUtils loginUtils;
|
|
|
private final EsScratchWordsService esScratchWordsService;
|
|
|
|
|
|
- public void addCompareRecord(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
|
|
|
+ public String addCompareRecord(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
|
|
|
String patentNo = noveltyCompareRecordDTO.getPatentNo();
|
|
|
Integer projectId = noveltyCompareRecordDTO.getProjectId();
|
|
|
PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
|
|
|
//获取专利
|
|
|
PatentWithIdVO patentWithIdVO = importSinglePatentService.addPatentToProject(patentNo, projectId);
|
|
|
//添加对比文件
|
|
|
- compareLiteratureService.addPatentCompareLiterature(patentWithIdVO.getPatent(), projectId,personnelVO.getId());
|
|
|
+ compareLiteratureService.addPatentCompareLiterature(patentWithIdVO.getPatent(), projectId, personnelVO.getId());
|
|
|
+
|
|
|
+ //TODO 添加查新对比文件
|
|
|
+
|
|
|
//添加记录
|
|
|
|
|
|
if (personnelVO != null) {
|
|
@@ -54,24 +60,48 @@ public class NoveltyCompareRecordService {
|
|
|
String id = null;
|
|
|
try {
|
|
|
id = esScratchWordsService.saveToEs(marking);
|
|
|
+ return id;
|
|
|
} catch (Exception e) {
|
|
|
throw new XiaoShiException("保存失败");
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
- public void updateCompareRecord(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
|
|
|
+ public String updateCompareRecord(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
|
|
|
String id = noveltyCompareRecordDTO.getId();
|
|
|
Marking marking = new Marking();
|
|
|
BeanUtils.copyProperties(noveltyCompareRecordDTO, marking);
|
|
|
- esScratchWordsService.updateScratchWords(id, marking);
|
|
|
+ return esScratchWordsService.updateScratchWords(id, marking);
|
|
|
}
|
|
|
|
|
|
|
|
|
+ public String addOrUpdateCompareRecord(NoveltyCompareRecordDTO noveltyCompareRecordDTO) {
|
|
|
+ String id = noveltyCompareRecordDTO.getId();
|
|
|
+ if (id == null) {
|
|
|
+ return this.addCompareRecord(noveltyCompareRecordDTO);
|
|
|
+ } else {
|
|
|
+ return this.updateCompareRecord(noveltyCompareRecordDTO);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ public void queryCompareRecord() throws Exception{
|
|
|
+ Integer projectId = null;
|
|
|
+ //根据projectId 查询所有的对比记录
|
|
|
+
|
|
|
+ List<NoveltyCompareRecordVO> vos= esScratchWordsService.queryNoveltyRecord(projectId,null);
|
|
|
|
|
|
- public void queryCompareRecord(){
|
|
|
- Integer projectId =null;
|
|
|
- //根据projectId 查询所有的对比记录
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ public List<String> removeCompareRecord(List<String> ids) {
|
|
|
+ try {
|
|
|
+ for (String id : ids) {
|
|
|
+ esScratchWordsService.removeById(id);
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ }
|
|
|
+ return ids;
|
|
|
+ }
|
|
|
}
|