Skip to content

Commit dc72745

Browse files
robinhood-jimrobinhood-jim
committed
vue sample update
1 parent 2f32841 commit dc72745

File tree

18 files changed

+196
-149
lines changed

18 files changed

+196
-149
lines changed

Diff for: ‎core/src/main/java/com/robin/core/base/dao/CommJdbcUtil.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import com.robin.core.base.exception.DAOException;
1919
import com.robin.core.base.reflect.ReflectUtils;
2020
import com.robin.core.base.util.Const;
21+
import com.robin.core.base.util.DateTimeFormatHolder;
2122
import com.robin.core.fileaccess.meta.DataCollectionMeta;
2223
import com.robin.core.fileaccess.meta.DataSetColumnMeta;
2324
import com.robin.core.query.util.PageQuery;
2425
import com.robin.core.query.util.QueryString;
2526
import com.robin.core.sql.util.BaseSqlGen;
26-
import com.robin.core.sql.util.FilterCondition;
2727
import lombok.NonNull;
2828
import org.apache.commons.dbutils.DbUtils;
2929
import org.apache.commons.lang3.StringUtils;
@@ -148,7 +148,7 @@ private static List<?> getResultList(@NonNull JdbcTemplate jdbcTemplate, LobHand
148148
rs.next();
149149
return rs.getInt(1);
150150
});
151-
pageQuery.setRecordCount(total);
151+
pageQuery.setTotal(total);
152152
if (total > 0) {
153153
setPageQueryParameter(pageQuery, total);
154154
String pageSQL = sqlGen.generatePageSql(querySQL, pageQuery);
@@ -164,7 +164,7 @@ private static List<?> getResultList(@NonNull JdbcTemplate jdbcTemplate, LobHand
164164
} else {
165165
list = getResultItems(jdbcTemplate, lobHandler, sqlGen, pageQuery, qs, querySQL);
166166
if (!CollectionUtils.isEmpty(list)) {
167-
pageQuery.setRecordCount(list.size());
167+
pageQuery.setTotal(list.size());
168168
}
169169
pageQuery.setPageCount(1);
170170
}
@@ -178,10 +178,10 @@ public static void setPageQueryParameter(PageQuery<Map<String, Object>> pageQuer
178178
}
179179
pageQuery.setPageCount(pages);
180180
//adjust pageNumber
181-
if (pageQuery.getPageNumber() > pages) {
182-
pageQuery.setPageNumber(pages);
183-
} else if (pageQuery.getPageNumber() < 1) {
184-
pageQuery.setPageNumber(1);
181+
if (pageQuery.getCurrentPage() > pages) {
182+
pageQuery.setCurrentPage(pages);
183+
} else if (pageQuery.getCurrentPage() < 1) {
184+
pageQuery.setCurrentPage(1);
185185
}
186186
}
187187

@@ -247,11 +247,11 @@ private static ResultSetExtractor<List<Map<String,Object>>> getDefaultExtract(fi
247247
putValue(fields, i, columnName, null, map);
248248
} else if ("DATE".equalsIgnoreCase(typeName)) {
249249
Date date = rs.getDate(i + 1);
250-
String datestr = query.getDateFormater().format(date);
250+
String datestr = DateTimeFormatHolder.getYmdFormatter().format(date.toInstant());
251251
putValue(fields, i, columnName, datestr, map);
252252
} else if ("TIMESTAMP".equalsIgnoreCase(typeName)) {
253253
Timestamp stamp = rs.getTimestamp(i + 1);
254-
String datestr = query.getTimestampFormater().format(new Date(stamp.getTime()));
254+
String datestr = DateTimeFormatHolder.getTimestampFormatter().format(stamp.toInstant());
255255
putValue(fields, i, columnName, datestr, map);
256256
} else if (className.toLowerCase().contains("clob")) {
257257
if (lobHandler != null) {
@@ -342,18 +342,18 @@ static void setTargetValue(Object target, Object value, String columnName, Strin
342342
throw new DAOException("Column " + columnName + " is not long value");
343343
}
344344
} else if (columnType.equals(Const.META_TYPE_DATE)) {
345-
if (value instanceof Date) {
346-
targetValue = value;
347-
} else if (value instanceof java.util.Date) {
345+
if (Date.class.isAssignableFrom(value.getClass()) || java.util.Date.class.isAssignableFrom(value.getClass()) || LocalDateTime.class.isAssignableFrom(value.getClass())) {
348346
targetValue = value;
349347
} else {
350-
targetValue = pageQuery.getDateFormater().parse(value.toString());
348+
LocalDateTime ds=LocalDateTime.parse(value.toString(),DateTimeFormatHolder.getTimestampFormatter());
349+
targetValue =new Timestamp(ds.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
351350
}
352351
} else if (columnType.equals(Const.META_TYPE_TIMESTAMP)) {
353-
if (value instanceof Timestamp) {
352+
if (Timestamp.class.isAssignableFrom(value.getClass()) || LocalDateTime.class.isAssignableFrom(value.getClass())) {
354353
targetValue = value;
355354
} else {
356-
targetValue = new Timestamp(pageQuery.getDateFormater().parse(value.toString()).getTime());
355+
LocalDateTime ds=LocalDateTime.parse(value.toString(),DateTimeFormatHolder.getTimestampFormatter());
356+
targetValue = new Timestamp(ds.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
357357
}
358358
} else {
359359
targetValue = value;
@@ -500,7 +500,7 @@ static void queryByPreparedParamter(JdbcTemplate jdbcTemplate, NamedParameterJdb
500500
} else {
501501
total = namedParameterJdbcTemplate.queryForObject(sumSQL, pageQuery.getNamedParameters(), Integer.class);
502502
}
503-
pageQuery.setRecordCount(total);
503+
pageQuery.setTotal(total);
504504
String pageSQL = sqlGen.generatePageSql(querySQL, pageQuery);
505505
if (logger.isDebugEnabled()) {
506506
logger.debug("sumSQL: {}", sumSQL);
@@ -520,7 +520,7 @@ static void queryByPreparedParamter(JdbcTemplate jdbcTemplate, NamedParameterJdb
520520
} else {
521521
list = getResultItemsByPreparedSimple(jdbcTemplate, namedParameterJdbcTemplate, lobHandler, sqlGen, qs, pageQuery, querySQL);
522522
int len1 = list.size();
523-
pageQuery.setRecordCount(len1);
523+
pageQuery.setTotal(len1);
524524
pageQuery.setPageCount(1);
525525
}
526526
} catch (Exception e) {
@@ -799,15 +799,15 @@ public static int executeByPreparedParamter(JdbcTemplate jdbcTemplate, BaseSqlGe
799799
}
800800

801801
public static void setPageQuery(PageQuery<Map<String, Object>> pageQuery, int total) {
802-
pageQuery.setRecordCount(total);
802+
pageQuery.setTotal(total);
803803
if (total > 0) {
804804
int pages = total / pageQuery.getPageSize();
805805
if (total % pageQuery.getPageSize() != 0) {
806806
pages++;
807807
}
808-
int pageNumber = pageQuery.getPageNumber();
808+
int pageNumber = pageQuery.getCurrentPage();
809809
if (pageNumber > pages) {
810-
pageQuery.setPageNumber(pages);
810+
pageQuery.setCurrentPage(pages);
811811
}
812812
pageQuery.setPageCount(pages);
813813
} else {

Diff for: ‎core/src/main/java/com/robin/core/base/dao/JdbcDao.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.robin.core.base.reflect.ReflectUtils;
2828
import com.robin.core.base.spring.SpringContextHolder;
2929
import com.robin.core.base.util.Const;
30-
import com.robin.core.base.util.IUserUtils;
3130
import com.robin.core.base.util.LicenseUtils;
3231
import com.robin.core.convert.util.ConvertUtil;
3332
import com.robin.core.fileaccess.meta.DataCollectionMeta;
@@ -52,9 +51,6 @@
5251

5352
import javax.sql.DataSource;
5453
import java.io.Serializable;
55-
import java.sql.PreparedStatement;
56-
import java.sql.SQLException;
57-
import java.sql.Timestamp;
5854
import java.util.*;
5955

6056
@Slf4j
@@ -93,7 +89,7 @@ public PageQuery<Map<String, Object>> queryByPageQuery(String querySQL, PageQuer
9389
try {
9490
String sumSQL = sqlGen.generateCountSql(querySQL);
9591
int total = this.returnTemplate().queryForObject(sumSQL, Integer.class);
96-
pageQuery.setRecordCount(total);
92+
pageQuery.setTotal(total);
9793
if (pageQuery.getPageSize() > 0) {
9894
String pageSQL = sqlGen.generatePageSql(querySQL, pageQuery);
9995
if (pageQuery.getOrder() != null && !"".equals(pageQuery.getOrder())) {
@@ -112,7 +108,7 @@ public PageQuery<Map<String, Object>> queryByPageQuery(String querySQL, PageQuer
112108
}
113109
} else {
114110
list = queryItemList(pageQuery, querySQL);
115-
pageQuery.setRecordCount(!CollectionUtils.isEmpty(list) ? list.size() : 0);
111+
pageQuery.setTotal(!CollectionUtils.isEmpty(list) ? list.size() : 0);
116112
pageQuery.setPageCount(1);
117113
}
118114
pageQuery.setRecordSet(list);
@@ -878,7 +874,7 @@ private static void extractQueryParts(FilterCondition condition, List<Object> ob
878874
}
879875

880876
private List<Map<String, Object>> queryItemList(final PageQuery<Map<String, Object>> qs, final String pageSQL) throws DAOException {
881-
int pageNum = qs.getPageNumber();
877+
int pageNum = qs.getCurrentPage();
882878
int pageSize = qs.getPageSize();
883879
int start = 0;
884880
int end = 0;

Diff for: ‎core/src/main/java/com/robin/core/base/util/Const.java

-11
Original file line numberDiff line numberDiff line change
@@ -471,18 +471,7 @@ public String getValue(){
471471
* 排序方式
472472
*/
473473
public static final String ORDER = "order";
474-
public enum ACCOUNTTYPE{
475-
ADMIN("1"),
476-
NORMAL("2");
477-
private String value;
478-
ACCOUNTTYPE(String value){
479-
this.value=value;
480-
}
481474

482-
public String getValue() {
483-
return value;
484-
}
485-
}
486475
public enum JOINTYPE{
487476
INNER("INNER"),
488477
LEFT("LEFT"),

Diff for: ‎core/src/main/java/com/robin/core/base/util/DateTimeFormatHolder.java

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package com.robin.core.base.util;
2+
3+
import org.springframework.util.ObjectUtils;
4+
5+
import java.time.format.DateTimeFormatter;
6+
7+
public class DateTimeFormatHolder {
8+
private static ThreadLocal<DateTimeFormatter> timestampFormatter=new ThreadLocal<>();
9+
private static ThreadLocal<DateTimeFormatter> yearFormatter=new ThreadLocal<>();
10+
private static ThreadLocal<DateTimeFormatter> ymdFormatter=new ThreadLocal<>();
11+
private DateTimeFormatHolder(){
12+
13+
}
14+
public static void setTimestampFormatter(DateTimeFormatter tsFormatter){
15+
timestampFormatter.set(tsFormatter);
16+
}
17+
public static void setYearFormatterFormatter(DateTimeFormatter tsFormatter){
18+
yearFormatter.set(tsFormatter);
19+
}
20+
public static void setYmdFormatterFormatter(DateTimeFormatter tsFormatter){
21+
ymdFormatter.set(tsFormatter);
22+
}
23+
public static DateTimeFormatter getTimestampFormatter(){
24+
if(ObjectUtils.isEmpty(timestampFormatter.get())){
25+
timestampFormatter.set(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
26+
}
27+
return timestampFormatter.get();
28+
}
29+
public static DateTimeFormatter getYmdFormatter(){
30+
if(ObjectUtils.isEmpty(timestampFormatter.get())){
31+
timestampFormatter.set(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
32+
}
33+
return timestampFormatter.get();
34+
}
35+
public static DateTimeFormatter getYearFormatter(){
36+
if(ObjectUtils.isEmpty(timestampFormatter.get())){
37+
timestampFormatter.set(DateTimeFormatter.ofPattern("yyyy"));
38+
}
39+
return timestampFormatter.get();
40+
}
41+
42+
}

Diff for: ‎core/src/main/java/com/robin/core/query/util/PageQuery.java

+12-37
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ public class PageQuery<T> implements Serializable {
3535

3636
protected Integer pageSize;
3737

38-
protected Integer pageNumber;
38+
protected Integer currentPage;
3939

40-
protected Integer recordCount;
40+
protected Integer total;
4141

42-
protected Integer pageCount;
42+
protected Integer pageCount;
4343

44-
protected String selectParamId;
44+
protected String selectParamId;
4545

4646
protected String order;
4747

@@ -55,26 +55,11 @@ public class PageQuery<T> implements Serializable {
5555
private List<Condition> conditions;
5656

5757
private List<T> recordSet=new ArrayList<>();
58-
59-
protected String querySql;
60-
61-
62-
protected String pageToolBar;
63-
protected String dateFormatString="yyyy-MM-dd";
64-
protected String timestampFormatString="yyyy-MM-dd HH:mm:ss";
65-
protected SimpleDateFormat dateFormater=null;
66-
protected SimpleDateFormat timestampFormater=null;
6758

6859
private Map<String, FilterCondition> conditionMap=new HashMap<>();
6960

70-
public static final String ASC = "asc";
71-
72-
public static final String DESC = "desc";
73-
public static final String DEFAULTQUERYSTRING="queryString";
74-
75-
7661
public PageQuery() {
77-
pageNumber = 1;
62+
currentPage = 1;
7863
pageSize = 10;
7964
}
8065
public PageQuery(String order, String orderDirection){
@@ -85,7 +70,7 @@ public PageQuery(Integer pageSize, Integer pageNumber, String order, String orde
8570
this.order=order;
8671
this.orderDirection=orderDirection;
8772
this.pageSize=pageSize;
88-
this.pageNumber=pageNumber;
73+
this.currentPage =pageNumber;
8974
}
9075

9176
public void setParameterWithKey(String key,String value){
@@ -96,23 +81,13 @@ public void setNameParameterWithKey(String key,Object value){
9681
namedParameters.put(key,value);
9782
}
9883

99-
public SimpleDateFormat getDateFormater(){
100-
if(dateFormater==null){
101-
dateFormater=new SimpleDateFormat(dateFormatString);
102-
}
103-
return dateFormater;
104-
}
105-
public SimpleDateFormat getTimestampFormater(){
106-
if(timestampFormater==null){
107-
timestampFormater=new SimpleDateFormat(timestampFormatString);
108-
}
109-
return timestampFormater;
110-
}
84+
85+
11186
public Map<String,Object> toMap(){
11287
Map<String,Object> retMap=new HashMap<>();
11388
retMap.put("pageSize",getPageSize());
114-
retMap.put("pageNo",getPageNumber());
115-
retMap.put("pageCount",getPageCount());
89+
retMap.put("pageNo", getCurrentPage());
90+
retMap.put("pageCount", getPageCount());
11691
Optional.ofNullable(getRecordSet()).map(f->retMap.put("values",getRecordSet()));
11792
return retMap;
11893
}
@@ -154,8 +129,8 @@ public Builder<T> setSelectedId(String selectedId){
154129
pageQuery.setSelectParamId(selectedId);
155130
return this;
156131
}
157-
public Builder<T> setPageNumber(Integer pageNumber){
158-
pageQuery.setPageNumber(pageNumber);
132+
public Builder<T> setCurrentPage(Integer pageNumber){
133+
pageQuery.setCurrentPage(pageNumber);
159134
return this;
160135
}
161136
public Builder<T> setOrder(String order){

Diff for: ‎core/src/main/java/com/robin/core/sql/util/AbstractSqlGen.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -624,10 +624,10 @@ protected String getNoPageSql(String sql,PageQuery<?> pageQuery){
624624
}
625625

626626
protected Integer[] getStartEndRecord(PageQuery<?> pageQuery) {
627-
int nBegin = (pageQuery.getPageNumber() - 1) * pageQuery.getPageSize();
627+
int nBegin = (pageQuery.getCurrentPage() - 1) * pageQuery.getPageSize();
628628
int tonums = nBegin + pageQuery.getPageSize();
629-
if (!ObjectUtils.isEmpty(pageQuery.getRecordCount()) && pageQuery.getRecordCount() < tonums) {
630-
tonums = pageQuery.getRecordCount();
629+
if (!ObjectUtils.isEmpty(pageQuery.getTotal()) && pageQuery.getTotal() < tonums) {
630+
tonums = pageQuery.getTotal();
631631
}
632632
return new Integer[]{nBegin, tonums};
633633
}

Diff for: ‎core/src/main/java/com/robin/core/sql/util/SqlServer2005Gen.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
import com.robin.core.base.datameta.BaseDataBaseMeta;
1919
import com.robin.core.base.exception.DAOException;
20+
import com.robin.core.base.util.Const;
2021
import com.robin.core.query.util.PageQuery;
2122

22-
import java.util.List;
23-
2423
public class SqlServer2005Gen extends AbstractSqlGen implements BaseSqlGen{
2524
private static final SqlServer2005Gen sqlGen=new SqlServer2005Gen();
2625
private SqlServer2005Gen(){
@@ -53,13 +52,13 @@ public String generatePageSql(String strSQL, PageQuery pageQuery) {
5352
String order = pageQuery.getOrder();
5453
String orderdesc = pageQuery.getOrderDirection();
5554
String norder ;
56-
if (orderdesc.equalsIgnoreCase(PageQuery.ASC)) {
57-
norder = PageQuery.DESC;
55+
if (orderdesc.equalsIgnoreCase(Const.ASC)) {
56+
norder = Const.DESC;
5857
} else {
59-
norder = PageQuery.ASC;
58+
norder = Const.ASC;
6059
}
6160
StringBuilder pagingSelect = new StringBuilder(strSQL.length() + 100);
62-
int pagefrom = pageQuery.getPageSize() * pageQuery.getPageNumber();
61+
int pagefrom = pageQuery.getPageSize() * pageQuery.getCurrentPage();
6362
int pos = strSQL.indexOf("select");
6463
int pos1 = strSQL.indexOf("order");
6564
String sqlpart = strSQL.substring(pos + 6, pos1);

0 commit comments

Comments
 (0)