更新赛程

score-common/src/main/java/com/live/common/domain/dto/api/UserInfoResponse.java

@@ -21,7 +21,7 @@ public class UserInfoResponse {
 
     private Integer message;
 
-    private Integer collectMatch;
+    private Integer collectArticle;
 
     private Integer collectTeam;
 

score-common/src/main/java/com/live/common/service/impl/UserServiceImpl.java

@@ -577,11 +577,6 @@ public class UserServiceImpl implements UserService {
                 .eq(UserMessage::getUserId, account.getId())
         );
 
-        long collectMatch = userReserveMapper.selectCount(Wrappers.<UserReserve>lambdaQuery()
-                .eq(UserReserve::getDeleted, StatusEnum.ENABLE.getCode())
-                .eq(UserReserve::getUserId, account.getId())
-                .eq(UserReserve::getType, 0)
-        );
         long collectTeam = userReserveMapper.selectCount(Wrappers.<UserReserve>lambdaQuery()
                 .eq(UserReserve::getDeleted, StatusEnum.ENABLE.getCode())
                 .eq(UserReserve::getUserId, account.getId())
@@ -594,7 +589,7 @@ public class UserServiceImpl implements UserService {
                 .userName(account.getUserName())
                 .userDesc(account.getUserDesc())
                 .message((int) count + 1)
-                .collectMatch((int) collectMatch)
+                .collectArticle(0)
                 .collectTeam((int) collectTeam)
                 .build());
     }

score-job/src/main/java/com/live/job/service/impl/ChatTimedSendingServiceImpl.java

-package com.live.job.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.live.common.domain.entity.RobotMsg;
-import com.live.common.domain.entity.Room;
-import com.live.common.domain.request.SendMessageByRoomRequest;
-import com.live.common.mapper.RobotMsgMapper;
-import com.live.common.mapper.RoomMapper;
-import com.live.common.service.HuanXinIMService;
-import com.live.common.utils.ChatFakeMsgUtils;
-import com.live.common.utils.IdGen;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.time.Instant;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class ChatTimedSendingServiceImpl {
-
-    @Resource
-    private RoomMapper roomMapper;
-    @Resource
-    private RobotMsgMapper robotMsgMapper;
-    @Resource
-    private HuanXinIMService huanXinIMService;
-    @Resource
-    private ThreadPoolTaskScheduler taskScheduler;
-
-    //  @Scheduled(fixedRate = 10 * 60 * 1000)
-//    @Scheduled(cron = "01 01/01 * * * ?")
-    public void timedSendingServiceImpl() {
-        List<Room> rooms = roomMapper.selectList(Wrappers.<Room>lambdaQuery()
-                .eq(Room::getDeleted, 0)
-                .eq(Room::getType, 1)
-                .eq(Room::getEnableFakeChat, 1)
-        );
-
-        for (String roomId : rooms.stream().map(Room::getHuanXinRoomId).collect(Collectors.toList())) {
-            int randomSeconds = IdGen.randomUtil(60);
-            taskScheduler.schedule(() -> sendFakeMessage(roomId), Instant.now().plusSeconds(randomSeconds));
-        }
-    }
-
-    private void sendFakeMessage(String roomId) {
-        List<RobotMsg> robotMsgs = returnFakeMsg();
-        for (RobotMsg msg : robotMsgs) {
-            String userName = StringUtils.isBlank(msg.getNickName()) ? ChatFakeMsgUtils.generateName() : msg.getNickName();
-
-            huanXinIMService.sendMessageByRoom(SendMessageByRoomRequest.builder()
-                    .ext(SendMessageByRoomRequest.Ext.builder()
-                            .live_room_user_name(userName)
-                            .user_level(getRandomLevel())
-                            .user_nick(userName)
-                            .build())
-                    .from(userName)
-                    .msg(SendMessageByRoomRequest.SendMessage.builder()
-                            .msg(msg.getFakeMsg())
-                            .type("txt")
-                            .build())
-                    .target_type("chatrooms")
-                    .target(Collections.singletonList(roomId))
-                    .build());
-        }
-
-    }
-
-    private List<RobotMsg> returnFakeMsg() {
-        int random = IdGen.randomUtil(6) + 1;
-
-        return robotMsgMapper.selectList(Wrappers.<RobotMsg>lambdaQuery()
-                .eq(RobotMsg::getMsgType, -1)
-                .eq(RobotMsg::getDeleted, 0)
-                .last(String.format(" ORDER BY RAND() LIMIT %s", random))
-        );
-    }
-
-    private int getRandomLevel() {
-        int random = IdGen.randomUtil(1000) + 1;
-        if (random > 950) {
-            return 7;
-        } else if (random > 880) {
-            return 6;
-        } else if (random > 800) {
-            return 5;
-        } else if (random > 650) {
-            return 4;
-        } else if (random > 550) {
-            return 3;
-        } else if (random > 350) {
-            return 2;
-        } else {
-            return 1;
-        }
-    }
-
-}

score-job/src/main/java/com/live/job/service/impl/CrawlAlStatServiceImpl.java

@@ -452,7 +452,7 @@ public class CrawlAlStatServiceImpl implements CrawlMatchService {
      * 10 分钟爬取一次 AlStat 足球实时比分
      */
 //    @Scheduled(fixedRate = 2 * 60 * 60 * 1000)
-//    @Scheduled(cron = "11 11/10 * * * ?")
+    @Scheduled(cron = "11 11/10 * * * ?")
     public void crawlAlStatFootballScore() {
         String url = String.format("http://data43.aistat.cn/matchs/liveScores?key=%s", footballKey);
         ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);