From da7826f004a742840cbbd693570cab318530164d Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 4 Sep 2021 10:07:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BC=81=E6=A0=87excl=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=20=E6=97=A5=E6=9C=9F=E5=87=BA=E7=8E=B0=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/utils/util/BussStandExportUtil.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java index 0e8f8207..aadd47a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java @@ -9,6 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -105,10 +106,14 @@ public class BussStandExportUtil { value = sarStandardsInfoEO.getStandStatusShow(); break; case "标准实施日期": - if (sarStandardsInfoEO.getPutTime() != null) { - String issueTime = sdf.format(sarStandardsInfoEO.getPutTime()); - value = issueTime; + String putTime=""; + if (Date.class.equals(sarStandardsInfoEO.getPutTime())) { + putTime = sdf.format(sarStandardsInfoEO.getPutTime()); + + }else { + putTime=sarStandardsInfoEO.getPutTime(); } + value = putTime; break; case "代替企标编号": value = sarStandardsInfoEO.getReplaceStandNum(); @@ -117,10 +122,13 @@ public class BussStandExportUtil { value = sarStandardsInfoEO.getReplacedStandNum(); break; case "发布日期": - if (sarStandardsInfoEO.getIssueTime() != null) { - String issueTime = sdf.format(sarStandardsInfoEO.getIssueTime()); - value = issueTime; + String issueTime=""; + if (Date.class.equals(sarStandardsInfoEO.getIssueTime().getClass())){ + issueTime = sdf.format(sarStandardsInfoEO.getIssueTime()); + }else { + issueTime=sarStandardsInfoEO.getIssueTime(); } + value = issueTime; break; case "复审日期": String field1 = attrInfoMap.get(name); From 19c52a212b0f84d3e4d1ed7cdae608651d3ed0a7 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 4 Sep 2021 10:09:40 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2,putTime,issuTime,textStatu?= =?UTF-8?q?sBuss=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussionessStandEOPage.java | 10 ++++++++++ .../sarBussionessStand/SarBussionessStandMapper.xml | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index a2263387..1ecd984c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -12,6 +12,16 @@ import java.util.List; */ public class SarBussionessStandEOPage extends BasePage { + private String textStatusBuss; + + public String getTextStatusBuss() { + return textStatusBuss; + } + + public void setTextStatusBuss(String textStatusBuss) { + this.textStatusBuss = textStatusBuss; + } + private String modifyTime; private String modifyTime1; private String modifyTime2; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 0aecf221..93d64a17 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -363,6 +363,17 @@ left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0) where 1=1 + + + and put_time=#{putTime} + + + and issue_time=#{issueTime} + + + and text_status_buss=#{textStatusBuss} + + + + + com.artofsolving + jodconverter + 2.2.1 + org.jodconverter jodconverter-core - 4.2.2 + 4.3.0 org.jodconverter jodconverter-spring-boot-starter - 4.2.2 + 4.3.0 org.jodconverter jodconverter-local - 4.2.2 + 4.3.0 diff --git a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java index 5fd73037..503973d9 100644 --- a/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java +++ b/adc-da-convert/src/main/java/com/adc/da/convert/common/DocConverterPdf.java @@ -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 From 307e6ddd85fecefcf5f676654017d1a01998572a Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 6 Sep 2021 14:29:04 +0800 Subject: [PATCH 09/11] commit --- .../mybatis/mapper/standardSplit/SarStandFileEOMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml index 3d7f4b6b..c36b52f1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml @@ -308,7 +308,6 @@ and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType} - GROUP BY STAND_ID order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a From e85d3daecb0baa2f85bf286d703521eb5c74fb75 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 6 Sep 2021 17:42:34 +0800 Subject: [PATCH 10/11] feat: There is no way the #47611 --- .../impl/SarBussionessStandServiceImpl.java | 37 ++-- .../entity/SarBussionessStandEOPage.java | 191 ++++++++++++++++++ 2 files changed, 210 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 8e784e58..bc01354b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -241,6 +241,25 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 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.getResourceUserId(page.getUserId()); + 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 (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List 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 getMenuIdList = new ArrayList<>(); - if(userId != null){ - getMenuIdList= tsUserService.getResourceUserId(userId); - } - // List getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null); - if (getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } else { - page.setMenuRoleList(null); - } -// List getMenuIdList = sarMenuEOService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId()); - if(getMenuIdList != null && !getMenuIdList.isEmpty()) { - page.setMenuRoleList(getMenuIdList); - } - List 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){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index 1ecd984c..d2fee840 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -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; } From 6683829f315ddf32f5bf88b933317cdd8d716473 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 6 Sep 2021 18:01:09 +0800 Subject: [PATCH 11/11] feat: There is no way the #47671 --- .../adc/da/search/service/impl/SearchCenterServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index d172428e..66c976c8 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -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()+"*"));