周伟鹏 / cnlive_shenhe · Commits

Commit 6e41ffa9e7d370195317b4b6173f888027a98b17

Authored by liwei2917
2 parents 18f405db 964e7cb9

Merge branch 'dev'

Inline Side-by-side
Showing 3 changed files with 4 additions and 2 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @6e41ffa
... ... @@ -155,6 +155,8 @@ public class VideosController {
155 155 if (CommonUtils.isNotNull(shySites)) {
156 156 if(CommonUtils.isNotEmpty(videos.getCategory())&&videos.getCategory().equals(CommonConst.CATEGORY_WITNESS)){
157 157 videos.setSpid_desc(shySites.getName()+"目击者");
  158 + }else if(CommonUtils.isNotEmpty(videos.getCategory())&&videos.getCategory().equals(CommonConst.CATEGORY_MOMENT)){
  159 + videos.setSpid_desc(shySites.getName()+"朋友圈");
158 160 }else{
159 161 videos.setSpid_desc(shySites.getName());
160 162 }
... ...
src/main/java/com/cnlive/shenhe/job/UsersSiteJob.java
  View file @6e41ffa
... ... @@ -46,7 +46,7 @@ public class UsersSiteJob {
46 46 ShySitesMapper shySitesMapper;
47 47  
48 48  
49   - @Scheduled(fixedRate = 30 * 60 * 1000)
  49 + @Scheduled(fixedRate = 10 * 60 * 1000)
50 50 public void syncUsers() {
51 51 try {
52 52 String tm = "0";
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/LiveServiceImpl.java
  View file @6e41ffa
... ... @@ -158,7 +158,7 @@ public class LiveServiceImpl {
158 158 // criteria2.andEqualTo("activity_id", activity_id);
159 159 }
160 160 if (CommonUtils.isNotNull(spid)) {
161   - criteria.andEqualTo("spid", spid);
  161 + criteria.andEqualTo("sp_id", spid);
162 162 // criteria2.andEqualTo("spid", spid);
163 163 }
164 164 if (CommonUtils.isNotNull(shenhe_state)) {
... ...