add:升级es到7.6.2

2021-07-28 15:35:45 +08:00
parent cb48c13635
commit de8f5631c0
8 changed files with 609 additions and 31 deletions
@@ -191,5 +191,409 @@ public class SarStandardsInfo extends BaseEntity {

    @TableField(exist = false)
    private String standSystemName;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getStandType() {
+        return standType;
+    }
+
+    public void setStandType(String standType) {
+        this.standType = standType;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getStandSort() {
+        return standSort;
+    }
+
+    public void setStandSort(String standSort) {
+        this.standSort = standSort;
+    }
+
+    public String getStandNumber() {
+        return standNumber;
+    }
+
+    public void setStandNumber(String standNumber) {
+        this.standNumber = standNumber;
+    }
+
+    public String getStandYear() {
+        return standYear;
+    }
+
+    public void setStandYear(String standYear) {
+        this.standYear = standYear;
+    }
+
+    public String getStandName() {
+        return standName;
+    }
+
+    public void setStandName(String standName) {
+        this.standName = standName;
+    }
+
+    public String getStandEnName() {
+        return standEnName;
+    }
+
+    public void setStandEnName(String standEnName) {
+        this.standEnName = standEnName;
+    }
+
+    public String getStandState() {
+        return standState;
+    }
+
+    public void setStandState(String standState) {
+        this.standState = standState;
+    }
+
+    public String getStandNature() {
+        return standNature;
+    }
+
+    public void setStandNature(String standNature) {
+        this.standNature = standNature;
+    }
+
+    public String getIssueTime() {
+        return issueTime;
+    }
+
+    public void setIssueTime(String issueTime) {
+        this.issueTime = issueTime;
+    }
+
+    public Date getPutTime() {
+        return putTime;
+    }
+
+    public void setPutTime(Date putTime) {
+        this.putTime = putTime;
+    }
+
+    public String getSynopsis() {
+        return synopsis;
+    }
+
+    public void setSynopsis(String synopsis) {
+        this.synopsis = synopsis;
+    }
+
+    public String getReplaceStandNum() {
+        return replaceStandNum;
+    }
+
+    public void setReplaceStandNum(String replaceStandNum) {
+        this.replaceStandNum = replaceStandNum;
+    }
+
+    public String getReplacedStandNum() {
+        return replacedStandNum;
+    }
+
+    public void setReplacedStandNum(String replacedStandNum) {
+        this.replacedStandNum = replacedStandNum;
+    }
+
+    public String getCreationUser() {
+        return creationUser;
+    }
+
+    public void setCreationUser(String creationUser) {
+        this.creationUser = creationUser;
+    }
+
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
+    public Date getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public String getIsRelateAccess() {
+        return isRelateAccess;
+    }
+
+    public void setIsRelateAccess(String isRelateAccess) {
+        this.isRelateAccess = isRelateAccess;
+    }
+
+    public String getCiteStand() {
+        return citeStand;
+    }
+
+    public void setCiteStand(String citeStand) {
+        this.citeStand = citeStand;
+    }
+
+    public String getCitedStand() {
+        return citedStand;
+    }
+
+    public void setCitedStand(String citedStand) {
+        this.citedStand = citedStand;
+    }
+
+    public String getTextStatus() {
+        return textStatus;
+    }
+
+    public void setTextStatus(String textStatus) {
+        this.textStatus = textStatus;
+    }
+
+    public String getStandSystem() {
+        return standSystem;
+    }
+
+    public void setStandSystem(String standSystem) {
+        this.standSystem = standSystem;
+    }
+
+    public String getCollectId() {
+        return collectId;
+    }
+
+    public void setCollectId(String collectId) {
+        this.collectId = collectId;
+    }
+
+    public String getCountryShow() {
+        return countryShow;
+    }
+
+    public void setCountryShow(String countryShow) {
+        this.countryShow = countryShow;
+    }
+
+    public String getStandSortShow() {
+        return standSortShow;
+    }
+
+    public void setStandSortShow(String standSortShow) {
+        this.standSortShow = standSortShow;
+    }
+
+    public String getStandStateShow() {
+        return standStateShow;
+    }
+
+    public void setStandStateShow(String standStateShow) {
+        this.standStateShow = standStateShow;
+    }
+
+    public String getStandNatureShow() {
+        return standNatureShow;
+    }
+
+    public void setStandNatureShow(String standNatureShow) {
+        this.standNatureShow = standNatureShow;
+    }
+
+    public String getSychronId() {
+        return sychronId;
+    }
+
+    public void setSychronId(String sychronId) {
+        this.sychronId = sychronId;
+    }
+
+    public List<DicTypeEO> getDicTypeList() {
+        return dicTypeList;
+    }
+
+    public void setDicTypeList(List<DicTypeEO> dicTypeList) {
+        this.dicTypeList = dicTypeList;
+    }
+
+    public List<SarStandAttrDetails> getAttrInfoList() {
+        return attrInfoList;
+    }
+
+    public void setAttrInfoList(List<SarStandAttrDetails> attrInfoList) {
+        this.attrInfoList = attrInfoList;
+    }
+
+    public Map<String, Object> getAttrInfoMap() {
+        return attrInfoMap;
+    }
+
+    public void setAttrInfoMap(Map<String, Object> attrInfoMap) {
+        this.attrInfoMap = attrInfoMap;
+    }
+
+    public Map<String, Object> getAttrInfoCaseMap() {
+        return attrInfoCaseMap;
+    }
+
+    public void setAttrInfoCaseMap(Map<String, Object> attrInfoCaseMap) {
+        this.attrInfoCaseMap = attrInfoCaseMap;
+    }
+
+    public String getSarStandAttrEOStr() {
+        return sarStandAttrEOStr;
+    }
+
+    public void setSarStandAttrEOStr(String sarStandAttrEOStr) {
+        this.sarStandAttrEOStr = sarStandAttrEOStr;
+    }
+
+    public String getMenuId() {
+        return menuId;
+    }
+
+    public void setMenuId(String menuId) {
+        this.menuId = menuId;
+    }
+
+    public int getUpReplaceNumFlag() {
+        return upReplaceNumFlag;
+    }
+
+    public void setUpReplaceNumFlag(int upReplaceNumFlag) {
+        this.upReplaceNumFlag = upReplaceNumFlag;
+    }
+
+    public int getUpNumFlag() {
+        return upNumFlag;
+    }
+
+    public void setUpNumFlag(int upNumFlag) {
+        this.upNumFlag = upNumFlag;
+    }
+
+    public String getFileIds() {
+        return fileIds;
+    }
+
+    public void setFileIds(String fileIds) {
+        this.fileIds = fileIds;
+    }
+
+    public Date getNewCarPutTime() {
+        return newCarPutTime;
+    }
+
+    public void setNewCarPutTime(Date newCarPutTime) {
+        this.newCarPutTime = newCarPutTime;
+    }
+
+    public List<SarStandItems> getItemsList() {
+        return itemsList;
+    }
+
+    public void setItemsList(List<SarStandItems> itemsList) {
+        this.itemsList = itemsList;
+    }
+
+    public String getRelateStand() {
+        return relateStand;
+    }
+
+    public void setRelateStand(String relateStand) {
+        this.relateStand = relateStand;
+    }
+
+    public String getAccessCountry() {
+        return accessCountry;
+    }
+
+    public void setAccessCountry(String accessCountry) {
+        this.accessCountry = accessCountry;
+    }
+
+    public String getProcessNum() {
+        return processNum;
+    }
+
+    public void setProcessNum(String processNum) {
+        this.processNum = processNum;
+    }
+
+    public String getMenuType() {
+        return menuType;
+    }
+
+    public void setMenuType(String menuType) {
+        this.menuType = menuType;
+    }
+
+    public String getAllPutTime() {
+        return allPutTime;
+    }
+
+    public void setAllPutTime(String allPutTime) {
+        this.allPutTime = allPutTime;
+    }
+
+    public String getJspg() {
+        return jspg;
+    }
+
+    public void setJspg(String jspg) {
+        this.jspg = jspg;
+    }
+
+    public String getCHJL() {
+        return CHJL;
+    }
+
+    public void setCHJL(String CHJL) {
+        this.CHJL = CHJL;
+    }
+
+    public String getPutTime2() {
+        return putTime2;
+    }
+
+    public void setPutTime2(String putTime2) {
+        this.putTime2 = putTime2;
+    }
+
+    public String getStandSystemName() {
+        return standSystemName;
+    }
+
+    public void setStandSystemName(String standSystemName) {
+        this.standSystemName = standSystemName;
+    }
 }

@@ -11,6 +11,7 @@ import com.adc.da.person.dao.PersonCollectEODao;
 import com.adc.da.person.dao.PersonShareEODao;
 import com.adc.da.person.entity.PersonMsgEO;
 import com.adc.da.person.service.IPersonCollectEOService;
+import com.adc.da.search.service.StandLawsSearchService;
 import com.adc.da.slrs.sarLawsInfo.entity.SarLawsInfo;
 import com.adc.da.slrs.sarLawsInfo.page.SarLawsInfoEOPage;
 import com.adc.da.slrs.sarLawsInfo.page.SarLawsItemsEOPage;
@@ -60,6 +61,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.util.PDFTextStripperByArea;
+import org.apache.poi.hwpf.extractor.WordExtractor;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -70,6 +78,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

 import java.io.File;
+import java.io.FileInputStream;
 import java.sql.Clob;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -175,6 +184,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
    @Autowired
    private CreateStandMQService createStandMQService;

+    @Autowired
+    private StandLawsSearchService standLawsSearchService;
+

    /***
     * @Description: 分页查询
@@ -1957,12 +1969,126 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao

    @Override
    public void insertIntoIndexForMap(Map<String, Object> attrInfoMap) {
-
+        Set<String> keys = attrInfoMap.keySet();
+        for (String key:keys) {
+            String value = String.valueOf(attrInfoMap.get(key));
+            if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key)){
+                value = value.replace(" , ",",");
+                value = value.replace(","," , ");
+                attrInfoMap.put(key,value);
+            }
+        }
+        // 根据文件attid 读取文件内容
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) {
+            String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
+            StringBuilder content = new StringBuilder("");
+            for (int i = 0; i < attidlist.length; i++) {
+                if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) ){
+                    AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
+                    //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
+                    String readFilePath = "E:\\上汽企标流程总览.pdf";
+                    try {
+                        // 判断文件是docx还是PDF
+                        if (null != attFileEO.getFileSuffix() && (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc") || attFileEO.getFileSuffix().equals("ppt") || attFileEO.getFileSuffix().equals("pptx"))) {
+                            if(attFileEO.getFileSuffix().equals("doc")){
+                                FileInputStream fis = new FileInputStream(readFilePath);
+                                WordExtractor wordExtractor = new WordExtractor(fis);
+                                String txt = wordExtractor.getText();
+                                content.append(txt);
+                            }else {
+                                OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
+                                XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
+                                String txt = extractor.getText();
+                                content.append(txt);
+                            }
+                       } else {
+                            PDDocument document = PDDocument.load(new File(readFilePath));
+                            document.getClass();
+                            if (!document.isEncrypted()) {
+                                PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+                                stripper.setSortByPosition(true);
+                                PDFTextStripper tStripper = new PDFTextStripper();
+                                String pdfFileInText = tStripper.getText(document);
+                                // String[] lines = pdfFileInText.split("\\r?\\n");
+                                content.append(pdfFileInText);
+                            }
+                        }
+                    } catch (Exception e) {
+                        logger.error("搜索中心新增数据读取文档内容时失败");
+                        logger.error(e.getMessage(),e);
+                    }
+                    attrInfoMap.put("content",content.toString());
+                }
+            }
+        }
+        else{
+            attrInfoMap.put("content","");
+        }
+        standLawsSearchService.addStandLawsSearchForMap(attrInfoMap);
    }

    @Override
    public void updateIntoIndexForMap(Map<String, Object> attrInfoMap) {
-
+        Set<String> keys = attrInfoMap.keySet();
+        for (String key:keys) {
+            String value = String.valueOf(attrInfoMap.get(key));
+            if (com.adc.da.util.utils.StringUtils.isNotBlank(value) && !"null".equals(value) && !"SVPPS".equals(key) && !"content".equals(key)){
+                value = value.replace(" , ",",");
+                value = value.replace(","," , ");
+                attrInfoMap.put(key,value);
+            }
+        }
+        // 根据文件attid 读取文件内容
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(String.valueOf(attrInfoMap.get("content")))) {
+            String[] attidlist = String.valueOf(attrInfoMap.get("content")).split(" , ");
+            StringBuilder content = new StringBuilder("");
+            for (int i = 0; i < attidlist.length; i++) {
+                if(org.apache.commons.lang.StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])){
+                    AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
+                    //String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
+                    try {
+                        // 判断文件是docx还是PDF
+                        /*if (attFileEO.getFileSuffix().equals("docx") || attFileEO.getFileSuffix().equals("doc")) {
+                            if(attFileEO.getFileSuffix().equals("doc")){
+                                FileInputStream fis = new FileInputStream(readFilePath);
+                                WordExtractor wordExtractor = new WordExtractor(fis);
+                                String txt = wordExtractor.getText();
+                                content.append(txt);
+                            }else {
+                                OPCPackage opcPackage = XWPFDocument.openPackage(readFilePath);
+                                XWPFWordExtractor extractor = new XWPFWordExtractor(opcPackage);
+                                String txt = extractor.getText();
+                                content.append(txt);
+                            }
+                        } else if (attFileEO.getFileSuffix().equals("pdf")){
+                            PDDocument document = PDDocument.load(new File(readFilePath));
+                            document.getClass();
+                            if (!document.isEncrypted()) {
+                                PDFTextStripperByArea stripper = new PDFTextStripperByArea();
+                                stripper.setSortByPosition(true);
+                                PDFTextStripper tStripper = new PDFTextStripper();
+                                String pdfFileInText = tStripper.getText(document);
+                                // String[] lines = pdfFileInText.split("\\r?\\n");
+                                content.append(pdfFileInText);
+                            }
+                        }*/
+                        String readFilePath = "E:\\上汽企标流程总览.pdf";
+                        FileInputStream fis = new FileInputStream(readFilePath);
+                        WordExtractor wordExtractor = new WordExtractor(fis);
+                        String txt = wordExtractor.getText();
+                        content.append(txt);
+                    } catch (Exception e) {
+                        logger.error("搜索中心修改数据读取文档内容时失败");
+                        logger.error(e.getMessage(),e);
+                    }
+                    attrInfoMap.put("content",content.toString());
+                }
+            }
+        }
+        else{
+            attrInfoMap.put("content","");
+        }
+        standLawsSearchService.updateStandLawsSearchForMap(attrInfoMap);
    }
 //
 //    @Override
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.search;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu;
+import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/${restPath}/search")
+public class SearchController {
+
+    @Autowired
+    private ITsDicTypeService iTsDictypeService;
+
+    @ApiOperation("获取筛选条件")
+    @PostMapping("/getMenu")
+    public ResponseMessage<List<TsSearchMenu>> getSearchMenu(){
+        return Result.success(iTsDictypeService.getSearchMenu());
+    }
+}