diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index ba3e5415..7914ac22 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -82,9 +82,9 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public Map> queryAllDictItems() { - Map> res = new HashMap>(); + Map> res = new HashMap<>(); List ls = sysDictMapper.selectList(null); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysDictItem::getStatus, 1); queryWrapper.orderByAsc(SysDictItem::getSortOrder); List sysDictItemList = sysDictItemMapper.selectList(queryWrapper); @@ -147,7 +147,7 @@ public class SysDictServiceImpl extends ServiceImpl impl log.debug("无缓存dictTableList的时候调用这里！"); return sysDictMapper.queryTableDictItemsByCodeAndFilter(table,text,code,filterSql); } - + /** * 通过查询指定table的 text code 获取字典值text * dictTableCache采用redis缓存有效期10分钟 @@ -200,7 +200,7 @@ public class SysDictServiceImpl extends ServiceImpl impl // 查询出来的顺序可能是乱的，需要排个序 for (String key : keyArray) { List 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()); } else if (!delNotExist) { texts.add(key); @@ -248,7 +248,7 @@ public class SysDictServiceImpl extends ServiceImpl impl public List queryAllUserBackDictModel() { return baseMapper.queryAllUserBackDictModel(); } - + @Override public List queryTableDictItems(String table, String text, String code, String keyword) { return baseMapper.queryTableDictItems(table, text, code, "%"+keyword+"%"); @@ -256,7 +256,7 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public List queryLittleTableDictItems(String table, String text, String code, String condition, String keyword, int pageSize) { - Page page = new Page(1, pageSize); + Page page = new Page<>(1, pageSize); page.setSearchCount(false); String filterSql = getFilterSql(text, code, condition, keyword); IPage pageList = baseMapper.queryTableDictWithFilter(page, table, text, code, filterSql); @@ -272,11 +272,13 @@ public class SysDictServiceImpl extends ServiceImpl impl * @return */ 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 (keyword.contains(",")) { - String inKeywords = "\"" + keyword.replaceAll(",", "\",\"") + "\""; + String inKeywords = "\"" + keyword.replace(",", "\",\"") + "\""; keywordSql = "(" + text + " in (" + inKeywords + ") or " + code + " in (" + inKeywords + "))"; } else { keywordSql = "("+text + " like '%"+keyword+"%' or "+ code + " like '%"+keyword+"%')"; @@ -295,8 +297,8 @@ public class SysDictServiceImpl extends ServiceImpl impl @Override public List queryAllTableDictItems(String table, String text, String code, String condition, String keyword) { String filterSql = getFilterSql(text, code, condition, keyword); - List ls = baseMapper.queryAllTableDictItems(table, text, code, filterSql); - return ls; +// List ls = baseMapper.queryAllTableDictItems(table, text, code, filterSql); + return baseMapper.queryAllTableDictItems(table, text, code, filterSql); } @Override @@ -331,7 +333,7 @@ public class SysDictServiceImpl extends ServiceImpl impl copyTreeSelectModel = newTreeSelectModel; } } - System.out.println("aaa"); + log.info("aaa"); // 遍历map里全部的节点，取出父节点放入list，并循环添加他的子节点 List treeNodeList = new ArrayList<>(); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysGatewayRouteServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysGatewayRouteServiceImpl.java index a93031f3..d685e2ff 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysGatewayRouteServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysGatewayRouteServiceImpl.java @@ -37,7 +37,7 @@ public class SysGatewayRouteServiceImpl extends ServiceImpl ls = this.list(new LambdaQueryWrapper()); + List ls = this.list(new LambdaQueryWrapper<>()); redisTemplate.opsForValue().set(key, JSON.toJSONString(ls)); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysLogServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysLogServiceImpl.java index 9a119665..8b429205 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysLogServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysLogServiceImpl.java @@ -1,13 +1,7 @@ package com.jero.modules.system.service.impl; -import java.sql.SQLException; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.annotation.Resource; - import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.util.CommonUtils; import com.jero.modules.system.entity.SysLog; @@ -16,7 +10,10 @@ import com.jero.modules.system.service.ISysLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; /** *

@@ -33,7 +30,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme private SysLogMapper sysLogMapper; @Autowired private ISysBaseAPI sysBaseAPI; - + /** * @功能：清空所有日志记录 */ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java index 43e9cb42..dd959cbe 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysPermissionDataRuleImpl.java @@ -41,11 +41,11 @@ public class SysPermissionDataRuleImpl extends ServiceImpl getPermRuleListByPermId(String permissionId) { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysPermissionDataRule::getPermissionId, permissionId); query.orderByDesc(SysPermissionDataRule::getCreateTime); - List permRuleList = this.list(query); - return permRuleList; +// List permRuleList = this.list(query); + return this.list(query); } /** @@ -61,11 +61,11 @@ public class SysPermissionDataRuleImpl extends ServiceImpl queryPermissionDataRules(String username,String permissionId) { List idsList = this.baseMapper.queryDataRuleIds(username, permissionId); //update-begin--Author:scott Date:20191119 for：数据权限失效问题处理-------------------- - if(idsList==null || idsList.size()==0) { + if(idsList==null || idsList.isEmpty()) { return null; } //update-end--Author:scott Date:20191119 for：数据权限失效问题处理-------------------- - Set set = new HashSet(); + Set set = new HashSet<>(); for (String ids : idsList) { if(oConvertUtils.isEmpty(ids)) { continue; @@ -77,7 +77,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl().in("id", set).eq("status",CommonConstant.STATUS_1)); @@ -110,7 +110,7 @@ public class SysPermissionDataRuleImpl extends ServiceImpl