JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】 SysDictServiceImpl.java文件

Browse Source
This commit is contained in:
tianwenbo
2023-03-07 11:27:00 +08:00
parent e6fdfdfafb
commit 63343886dd
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+11 -9
View File
@@ -82,9 +82,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override @Override
public Map<String, List<DictModel>> queryAllDictItems() { public Map<String, List<DictModel>> queryAllDictItems() {
Map<String, List<DictModel>> res = new HashMap<String, List<DictModel>>(); Map<String, List<DictModel>> res = new HashMap<>();
List<SysDict> ls = sysDictMapper.selectList(null); List<SysDict> ls = sysDictMapper.selectList(null);
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>(); LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysDictItem::getStatus, 1); queryWrapper.eq(SysDictItem::getStatus, 1);
queryWrapper.orderByAsc(SysDictItem::getSortOrder); queryWrapper.orderByAsc(SysDictItem::getSortOrder);
List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(queryWrapper); List<SysDictItem> sysDictItemList = sysDictItemMapper.selectList(queryWrapper);
@@ -200,7 +200,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
// 查询出来的顺序可能是乱的，需要排个序 // 查询出来的顺序可能是乱的，需要排个序
for (String key : keyArray) { for (String key : keyArray) {
List<DictModel> res = dicts.stream().filter(i -> key.equals(i.getValue())).collect(Collectors.toList()); List<DictModel> res = dicts.stream().filter(i -> key.equals(i.getValue())).collect(Collectors.toList());
if (res.size() > 0) { if (!res.isEmpty()) {
texts.add(res.get(0).getText()); texts.add(res.get(0).getText());
} else if (!delNotExist) { } else if (!delNotExist) {
texts.add(key); texts.add(key);
@@ -256,7 +256,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override @Override
public List<DictModel> queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageSize) { public List<DictModel> queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageSize) {
Page<DictModel> page = new Page<DictModel>(1, pageSize); Page<DictModel> page = new Page<>(1, pageSize);
page.setSearchCount(false); page.setSearchCount(false);
String filterSql = getFilterSql(text, code, condition, keyword); String filterSql = getFilterSql(text, code, condition, keyword);
IPage<DictModel> pageList = baseMapper.queryTableDictWithFilter(page, table, text, code, filterSql); IPage<DictModel> pageList = baseMapper.queryTableDictWithFilter(page, table, text, code, filterSql);
@@ -272,11 +272,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
* @return * @return
*/ */
private String getFilterSql(String text, String code, String condition, String keyword){ private String getFilterSql(String text, String code, String condition, String keyword){
String keywordSql = null, filterSql = "", sql_where = " where "; String keywordSql = null;
String filterSql = "";
String sql_where = " where ";
if(oConvertUtils.isNotEmpty(keyword)){ if(oConvertUtils.isNotEmpty(keyword)){
// 判断是否是多选 // 判断是否是多选
if (keyword.contains(",")) { if (keyword.contains(",")) {
String inKeywords = "\"" + keyword.replaceAll(",", "\",\"") + "\""; String inKeywords = "\"" + keyword.replace(",", "\",\"") + "\"";
keywordSql = "(" + text + " in (" + inKeywords + ") or " + code + " in (" + inKeywords + "))"; keywordSql = "(" + text + " in (" + inKeywords + ") or " + code + " in (" + inKeywords + "))";
} else { } else {
keywordSql = "("+text + " like '%"+keyword+"%' or "+ code + " like '%"+keyword+"%')"; keywordSql = "("+text + " like '%"+keyword+"%' or "+ code + " like '%"+keyword+"%')";
@@ -295,8 +297,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override @Override
public List<DictModel> queryAllTableDictItems(String table, String text, String code, String condition, String keyword) { public List<DictModel> queryAllTableDictItems(String table, String text, String code, String condition, String keyword) {
String filterSql = getFilterSql(text, code, condition, keyword); String filterSql = getFilterSql(text, code, condition, keyword);
List<DictModel> ls = baseMapper.queryAllTableDictItems(table, text, code, filterSql); // List<DictModel> ls = baseMapper.queryAllTableDictItems(table, text, code, filterSql);
return ls; return baseMapper.queryAllTableDictItems(table, text, code, filterSql);
} }
@Override @Override
@@ -331,7 +333,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
copyTreeSelectModel = newTreeSelectModel; copyTreeSelectModel = newTreeSelectModel;
} }
} }
System.out.println("aaa"); log.info("aaa");
// 遍历map里全部的节点，取出父节点放入list，并循环添加他的子节点 // 遍历map里全部的节点，取出父节点放入list，并循环添加他的子节点
List<TreeSelectModel> treeNodeList = new ArrayList<>(); List<TreeSelectModel> treeNodeList = new ArrayList<>();