|
|
|
@@ -14,10 +14,7 @@ import org.springframework.util.CollectionUtils; |
|
|
|
|
|
|
|
import java.lang.reflect.Method; |
|
|
|
import java.text.MessageFormat; |
|
|
|
import java.util.Collection; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Objects; |
|
|
|
import java.util.*; |
|
|
|
import java.util.function.Function; |
|
|
|
import java.util.function.Predicate; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
@@ -28,23 +25,21 @@ public class InvestHelper { |
|
|
|
Page<T> page = new Page<>(); |
|
|
|
page.setCurrent(pageQuery.getPageNum()); |
|
|
|
page.setSize(pageQuery.getPageSize()); |
|
|
|
page.setAscs(camelToUnderline(pageQuery.getAscs())); |
|
|
|
page.setDescs(camelToUnderline(pageQuery.getDescs())); |
|
|
|
camelToUnderline(pageQuery.getSortColumn(), pageQuery.getSortOrder(), page); |
|
|
|
page.setOptimizeCountSql(true); |
|
|
|
page.setSearchCount(true); |
|
|
|
return page; |
|
|
|
} |
|
|
|
|
|
|
|
private static List<String> camelToUnderline(List<String> orders) { |
|
|
|
if (CollectionUtils.isEmpty(orders)) { |
|
|
|
return orders; |
|
|
|
private static void camelToUnderline(String sortColumn, String sortOrder, Page page) { |
|
|
|
if (StringUtils.isEmpty(sortColumn)) { |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
List<String> newOrders = Lists.newArrayList(); |
|
|
|
for (String order : orders) { |
|
|
|
newOrders.add(StringUtils.camelToUnderline(order)); |
|
|
|
if (Objects.equals(sortOrder, "desc")) { |
|
|
|
page.setDesc(sortColumn); |
|
|
|
} else { |
|
|
|
page.setAsc(sortColumn); |
|
|
|
} |
|
|
|
return newOrders; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|