|
@@ -316,15 +316,13 @@ public class ExcutePatentDataStar implements IExcutePatentData {
|
|
|
//下载 isAdd中的专利/多个专利号导入的专利
|
|
|
if (isAddPatentNos != null && isAddPatentNos.size() > 0) {
|
|
|
String patentNoCondition = StringUtils.join(isAddPatentNos, " OR ");
|
|
|
- //若是多个专利号导入的下载
|
|
|
- if (task.getIsAddType() != null && task.getIsAddType().equals(2)) {
|
|
|
+
|
|
|
+ if (task.getIsAddType() != null && task.getIsAddType().equals(2)) { //若是多个专利号导入的下载
|
|
|
conditions = "AN=(" + patentNoCondition + ") OR PN=(" + patentNoCondition + ") OR GN=(" + patentNoCondition + ")";
|
|
|
- downLoadIsAddPatentNos(isAddPatentNos, task, orderBy, orderByType, dbType, cells, conditions);
|
|
|
- //若是检索页面手动勾选的多个专利的下载
|
|
|
- } else {
|
|
|
+ } else { //若是检索页面手动勾选的多个专利的下载
|
|
|
conditions = "AN=(" + patentNoCondition + ")";
|
|
|
- downLoadIsAddPatentNos(isAddPatentNos, task, orderBy, orderByType, dbType, cells, conditions);
|
|
|
}
|
|
|
+ downLoadIsAddPatentNos(isAddPatentNos, task, orderBy, orderByType, dbType, cells, conditions);
|
|
|
}
|
|
|
|
|
|
} catch (IOException e) {
|
|
@@ -1014,6 +1012,8 @@ public class ExcutePatentDataStar implements IExcutePatentData {
|
|
|
os.close();
|
|
|
in.close();
|
|
|
|
|
|
+ //TODO 在此处通过 iText/pdfBox 技术读取file文件,取出pdf文件中的附图,并入附图表"os_patent_img"
|
|
|
+
|
|
|
DiskFileItemFactory diskFileItemFactory = new DiskFileItemFactory(16, null);
|
|
|
FileItem item = diskFileItemFactory.createItem(file.getName(), "text/plain", true, file.getName());
|
|
|
buffer = new byte[8192];
|