FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!158
This commit is contained in:
super_liu
2021-09-08 11:06:25 +08:00
parent 5d8e14befe 7fab612a90
commit 692feda363
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+10 -1
View File
@@ -224,6 +224,7 @@ public class ScheduledJob {
//数据格式: (GB 123-2000,GB 4233434-2021,GB 423423423-2021) //数据格式: (GB 123-2000,GB 4233434-2021,GB 423423423-2021)
if (!DTBJHStr.equals("")){ if (!DTBJHStr.equals("")){
try{
String[] DTBJHArray = DTBJHStr.split(","); String[] DTBJHArray = DTBJHStr.split(",");
for (String DTBJH : DTBJHArray) { for (String DTBJH : DTBJHArray) {
String[] sortAndNumberAndYear = DTBJH.split("\\s+"); String[] sortAndNumberAndYear = DTBJH.split("\\s+");
@@ -241,8 +242,8 @@ public class ScheduledJob {
List<Map<String, Object>> idMaps = sarStandardsInfoDao.selectMaps(infoWrapper); List<Map<String, Object>> idMaps = sarStandardsInfoDao.selectMaps(infoWrapper);
if (idMaps.size()>0){
String standId = idMaps.get(0).get("ID").toString(); String standId = idMaps.get(0).get("ID").toString();
//如果代替标准id已存在则映射为2不存在则添加并映射为1 //如果代替标准id已存在则映射为2不存在则添加并映射为1
if (replaceIdCountMap.containsKey(standId)) { if (replaceIdCountMap.containsKey(standId)) {
replaceIdCountMap.replace(standId,2); replaceIdCountMap.replace(standId,2);
@@ -251,6 +252,14 @@ public class ScheduledJob {
} }
} }
}
}catch (Exception e){
System.out.println("=====错误===="+item+"=====错误=====");
}
} }