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

249-配置标准bug修改

Browse Source
This commit is contained in:
liyawei
2022-11-17 13:42:02 +08:00
parent a41ec08f4f
commit 143719dccc
2 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+25 -6
View File
@@ -62,6 +62,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.json.JSONTokener; import org.json.JSONTokener;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -1333,6 +1334,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
String treeType = standardsInfoEO.getTreeType(); String treeType = standardsInfoEO.getTreeType();
String menuName = standardsInfoEO.getMenuName(); String menuName = standardsInfoEO.getMenuName();
sarStandMenuEO.setMenuId(nowMenuId); sarStandMenuEO.setMenuId(nowMenuId);
QueryWrapper<SarBussStandMenu> queryWrapper = new QueryWrapper<>();
List<String> menuOldIds = new ArrayList<>();
for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) { for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) {
String standId = standardsInfoEO.getIdlist()[i]; String standId = standardsInfoEO.getIdlist()[i];
sarStandMenuEO.setBussStandId(standId); sarStandMenuEO.setBussStandId(standId);
@@ -1375,20 +1378,36 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
sarBussStandMenuEODao.deleteByStandIdAndMenuId(sarStandMenuDel); sarBussStandMenuEODao.deleteByStandIdAndMenuId(sarStandMenuDel);
int op = 0; int op = 0;
if (getInfo == null || getInfo.isEmpty()) { if (getInfo == null || getInfo.isEmpty()) {
sarStandMenuEO.setId(UUIDUtils.randomUUID20()); queryWrapper.lambda().eq(SarBussStandMenu::getBussStandId, standId);
op = sarBussStandMenuEODao.insertSelective(sarStandMenuEO); List<SarBussStandMenu> 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 { } else {
sarStandMenuEO.setOldMenuId(secondLevelId); sarStandMenuEO.setOldMenuId(secondLevelId);
List<String> menuOldIds = new ArrayList<>();
if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) { if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) {
menuOldIds = iSarMenuStandardService.getChildMenuList(secondLevelId); menuOldIds = iSarMenuStandardService.getChildMenuList(secondLevelId);
sarStandMenuEO.setMenuIds(menuOldIds); sarStandMenuEO.setMenuIds(menuOldIds);
sarStandMenuEO.setId(getInfo.get(0).getId()); sarStandMenuEO.setId(getInfo.get(0).getId());
op = sarBussStandMenuEODao.updateById(sarStandMenuEO); op = sarBussStandMenuEODao.updateById(sarStandMenuEO);
}else { }else {
menuOldIds= iTsResourceService.getChildMenuList(secondLevelId); // menuOldIds= iTsResourceService.getChildMenuList(secondLevelId);
sarStandMenuEO.setMenuIds(menuOldIds); // sarStandMenuEO.setMenuIds(menuOldIds);
op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO); // op = sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
queryWrapper.lambda().eq(SarBussStandMenu::getBussStandId, standId);
List<SarBussStandMenu> 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)) { if(StringUtils.isNotBlank(treeType) && "sarMs".equals(treeType)) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+26 -14
View File
@@ -86,6 +86,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.util.PDFTextStripper; import org.apache.pdfbox.util.PDFTextStripper;
@@ -3099,6 +3100,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
SarStandMenu sarStandMenuEO = new SarStandMenu(); SarStandMenu sarStandMenuEO = new SarStandMenu();
String nowMenuId = standardsInfoEO.getMenuId(); String nowMenuId = standardsInfoEO.getMenuId();
sarStandMenuEO.setMenuId(nowMenuId); sarStandMenuEO.setMenuId(nowMenuId);
QueryWrapper<SarStandMenu> queryWrapper = new QueryWrapper<>();
List<String> menuOldIds = new ArrayList<>();
for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) { for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) {
sarStandMenuEO.setStandId(standardsInfoEO.getIdlist()[i]); sarStandMenuEO.setStandId(standardsInfoEO.getIdlist()[i]);
sarStandMenuEO.setId(null); sarStandMenuEO.setId(null);
@@ -3125,21 +3128,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
sarStandMenuDel.setMenuId(standardsInfoEO.getRootMenuId()); sarStandMenuDel.setMenuId(standardsInfoEO.getRootMenuId());
sarStandMenuEODao.deleteByStandIdAndMenuId(sarStandMenuDel); sarStandMenuEODao.deleteByStandIdAndMenuId(sarStandMenuDel);
//重新配置到相应节点 //重新配置到相应节点
if (getInfo == null || getInfo.isEmpty()) { queryWrapper.lambda().eq(SarStandMenu::getStandId, standardsInfoEO.getIdlist()[i]);
sarStandMenuEO.setId(UUIDUtils.randomUUID20()); List<SarStandMenu> oldList = sarStandMenuEODao.selectList(queryWrapper);
int size = sarStandMenuEODao.insert(sarStandMenuEO); if (CollectionUtils.isNotEmpty(oldList)) {
// if (size>0){ menuOldIds = oldList.stream().map(SarStandMenu::getMenuId).collect(Collectors.toList());
// return true; if (!menuOldIds.contains(nowMenuId)) {
// } sarStandMenuEO.setId(UUIDUtils.randomUUID20());
} else { int size = sarStandMenuEODao.insert(sarStandMenuEO);
sarStandMenuEO.setOldMenuId(secondLevelId); }
List<String> menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId);
sarStandMenuEO.setMenuIds(menuOldIds);
int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
// if (size>0) {
// return true;
// }
} }
// if (getInfo == null || getInfo.isEmpty()) {
// sarStandMenuEO.setId(UUIDUtils.randomUUID20());
// int size = sarStandMenuEODao.insert(sarStandMenuEO);
//// if (size>0){
//// return true;
//// }
// } else {
// sarStandMenuEO.setOldMenuId(secondLevelId);
// List<String> menuOldIds = sarMenuEOService.getChildMenuList(secondLevelId);
// sarStandMenuEO.setMenuIds(menuOldIds);
// int size = sarStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
//// if (size>0) {
//// return true;
//// }
// }
} }
return true; return true;
} }