wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' into dev

pull/4/head
fangjiakai 2024-01-11 09:25:46 +08:00
parent 9c86394e0b edb3a21777
commit a96b4f85df
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/entity/PageData.java
View File

@ -64,7 +64,7 @@ public class PageData extends HashMap<Object, Object> implements Map<Object, Obj
}
public String getString(Object key) {
return get(key) == null ? "" : get(key).toString().trim();
return get(key) == null ? null : get(key).toString().trim();
}
@Override

2
src/main/java/com/zcloud/util/MqUtil.java
View File

@ -9,7 +9,7 @@ public class MqUtil {
private final static SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
public static Integer analysisTime(String time) throws Exception{
Date agreed_date = timeFormat.parse(time);
Date agreed_date = timeFormat.parse(time.replaceAll("/","-"));
long time_difference = agreed_date.getTime() - new Date().getTime();
if (time_difference < 0){
return 0;