From 32626f3ae1477abbfc9e43227c42330fd79f83ee Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 16 Aug 2021 16:13:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=BF=87=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 60 ++++++++------ .../entity/SarStandardsInfoEOPage.java | 3 + .../da/utils/util/SarAdvanceSearchUtil.java | 79 ++++++++++++------- .../SarStandardsInfoMapper.xml | 28 ++++++- 4 files changed, 116 insertions(+), 54 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 186be42a..e333d7ac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -130,36 +130,52 @@ public class SarStandardsInfoController extends BaseController } } } + + if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); - int i = 0; - for (SarAdvanceSearchVO sarAdvanceSearchVO:searchList){ - if ("SVPPS".equals(sarAdvanceSearchVO.getField()) && StringUtils.isBlank(sarAdvanceSearchVO.getValue())){ - isNull = i; - } - i++; - } - if (-1 != isNull) { - searchList.remove(isNull); - } - if (isNull == 0 && searchList.size() > 0){ - searchList.get(0).setConnect(""); - } - String advanceStr = SarAdvanceSearchUtil.createSql(searchList); - if (null != advanceStr) { - advanceStr = advanceStr.replace("stand_number", "concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',SAR_STANDARDS_INFO.STAND_YEAR)"); - } - if (-1 != isNull && StringUtils.isBlank(advanceStr)){ - advanceStr = advanceStr + " SVPPS is null"; - }else if (-1 != isNull && StringUtils.isNotBlank(advanceStr)){ - advanceStr = advanceStr + " and SVPPS is null"; - } + String advanceStr = SarAdvanceSearchUtil.createStandSql(searchList); if (StringUtils.isNotBlank(advanceStr)) { page.setAdvanceSearchStr(advanceStr); } else { page.setAdvanceSearchStr(null); } } + + + + + +// if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) { +// List searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class); +// int i = 0; +// for (SarAdvanceSearchVO sarAdvanceSearchVO:searchList){ +// if ("SVPPS".equals(sarAdvanceSearchVO.getField()) && StringUtils.isBlank(sarAdvanceSearchVO.getValue())){ +// isNull = i; +// } +// i++; +// } +// if (-1 != isNull) { +// searchList.remove(isNull); +// } +// if (isNull == 0 && searchList.size() > 0){ +// searchList.get(0).setConnect(""); +// } +// String advanceStr = SarAdvanceSearchUtil.createSql(searchList); +// if (null != advanceStr) { +// advanceStr = advanceStr.replace("stand_number", "concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',SAR_STANDARDS_INFO.STAND_YEAR)"); +// } +// if (-1 != isNull && StringUtils.isBlank(advanceStr)){ +// advanceStr = advanceStr + " SVPPS is null"; +// }else if (-1 != isNull && StringUtils.isNotBlank(advanceStr)){ +// advanceStr = advanceStr + " and SVPPS is null"; +// } +// if (StringUtils.isNotBlank(advanceStr)) { +// page.setAdvanceSearchStr(advanceStr); +// } else { +// page.setAdvanceSearchStr(null); +// } +// } if(page.getUserId() == null || page.getUserId().equals("")){ page.setUserId(LoginUserUtil.getUserId()); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java index dcf25cca..7e24c346 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfoEOPage.java @@ -87,5 +87,8 @@ public class SarStandardsInfoEOPage extends BasePage { private String orderBy1 = "SAR_STANDARDS_INFO.issue_time"; private String order1 = "desc"; +// zhaokaiyao + private String textStatus;//文本状态 + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index 7201ccae..c3a9f1a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -14,61 +14,61 @@ import java.util.List; public class SarAdvanceSearchUtil { // 拼接sql语句 - public static String createSql (List searchVOList) { + public static String createSql(List searchVOList) { String sqlInfo = ""; StringBuilder sqlBuilder = new StringBuilder(); if (searchVOList != null && !searchVOList.isEmpty()) { for (SarAdvanceSearchVO searchVO : searchVOList) { String sql = ""; if (StringUtils.isNotBlank(searchVO.getValue())) { - if(searchVO.getValue().contains(",")){ - sql += searchVO.getConnect()+"("; + if (searchVO.getValue().contains(",")) { + sql += searchVO.getConnect() + "("; List list = Arrays.asList(searchVO.getValue().split(",")); - for(int i =0;i searchVOList) { + String sqlInfo = ""; + String tableName="SAR_STAND_ATTR_INFO."; + StringBuilder sqlBuilder = new StringBuilder(); + if (searchVOList != null && !searchVOList.isEmpty()) { + + for (int i = 0; i < searchVOList.size(); i++) { + String sql = ""; + SarAdvanceSearchVO searchVO=searchVOList.get(i); + if (StringUtils.isNotBlank(searchVO.getValue())); + if (i==0){ + sql+=tableName+searchVO.getField()+" " + searchVO.getType() + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; + }else { + sql+="AND"+" "+tableName+searchVO.getField()+" " + searchVO.getType() + " " + "concat(concat('%','" +searchVO.getValue() + "'),'%') "; + } + sqlBuilder.append(sql); + } + sqlInfo = sqlBuilder.toString(); + } + + return sqlInfo; + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 4b56f28b..7e1706b2 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -429,6 +429,9 @@ and replaced_stand_num like concat(concat('%',#{replacedStandNum}),'%') + + and is_relate_access = #{isRelateAccess} + and SAR_STAND_MENU.MENU_ID in @@ -490,11 +493,28 @@ and SAR_STANDARDS_INFO.stand_sort = #{standSort} + + + + and SAR_STANDARDS_INFO.STAND_YEAR = #{standYear} + + + and SAR_STANDARDS_INFO.ISSUE_TIME = #{issueTime} AND dbms_lob.instr(SYNOPSIS, #{synopsis} ,1,1) > 0 + + + + and SAR_STANDARDS_INFO.TEXT_STATUS = #{textStatus} + + + + and SAR_STANDARDS_INFO.IS_RELATE_ACCESS = #{isRelateAccess} + + and SAR_STANDARDS_INFO.id in ( select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 @@ -502,18 +522,18 @@ and TS_PERSON_COLLECT.user_id=#{userId} ) + and SAR_STAND_ATTR_INFO.GXHBQ is not null and SAR_STAND_ATTR_INFO.GXHBQ like concat(concat('%',#{labelMenuId}),'%') + - and SAR_STAND_ATTR_INFO.SYCLLX = #{applyArctic} - - - and is_relate_access = #{isRelateAccess} + and SAR_STAND_ATTR_INFO.CLLX = #{applyArctic} + and (${advanceSearchStr}) From 68d7a1ab66fc33c783234a57029e7380a8c8eed9 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 16 Aug 2021 16:16:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/utils/util/SarAdvanceSearchUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java index c3a9f1a3..bfc545b2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/SarAdvanceSearchUtil.java @@ -79,6 +79,12 @@ public class SarAdvanceSearchUtil { return sqlInfo; } + + /** + * 国内外标准高级查询 对SAR_STAND_ATTR_INFO表自定义字段生成条件语句 + * @param searchVOList + * @return + */ public static String createStandSql(List searchVOList) { String sqlInfo = ""; String tableName="SAR_STAND_ATTR_INFO."; From dbb69c867679ecb6c995e4819acd3350738c6222 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 17 Aug 2021 10:47:27 +0800 Subject: [PATCH 3/5] feat: There is no way the --- .../src/main/java/com/adc/da/main/generate/CodeGen.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java index 12658804..8e9a93ae 100644 --- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java +++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java @@ -18,12 +18,9 @@ public class CodeGen { private static final String PACKAGE_PATH="/adc-da-slrs/src/main"; - private static final String AUTHOR="zyl"; + private static final String AUTHOR="super_liu"; - // x.x.x.x:3306/xxxx --MYSQL - // 192.168.10.140:1521:foton_slrs_test - // foton_slrs_test@101.36.227.22 - private static final String DB_IP="192.168.10.47/foton_slrs_test"; + private static final String DB_IP="127.0.0.1:3306/foton_slrs_test"; private static final String DB_USER="root"; From 1791877be5618c69a1ddfb3eaacba2929be1b1d1 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 17 Aug 2021 15:04:17 +0800 Subject: [PATCH 4/5] feat: There is no way the --- adc-da-main/src/main/resources/application-dev.properties | 6 +++--- .../da/search/service/impl/StandLawsSearchServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index ccba8463..3244c6d5 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -44,10 +44,10 @@ spring.mail.port=587 #spring.rabbitmq.username=uat_pcms #spring.rabbitmq.password=VxsBLL5bJruwzXfS # spring.rabbitmq.publisher-confirms=true -spring.rabbitmq.host=62.234.118.181 +spring.rabbitmq.host=127.0.0.1 spring.rabbitmq.port=5672 -spring.rabbitmq.username=admin -spring.rabbitmq.password=admin +spring.rabbitmq.username=guest +spring.rabbitmq.password=guest # ============================================== # 文档存储路径指向 # ============================================== diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index d4dcb175..1980b183 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -97,7 +97,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { result = elasticsearchService.updateDataByIdForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); } } else { - result = elasticsearchService.updateDataByIdForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); + result = elasticsearchService.addDataForMap(fullTextSearchEO,"fulltextserch","fulltextserch",id); } } return result; From 7b28ebb23cd914baf63ccd0a00eb82661cad4b73 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Tue, 17 Aug 2021 16:15:51 +0800 Subject: [PATCH 5/5] =?UTF-8?q?add:ocr=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index ccba8463..1356e669 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -57,13 +57,13 @@ file.path=/usr/laws/file/ #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = http://39.98.140.126:10001/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = http://62.234.136.153:8033/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M # OCR文件存储路径 -OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/ +OCR.ocrPath=/opt/foton-slrs/front/dist/file/ # OCR文件请求下载或在线预览时URL -OCR.ocrDownPath=http://106.2.13.189:8089/downfile/ +OCR.ocrDownPath=http://62.234.136.153:8038/file/ OCR.times=20 OCR.convertType=BOTH \ No newline at end of file