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 a54807ac..aad97d2d 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 @@ -116,6 +116,9 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) + .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) + .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standNatureName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("textStatusName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -160,7 +163,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) + .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")) + .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*")); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -247,7 +253,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*" +searchInfoEO.getSelectValue().toUpperCase()+ "*").boost(1002f)) .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)); + .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)) + .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) + .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -262,7 +271,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("standYear.keyword", searchInfoEO.getSelectValue().toUpperCase()).boost(1003f)) .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*" +searchInfoEO.getSelectValue().toUpperCase()+ "*").boost(1002f)) .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)) - .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)); + .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(999f)) + .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) + .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)); break; default: break; } @@ -409,7 +421,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) + .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)); break; case "laws": boolQueryShould.should(QueryBuilders.wildcardQuery("lawsNumber.keyword", "*"+searchInfoEO.getSelectValue()+"*")) @@ -431,7 +446,10 @@ public class SearchCenterServiceImpl implements SearchCenterService { boolQueryShould.should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("stand_name.keyword", "*"+searchInfoEO.getSelectValue()+"*")) .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + .should(QueryBuilders.wildcardQuery("nameshow.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("numberShowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(999f)) + .should(QueryBuilders.wildcardQuery("nameshowBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)) + .should(QueryBuilders.wildcardQuery("standEnNameBig.keyword", "*"+searchInfoEO.getSelectValue().toUpperCase()+"*").boost(1002f)); if (isRqFormat(searchInfoEO.getSelectValue())) { Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); @@ -1463,8 +1481,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){ QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery(""); multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + "sortTitle","numberTitle","yearOrder","nameTitle","title","titleBig","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("titleBig",1000f).field("textContent",100f).field("issue_time",10f); boolQueryBuilder.must(multiQueryBuilder); } //在结果中检索 @@ -1615,7 +1633,8 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("numberTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1004f)) .should(QueryBuilders.wildcardQuery("yearOrder.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1003f)) .should(QueryBuilders.wildcardQuery("nameTitle.keyword","*" + searchInfoEO.getSelectValue() + "*").boost(1002f)) - .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f)); + .should(QueryBuilders.wildcardQuery("title.keyword", "*" + searchInfoEO.getSelectValue() + "*").boost(1000f)) + .should(QueryBuilders.wildcardQuery("titleBig.keyword", "*" + searchInfoEO.getSelectValue().toUpperCase() + "*").boost(1000f)); // queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), // "sortTitle","numberTitle","yearOrder","nameTitle","title" // ).field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f); @@ -1961,16 +1980,16 @@ public class SearchCenterServiceImpl implements SearchCenterService { if (null != value && select == null) { QueryBuilder queryBuilder1 = QueryBuilders.multiMatchQuery(""); queryBuilder1 = QueryBuilders.multiMatchQuery(value, - "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + "sortTitle","numberTitle","yearOrder","nameTitle","title","titleBig","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("titleBig",1000f).field("textContent",100f).field("issue_time",10f); boolQueryShould.must(queryBuilder1); } // searchInfoEO.setSelectValue(searchInfoEO.getSelectValue().replace("-","\\-")); if (null != select) { QueryBuilder queryBuilder2 = QueryBuilders.multiMatchQuery(""); queryBuilder2 = QueryBuilders.multiMatchQuery(real, - "sortTitle","numberTitle","yearOrder","nameTitle","title","textContent","issue_time" - ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("textContent",100f).field("issue_time",10f); + "sortTitle","numberTitle","yearOrder","nameTitle","title","titleBig","textContent","issue_time" + ).minimumShouldMatch("100%").field("sortTitle",1005f).field("numberTitle",1004f).field("yearOrder",1003f).field("nameTitle",1002f).field("title",1000f).field("titleBig",1000f).field("textContent",100f).field("issue_time",10f); boolQueryShould.must(queryBuilder2); // for (String se : selects) { // if (StringUtils.isNotBlank(se)) { 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 5806c642..3ccd1ab0 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 @@ -164,6 +164,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { boolean isForeign = false; Map fullTextSearchEO = new HashMap<>(); + fullTextSearchEO.put("titleBig",attrInfoMap.get("sortTitle")); Map mapItems = new TreeMap<>(); if(attrInfoMap.get("mapItems") != null){ mapItems = net.sf.json.JSONObject.fromObject(attrInfoMap.get("mapItems").toString()); @@ -463,6 +464,8 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { logger.info("err:" + errFilter(e.getMessage())); } } + String title = String.valueOf(fullTextSearchEO.getOrDefault("title","")); + fullTextSearchEO.put("titleBig",title.toUpperCase()); return fullTextSearchEO; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 3df6114e..c3321cf7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -227,6 +227,10 @@ public class SendBussMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + String numberShow = String.valueOf(saveMap.get("numbershow")); + if (!"null".equals(numberShow) && StringUtils.isNotBlank(numberShow)) { + saveMap.put("titleBig", numberShow.toUpperCase()); + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java index 948feed8..18937562 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendLawsMQService.java @@ -275,6 +275,10 @@ public class SendLawsMQService { context = context.replace(",,", ","); saveMap.put("content", context); } + String numberShow = String.valueOf(saveMap.get("numbershow")); + if (!"null".equals(numberShow) && StringUtils.isNotBlank(numberShow)) { + saveMap.put("titleBig", numberShow.toUpperCase()); + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { 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 ff10623f..80f7c1ec 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 @@ -262,6 +262,18 @@ public class SendStandMQService { // if(StringUtils.isNotBlank(String.valueOf(saveMap.get("ZCCSSRQ")))) { // saveMap.put("ZCCSSRQ"," " + String.valueOf(saveMap.get("ZCCSSRQ"))); // } + String numberShow = String.valueOf(saveMap.get("numbershow")); + if (!"null".equals(numberShow) && StringUtils.isNotBlank(numberShow)) { + saveMap.put("numberShowBig", numberShow.toUpperCase()); + } + String nameshow = String.valueOf(saveMap.get("nameshow")); + if (!"null".equals(nameshow) && StringUtils.isNotBlank(nameshow)) { + saveMap.put("nameshowBig", nameshow.toUpperCase()); + } + String standEnName = String.valueOf(saveMap.get("standEnName")); + if (!"null".equals(standEnName) && StringUtils.isNotBlank(standEnName)) { + saveMap.put("standEnNameBig", standEnName.toUpperCase()); + } if("add".equals(addOrUpdate)){ sarStandardsInfoService.insertIntoIndexForMap(saveMap); } else { diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java index 15007290..14f076a5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java @@ -23,6 +23,7 @@ import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.extern.slf4j.Slf4j; import net.sf.json.JSONObject; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -155,7 +156,7 @@ public class ScheduledJob { BeanUtils.copyProperties(item, warningDate); warningDate.setId(UUIDUtils.randomUUID20()); warningDate.setSSRQ(s); - warningDate.setFileType("0"); + warningDate.setType("0"); data.add(warningDate); } } @@ -163,13 +164,16 @@ public class ScheduledJob { //此处开始处理条款中的预警数据 //查询符合预警期限的标准 多个 List warningDateOfItems = sarStandardWarningDao.getWarningDateOfItems(term); + //第二步便利相同的 +// List second = sarStandardWarningDao.getWarningDateOfItems(term); + Map> standMap = new HashMap<>(); warningDateOfItems.forEach(item -> { for (String s : item.getSSRQ().split(",")) { - String id = item.getLawId(); - if (id.equals("vgh0j186ve7uhxjelctt")){ - System.out.println(id); - } - System.out.println(id); +// String id = item.getLawId(); +// if (id.equals("vgh0j186ve7uhxjelctt")){ +// System.out.println(id); +// } +// System.out.println(id); String pattern = term.getTermStr(); Pattern r = Pattern.compile(pattern); Matcher m = r.matcher(s); @@ -177,22 +181,32 @@ public class ScheduledJob { if (m.matches()) { //此处判断当前条款的数据是否是最新状态的 String lawsId = item.getLawId(); - String fileType =item.getFileType(); - String textState = sarStandardWarningDao.getStandTextStateByStandId(lawsId); - if(StringUtils.isNotBlank(textState)){ - String convertFileType = convertTextStateToItemType(textState); - if(StringUtils.isNotBlank(convertFileType) && fileType.equals(convertFileType)){ - WarningDate warningDate = new WarningDate(); - BeanUtils.copyProperties(item, warningDate); - warningDate.setId(UUIDUtils.randomUUID20()); - warningDate.setSSRQ(s); - warningDate.setFileType("1"); - data.add(warningDate); - } +// String fileType =item.getFileType(); +// String textState = sarStandardWarningDao.getStandTextStateByStandId(lawsId); + List warningDates = null; + if(standMap.containsKey(lawsId)){ + warningDates = standMap.get(lawsId); + }else{ + warningDates=new ArrayList<>(); } + WarningDate warningDate = new WarningDate(); + BeanUtils.copyProperties(item, warningDate); + warningDate.setId(UUIDUtils.randomUUID20()); + warningDate.setSSRQ(s); + warningDate.setType("1"); + warningDates.add(warningDate); + standMap.put(lawsId,warningDates); } } }); + for (String lawId : standMap.keySet()){ + List warningDates = standMap.get(lawId); + List warningDateSend = compareState(warningDates); + if (null != warningDateSend) { + data.addAll(warningDateSend); + } + } + //清空标准的日期子表 iWarningDateService.remove(null); // 保存进入标准的日期子表 保存标准的实施日期 新车型实施日期 在产车实施日期 多个 @@ -216,6 +230,60 @@ public class ScheduledJob { } } + private List compareState(List warningDates){ + List ca = new ArrayList<>(); + List zqyjg = new ArrayList<>(); + List bpg = new ArrayList<>(); + List ssg = new ArrayList<>(); + List fbgbjbd = new ArrayList<>(); + for (WarningDate warningDate :warningDates){ + if (null == warningDate.getFileType()){ + warningDate.setFileType(""); + } + switch (warningDate.getFileType()){ + case "CA"://草稿 + ca.add(warningDate); +// fileType="CA"; + break; + case "ZQYJG"://征求意见稿 + zqyjg.add(warningDate); +// fileType="ZQYJG"; + break; + case "BPG"://报批稿 + bpg.add(warningDate); +// fileType="BPG"; + break; + case "SSG"://送审稿 + ssg.add(warningDate); +// fileType="SSG"; + break; + case "FBGBJBD"://发布稿 + fbgbjbd.add(warningDate); +// fileType="FBGBJBD"; + break; +// case "vsaga7nwub"://已实施 +// fbgbjbd.add(warningDate); +//// fileType="FBGBJBD"; +// break; + default: + break; + } + } + if (!CollectionUtils.isEmpty(fbgbjbd)){ + return fbgbjbd; + }else if (!CollectionUtils.isEmpty(ssg)){ + return ssg; + }else if (!CollectionUtils.isEmpty(bpg)){ + return bpg; + }else if (!CollectionUtils.isEmpty(zqyjg)){ + return zqyjg; + }else if (!CollectionUtils.isEmpty(ca)){ + return ca; + }else{ + return null; + } + } + /** * 将文本状态转换成文件类型 * @param textState diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java index 7294e1c3..6daf49a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenu/service/impl/SarMenuServiceImpl.java @@ -175,6 +175,7 @@ public class SarMenuServiceImpl extends ServiceImpl impleme QueryWrapper sarMenuQueryWrapper=new QueryWrapper<>(); sarMenuQueryWrapper.orderByAsc("DISPLAY_SEQ"); sarMenuQueryWrapper.isNull("PARENT_ID"); + sarMenuQueryWrapper.eq("VALID_FLAG","0"); List sarMenus=dao.selectList(sarMenuQueryWrapper); for(SarMenu sarMenu:sarMenus){ sarMenu.setChildren(recursionGetChildren((sarMenu))); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java index a0c63994..1bcd8c59 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java @@ -24,5 +24,8 @@ public class WarningDate { private String timeName; @TableField("type") + private String type; + + @TableField(exist = false) private String fileType; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index d7be73ee..7581859b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -1666,6 +1666,34 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl result = dao.selectStandardsByStandnumber(sarStandardsSelectEO); + if (result != null && result.size() > 0) { + String standId = result.get(0).getId(); + String field = "BDTBZH"; + String citedStand = sarStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId()); + String changeCitedStand = ""; + if (StringUtils.isNotBlank(citedStand)) { + String[] beforerepalced = citedStand.split(","); + ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced)); + if (beforlist.contains(beforeStrandNumber)) { + beforlist.remove(beforeStrandNumber); + changeCitedStand = StringUtils.join(beforlist.toArray(), ","); + } else { + continue; + } + sarStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand); + } + } + } + } + } } } @@ -1953,7 +1981,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl