From 84a246ea06181308a6d2640ec214076914e66622 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 15 Jan 2022 17:02:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81,?= =?UTF-8?q?=E7=94=B1=E4=BA=8E=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8E=E4=B8=8D=E4=B8=8E=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E7=9B=B8=E5=90=8C,=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E5=87=86=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/scheduled/ScheduledJob.java | 41 ++++++++++--------- .../dao/SarStandardsInfoDao.java | 3 ++ .../SarStandardsInfoMapper.xml | 28 +++++++++++++ 3 files changed, 53 insertions(+), 19 deletions(-) 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 586a8736..da7a421a 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 @@ -230,7 +230,10 @@ public class ScheduledJob { List> replaceStandIdMaps = sarStandAttrInfoDao.selectMaps(columnForDTBJH); HashMap replaceIdCountMap = new HashMap<>(); // 格式为 T/CSAE 175-2021 - Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); + /** + * 国内外表准号格式不统一 + */ +// Pattern pattern = Pattern.compile("^\\S*\\s\\S*[\\u2014\\u002d\\s]\\d{4}$"); replaceStandIdMaps.forEach(item->{ if (item!=null){ //此标准代替的标准的标准号的数组 @@ -241,30 +244,30 @@ public class ScheduledJob { String[] DTBJHArray = DTBJHStr.split(","); for (String DTBJH : DTBJHArray) { - if (!pattern.matcher(DTBJH).matches()){ - continue; - } +// if (!pattern.matcher(DTBJH).matches()){ +// continue; +// } - String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 - String sort = split[0]; - String number = split[1]; - String year = split[2]; - - QueryWrapper infoWrapper = new QueryWrapper<>(); - infoWrapper.select("ID") - .eq("STAND_SORT", sort) - .eq("STAND_NUMBER", number) - .eq("STAND_YEAR", year); +// String[] split = DTBJH.split("[\\u2014\\u002d\\s]");//以空格或'-'或'—'分割 +// String sort = split[0]; +// String number = split[1]; +// String year = split[2]; +// +// QueryWrapper infoWrapper = new QueryWrapper<>(); +// infoWrapper.select("ID") +// .eq("STAND_SORT", sort) +// .eq("STAND_NUMBER", number) +// .eq("STAND_YEAR", year); - List> idMaps = sarStandardsInfoDao.selectMaps(infoWrapper); - if (idMaps.size() > 0) { - String standId = idMaps.get(0).get("ID").toString(); + List standId = sarStandardsInfoDao.selectIdFormDTBZH(DTBJH); + if (standId.size() > 0) { + //如果代替标准id已存在则映射为2不存在则添加并映射为1 if (replaceIdCountMap.containsKey(standId)) { - replaceIdCountMap.replace(standId, 2); + replaceIdCountMap.replace(standId.get(0), 2); } else { - replaceIdCountMap.put(standId, 1); + replaceIdCountMap.put(standId.get(0), 1); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 0b9dfd4b..07a0949b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -74,4 +74,7 @@ public interface SarStandardsInfoDao extends BaseMapper { int updateISRELATEACCESSById(@Param("IS_RELATE_ACCESS") String ACCESS,@Param("list") List list); + + List selectIdFormDTBZH(String DTBZHCode); + } 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 88544600..557e4d0b 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 @@ -1719,4 +1719,32 @@ ) tmp_tb limit ${pager.startIndex-1},${pageSize}) a + + +