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

src/dsb/com/cnd3b/restcontroller/customer/live/SQL/实时聊天列表.sql

@@ -14,4 +14,4 @@ SELECT t1.pic,
        CONVERT(varchar (100), DATEADD(S, convert(float, t1.time) / 1000, '1970-01-01 08:00'), 120) as datetime
 from tlive_usermessages AS t1
 WHERE t1.channelid = $channelid$
-  AND t1.time > $time$
+

src/dsb/com/cnd3b/restcontroller/customer/live/SQL/展会直播详情.sql

@@ -1,7 +1,29 @@
-select t1.tliveid, t1.siteid, t1.createby, t1.changeby, t1.createdate, t1.changedate,
-       t1.tactivityid, t1.tliveapplyid, t1.tagentsid, t1.fliveurl_web,t1.fliveurl_client, t1.fliveshowurl,
-       t1.categoryid,t1.categoryname, t1.channelname, t1.channelpasswd, t1.channelid,t1.fassistanturl,t1.fisneedauth,
-       t1.secretkey,t1.livestatus,t1.channelcoverimageurl,t3.ftitle from tlive t1
-inner join tagents t2 on t1.siteid=t2.siteid and t1.tagentsid=t2.tagentsid
-inner join tactivity t3 on t1.siteid=t3.siteid and t1.tactivityid=t3.tactivityid and t3.fstatus='活动中'
-where t1.siteid=$siteid$ and t1.categoryName='展会直播' and t1.tagentsid = $tagentsid$
+select t1.tliveid,
+       t1.siteid,
+       t1.createby,
+       t1.changeby,
+       t1.createdate,
+       t1.changedate,
+       t1.tactivityid,
+       t1.tliveapplyid,
+       t1.tagentsid,
+       t1.fliveurl_web,
+       t1.fliveurl_client,
+       t1.fliveshowurl,
+       t1.categoryid,
+       t1.categoryname,
+       t1.channelname,
+       t1.channelpasswd,
+       t1.channelid,
+       t1.fassistanturl,
+       t1.fisneedauth,
+       t1.secretkey,
+       t1.livestatus,
+       t1.channelcoverimageurl,
+       t3.ftitle
+from tlive t1
+         inner join tagents t2 on t1.siteid = t2.siteid and t1.tagentsid = t2.tagentsid
+         inner join tactivity t3 on t1.siteid = t3.siteid and t1.tactivityid = t3.tactivityid and t3.fstatus = '活动中'
+where t1.siteid = $siteid$
+  and t1.categoryName = '展会直播'
+  and t1.tagentsid = $tagentsid$

src/dsb/com/cnd3b/restcontroller/customer/live/SQL/直播列表查询.sql

@@ -1,3 +1,17 @@
-select t1.tliveid, t1.createby, t1.createdate, t1.tagentsid,t2.fagentname, t1.categoryid,t1.categoryname,t1.channelid, t1.channelname,t1.livestatus,t1.channelcoverimageurl from tlive t1
-inner join tagents t2 on t1.siteid=t2.siteid and t1.tagentsid=t2.tagentsid
-where t1.siteid=$siteid$ and t1.tagentsid=$tagentsid$ and $where$
+select t1.tliveid,
+       t1.createby,
+       t1.createdate,
+       t1.tagentsid,
+       t2.fagentname,
+       t1.categoryid,
+       t1.categoryname,
+       t1.channelid,
+       t1.channelname,
+       t1.livestatus,
+       t1.channelcoverimageurl,
+       t1.fisneedauth
+from tlive t1
+         inner join tagents t2 on t1.siteid = t2.siteid and t1.tagentsid = t2.tagentsid
+where t1.siteid = $siteid$
+  and t1.tagentsid = $tagentsid$
+  and $where$

src/dsb/com/cnd3b/restcontroller/customer/live/SQL/私域直播详情.sql

@@ -1,5 +1,28 @@
-select t1.tliveid, t1.siteid, t1.createby, t1.changeby, t1.createdate, t1.changedate,
-       t1.tactivityid, t1.tliveapplyid, t1.tagentsid, t1.fliveurl_web,t1.fliveurl_client, t1.fliveshowurl,
-       t1.categoryid,t1.categoryname, t1.channelname, t1.channelpasswd, t1.channelid,t1.fassistanturl,t1.fisneedauth,t1.secretkey,t1.livestatus,t1.channelcoverimageurl from tlive t1
-inner join tagents t2 on t1.siteid=t2.siteid and t1.tagentsid=t2.tagentsid
-where t1.siteid=$siteid$ and t1.categoryName='˽ÓòÖ±²¥' and t1.tagentsid = $tagentsid$
+select t1.tliveid,
+       t1.siteid,
+       t1.createby,
+       t1.changeby,
+       t1.createdate,
+       t1.changedate,
+       t1.tactivityid,
+       t1.tliveapplyid,
+       t1.tagentsid,
+       t1.fliveurl_web,
+       t1.fliveurl_client,
+       t1.fliveshowurl,
+       t1.categoryid,
+       t1.categoryname,
+       t1.channelname,
+       t1.channelpasswd,
+       t1.channelid,
+       t1.fassistanturl,
+       t1.fisneedauth,
+       t1.secretkey,
+       t1.livestatus,
+       t1.channelcoverimageurl,
+       t1.fisneedauth
+from tlive t1
+         inner join tagents t2 on t1.siteid = t2.siteid and t1.tagentsid = t2.tagentsid
+where t1.siteid = $siteid$
+  and t1.categoryName = '˽ÓòÖ±²¥'
+  and t1.tagentsid = $tagentsid$

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

@@ -390,10 +390,10 @@ public class live extends Controller {
      */
     public String getRealTimeMessageList() {
         String channelid = content.getString("channelid");
-        Long time = getDateTime().getTime() - 1*60*1000;
-        SQLFactory sqlFactory = new SQLFactory(this, "实时聊天列表", pageSize, pageNumber, "t1.tlive_usermessagid DESC");
+//        Long time = getDateTime().getTime() - 1*60*1000;
+        SQLFactory sqlFactory = new SQLFactory(this, "实时聊天列表", pageSize, pageNumber, "t1.time DESC");
         sqlFactory.addParameter("channelid", channelid);
-        sqlFactory.addParameter("time", time);
+//        sqlFactory.addParameter("time", time);
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         return getSucReturnObject().setDataByPaging(rows).preloading(1).toString();
     }