|
@@ -236,7 +236,7 @@ public class UploadPatentBatchService {
|
|
|
//发明人 OS_PATENT_INVENTOR
|
|
|
patentInventorBusiness(uploadParamsVO);
|
|
|
//申请人(原始)/权利人(当前) OS_PATENT_APPLICATION || OS_APPLICATION_ATTR
|
|
|
- patentApplicationBusiness(uploadParamsVO);
|
|
|
+ patentApplicationBusiness(uploadParamsVO);
|
|
|
//申请人地址 OS_PATENT_APPLICATION
|
|
|
patentApplicationAddressBusiness(uploadParamsVO);
|
|
|
//专题库关联专利信息 OS_THEMATIC_PID
|
|
@@ -323,7 +323,7 @@ public class UploadPatentBatchService {
|
|
|
//发明人 OS_PATENT_INVENTOR
|
|
|
patentInventorBusiness(uploadParamsVO);
|
|
|
//申请人(原始)/权利人(当前) OS_PATENT_APPLICATION || OS_APPLICATION_ATTR
|
|
|
- patentApplicationBusiness(uploadParamsVO);
|
|
|
+ patentApplicationBusiness(uploadParamsVO);
|
|
|
//申请人地址 OS_PATENT_APPLICATION
|
|
|
patentApplicationAddressBusiness(uploadParamsVO);
|
|
|
//分类号关联 OS_PATENT_TYPENO
|
|
@@ -346,6 +346,7 @@ public class UploadPatentBatchService {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* @param uploadParamsVO 全局类
|
|
|
* @date 2022-7-11
|
|
@@ -467,29 +468,29 @@ public class UploadPatentBatchService {
|
|
|
//申请人(原始)/权利人(当前) OS_PATENT_APPLICATION || OS_APPLICATION_ATTR
|
|
|
private void patentApplicationBusiness(UploadParamsVO uploadParamsVO) {
|
|
|
// 根据本条数据的名字查询所有的申请人信息
|
|
|
- List<String> name =new ArrayList<>();
|
|
|
- if(uploadParamsVO.getPatentApplicantCurrentName()!=null){
|
|
|
- name.addAll(uploadParamsVO.getPatentApplicantCurrentName());
|
|
|
- }
|
|
|
- if(uploadParamsVO.getPatentApplicantOriginalName()!=null){
|
|
|
- name.addAll(uploadParamsVO.getPatentApplicantOriginalName());
|
|
|
- }
|
|
|
- if(uploadParamsVO.getPatentApplicantStandardCurrentName()!=null){
|
|
|
+ List<String> name = new ArrayList<>();
|
|
|
+ if (uploadParamsVO.getPatentApplicantCurrentName() != null) {
|
|
|
+ name.addAll(uploadParamsVO.getPatentApplicantCurrentName());
|
|
|
+ }
|
|
|
+ if (uploadParamsVO.getPatentApplicantOriginalName() != null) {
|
|
|
+ name.addAll(uploadParamsVO.getPatentApplicantOriginalName());
|
|
|
+ }
|
|
|
+ if (uploadParamsVO.getPatentApplicantStandardCurrentName() != null) {
|
|
|
name.addAll(uploadParamsVO.getPatentApplicantStandardCurrentName());
|
|
|
}
|
|
|
- if(uploadParamsVO.getPatentApplicantStandardOriginalName()!=null){
|
|
|
+ if (uploadParamsVO.getPatentApplicantStandardOriginalName() != null) {
|
|
|
name.addAll(uploadParamsVO.getPatentApplicantStandardOriginalName());
|
|
|
}
|
|
|
- if(name.size()!=0) {
|
|
|
+ if (name.size() != 0) {
|
|
|
List<PatentApplicant> patentApplicantList = patentApplicantService.list(Wrappers.<PatentApplicant>lambdaQuery().in(PatentApplicant::getName, name));
|
|
|
//权利人
|
|
|
- if(uploadParamsVO.getPatentApplicantCurrentName()!=null||uploadParamsVO.getPatentApplicantStandardCurrentName()!=null)
|
|
|
- patentApplicantLinkService.updatePatentApplicantLink(uploadParamsVO.getPatentApplicantCurrentName(), uploadParamsVO.getPatentApplicantStandardCurrentName(), 1, uploadParamsVO.getPatent().getId(), patentApplicantList);
|
|
|
+ if (uploadParamsVO.getPatentApplicantCurrentName() != null || uploadParamsVO.getPatentApplicantStandardCurrentName() != null)
|
|
|
+ patentApplicantLinkService.updatePatentApplicantLink(uploadParamsVO.getPatentApplicantCurrentName(), uploadParamsVO.getPatentApplicantStandardCurrentName(), 1, uploadParamsVO.getPatent().getId(), patentApplicantList);
|
|
|
//申请人
|
|
|
- if(uploadParamsVO.getPatentApplicantOriginalName()!=null||uploadParamsVO.getPatentApplicantStandardOriginalName()!=null)
|
|
|
- patentApplicantLinkService.updatePatentApplicantLink(uploadParamsVO.getPatentApplicantOriginalName(), uploadParamsVO.getPatentApplicantStandardOriginalName(), 2, uploadParamsVO.getPatent().getId(), patentApplicantList);
|
|
|
- }
|
|
|
+ if (uploadParamsVO.getPatentApplicantOriginalName() != null || uploadParamsVO.getPatentApplicantStandardOriginalName() != null)
|
|
|
+ patentApplicantLinkService.updatePatentApplicantLink(uploadParamsVO.getPatentApplicantOriginalName(), uploadParamsVO.getPatentApplicantStandardOriginalName(), 2, uploadParamsVO.getPatent().getId(), patentApplicantList);
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
private void patentApplicationAddressBusiness(UploadParamsVO uploadParamsVO) {
|
|
|
PatentApplicantAddressParams patentApplicantAddressParams = new PatentApplicantAddressParams();
|
|
@@ -582,9 +583,8 @@ public class UploadPatentBatchService {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@Async("singleThreadAsyncTaskExecutor")
|
|
|
- public void uploadPatentForProduct(TaskParams params,Integer productId) {
|
|
|
+ public void uploadPatentForProduct(TaskParams params, Integer productId) {
|
|
|
Integer total = params.getRowList().size();
|
|
|
try {
|
|
|
//先解析Json文件 获得配置文件的Json串
|
|
@@ -617,7 +617,7 @@ public class UploadPatentBatchService {
|
|
|
//将装配对象中的数据保存到数据库
|
|
|
dataToDBBro(params, uploadParamsVO);
|
|
|
//添加关联关系
|
|
|
- assoProductPatentService.addPatents(Arrays.asList(uploadParamsVO.getPatent().getPatentNo()),productId);
|
|
|
+ assoProductPatentService.addPatents(Arrays.asList(uploadParamsVO.getPatent().getPatentNo()), productId);
|
|
|
//通过WebSocket 在每一次循环结束后 向前端发送完成进度
|
|
|
WebSocketServer.sendInfo(Response.websocket(new TaskWebSocketDTO()
|
|
|
.setTaskId(params.getTaskId())
|
|
@@ -654,14 +654,13 @@ public class UploadPatentBatchService {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
-
|
|
|
* @date 2022-7-11
|
|
|
* @name 数据库交互
|
|
|
* @description 将装配完毕的VO类向数据库中不同的表进行添加或修改操作(dataToDB兄弟类)
|
|
|
*/
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void dataToDBCell(PatentCell patentCell) {
|
|
|
- UploadParamsVO uploadParamsVO =new UploadParamsVO();
|
|
|
+ UploadParamsVO uploadParamsVO = new UploadParamsVO();
|
|
|
uploadParamsVO.setPatent(new Patent());
|
|
|
uploadParamsVO.getPatent().setPatentNo(patentCell.getPatentNo());
|
|
|
getOneOrInsertOne(uploadParamsVO);
|
|
@@ -678,7 +677,7 @@ public class UploadPatentBatchService {
|
|
|
uploadParamsVO.getPatent().updateById();
|
|
|
}
|
|
|
uploadParamsVO.setPatentRight(new PatentRight());
|
|
|
- uploadParamsVO.getPatentRight().setContent(StringUtils.join(patentCell.getRights(),""));
|
|
|
+ uploadParamsVO.getPatentRight().setContent(StringUtils.join(patentCell.getRights(), ""));
|
|
|
uploadParamsVO.setSelfContent(patentCell.getMainRignt());
|
|
|
//权利要求 OS_PATENT_RIGHT
|
|
|
patentRightBusiness(uploadParamsVO);
|