FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-06 18:15:17 +08:00
parent 16e38bd98d abad09c2ea
commit 0c1a57a345
5 changed files with 260 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-convert/pom.xml
+9 -3
View File
@@ -23,20 +23,26 @@
<version>3.0.0</version>
</dependency>
<!-- openOffice 和 jobconverter-->
<dependency>
<groupId>com.artofsolving</groupId>
<artifactId>jodconverter</artifactId>
<version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.jodconverter</groupId>
<artifactId>jodconverter-core</artifactId>
<version>4.2.2</version>
<version>4.3.0</version>
</dependency>
<dependency>
<groupId>org.jodconverter</groupId>
<artifactId>jodconverter-spring-boot-starter</artifactId>
<version>4.2.2</version>
<version>4.3.0</version>
</dependency>
<dependency>
<groupId>org.jodconverter</groupId>
<artifactId>jodconverter-local</artifactId>
<version>4.2.2</version>
<version>4.3.0</version>
</dependency>
<!-- openOffice end-->
<dependency>
adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java
+39 -6
View File
@@ -1,16 +1,20 @@
package com.adc.da.convert.common;
import com.artofsolving.jodconverter.openoffice.connection.SocketOpenOfficeConnection;
import com.artofsolving.jodconverter.openoffice.converter.StreamOpenOfficeDocumentConverter;
import org.apache.commons.lang.StringUtils;
import org.jodconverter.DocumentConverter;
import org.jodconverter.JodConverter;
import org.jodconverter.OfficeDocumentConverter;
import org.jodconverter.document.DefaultDocumentFormatRegistry;
import org.jodconverter.office.*;
import org.jodconverter.core.DocumentConverter;
import org.jodconverter.core.office.OfficeException;
import org.jodconverter.core.office.OfficeManager;
import org.jodconverter.core.office.OfficeUtils;
import org.jodconverter.local.JodConverter;
import org.jodconverter.local.office.LocalOfficeManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.*;
import java.net.ConnectException;
public class DocConverterPdf {
@@ -75,6 +79,35 @@ public class DocConverterPdf {
*/
private static final int openOfficePort = 8100;
/**
*
* @param input 初始文件的路径，例：C:\Users\...\Desktop\test\1.doc
* @param output 转换后的存储路径，例：C:\Users\...\Desktop\test\
*/
public void convert(File input , File output){
if (!input.exists()){
System.out.println("源文件不存在");
return;
}
SocketOpenOfficeConnection connection = new SocketOpenOfficeConnection("0.0.0.0", 8100);
// SocketOpenOfficeConnection connection = new SocketOpenOfficeConnection("10.10.66.176", 8100);
try {
connection.connect();
System.out.println("获取连接成功！");
} catch (ConnectException e) {
System.out.println("获取连接失败！");
e.printStackTrace();
}
// OpenOfficeDocumentConverter converter = new OpenOfficeDocumentConverter(connection);
StreamOpenOfficeDocumentConverter converter = new StreamOpenOfficeDocumentConverter(connection);
System.out.println("开始转换！");
converter.convert(input, output);
System.out.println("转换成功！");
System.out.println("关闭连接！");
connection.disconnect();
}
/**
* 转化文档
* @param input
@@ -113,7 +146,7 @@ public class DocConverterPdf {
try {
// in = new FileInputStream(docFile);
// out = new FileOutputStream(convertPdfFile);
convertFile(docFile,convertPdfFile);
convert(docFile,convertPdfFile);
// converter.convert(in).as(DefaultDocumentFormatRegistry.getFormatByMediaType(filesType)).
// to(out).as(DefaultDocumentFormatRegistry.PDF);
// close the connection
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+2 -2
View File
@@ -571,13 +571,13 @@ public class SearchCenterServiceImpl implements SearchCenterService {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standCode.keyword", "*"+searchInfoEO.getStandCode()+"*"));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getStandCode()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandYear())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getStandYear()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandName())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getStandName()+"*"));
boolQueryBuilder.must(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getStandName()+"*"));
}
if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) {
boolQueryBuilder.must(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getStandEnName()+"*"));
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+19 -18
View File
@@ -241,6 +241,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
page = (SarBussionessStandEOPage)JSONObject.toBean(jsonObject, SarBussionessStandEOPage.class);
page.setPage(1);
page.setPageSize(10000);
//查询当前登录人角色拥有权限的菜单
if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
QueryWrapper<TsResource> qw = new QueryWrapper<>();
qw.eq("ID",page.getMenuId());
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
}
}
}
if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
String advanceStr = SarAdvanceSearchUtil.createSql(searchList,"SAR_BUSS_STAND_ATTR_INFO");
@@ -250,24 +269,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
page.setAdvanceSearchStr(null);
}
}
List<String> getMenuIdList = new ArrayList<>();
if(userId != null){
getMenuIdList= tsUserService.getResourceUserId(userId);
}
// List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
// List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId());
if(getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
}
List<String> ids = sarMenuEOService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
}
}
page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id");
if(userId != null){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java
+191
View File
@@ -121,6 +121,197 @@ public class SarBussionessStandEOPage extends BasePage {
private String shunxu;
private String sql;
// 新增字段
private String FZRQBUSS;
private String FSRQBUSS;
private String FBGBUSS;
private String BZSMBUSS;
private String LSBBBUSS;
private String QTWJBUSS;
private String QCDW;
private String QCRBUSS;
private String WJSCRYBUSS;
private String SYCXCLASS;
private String NYLXCLASS;
private String SYCPXCLASS;
private String TXLBBUSS;
private String VPPSBMBUSS;
private String VPPSCNBUSS;
private String DTQBBHBUSS;
private String BDTQBBHBUSS;
private String XGJLBUSS;
private String XGLC;
private String GLWJBUSS;
private String XCSJBUSS;
public String getFZRQBUSS() {
return FZRQBUSS;
}
public void setFZRQBUSS(String FZRQBUSS) {
this.FZRQBUSS = FZRQBUSS;
}
public String getFSRQBUSS() {
return FSRQBUSS;
}
public void setFSRQBUSS(String FSRQBUSS) {
this.FSRQBUSS = FSRQBUSS;
}
public String getFBGBUSS() {
return FBGBUSS;
}
public void setFBGBUSS(String FBGBUSS) {
this.FBGBUSS = FBGBUSS;
}
public String getBZSMBUSS() {
return BZSMBUSS;
}
public void setBZSMBUSS(String BZSMBUSS) {
this.BZSMBUSS = BZSMBUSS;
}
public String getLSBBBUSS() {
return LSBBBUSS;
}
public void setLSBBBUSS(String LSBBBUSS) {
this.LSBBBUSS = LSBBBUSS;
}
public String getQTWJBUSS() {
return QTWJBUSS;
}
public void setQTWJBUSS(String QTWJBUSS) {
this.QTWJBUSS = QTWJBUSS;
}
public String getQCDW() {
return QCDW;
}
public void setQCDW(String QCDW) {
this.QCDW = QCDW;
}
public String getQCRBUSS() {
return QCRBUSS;
}
public void setQCRBUSS(String QCRBUSS) {
this.QCRBUSS = QCRBUSS;
}
public String getWJSCRYBUSS() {
return WJSCRYBUSS;
}
public void setWJSCRYBUSS(String WJSCRYBUSS) {
this.WJSCRYBUSS = WJSCRYBUSS;
}
public String getSYCXCLASS() {
return SYCXCLASS;
}
public void setSYCXCLASS(String SYCXCLASS) {
this.SYCXCLASS = SYCXCLASS;
}
public String getNYLXCLASS() {
return NYLXCLASS;
}
public void setNYLXCLASS(String NYLXCLASS) {
this.NYLXCLASS = NYLXCLASS;
}
public String getSYCPXCLASS() {
return SYCPXCLASS;
}
public void setSYCPXCLASS(String SYCPXCLASS) {
this.SYCPXCLASS = SYCPXCLASS;
}
public String getTXLBBUSS() {
return TXLBBUSS;
}
public void setTXLBBUSS(String TXLBBUSS) {
this.TXLBBUSS = TXLBBUSS;
}
public String getVPPSBMBUSS() {
return VPPSBMBUSS;
}
public void setVPPSBMBUSS(String VPPSBMBUSS) {
this.VPPSBMBUSS = VPPSBMBUSS;
}
public String getVPPSCNBUSS() {
return VPPSCNBUSS;
}
public void setVPPSCNBUSS(String VPPSCNBUSS) {
this.VPPSCNBUSS = VPPSCNBUSS;
}
public String getDTQBBHBUSS() {
return DTQBBHBUSS;
}
public void setDTQBBHBUSS(String DTQBBHBUSS) {
this.DTQBBHBUSS = DTQBBHBUSS;
}
public String getBDTQBBHBUSS() {
return BDTQBBHBUSS;
}
public void setBDTQBBHBUSS(String BDTQBBHBUSS) {
this.BDTQBBHBUSS = BDTQBBHBUSS;
}
public String getXGJLBUSS() {
return XGJLBUSS;
}
public void setXGJLBUSS(String XGJLBUSS) {
this.XGJLBUSS = XGJLBUSS;
}
public String getXGLC() {
return XGLC;
}
public void setXGLC(String XGLC) {
this.XGLC = XGLC;
}
public String getGLWJBUSS() {
return GLWJBUSS;
}
public void setGLWJBUSS(String GLWJBUSS) {
this.GLWJBUSS = GLWJBUSS;
}
public String getXCSJBUSS() {
return XCSJBUSS;
}
public void setXCSJBUSS(String XCSJBUSS) {
this.XCSJBUSS = XCSJBUSS;
}
public String getZqcrId() {
return zqcrId;
}