|
@@ -6,6 +6,7 @@ import com.cnd3b.common.data.Row;
|
|
|
import com.cnd3b.common.data.Rows;
|
|
|
import com.cnd3b.common.data.RowsMap;
|
|
|
import com.cnd3b.common.data.SQLFactory;
|
|
|
+import com.cnd3b.utility.qywechat.base.Parameter;
|
|
|
|
|
|
|
|
|
public class live extends Controller {
|
|
@@ -91,9 +92,11 @@ public class live extends Controller {
|
|
|
Long timeEnd = getTimestamp("2022-03-20 00:00:00");
|
|
|
Long timeNow = System.currentTimeMillis();
|
|
|
System.err.println(time1);
|
|
|
- long hour = 3600000*2;
|
|
|
- System.err.println(time2+hour);
|
|
|
- if ((timeNow >= time1 && timeNow <= time1 + hour) || (timeNow >= time2 && timeNow <= time2 + hour) || (timeNow >= time3 && timeNow <= time3 + hour) || (timeNow >= timeEnd)) {
|
|
|
+ long hour = 3600000 * 2;
|
|
|
+ System.err.println(time2 + hour);
|
|
|
+ Long time4 = getTimestamp("2022-03-17 15:30:00");
|
|
|
+
|
|
|
+ if ((timeNow >= time4 && timeNow <= time4 + (hour * 2)) || (timeNow >= time1 && timeNow <= time1 + hour) || (timeNow >= time2 && timeNow <= time2 + hour) || (timeNow >= time3 && timeNow <= time3 + hour) || (timeNow >= timeEnd)) {
|
|
|
resultObject.put("tlivelist", newliverows);
|
|
|
} else {
|
|
|
resultObject.put("tlivelist", new Rows());
|