From 143719dccc73221797f51b23f00a3fb2402a56b7 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 17 Nov 2022 13:42:02 +0800 Subject: [PATCH] =?UTF-8?q?249-=E9=85=8D=E7=BD=AE=E6=A0=87=E5=87=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 31 +++++++++++--- .../impl/SarStandardsInfoServiceImpl.java | 40 ++++++++++++------- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index c54094ce..6b67f662 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -62,6 +62,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; import org.apache.commons.beanutils.BeanUtils; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.json.JSONTokener; import org.slf4j.Logger; @@ -1333,6 +1334,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + List menuOldIds = new ArrayList<>(); for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) { String standId = standardsInfoEO.getIdlist()[i]; sarStandMenuEO.setBussStandId(standId); @@ -1375,20 +1378,36 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldList = sarBussStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO); + } + } } else { sarStandMenuEO.setOldMenuId(secondLevelId); - List menuOldIds = new ArrayList<>(); if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { menuOldIds = iSarMenuStandardService.getChildMenuList(secondLevelId); sarStandMenuEO.setMenuIds(menuOldIds); sarStandMenuEO.setId(getInfo.get(0).getId()); op = sarBussStandMenuEODao.updateById(sarStandMenuEO); }else { - menuOldIds= iTsResourceService.getChildMenuList(secondLevelId); - sarStandMenuEO.setMenuIds(menuOldIds); - op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); +// menuOldIds= iTsResourceService.getChildMenuList(secondLevelId); +// sarStandMenuEO.setMenuIds(menuOldIds); +// op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); + + queryWrapper.lambda().eq(SarBussStandMenu::getBussStandId, standId); + List oldList = sarBussStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarBussStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO); + } + } } } if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { 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 fb76f09c..ca1a179e 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 @@ -86,6 +86,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.util.PDFTextStripper; @@ -3099,6 +3100,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + List menuOldIds = new ArrayList<>(); for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) { sarStandMenuEO.setStandId(standardsInfoEO.getIdlist()[i]); sarStandMenuEO.setId(null); @@ -3125,21 +3128,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl0){ -// return true; -// } - } else { - sarStandMenuEO.setOldMenuId(secondLevelId); - List menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId); - sarStandMenuEO.setMenuIds(menuOldIds); - int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); -// if (size>0) { -// return true; -// } + queryWrapper.lambda().eq(SarStandMenu::getStandId, standardsInfoEO.getIdlist()[i]); + List oldList = sarStandMenuEODao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(oldList)) { + menuOldIds = oldList.stream().map(SarStandMenu::getMenuId).collect(Collectors.toList()); + if (!menuOldIds.contains(nowMenuId)) { + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + int size = sarStandMenuEODao.insert(sarStandMenuEO); + } } +// if (getInfo == null || getInfo.isEmpty()) { +// sarStandMenuEO.setId(UUIDUtils.randomUUID20()); +// int size = sarStandMenuEODao.insert(sarStandMenuEO); +//// if (size>0){ +//// return true; +//// } +// } else { +// sarStandMenuEO.setOldMenuId(secondLevelId); +// List menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId); +// sarStandMenuEO.setMenuIds(menuOldIds); +// int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); +//// if (size>0) { +//// return true; +//// } +// } } return true; }