From 6bc2bfadb09b6ec1f53deef68e398d33f8fcb525 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 13:09:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=87=8D=E6=9E=84=E5=90=8E=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/mq/SendStandMQService.java | 31 ++++++++++ .../server/ResetSearchCenterService.java | 62 +++++++++++-------- 2 files changed, 66 insertions(+), 27 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java index 80f7c1ec..8c881c6c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendStandMQService.java @@ -7,6 +7,7 @@ import com.adc.da.slrs.sysInfo.service.SysInfoEOService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.utils.util.InitStandAttrUtil; +import com.adc.da.utils.util.Utils; import com.rabbitmq.client.Channel; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -82,8 +83,10 @@ public class SendStandMQService { } String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr(); Map attrInfoMap = new TreeMap<>(); + Map attrInfoMapForAuth = new TreeMap<>(); if(StringUtils.isNotBlank(sarStandAttrEOStr)){ attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr); + attrInfoMapForAuth.putAll(attrInfoMap); } Map infoMap = infoEO.getAttrInfoMap(); Map infoEOMapItems = infoEO.getMapItems(); @@ -274,6 +277,34 @@ public class SendStandMQService { if (!"null".equals(standEnName) && StringUtils.isNotBlank(standEnName)) { saveMap.put("standEnNameBig", standEnName.toUpperCase()); } + if ("1".equals(attrInfoMapForAuth.get("updateAuth"))) { + Map getAttrMap = new TreeMap<>(attrInfoMapForAuth); + if (getAttrMap != null && getAttrMap.size() > 0) { + for (Map.Entry entry : getAttrMap.entrySet()) { + String name = entry.getKey(); + String value = ""; + List valArr = new ArrayList<>(); + if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { + if (StringUtils.isNotBlank(entry.getValue().toString())) { + Object json = null; + if (Utils.isJson(entry.getValue().toString())) { + json = new JSONTokener(entry.getValue().toString()).nextValue(); + } + if (json instanceof org.json.JSONArray) { + valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); + } else { + value = entry.getValue().toString(); + valArr = Arrays.asList(value.split(",")); + } + if (!valArr.isEmpty()) { + value = dicTypeEODao.getDicNamesByCodes(valArr, ""); + } + } + saveMap.put(name + "Name",value); + } + } + } + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java index 2e1755e0..6913cfc7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java @@ -27,6 +27,7 @@ import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.slrs.standardSplit.service.SarStandardsInfoEOService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; import com.adc.da.util.http.ResponseMessage; @@ -37,6 +38,7 @@ import com.adc.da.utils.util.InitStandAttrUtil; import com.adc.da.utils.util.Utils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.elasticsearch.client.transport.TransportClient; @@ -107,6 +109,9 @@ public class ResetSearchCenterService { @Autowired private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + @Autowired + private ISarStandardsInfoService sarStandardsInfoEOService; + @PostConstruct public void init() { @@ -854,36 +859,39 @@ public class ResetSearchCenterService { getAttrMap.put(clobField, fieldValue); } } - + getAttrMap.put("updateAuth","1"); row.setAttrInfoMap(getAttrMap); } - Map getAttrMap = row.getAttrInfoMap(); - if (getAttrMap != null && getAttrMap.size() > 0) { - for (Map.Entry entry : getAttrMap.entrySet()) { - String name = entry.getKey(); - String value = ""; - List valArr = new ArrayList<>(); - if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { - if (StringUtils.isNotBlank(entry.getValue().toString())) { - Object json = null; - if(Utils.isJson(entry.getValue().toString())){ - json = new JSONTokener(entry.getValue().toString()).nextValue(); - } - if (json instanceof org.json.JSONArray) { - valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); - } else { - value = entry.getValue().toString(); - valArr = Arrays.asList(value.split(",")); - } - if (!valArr.isEmpty()) { - value = dicTypeEODao.getDicNamesByCodes(valArr, ""); - } - } - entry.setValue(value); - } - } - } +// Map getAttrMap = row.getAttrInfoMap(); +// if (getAttrMap != null && getAttrMap.size() > 0) { +// for (Map.Entry entry : getAttrMap.entrySet()) { +// String name = entry.getKey(); +// String value = ""; +// List valArr = new ArrayList<>(); +// if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) { +// if (StringUtils.isNotBlank(entry.getValue().toString())) { +// Object json = null; +// if(Utils.isJson(entry.getValue().toString())){ +// json = new JSONTokener(entry.getValue().toString()).nextValue(); +// } +// if (json instanceof org.json.JSONArray) { +// valArr = com.alibaba.fastjson.JSONObject.parseArray(entry.getValue().toString(), String.class); +// } else { +// value = entry.getValue().toString(); +// valArr = Arrays.asList(value.split(",")); +// } +// if (!valArr.isEmpty()) { +// value = dicTypeEODao.getDicNamesByCodes(valArr, ""); +// } +// } +// entry.setValue(value); +// } +// } +// } +// if (getAttrMap != null) { +// row.setSarStandAttrEOStr(JSONObject.toJSONString(getAttrMap)); +// } } } From bc0d3a878a16404f94e91bd3ba44e5ddf6e70d94 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 14:13:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=B9=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=B1=BB=E5=9E=8B=E3=80=81=E8=83=BD=E6=BA=90?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/service/impl/SearchCenterServiceImpl.java | 10 ++++++---- .../service/impl/StandLawsSearchServiceImpl.java | 4 ++++ 2 files changed, 10 insertions(+), 4 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 aad97d2d..7afd8604 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 @@ -1495,14 +1495,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS()) || StringUtils.isNotBlank(searchInfoEO.getCLLX())){ if(StringUtils.isNotBlank(searchInfoEO.getNYLXCLASS())){ queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getNYLXCLASS(), - "textContent" - ).minimumShouldMatch("100%").field("title",10f)); + "NYLXName" + ).minimumShouldMatch("100%")); +// .field("title",10f)); } if(StringUtils.isNotBlank(searchInfoEO.getCLLX())){ queryBuilder.should(QueryBuilders.multiMatchQuery(searchInfoEO.getCLLX(), - "textContent" - ).minimumShouldMatch("100%").field("title",10f)); + "CLLXName" + ).minimumShouldMatch("100%")); +// .field("title",10f)); } boolQueryBuilder.must(queryBuilder); 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 d2539f51..ce74e0bb 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 @@ -466,6 +466,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { } String title = String.valueOf(fullTextSearchEO.getOrDefault("title","")); fullTextSearchEO.put("titleBig",title.toUpperCase()); + fullTextSearchEO.put("CLLXName",attrInfoMap.get("CLLXName")); + fullTextSearchEO.put("NYLXName",attrInfoMap.get("NYLXName")); + fullTextSearchEO.put("CLLX",attrInfoMap.get("CLLX")); + fullTextSearchEO.put("NYLX",attrInfoMap.get("NYLX")); return fullTextSearchEO; } From 97f12bdef17d44461b9b1c22a8637ff14f002114 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 14:40:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7=E8=B6=85=E9=93=BE=E6=8E=A5=E6=89=93=E4=B8=8D=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandardsInfoController.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 df295625..945da70f 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 @@ -768,15 +768,15 @@ public class SarStandardsInfoController extends BaseController //@RequiresPermissions("lawss:sarStandardsInfo:list") public ResponseMessage queryInfoByStandNum(SarStandardsInfoEOPage page) throws Exception { if (org.apache.commons.lang.StringUtils.isNotBlank(page.getStandNumber())){ - String sort = ""; - if (page.getStandNumber().length()>3) { - sort = page.getStandNumber().substring(0, 3); - } - if ("ECE".equals(sort)) { - int length = page.getStandNumber().length(); - String number = page.getStandNumber().substring(3,length); - page.setStandNumber("UN(ECE)" + number); - } +// String sort = ""; +// if (page.getStandNumber().length()>3) { +// sort = page.getStandNumber().substring(0, 3); +// } +// if ("ECE".equals(sort)) { +// int length = page.getStandNumber().length(); +// String number = page.getStandNumber().substring(3,length); +// page.setStandNumber("UN(ECE)" + number); +// } } List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(page.getStandNumber(),page.getStandType()); SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage(); From d105dce3a5f3dcdf613158a437c20848640366a8 Mon Sep 17 00:00:00 2001 From: zhangjun <879913833@qq.com> Date: Thu, 29 Sep 2022 15:00:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=87=BAexcel=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EarlyWarningEOController.java | 8 +++++++- .../da/slrs/sarStandWarning/entity/EarlyWarningEO.java | 8 +++++++- .../da/slrs/sarStandWarning/entity/WarningExportVO.java | 8 ++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java index 987beea9..f66ba43d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java @@ -150,7 +150,13 @@ public class EarlyWarningEOController extends BaseController { // List exportExcel = earlyWarningEOService.getExportExcel(excelVO); List exportExcel = earlyWarningEOService.getExportExcel(excelVO); - + for (WarningExportVO warningExportVO : exportExcel){ + String condition = warningExportVO.getTermsConditions(); + if (condition != null && condition.length() > 32001){ + condition = condition.substring(0,32000); + warningExportVO.setTermsConditions(condition); + } + } // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), WarningExportVO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java index 65e8ae2e..152c60d9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java @@ -60,7 +60,7 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String standName; - @ExcelProperty(value = "发布日期",index = 5) + @ExcelProperty(value = "发布日期",index = 6) @ColumnWidth(20) @ApiModelProperty("发布日期") @TableField(exist = false) @@ -98,6 +98,12 @@ public class EarlyWarningEO extends BaseEntity { @TableField(exist = false) private String itemsName; + @ExcelProperty(value = "条款内容",index = 5) + @ColumnWidth(60) + @ApiModelProperty("条款内容") + @TableField(exist = false) + private String termsConditions; + @ExcelIgnore @TableField("POLICY_ID") private String policyId; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java index db2f7b95..e3041f7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningExportVO.java @@ -11,18 +11,18 @@ public class WarningExportVO extends EarlyWarningEO { - @ExcelProperty(value = "实施日期",index = 6) + @ExcelProperty(value = "实施日期",index = 7) @ColumnWidth(20) @ApiModelProperty("实施日期") private String SSRQ; - @ExcelProperty(value = "新车型实施日期",index = 7) + @ExcelProperty(value = "新车型实施日期",index = 8) @ColumnWidth(20) @ApiModelProperty("新车型实施日期") private String XCXSSRQ; - @ExcelProperty(value = "在产车实施日期",index = 8) + @ExcelProperty(value = "在产车实施日期",index = 9) @ColumnWidth(20) @ApiModelProperty("在产车实施日期") private String ZCCSSRQ; @@ -31,7 +31,7 @@ public class WarningExportVO extends EarlyWarningEO { @ApiModelProperty("标准类别显示") private String standTypeShow; - @ExcelProperty(value = "适用车型",index = 9) + @ExcelProperty(value = "适用车型",index = 10) @ColumnWidth(20) @ApiModelProperty("适用车型展示") private String applyTypeShow;