|
@@ -432,13 +432,14 @@ object makedata_recsys_61_originData_20241209 {
|
|
|
}
|
|
|
|
|
|
def tsToCalendar(ts: String): Calendar = {
|
|
|
- val ms = ts.toLong * 1000L
|
|
|
- if (ms > 1107658247000L && ms < 2685495047000L) {
|
|
|
- val calendar = Calendar.getInstance
|
|
|
- calendar.setTimeInMillis(ms)
|
|
|
- calendar
|
|
|
- } else {
|
|
|
- null
|
|
|
+ if (null != ts && ts.nonEmpty) {
|
|
|
+ val ms = ts.toLong * 1000L
|
|
|
+ if (ms > 1107658247000L && ms < 2685495047000L) {
|
|
|
+ val calendar = Calendar.getInstance
|
|
|
+ calendar.setTimeInMillis(ms)
|
|
|
+ return calendar
|
|
|
+ }
|
|
|
}
|
|
|
+ null
|
|
|
}
|
|
|
}
|