From 1772b09067c656448554625d691fadc0a68ad1d0 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 23 Jun 2022 11:06:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20ES?= =?UTF-8?q?=20=E6=96=87=E6=9C=AC=E7=B4=A2=E5=BC=95=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StandLawsSearchServiceImpl.java | 359 ++++++++++-------- 1 file changed, 193 insertions(+), 166 deletions(-) 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 77620cf7..5806c642 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 @@ -188,86 +188,8 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } - StringBuilder contentBuilder = new StringBuilder(); - contentBuilder.append("标准类别:").append(attrInfoMap.get("standSort")).append(" "); - contentBuilder.append("标准编号:").append(attrInfoMap.get("standNumber")).append(" "); - contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("标准名称:").append(attrInfoMap.get("standName")).append(" "); - contentBuilder.append("标准英文名称:").append(attrInfoMap.get("standEnName")).append(" "); - contentBuilder.append("标准性质:").append(attrInfoMap.get("standNatureName")).append(" "); - contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusName")).append(" "); - contentBuilder.append("标准发布日期:").append(attrInfoMap.get("issueTime")).append(" "); - contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccessName")).append(" "); - - // 区分国内、海外 - if (isForeign) { - contentBuilder.append("标准状态:").append(attrInfoMap.get("standstateshow")).append(" "); - contentBuilder.append("标签:").append(attrInfoMap.get("gxhbq")).append(" "); - }else { - contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" "); - if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBHName")).append(" "); - }else { - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBHName")).append(" "); - } - } - - contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQName")).append(" "); - contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQName")).append(" "); - contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQName")).append(" "); - - if (isForeign) { - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); - }else { - contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); -// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); - contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); -// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); - contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); - contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); - contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); - } - contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLXName")).append(" "); - contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); - contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); - contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); -// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); - contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); -// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); - contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); - contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); - contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); - contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); - contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append(" "); - contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" "); - contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" "); - - contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append(" "); - contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append(" "); - contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJName")).append(" "); - if (isForeign) { - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); - }else { - contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBHName")).append(" "); - contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCDName")).append(" "); - contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZName")).append(" "); - contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZName")).append(" "); - } - - if (attrInfoMap.containsKey("content")){ - if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ - String con = String.valueOf(attrInfoMap.get("content")); - con = con.replace(",",""); - if (StringUtils.isBlank(con)){ - attrInfoMap.put("content","--"); - } - } - } - - contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); - StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); - fullTextSearchEO.put("textContent",textContent.toString()); + // 逻辑字段 if ("FOREIGN".equals(String.valueOf(attrInfoMap.get("standType")))){ fullTextSearchEO.put("standTypeOrder","2"); }else { @@ -298,6 +220,92 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("issue_time", "--"); fullTextSearchEO.put("issue_time_order", "--"); } + + // 文本内容字段 + try { + StringBuilder contentBuilder = new StringBuilder(); + + contentBuilder.append("标准类别:").append(attrInfoMap.get("standSort")).append(" "); + contentBuilder.append("标准编号:").append(attrInfoMap.get("standNumber")).append(" "); + contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); + contentBuilder.append("标准名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("标准英文名称:").append(attrInfoMap.get("standEnName")).append(" "); + contentBuilder.append("标准性质:").append(attrInfoMap.get("standNatureName")).append(" "); + contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusName")).append(" "); + contentBuilder.append("标准发布日期:").append(attrInfoMap.get("issueTime")).append(" "); + contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccessName")).append(" "); + + // 区分国内、海外 + if (isForeign) { + contentBuilder.append("标准状态:").append(attrInfoMap.get("standstateshow")).append(" "); + contentBuilder.append("标签:").append(attrInfoMap.get("gxhbq")).append(" "); + }else { + contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" "); + if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBHName")).append(" "); + }else { + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBHName")).append(" "); + } + } + + contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQName")).append(" "); + contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQName")).append(" "); + contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQName")).append(" "); + + if (isForeign) { + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); + }else { + contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); +// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); + contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); + contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); + } + contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLXName")).append(" "); + contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); + contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); + contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); +// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); +// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); + contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); + contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); + contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); + contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append(" "); + contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" "); + contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" "); + + contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append(" "); + contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append(" "); + contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJName")).append(" "); + if (isForeign) { + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); + }else { + contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBHName")).append(" "); + contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCDName")).append(" "); + contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZName")).append(" "); + contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZName")).append(" "); + } + + if (attrInfoMap.containsKey("content")){ + if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ + String con = String.valueOf(attrInfoMap.get("content")); + con = con.replace(",",""); + if (StringUtils.isBlank(con)){ + attrInfoMap.put("content","--"); + } + } + } + + contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); + StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); + fullTextSearchEO.put("textContent",textContent.toString()); + }catch (Exception e){ + logger.info("err:" + errFilter(e.getMessage())); + } } else if("laws".equals(attrInfoMap.get("type"))){ // 政策全文 for (String key : attrInfoMap.keySet()) { @@ -305,60 +313,12 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } + // 逻辑字段 if(StringUtils.isNotBlank(attrInfoMap.getOrDefault("lawsName","").toString())){ fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+" "+attrInfoMap.getOrDefault("lawsNumber","")+" "+attrInfoMap.getOrDefault("lawsName","")); }else{ fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+" "+attrInfoMap.getOrDefault("lawsNumber","")+" "+attrInfoMap.getOrDefault("lawsEnName","")); } - - StringBuilder contentBuilder = new StringBuilder(); - contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append(" "); - contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append(" "); - contentBuilder.append("中文名称: ").append(attrInfoMap.get("lawsName")).append(" "); - contentBuilder.append("英文名称: ").append(attrInfoMap.get("lawsEnName")).append(" "); - contentBuilder.append("政策文号: ").append(attrInfoMap.get("lawsNo")).append(" "); -// contentBuilder.append("发布日期:"+attrInfoMap.get("issueTime")+" "); - contentBuilder.append("地区: ").append(attrInfoMap.get("country")).append(" "); - contentBuilder.append("发文日期: ").append(attrInfoMap.get("issueTime")).append(" "); - contentBuilder.append("发文单位: ").append(attrInfoMap.get("issueCompany")).append(" "); - contentBuilder.append("征集意见周期-起始时间: ").append(attrInfoMap.get("commentCycleStart")).append(" "); - contentBuilder.append("征集意见周期-结束时间: ").append(attrInfoMap.get("commentCycleEnd")).append(" "); - contentBuilder.append("文本状态: ").append(attrInfoMap.get("lawsTextStateName")).append(" "); - contentBuilder.append("适用区域: ").append(attrInfoMap.get("lawsSyqyName")).append(" "); - contentBuilder.append("适用车型: ").append(attrInfoMap.get("lawsSycxName")).append(" "); - contentBuilder.append("是否纳入认证清单: ").append(attrInfoMap.get("isRelateAccessName")).append(" "); - contentBuilder.append("年度: ").append(attrInfoMap.get("lawsYearName")).append(" "); - contentBuilder.append("福田转发通知文号: ").append(attrInfoMap.get("lawsNotisyncNum")).append(" "); - contentBuilder.append("信息简报: ").append(attrInfoMap.get("lawsBulletin")).append(" "); - contentBuilder.append("标签: ").append(attrInfoMap.get("lawsLabel")).append(" "); - contentBuilder.append("备注: ").append(attrInfoMap.get("lawsRemark")).append(" "); - contentBuilder.append("实施日期（文本）: ").append(attrInfoMap.get("SSRQLAWSName")).append(" "); - contentBuilder.append("新车型实施日期（文本）: ").append(attrInfoMap.get("XCXSSRQLAWSName")).append(" "); - contentBuilder.append("在产车实施日期（文本）: ").append(attrInfoMap.get("ZCXSSRQLAWSName")).append(" "); - contentBuilder.append("发布机构: ").append(attrInfoMap.get("FBJGLAWSName")).append(" "); - contentBuilder.append("我司参与深度: ").append(attrInfoMap.get("CYSDLAWSName")).append(" "); - contentBuilder.append("投稿人: ").append(attrInfoMap.get("TGRLAWSName")).append(" "); - contentBuilder.append("投稿单位: ").append(attrInfoMap.get("TGRLAWSName")).append(" "); - contentBuilder.append("能源类型: ").append(attrInfoMap.get("NYLXLAWSName")).append(" "); - contentBuilder.append("适用认证: ").append(attrInfoMap.get("YYRZLAWSName")).append(" "); - contentBuilder.append("责任部门: ").append(attrInfoMap.get("ZRBMLAWSName")).append(" "); - contentBuilder.append("责任工程师: ").append(attrInfoMap.get("ZRGCSLAWSName")).append(" "); - contentBuilder.append("代替文件号: ").append(attrInfoMap.get("DTWJHLAWSName")).append(" "); - contentBuilder.append("被代替文件号: ").append(attrInfoMap.get("BDTWJHLAWSName")).append(" "); - contentBuilder.append("引用标准&政策: ").append(attrInfoMap.get("YYBZZCLAWSName")).append(" "); -// contentBuilder.append("相关资料:"+attrInfoMap.get("")+" "); - if (attrInfoMap.containsKey("content")){ - if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ - String con = String.valueOf(attrInfoMap.get("content")); - con = con.replace(",",""); - if (StringUtils.isBlank(con)){ - attrInfoMap.put("content",""); - } - } - } - contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); - StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); - fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("standTypeOrder","4"); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("lawsTypeName")),dicMap)); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName"))); @@ -376,6 +336,60 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("issue_time", "--"); fullTextSearchEO.put("issue_time_order", "--"); } + + // 文本内容字段 + try { + StringBuilder contentBuilder = new StringBuilder(); + contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append(" "); + contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append(" "); + contentBuilder.append("中文名称: ").append(attrInfoMap.get("lawsName")).append(" "); + contentBuilder.append("英文名称: ").append(attrInfoMap.get("lawsEnName")).append(" "); + contentBuilder.append("政策文号: ").append(attrInfoMap.get("lawsNo")).append(" "); +// contentBuilder.append("发布日期:"+attrInfoMap.get("issueTime")+" "); + contentBuilder.append("地区: ").append(attrInfoMap.get("country")).append(" "); + contentBuilder.append("发文日期: ").append(attrInfoMap.get("issueTime")).append(" "); + contentBuilder.append("发文单位: ").append(attrInfoMap.get("issueCompany")).append(" "); + contentBuilder.append("征集意见周期-起始时间: ").append(attrInfoMap.get("commentCycleStart")).append(" "); + contentBuilder.append("征集意见周期-结束时间: ").append(attrInfoMap.get("commentCycleEnd")).append(" "); + contentBuilder.append("文本状态: ").append(attrInfoMap.get("lawsTextStateName")).append(" "); + contentBuilder.append("适用区域: ").append(attrInfoMap.get("lawsSyqyName")).append(" "); + contentBuilder.append("适用车型: ").append(attrInfoMap.get("lawsSycxName")).append(" "); + contentBuilder.append("是否纳入认证清单: ").append(attrInfoMap.get("isRelateAccessName")).append(" "); + contentBuilder.append("年度: ").append(attrInfoMap.get("lawsYearName")).append(" "); + contentBuilder.append("福田转发通知文号: ").append(attrInfoMap.get("lawsNotisyncNum")).append(" "); + contentBuilder.append("信息简报: ").append(attrInfoMap.get("lawsBulletin")).append(" "); + contentBuilder.append("标签: ").append(attrInfoMap.get("lawsLabel")).append(" "); + contentBuilder.append("备注: ").append(attrInfoMap.get("lawsRemark")).append(" "); + contentBuilder.append("实施日期（文本）: ").append(attrInfoMap.get("SSRQLAWSName")).append(" "); + contentBuilder.append("新车型实施日期（文本）: ").append(attrInfoMap.get("XCXSSRQLAWSName")).append(" "); + contentBuilder.append("在产车实施日期（文本）: ").append(attrInfoMap.get("ZCXSSRQLAWSName")).append(" "); + contentBuilder.append("发布机构: ").append(attrInfoMap.get("FBJGLAWSName")).append(" "); + contentBuilder.append("我司参与深度: ").append(attrInfoMap.get("CYSDLAWSName")).append(" "); + contentBuilder.append("投稿人: ").append(attrInfoMap.get("TGRLAWSName")).append(" "); + contentBuilder.append("投稿单位: ").append(attrInfoMap.get("TGRLAWSName")).append(" "); + contentBuilder.append("能源类型: ").append(attrInfoMap.get("NYLXLAWSName")).append(" "); + contentBuilder.append("适用认证: ").append(attrInfoMap.get("YYRZLAWSName")).append(" "); + contentBuilder.append("责任部门: ").append(attrInfoMap.get("ZRBMLAWSName")).append(" "); + contentBuilder.append("责任工程师: ").append(attrInfoMap.get("ZRGCSLAWSName")).append(" "); + contentBuilder.append("代替文件号: ").append(attrInfoMap.get("DTWJHLAWSName")).append(" "); + contentBuilder.append("被代替文件号: ").append(attrInfoMap.get("BDTWJHLAWSName")).append(" "); + contentBuilder.append("引用标准&政策: ").append(attrInfoMap.get("YYBZZCLAWSName")).append(" "); +// contentBuilder.append("相关资料:"+attrInfoMap.get("")+" "); + if (attrInfoMap.containsKey("content")){ + if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ + String con = String.valueOf(attrInfoMap.get("content")); + con = con.replace(",",""); + if (StringUtils.isBlank(con)){ + attrInfoMap.put("content",""); + } + } + } + contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); + StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); + fullTextSearchEO.put("textContent",textContent.toString()); + }catch (Exception e){ + logger.info("err:" + errFilter(e.getMessage())); + } }else if ("bussstand".equals(attrInfoMap.get("type"))){ for (String key : attrInfoMap.keySet()) { @@ -388,44 +402,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { }else{ fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+" "+attrInfoMap.getOrDefault("stand_en_name","")); } - StringBuilder contentBuilder = new StringBuilder(); - contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); - contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); - contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); - contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); - contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); - contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); - contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); - contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); -// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); - contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); -// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); - contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); - contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); - contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); - contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); - contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXCLASSName")).append(" "); - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBBUSSName")).append(" "); - contentBuilder.append("关联模块VPPS编码:").append(attrInfoMap.get("VPPSBMBUSSName")).append(" "); - contentBuilder.append("关联模块中文名称:").append(attrInfoMap.get("VPPSCNBUSSName")).append(" "); - contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append(" "); - contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append(" "); - - if (attrInfoMap.containsKey("content")){ - if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ - String con = String.valueOf(attrInfoMap.get("content")); - con = con.replace(",",""); - if (StringUtils.isBlank(con)){ - attrInfoMap.put("content","--"); - } - } - } - contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); -// contentBuilder.append("相关计划:"+String.valueOf(attrInfoMap.get(""))+" "); - - StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); - fullTextSearchEO.put("textContent",textContent.toString()); + // 逻辑字段 fullTextSearchEO.put("standTypeOrder","3"); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap)); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear"))); @@ -442,10 +419,60 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("issue_time", "--"); fullTextSearchEO.put("issue_time_order", "--"); } + // 文本内容字段 + try { + StringBuilder contentBuilder = new StringBuilder(); + contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); + contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); + contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); + contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); + contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); + contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); + contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); + contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); + contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); +// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); + contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); + contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); + contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); + contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); + contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); + contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXCLASSName")).append(" "); + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBBUSSName")).append(" "); + contentBuilder.append("关联模块VPPS编码:").append(attrInfoMap.get("VPPSBMBUSSName")).append(" "); + contentBuilder.append("关联模块中文名称:").append(attrInfoMap.get("VPPSCNBUSSName")).append(" "); + contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append(" "); + contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append(" "); + + if (attrInfoMap.containsKey("content")){ + if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ + String con = String.valueOf(attrInfoMap.get("content")); + con = con.replace(",",""); + if (StringUtils.isBlank(con)){ + attrInfoMap.put("content","--"); + } + } + } + contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); +// contentBuilder.append("相关计划:"+String.valueOf(attrInfoMap.get(""))+" "); + + StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); + fullTextSearchEO.put("textContent",textContent.toString()); + }catch (Exception e){ + logger.info("err:" + errFilter(e.getMessage())); + } } return fullTextSearchEO; } + private String errFilter(String str){ + if (str.contains("Cause")){ + str = str.split("Cause")[0].replaceAll("\\r\\n###",""); + } + return str; + } + private String esStateOrder(String data, Map dicMap){ if(StringUtils.isNotBlank(data)){ data = data.replace(" ",""); From 29f63744744500a7c5a77e61d5358cbf81322c2a Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 23 Jun 2022 14:27:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=94=B9=E9=80=A0=E6=A0=87=E5=87=86?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=A8=A1=E5=9D=97=E5=AE=9A=E6=97=B6=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/Timer/ProcessTimer.java | 78 +++++++++---------- .../da/scheduled/WarningSchedulingTasks.java | 29 +++++++ ...0220623_定时任务执行管理表添加预警信息.sql | 1 + 3 files changed, 69 insertions(+), 39 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java create mode 100644 doc/sql/20220623_定时任务执行管理表添加预警信息.sql diff --git a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java index 9846d4f2..67312aae 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java +++ b/adc-da-activiti/src/main/java/com/adc/da/Timer/ProcessTimer.java @@ -69,45 +69,45 @@ public class ProcessTimer { public void urging() { if(isNotScheduled){ log.info("=================================自动催办定时任务启动====================================="); - List busProcessNames = workFlowFeignClient.queryBusProcessNameForEnd(null); - if (null != busProcessNames && 0 < busProcessNames.size()) { - for (BusProcessName busProcessName : busProcessNames) { - String type = busProcessName.getPrcType(); - Integer typeInt = 99; - if (StringUtils.isNotEmpty(type)) { - typeInt = Integer.valueOf(type); - } - type = chooseType(typeInt, type); - - UserEO userEO = userEOService.selectByPrimaryKey(busProcessName.getCreatUserName()); - String[] array = userEO.getEmail().split(","); - String overTime = busProcessName.getOverTime(); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - Date dateTime = null; - Integer num = 3; - try { - dateTime = simpleDateFormat.parse(overTime); - Date now = new Date(); - long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000); - num = Integer.valueOf(String.valueOf(daysBetween)); - } catch (ParseException e) { - SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'"); - try { - dateTime = simpleDateFormat1.parse(overTime); - Date now = new Date(); - long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000); - num = Integer.valueOf(String.valueOf(daysBetween)); - } catch (ParseException e1) { - e.getMessage(); - } - } - - String msg = "您好，[" + busProcessName.getPrcNum() + "]-[" + busProcessName.getPrcName() + "] 您有待办任务未及时办理，距离截至日期还有[" + String.valueOf(num) + "]天 请及时办理，请登录全球标准法规管理系统 ( http://39.98.140.126:10005/#/login ) 办理：链接 ( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter ) 。\n" + - " ——来自 全球标准法规管理系统"; - String title = "GSRM——【待办任务】[" + type + "] 您有未完成的待办任务"; - mailUtil.sendMsgFeign(array, title, msg); - } - } +// List busProcessNames = workFlowFeignClient.queryBusProcessNameForEnd(null); +// if (null != busProcessNames && 0 < busProcessNames.size()) { +// for (BusProcessName busProcessName : busProcessNames) { +// String type = busProcessName.getPrcType(); +// Integer typeInt = 99; +// if (StringUtils.isNotEmpty(type)) { +// typeInt = Integer.valueOf(type); +// } +// type = chooseType(typeInt, type); +// +// UserEO userEO = userEOService.selectByPrimaryKey(busProcessName.getCreatUserName()); +// String[] array = userEO.getEmail().split(","); +// String overTime = busProcessName.getOverTime(); +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); +// Date dateTime = null; +// Integer num = 3; +// try { +// dateTime = simpleDateFormat.parse(overTime); +// Date now = new Date(); +// long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000); +// num = Integer.valueOf(String.valueOf(daysBetween)); +// } catch (ParseException e) { +// SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'"); +// try { +// dateTime = simpleDateFormat1.parse(overTime); +// Date now = new Date(); +// long daysBetween = (dateTime.getTime() - now.getTime() + 1000000) / (60 * 60 * 24 * 1000); +// num = Integer.valueOf(String.valueOf(daysBetween)); +// } catch (ParseException e1) { +// e.getMessage(); +// } +// } +// +// String msg = "您好，[" + busProcessName.getPrcNum() + "]-[" + busProcessName.getPrcName() + "] 您有待办任务未及时办理，距离截至日期还有[" + String.valueOf(num) + "]天 请及时办理，请登录全球标准法规管理系统 ( http://39.98.140.126:10005/#/login ) 办理：链接 ( http://39.98.140.126:10005/#/processCenter?tabsName=ProcessCenter ) 。\n" + +// " ——来自 全球标准法规管理系统"; +// String title = "GSRM——【待办任务】[" + type + "] 您有未完成的待办任务"; +// mailUtil.sendMsgFeign(array, title, msg); +// } +// } log.info("=================================自动催办定时任务结束====================================="); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java new file mode 100644 index 00000000..4d16ec86 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/WarningSchedulingTasks.java @@ -0,0 +1,29 @@ +package com.adc.da.scheduled; + +import com.adc.da.common.GetBeanUtil; +import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@Slf4j +public class WarningSchedulingTasks implements Runnable{ + + + Logger logger = LoggerFactory.getLogger(WarningSchedulingTasks.class); + + private ScheduledJob scheduledJob; + + public WarningSchedulingTasks() { + scheduledJob= GetBeanUtil.getApplicationContext().getBean(ScheduledJob.class); + } + + @Override + public void run() { + try{ + Thread.sleep(2000); + scheduledJob.warningSchedulingTasks(); + }catch(Exception e){ + logger.info(e.getMessage()); + } + } +} diff --git a/doc/sql/20220623_定时任务执行管理表添加预警信息.sql b/doc/sql/20220623_定时任务执行管理表添加预警信息.sql new file mode 100644 index 00000000..48e83a89 --- /dev/null +++ b/doc/sql/20220623_定时任务执行管理表添加预警信息.sql @@ -0,0 +1 @@ +INSERT INTO `tb_task`(`id`, `task_name`, `task_desc`, `task_exp`, `task_status`, `task_class`, `update_time`, `create_time`) VALUES ('6', 'task6', '每天定时扫描标准预警数据', '*/5 * * * * ?', 0, 'com.adc.da.scheduled.WarningSchedulingTasks', '2022-06-23 06:19:32', '2022-06-23 06:19:32');