Merge remote-tracking branch 'origin/develop' into develop

src/dsb/com/cnd3b/restcontroller/publicmethod/live/live.java

@@ -6,6 +6,8 @@ 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.common.parameter.parameter;
+import com.cnd3b.utility.qywechat.base.Parameter;
 
 
 public class live extends Controller {
@@ -85,20 +87,23 @@ public class live extends Controller {
                 }
             }
             //ÏÞÖÆÔÚ2022-03-17£¬2022-03-19
-            Long time1 = getTimestamp("2022-03-17 19:30:00");
             Long time2 = getTimestamp("2022-03-18 19:30:00");
             Long time3 = getTimestamp("2022-03-19 19:30:00");
             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);
+            if (parameter.isdebug()) {
                 resultObject.put("tlivelist", newliverows);
             } else {
-                resultObject.put("tlivelist", new Rows());
+                if ((timeNow >= time2 && timeNow <= time2 + hour) || (timeNow >= time3 && timeNow <= time3 + hour) || (timeNow >= timeEnd)) {
+                    resultObject.put("tlivelist", newliverows);
+                } else {
+                    resultObject.put("tlivelist", new Rows());
+                }
             }
 
+
             resultObject.put("pageSize", pageSize);
             resultObject.put("pageNumber", pageNumber);
             resultObject.put("total", flivecount);