p85126437
/
datagear
forked from p81075629/datagear
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

[web]移除UserController中已废弃的内存关键字搜索逻辑

This commit is contained in:
datagear 2018-10-25 16:22:05 +08:00
parent ccc8c98291
commit 6d9c71948f
2 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisService.java
View File

@ -440,7 +440,7 @@ public abstract class AbstractMybatisService<T> extends SqlSessionDaoSupport
if (keyword != null && !keyword.isEmpty())
{
if (!keyword.startsWith("%") && !keyword.endsWith("%"))
keyword = keyword + "%";
keyword = "%" + keyword + "%";
param.put(QUERY_PARAM_KEYWORD, keyword);
}

23
datagear-web/src/main/java/org/datagear/web/controller/UserController.java
View File

@ -9,7 +9,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.datagear.dbinfo.TableInfo;
import org.datagear.management.domain.User;
import org.datagear.management.service.SchemaService;
import org.datagear.management.service.UserService;
@ -17,7 +16,6 @@ import org.datagear.persistence.PagingQuery;
import org.datagear.persistence.support.UUID;
import org.datagear.web.OperationMessage;
import org.datagear.web.convert.ClassDataConverter;
import org.datagear.web.util.KeywordMatcher;
import org.datagear.web.util.WebUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.MessageSource;
@ -224,8 +222,6 @@ public class UserController extends AbstractController
List<User> users = this.userService.query(WebUtils.getUser(request, response), pagingQuery);
users = findByKeyword(users, pagingQuery.getKeyword());
return users;
}
@ -273,25 +269,6 @@ public class UserController extends AbstractController
return buildOperationMessageSaveSuccessResponseEntity(request);
}
/**
* 根据表名称关键字查询{@linkplain TableInfo}列表。
*
* @param users
* @param tableNameKeyword
* @return
*/
protected List<User> findByKeyword(List<User> users, String keyword)
{
return KeywordMatcher.<User> match(users, keyword, new KeywordMatcher.MatchValue<User>()
{
@Override
public String[] get(User t)
{
return new String[] { t.getName() };
}
});
}
@Override
protected String buildMessageCode(String code)
{