getInlandLawsList = InitStandAttrUtil.lawsInlandAttrFieldList;
resultMap.put(SarTypeEnum.INLAND_LAWS.getValue(),getInlandLawsList);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
index 8985ecd5..4458e331 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
@@ -5,11 +5,13 @@ import java.time.LocalDateTime;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
/**
*
@@ -60,10 +62,14 @@ public class SarStandAttrInfo extends BaseEntity {
@ApiModelProperty(value = "新车型实施日期（文本）")
@TableField("XCXSSRQ")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String xcxssrq;
@ApiModelProperty(value = "在产车实施日期（文本）")
@TableField("ZCCSSRQ")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String zccssrq;
@ApiModelProperty(value = "标签")
@@ -148,18 +154,20 @@ public class SarStandAttrInfo extends BaseEntity {
@ApiModelProperty(value = "实施日期(标准文本）")
@TableField("SSRQ")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
private String ssrq;
@ApiModelProperty(value = "实施日期(国际）")
- @TableField("SSRQGJ")
+ @TableField(exist=false)
private String ssrqgj;
@ApiModelProperty(value = "新车型实施日期(国家）")
- @TableField("XCXSSRQGJ")
+ @TableField(exist=false)
private String xcxssrqgj;
@ApiModelProperty(value = "在产车实施日期(国家）")
- @TableField("ZCCSSRQGJ")
+ @TableField(exist=false)
private String zccssrqgj;
@ApiModelProperty(value = "修改单")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
index ef3e5e5a..b5a9a254 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandIdea/controller/SarPublicIdeaController.java
@@ -64,5 +64,16 @@ public class SarPublicIdeaController extends BaseController {
return Result.success(publicList);
}
+ @ApiOperation(value = "发起标准征求意见流程后自动公开征求意见")
+ @PostMapping("/addSarPublicIdea")
+ public ResponseMessage addSarPublicIdea(@RequestBody SarPublicIdea sarPublicIdea){
+ try{
+ sarPublicIdeaService.save(sarPublicIdea);
+ }catch(Exception e){
+ return Result.error();
+ }
+ return Result.success();
+ }
+
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
index 238eca43..d92d3c62 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
@@ -36,7 +36,7 @@ public class StandAttrInfoDto {
//标准实施日期
@ExcelProperty("标准实施日期")
private String SSRQ;
- //新车型实施日期
+ //新车型实施日期 数据库中字段实际没有GJ 如需要修改 可修改此处
@ExcelProperty("新车型实施日期")
private String XCXSSRQGJ;
//在产车实施日期
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index 3c4b7dc6..f3b765f9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -246,6 +246,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper wrapper) {
Page page = new Page<>(current, pageSize);
IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
@@ -253,4 +254,4 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl
page.setAdvanceSearchStr(null);
}
}
- page.setUserId(LoginUserUtil.getUserId());
+ if(page.getUserId() == null || page.getUserId().equals("")){
+ page.setUserId(LoginUserUtil.getUserId());
+ }
List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
index f61bd816..62c545e5 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java
@@ -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 getDicTypeList() {
+ return dicTypeList;
+ }
+
+ public void setDicTypeList(List dicTypeList) {
+ this.dicTypeList = dicTypeList;
+ }
+
+ public List getAttrInfoList() {
+ return attrInfoList;
+ }
+
+ public void setAttrInfoList(List attrInfoList) {
+ this.attrInfoList = attrInfoList;
+ }
+
+ public Map getAttrInfoMap() {
+ return attrInfoMap;
+ }
+
+ public void setAttrInfoMap(Map attrInfoMap) {
+ this.attrInfoMap = attrInfoMap;
+ }
+
+ public Map getAttrInfoCaseMap() {
+ return attrInfoCaseMap;
+ }
+
+ public void setAttrInfoCaseMap(Map 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 getItemsList() {
+ return itemsList;
+ }
+
+ public void setItemsList(List 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;
+ }
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 0af77f7f..b58cda14 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -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 getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
//查询当前登录人角色拥有权限的菜单
- List getMenuIdList=tsUserService.getResourceId(new TsResource());
-// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
- if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
- page.setMenuRoleList(getMenuIdList);
- } else {
- page.setMenuRoleList(null);
- }
- List ids = iTsResourceService.getChildMenuList(page.getMenuId());
- if (ids != null && !ids.isEmpty()) {
- page.setMenuAllChildrenIdList(ids);
+ if(page.getMenuId() != null ){
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.eq("ID",page.getMenuId());
+ qw.isNull("PARENT_ID");
+ List children = iTsResourceService.list(qw);
+ if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
+ List getMenuIdList = tsUserService.getResourceId(new TsResource());
+ if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
+ page.setMenuRoleList(getMenuIdList);
+ } else {
+ page.setMenuRoleList(null);
+ }
+ List ids = iTsResourceService.getChildMenuList(page.getMenuId());
+ if (ids != null && !ids.isEmpty()) {
+ page.setMenuAllChildrenIdList(ids);
+ }
+ }
}
Integer rowCount = dao.getSarStandardsInfoCount(page);
page.getPager().setRowCount(rowCount);
@@ -601,8 +620,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl multiTimeMap) throws Exception {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (multiTimeMap != null && multiTimeMap.size() > 0) {
@@ -1957,12 +1981,126 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl attrInfoMap) {
-
+ Set 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 attrInfoMap) {
-
+ Set 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
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java
new file mode 100644
index 00000000..1377523d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/search/SearchController.java
@@ -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> getSearchMenu(){
+ return Result.success(iTsDictypeService.getSearchMenu());
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
index 1888d4e7..e0966339 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java
@@ -30,8 +30,9 @@ public class FieldConvertUtil {
public static String exportBaseFieldNames = "标准体系,是否纳入认证清单,标准性质,标准类别,标准编号,标准年份,中文名称,英文名称," +
"文本状态,发布日期"; // 导出基础表字段 //删除 实施日期 2021-05-28
- public static String exportBaseFieldNamesForeign = "重要度,标准类别,标准编号,标准年份/系列,中文名称,英文名称," +
- "标准状态,发布日期,文本说明"; // 导出基础表字段
+ public static String exportBaseFieldNamesForeign = "标准类别,标准编号,标准年份,中文名称,英文名称," +
+ "文本状态,发布日期,文本说明,是否纳入认证清单,体系类别,标签,适用产品线,适用认证,能源类型,责任工程师," +
+ "关联文件,发布稿,增补件,勘误件,草案"; // 导出基础表字段
public static String exportAttrFieldNamesInland = "归口管理部门,发布机构,工作组信息,我司参与深度,适用车辆类型,要求类型," +
"标签,发布稿（必读）,增补件（必读）,报批稿,送审稿,征求意见稿,草案,相关资料,新车型实施日期（文本）,在产车实施日期（文本）," +
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml
index a09cbd84..09f9859f 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml
@@ -15,6 +15,8 @@
+
+
parent_id, menu_name, sor_divide, id, modify_time, creation_time, valid_flag, display_seq, parent_ids, remarks
@@ -69,6 +71,12 @@
+
+
+ INSERT INTO ts_role_resource
+ VALUES(#{roleId},#{resourceId} )
+
+
+
+ com.lowagie
+ itext
+ 2.1.7
+
+
+ com.lowagie
+ itextasian
+ 2.1.7
+
+
+ com.itextpdf
+ itextpdf
+ 5.5.9
+
+
+ com.itextpdf
+ itext-asian
+ 5.2.0
+
diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
index 456e39c7..ef5fb044 100644
--- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java
@@ -1,13 +1,17 @@
package com.adc.da.att.controller;
+import com.adc.da.att.dao.UserDao;
import com.adc.da.att.entity.AttFileEO;
+import com.adc.da.att.entity.TsUser;
import com.adc.da.att.service.IAttFileEOService;
import com.adc.da.att.vo.AttFileVo;
import com.adc.da.file.store.IFileStore;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
+import com.adc.da.sys.entity.UserEO;
import com.adc.da.util.MD5Util;
import com.adc.da.util.UUIDUtils;
+import com.adc.da.util.WaterMarkUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -46,6 +50,9 @@ public class AttFileEOController {
@Autowired
private IFileStore iFileStore;
+ @Autowired
+ private UserDao userDao;
+
@Value("${file.path}")
private String filePath;//文件存储路径
@@ -249,7 +256,7 @@ public class AttFileEOController {
@ApiOperation(value = "|File|下载文件加水印")
@GetMapping("/downloadFileForSarWaterMark")
// @RequiresPermissions("sys:file:downloadFileForSar")
- public void downloadFileForSarWaterMark(String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception {
+ public void downloadFileForSarWaterMark(String userId,String fileId, HttpServletResponse response, HttpServletRequest request) throws Exception {
AttFileEO attFileEO = attFileEOService.getFileInfo(fileId);
InputStream is = null;
OutputStream os = null;
@@ -265,24 +272,36 @@ public class AttFileEOController {
}
String waterFilePath = newFilePath + attFileEO.getOldFileName();
// 添加水印
- String waterContent = "";
-// String userId = LoginUserUtil.getUserId();
-// String userMsg = "";
-// UserEO userEO = userEOService.selectByPrimaryKey(userId);
-// if (userEO != null) {
-// userMsg = userEO.getUname() + ",";
-// if (StringUtils.isNotEmpty(userEO.getWorkNum())) {
-// userMsg += userEO.getWorkNum() + ",";
+ String userMsg = "";
+ TsUser tsUser = userDao.selectById(userId);
+ if (tsUser != null) {
+ userMsg = tsUser.getUname() + ",";
+ //2021/7/28水印内容取消工号
+// if (StringUtils.isNotEmpty(tsUser.getWorkNum())) {
+// userMsg += tsUser.getWorkNum() + ",";
// }
-// }
+ }
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");//设置日期格式
String date = df.format(new Date());
-// waterContent = userMsg + date;
+ String waterContent = userMsg+date ;
//2020年9月5日 去掉水印处理
-// WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);
+ //2021年7月25日要求下载生成水印
+ WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent);
response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\"");
response.setContentType("application/octet-stream");
- File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName());
+
+ String downloadFilePath="";
+ String fileName=attFileEO.getFileName();
+ String suffix=fileName.substring(fileName.lastIndexOf(".")+1);
+ //只能在pdf中添加水印,
+ //非pdf文件直接下载原文件
+ if (suffix.equals("pdf")){
+ downloadFilePath=waterFilePath;
+ }else {
+ downloadFilePath=oldFilePath;
+ }
+
+ File file = new File(downloadFilePath);
is = new FileInputStream(file);
os = response.getOutputStream();
IOUtils.copy(is, os);
diff --git a/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java b/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java
new file mode 100644
index 00000000..b7f6d6df
--- /dev/null
+++ b/adc-da-sys/src/main/java/com/adc/da/att/dao/UserDao.java
@@ -0,0 +1,8 @@
+package com.adc.da.att.dao;
+
+import com.adc.da.att.entity.TsUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface UserDao extends BaseMapper {
+
+}
diff --git a/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java b/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java
new file mode 100644
index 00000000..c088351b
--- /dev/null
+++ b/adc-da-sys/src/main/java/com/adc/da/att/entity/TsUser.java
@@ -0,0 +1,24 @@
+package com.adc.da.att.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TsUser extends BaseEntity implements Serializable {
+ @TableId
+ private String usid;
+ @TableField
+ private String uname;
+ @TableField
+ private String workNum;
+
+
+}
diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
index 600d4d9b..5ffdf75d 100644
--- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java
@@ -93,7 +93,7 @@ public class PersonCollectEOController extends BaseController {
@ApiOperation(value = "|PersonCollectEO|修改")
- @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE)
+ @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE,value = "/updatePersonCollect")
// @RequiresPermissions("person:personCollect:update")
public ResponseMessage update(@RequestBody TsPersonCollect tsPersonCollect) throws Exception {
tsPersonCollect.setModifyTime(new Date());
diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
index 86f5a6f0..cd17691a 100644
--- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
+++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/DicTypeEOMapper.xml
@@ -461,8 +461,9 @@
AND SAR_LAWS_ITEM_VAL.VALID_FLAG =0
union
select count(*) from SAR_BUSSIONESS_STAND
- where (SAR_BUSSIONESS_STAND.STAND_GENERA = #{dicTypeCode} or
- SAR_BUSSIONESS_STAND.STAND_SUBCLASS = #{dicTypeCode} or
+ where (
+
+
SAR_BUSSIONESS_STAND.STAND_STATUS = #{dicTypeCode} or
SAR_BUSSIONESS_STAND.STAND_SORT = #{dicTypeCode})
and SAR_BUSSIONESS_STAND.VALID_FLAG =0