提交 17a6691c 作者: chenshiqiang

add log

上级 9451ab86
...@@ -89,13 +89,15 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -89,13 +89,15 @@ class KnowledgeServiceImpl implements IKnowledgeService {
@Autowired @Autowired
private AsyncService asyncService; private AsyncService asyncService;
private String TEMP_PATH="/storage/temp/"; private String TEMP_PATH = "/storage/temp/";
@Autowired @Autowired
private StringRedisTemplate stringRedisTemplate; private StringRedisTemplate stringRedisTemplate;
@Override @Override
public void addKnowledge(KnowFile knowFile, Knowledge knowledge, KbAuthorizedUser userInfo) { public void addKnowledge(KnowFile knowFile, Knowledge knowledge, KbAuthorizedUser userInfo) {
log.info("addKnowledge knowledge :{}", knowledge);
log.info("addKnowledge knowFile :{}", knowFile);
knowledge.setAuthor(userInfo.getName()); knowledge.setAuthor(userInfo.getName());
if (null == knowledge.getVerifyStatus()) { if (null == knowledge.getVerifyStatus()) {
knowledge.setVerifyStatus(0); knowledge.setVerifyStatus(0);
...@@ -116,44 +118,49 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -116,44 +118,49 @@ class KnowledgeServiceImpl implements IKnowledgeService {
String html = null; String html = null;
try { try {
String path = filesStorage + knowledge.getFiles().get(0).getFilePath(); String path = filesStorage + knowledge.getFiles().get(0).getFilePath();
String filePath=null; String filePath = null;
if (".pdf".equals(knowFile.getFileType())) { if (".pdf".equals(knowFile.getFileType())) {
log.info("pdf");
try { try {
PDDocument document = PDDocument.load(new File(path)); PDDocument document = PDDocument.load(new File(path));
StringBuilder allBuilder= new StringBuilder(); StringBuilder allBuilder = new StringBuilder();
PDFTextStripper pdfTextStripper = new PDFTextStripper(){ PDFTextStripper pdfTextStripper = new PDFTextStripper() {
private StringBuilder paragraphBuilder= new StringBuilder(); private StringBuilder paragraphBuilder = new StringBuilder();
@Override @Override
protected void startPage(PDPage page) throws IOException{ protected void startPage(PDPage page) throws IOException {
super.startPage(page); super.startPage(page);
paragraphBuilder.setLength(0);//make paragraphBuilder empty paragraphBuilder.setLength(0);//make paragraphBuilder empty
} }
@Override @Override
protected void writeLineSeparator() throws IOException{ protected void writeLineSeparator() throws IOException {
super.writeLineSeparator(); super.writeLineSeparator();
if( if (
paragraphBuilder.toString().endsWith(".")|| paragraphBuilder.toString().endsWith(".") ||
paragraphBuilder.toString().endsWith("。")|| paragraphBuilder.toString().endsWith("。") ||
paragraphBuilder.toString().endsWith("!")|| paragraphBuilder.toString().endsWith("!") ||
paragraphBuilder.toString().endsWith("!") paragraphBuilder.toString().endsWith("!")
){ ) {
paragraphBuilder.append("\n");//mark paragraph paragraphBuilder.append("\n");//mark paragraph
paragraphBuilder.append("😀"); paragraphBuilder.append("😀");
}else { } else {
paragraphBuilder.append("\n");//mark paragraph paragraphBuilder.append("\n");//mark paragraph
} }
} }
@Override @Override
protected void writeString(String string, List<TextPosition> textPositions) throws IOException{ protected void writeString(String string, List<TextPosition> textPositions) throws IOException {
super.writeString(string,textPositions); super.writeString(string, textPositions);
paragraphBuilder.append(string);//add text content paragraphBuilder.append(string);//add text content
} }
@Override @Override
protected void endPage(PDPage page) throws IOException{ protected void endPage(PDPage page) throws IOException {
super.endPage(page); super.endPage(page);
String paragraph= paragraphBuilder.toString().trim();//get paragraph String paragraph = paragraphBuilder.toString().trim();//get paragraph
if(!paragraph.isEmpty()){ if (!paragraph.isEmpty()) {
allBuilder.append(paragraph); allBuilder.append(paragraph);
} }
} }
...@@ -164,17 +171,18 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -164,17 +171,18 @@ class KnowledgeServiceImpl implements IKnowledgeService {
pdfTextStripper.setEndPage(document.getNumberOfPages()); pdfTextStripper.setEndPage(document.getNumberOfPages());
String text = pdfTextStripper.getText(document); String text = pdfTextStripper.getText(document);
knowledge.setContentAll(text); knowledge.setContentAll(text);
log.info("allBuilder:{}",allBuilder); log.info("allBuilder:{}", allBuilder);
contentStringList = Arrays.asList(allBuilder.toString().split("😀")); contentStringList = Arrays.asList(allBuilder.toString().split("😀"));
} catch (Exception e) { } catch (Exception e) {
log.error("parsing pdf error :{}", e.getMessage()); log.error("parsing pdf error :{}", e.getMessage());
} }
}else { } else {
filePath=path; filePath = path;
File file = new File(filePath); File file = new File(filePath);
log.info("word dealing filePath{}",filePath);
html = DocUtil.convertDocStream2Html(new FileInputStream(file)); html = DocUtil.convertDocStream2Html(new FileInputStream(file));
log.info("html :{}", html);
String htmlWithTable = html.replace("</p>", "######</p>"); String htmlWithTable = html.replace("</p>", "######</p>");
htmlWithTable = htmlWithTable.replace("</title>", "######</title>"); htmlWithTable = htmlWithTable.replace("</title>", "######</title>");
htmlWithTable = htmlWithTable.replace("</h1>", "######</h1>"); htmlWithTable = htmlWithTable.replace("</h1>", "######</h1>");
...@@ -182,7 +190,7 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -182,7 +190,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.error(e.getMessage());
} }
...@@ -231,15 +239,15 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -231,15 +239,15 @@ class KnowledgeServiceImpl implements IKnowledgeService {
esOpUtil.docEditByEntity(Constants.ES_DATA_FOR_KNOWLEDGE, knowledge.getId(), knowledge); esOpUtil.docEditByEntity(Constants.ES_DATA_FOR_KNOWLEDGE, knowledge.getId(), knowledge);
} }
//删除 //删除
if(null==knowledge.getKnowledgeProjectId()){ if (null == knowledge.getKnowledgeProjectId()) {
KnowledgeVO knowledgeVO = this.getById(knowledge.getId()); KnowledgeVO knowledgeVO = this.getById(knowledge.getId());
knowledge.setKnowledgeProjectId(knowledgeVO.getKbKnowledgeId()); knowledge.setKnowledgeProjectId(knowledgeVO.getKbKnowledgeId());
} }
deleteForPython(knowledge.getId(),knowledge.getKnowledgeProjectId()); deleteForPython(knowledge.getId(), knowledge.getKnowledgeProjectId());
BeanUtils.copyProperties(knowledge, knowledgeMessage); BeanUtils.copyProperties(knowledge, knowledgeMessage);
knowledgeMessage.setType(knowledge.getTypeId()); knowledgeMessage.setType(knowledge.getTypeId());
log.info("send message:{}",knowledgeMessage); log.info("send message:{}", knowledgeMessage);
produceInfo.sendKnowledgeContents(knowledgeMessage); produceInfo.sendKnowledgeContents(knowledgeMessage);
} }
...@@ -248,11 +256,11 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -248,11 +256,11 @@ class KnowledgeServiceImpl implements IKnowledgeService {
esOpUtil.docSavaByEntity(Constants.ES_DATA_FOR_KNOWLEDGE, knowledge.getId(), knowledge); esOpUtil.docSavaByEntity(Constants.ES_DATA_FOR_KNOWLEDGE, knowledge.getId(), knowledge);
//sync data //sync data
KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo(); KbAuthorizedUser userInfo = SpringContextUtils.getUserInfo();
if(null==userInfo){ if (null == userInfo) {
return; return;
} }
KnowledgeVO knowledgeVO = this.getById(knowledge.getId()); KnowledgeVO knowledgeVO = this.getById(knowledge.getId());
addKnowledge(knowledgeVO.getFiles().get(0),knowledge,userInfo); addKnowledge(knowledgeVO.getFiles().get(0), knowledge, userInfo);
} }
@Override @Override
...@@ -263,20 +271,20 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -263,20 +271,20 @@ class KnowledgeServiceImpl implements IKnowledgeService {
CompletableFuture.runAsync(() -> { CompletableFuture.runAsync(() -> {
for (Knowledge knowledge : knowledgeList) { for (Knowledge knowledge : knowledgeList) {
deleteForPython(knowledge.getId(),knowledge.getKbKnowledgeId()); deleteForPython(knowledge.getId(), knowledge.getKbKnowledgeId());
} }
}); });
} }
public void deleteForPython(String id,String knowledgeBaseId) { public void deleteForPython(String id, String knowledgeBaseId) {
JSONObject params = new JSONObject(); JSONObject params = new JSONObject();
List <String > lidList=new ArrayList<>(); List<String> lidList = new ArrayList<>();
lidList.add(id); lidList.add(id);
params.put("id", lidList); params.put("id", lidList);
params.put("knowledge_base_id", knowledgeBaseId); params.put("knowledge_base_id", knowledgeBaseId);
log.info("delete param:{}",params); log.info("delete param:{}", params);
try { try {
HttpUtil.doPost(deleteUrl, params, 120000); HttpUtil.doPost(deleteUrl, params, 120000);
} catch (IOException e) { } catch (IOException e) {
...@@ -446,7 +454,7 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -446,7 +454,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
e.printStackTrace(); e.printStackTrace();
} }
if(null!=searchResponse&&null!= searchResponse.getHits()){ if (null != searchResponse && null != searchResponse.getHits()) {
SearchHit[] searchHits = searchResponse.getHits().getHits(); SearchHit[] searchHits = searchResponse.getHits().getHits();
List<KnowledgeVO> list = new ArrayList<>(); List<KnowledgeVO> list = new ArrayList<>();
for (SearchHit hit : searchHits) { for (SearchHit hit : searchHits) {
...@@ -586,7 +594,7 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -586,7 +594,7 @@ class KnowledgeServiceImpl implements IKnowledgeService {
String fileSuffix = multipartFile.getOriginalFilename().substring(index + 1); String fileSuffix = multipartFile.getOriginalFilename().substring(index + 1);
if ("xls".equals(fileSuffix) || "xlsx".equals(fileSuffix)) { if ("xls".equals(fileSuffix) || "xlsx".equals(fileSuffix)) {
//文件校验 //文件校验
if(!this.checkExcel(multipartFile)){ if (!this.checkExcel(multipartFile)) {
log.error("excel格式不对"); log.error("excel格式不对");
return Result.error("模版错误,请下载正确模板,再次上传!"); return Result.error("模版错误,请下载正确模板,再次上传!");
} }
...@@ -602,8 +610,8 @@ class KnowledgeServiceImpl implements IKnowledgeService { ...@@ -602,8 +610,8 @@ class KnowledgeServiceImpl implements IKnowledgeService {
Workbook workbook = ExcelExportUtil.getWorkbook(multipartFile); Workbook workbook = ExcelExportUtil.getWorkbook(multipartFile);
if (workbook != null) { if (workbook != null) {
List<String> list = ExcelExportUtil.getSheetTitles(workbook); List<String> list = ExcelExportUtil.getSheetTitles(workbook);
return list != null&&list.contains("标题")&&list.contains("正文") return list != null && list.contains("标题") && list.contains("正文")
&&list.contains("作者")&&list.contains("来源")&&list.contains("发布时间"); && list.contains("作者") && list.contains("来源") && list.contains("发布时间");
} }
return false; return false;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论