开奖

game-business/src/main/java/com/game/business/controller/AppGameBettingController.java

@@ -73,7 +73,7 @@ public class AppGameBettingController extends BaseController{
         }
 
         if(StringUtils.isBlank(appGame.getGameTime())){
-            return error("游戏倒计时不存在，无法下单。");
+            return error("游戏已封盘，无法下单。");
         }
 
         if(!appGame.getGameTime().contains(":")){

game-business/src/main/java/com/game/business/service/IAppGameService.java

@@ -59,6 +59,13 @@ public interface IAppGameService extends IService<AppGame> {
      */
     public int deleteAppGameById(Long id);
 
+    /**
+     * 根据类型查询游戏
+     * @param classId
+     * @return
+     */
+    List<AppGame> selectAppGameByClassId(Long classId);
+
     /**
      * 根据编码查询游戏
      * @param classId

game-business/src/main/java/com/game/business/service/impl/AppGameBettingServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.game.business.domain.AppGameBetting;
 import com.game.business.mapper.AppGameBettingMapper;
 import com.game.business.service.IAppGameBettingService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -13,6 +14,7 @@ import java.util.List;
 @Service
 public class AppGameBettingServiceImpl extends ServiceImpl<AppGameBettingMapper, AppGameBetting> implements IAppGameBettingService {
 
+    @Autowired
     private AppGameBettingMapper appGameBettingMapper;
 
     @Override

game-business/src/main/java/com/game/business/service/impl/AppGameClassifyServiceImpl.java

@@ -1,11 +1,12 @@
 package com.game.business.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
+import com.game.common.annotation.DataSource;
+import com.game.common.enums.DataSourceType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.game.business.mapper.AppGameClassifyMapper;
@@ -19,7 +20,6 @@ import com.game.business.service.IAppGameClassifyService;
  * @date 2024-06-14
  */
 @Service
-@DS("slave")
 public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMapper, AppGameClassify> implements IAppGameClassifyService {
     @Autowired
     private AppGameClassifyMapper appGameClassifyMapper;
@@ -31,6 +31,7 @@ public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMappe
      * @return 游戏分类
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public AppGameClassify selectAppGameClassifyById(Long id) {
         return appGameClassifyMapper.selectAppGameClassifyById(id);
     }
@@ -42,6 +43,7 @@ public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMappe
      * @return 游戏分类
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public List<AppGameClassify> selectAppGameClassifyList(AppGameClassify appGameClassify) {
         return appGameClassifyMapper.selectAppGameClassifyList(appGameClassify);
     }
@@ -53,6 +55,7 @@ public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMappe
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int insertAppGameClassify(AppGameClassify appGameClassify) {
             return appGameClassifyMapper.insertAppGameClassify(appGameClassify);
     }
@@ -64,6 +67,7 @@ public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMappe
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int updateAppGameClassify(AppGameClassify appGameClassify) {
         return appGameClassifyMapper.updateAppGameClassify(appGameClassify);
     }
@@ -75,6 +79,7 @@ public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMappe
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppGameClassifyByIds(Long[] ids) {
         return appGameClassifyMapper.deleteAppGameClassifyByIds(ids);
     }
@@ -86,11 +91,13 @@ public class AppGameClassifyServiceImpl extends ServiceImpl<AppGameClassifyMappe
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppGameClassifyById(Long id) {
         return appGameClassifyMapper.deleteAppGameClassifyById(id);
     }
 
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public AppGameClassify getByCode(String code) {
         LambdaQueryWrapper<AppGameClassify> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(AppGameClassify::getCode, code);

game-business/src/main/java/com/game/business/service/impl/AppGameServiceImpl.java

@@ -1,6 +1,5 @@
 package com.game.business.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,7 +21,6 @@ import com.game.business.service.IAppGameService;
  * @date 2024-06-14
  */
 @Service
-@DS("slave")
 public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> implements IAppGameService {
     @Autowired
     private AppGameMapper appGameMapper;
@@ -34,6 +32,7 @@ public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> impl
      * @return 游戏配置
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public AppGame selectAppGameById(Long id) {
         return appGameMapper.selectAppGameById(id);
     }
@@ -45,6 +44,7 @@ public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> impl
      * @return 游戏配置
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public List<AppGame> selectAppGameList(AppGame appGame) {
         return appGameMapper.selectAppGameList(appGame);
     }
@@ -56,6 +56,7 @@ public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> impl
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int insertAppGame(AppGame appGame) {
                 appGame.setCreateTime(DateUtils.getNowDate());
             return appGameMapper.insertAppGame(appGame);
@@ -68,6 +69,7 @@ public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> impl
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int updateAppGame(AppGame appGame) {
         return appGameMapper.updateAppGame(appGame);
     }
@@ -79,6 +81,7 @@ public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> impl
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppGameByIds(Long[] ids) {
         return appGameMapper.deleteAppGameByIds(ids);
     }
@@ -90,11 +93,21 @@ public class AppGameServiceImpl extends ServiceImpl<AppGameMapper, AppGame> impl
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppGameById(Long id) {
         return appGameMapper.deleteAppGameById(id);
     }
 
     @Override
+    @DataSource(DataSourceType.SLAVE)
+    public List<AppGame> selectAppGameByClassId(Long classId) {
+        LambdaQueryWrapper<AppGame> queryGameWrapper = Wrappers.lambdaQuery();;
+        queryGameWrapper.eq(AppGame::getClassifyId, classId);
+        return appGameMapper.selectList(queryGameWrapper);
+    }
+
+    @Override
+    @DataSource(DataSourceType.SLAVE)
     public AppGame selectAppGameByClassIdAndCode(Long classId, String code) {
         LambdaQueryWrapper<AppGame> queryGameWrapper = Wrappers.lambdaQuery();;
         queryGameWrapper.eq(AppGame::getCode, code);

game-business/src/main/java/com/game/business/service/impl/AppUserServiceImpl.java

@@ -1,6 +1,5 @@
 package com.game.business.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -20,7 +19,6 @@ import com.game.business.service.IAppUserService;
  * @date 2024-06-18
  */
 @Service
-@DS("slave")
 public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements IAppUserService {
     @Autowired
     private AppUserMapper appUserMapper;
@@ -32,6 +30,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      * @return app用户
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public AppUser selectAppUserByUserid(Long userid) {
         return appUserMapper.selectAppUserByUserid(userid);
     }
@@ -43,6 +42,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      * @return app用户
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public List<AppUser> selectAppUserList(AppUser appUser) {
         return appUserMapper.selectAppUserList(appUser);
     }
@@ -54,6 +54,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int insertAppUser(AppUser appUser) {
                 appUser.setCreateTime(DateUtils.getNowDate());
             return appUserMapper.insertAppUser(appUser);
@@ -66,6 +67,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int updateAppUser(AppUser appUser) {
         return appUserMapper.updateAppUser(appUser);
     }
@@ -77,6 +79,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppUserByUserids(Long[] userids) {
         return appUserMapper.deleteAppUserByUserids(userids);
     }
@@ -88,6 +91,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppUserByUserid(Long userid) {
         return appUserMapper.deleteAppUserByUserid(userid);
     }

game-business/src/main/java/com/game/business/service/impl/AppUsersCashrecordServiceImpl.java

@@ -1,6 +1,5 @@
 package com.game.business.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -19,7 +18,6 @@ import com.game.business.service.IAppUsersCashrecordService;
  * @date 2024-06-18
  */
 @Service
-@DS("slave")
 public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecordMapper, AppUsersCashrecord> implements IAppUsersCashrecordService {
     @Autowired
     private AppUsersCashrecordMapper appUsersCashrecordMapper;
@@ -31,6 +29,7 @@ public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecor
      * @return 提现记录
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public AppUsersCashrecord selectAppUsersCashrecordById(Long id) {
         return appUsersCashrecordMapper.selectAppUsersCashrecordById(id);
     }
@@ -42,6 +41,7 @@ public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecor
      * @return 提现记录
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public List<AppUsersCashrecord> selectAppUsersCashrecordList(AppUsersCashrecord appUsersCashrecord) {
         return appUsersCashrecordMapper.selectAppUsersCashrecordList(appUsersCashrecord);
     }
@@ -53,6 +53,7 @@ public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecor
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int insertAppUsersCashrecord(AppUsersCashrecord appUsersCashrecord) {
             return appUsersCashrecordMapper.insertAppUsersCashrecord(appUsersCashrecord);
     }
@@ -64,6 +65,7 @@ public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecor
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int updateAppUsersCashrecord(AppUsersCashrecord appUsersCashrecord) {
         return appUsersCashrecordMapper.updateAppUsersCashrecord(appUsersCashrecord);
     }
@@ -75,6 +77,7 @@ public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecor
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppUsersCashrecordByIds(Long[] ids) {
         return appUsersCashrecordMapper.deleteAppUsersCashrecordByIds(ids);
     }
@@ -86,6 +89,7 @@ public class AppUsersCashrecordServiceImpl extends ServiceImpl<AppUsersCashrecor
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppUsersCashrecordById(Long id) {
         return appUsersCashrecordMapper.deleteAppUsersCashrecordById(id);
     }

game-business/src/main/java/com/game/business/service/impl/AppUsersChargeServiceImpl.java

@@ -1,6 +1,5 @@
 package com.game.business.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -19,7 +18,6 @@ import com.game.business.service.IAppUsersChargeService;
  * @date 2024-06-18
  */
 @Service
-@DS("slave")
 public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper, AppUsersCharge> implements IAppUsersChargeService {
     @Autowired
     private AppUsersChargeMapper appUsersChargeMapper;
@@ -31,6 +29,7 @@ public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper,
      * @return 充值记录
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public AppUsersCharge selectAppUsersChargeById(Long id) {
         return appUsersChargeMapper.selectAppUsersChargeById(id);
     }
@@ -42,6 +41,7 @@ public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper,
      * @return 充值记录
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public List<AppUsersCharge> selectAppUsersChargeList(AppUsersCharge appUsersCharge) {
         return appUsersChargeMapper.selectAppUsersChargeList(appUsersCharge);
     }
@@ -53,6 +53,7 @@ public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper,
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int insertAppUsersCharge(AppUsersCharge appUsersCharge) {
             return appUsersChargeMapper.insertAppUsersCharge(appUsersCharge);
     }
@@ -64,6 +65,7 @@ public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper,
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int updateAppUsersCharge(AppUsersCharge appUsersCharge) {
         return appUsersChargeMapper.updateAppUsersCharge(appUsersCharge);
     }
@@ -75,6 +77,7 @@ public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper,
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppUsersChargeByIds(Long[] ids) {
         return appUsersChargeMapper.deleteAppUsersChargeByIds(ids);
     }
@@ -86,6 +89,7 @@ public class AppUsersChargeServiceImpl extends ServiceImpl<AppUsersChargeMapper,
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteAppUsersChargeById(Long id) {
         return appUsersChargeMapper.deleteAppUsersChargeById(id);
     }

game-business/src/main/java/com/game/business/service/impl/FinTranRecordServiceImpl.java

@@ -1,6 +1,5 @@
 package com.game.business.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
 
@@ -20,7 +19,6 @@ import com.game.business.service.IFinTranRecordService;
  * @date 2024-06-18
  */
 @Service
-@DS("slave")
 public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, FinTranRecord> implements IFinTranRecordService {
 
     @Autowired
@@ -33,6 +31,7 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
      * @return 消费记录
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public FinTranRecord selectFinTranRecordById(Long id) {
         return finTranRecordMapper.selectFinTranRecordById(id);
     }
@@ -44,6 +43,7 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
      * @return 消费记录
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public List<FinTranRecord> selectFinTranRecordList(FinTranRecord finTranRecord) {
         return finTranRecordMapper.selectFinTranRecordList(finTranRecord);
     }
@@ -55,6 +55,7 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int insertFinTranRecord(FinTranRecord finTranRecord) {
                 finTranRecord.setCreateTime(DateUtils.getNowDate());
             return finTranRecordMapper.insertFinTranRecord(finTranRecord);
@@ -67,6 +68,7 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int updateFinTranRecord(FinTranRecord finTranRecord) {
         return finTranRecordMapper.updateFinTranRecord(finTranRecord);
     }
@@ -78,6 +80,7 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteFinTranRecordByIds(Long[] ids) {
         return finTranRecordMapper.deleteFinTranRecordByIds(ids);
     }
@@ -89,6 +92,7 @@ public class FinTranRecordServiceImpl extends ServiceImpl<FinTranRecordMapper, F
      * @return 结果
      */
     @Override
+    @DataSource(DataSourceType.SLAVE)
     public int deleteFinTranRecordById(Long id) {
         return finTranRecordMapper.deleteFinTranRecordById(id);
     }

game-business/src/main/java/com/game/business/websocket/WebSocketConnent.java

@@ -23,20 +23,20 @@ public class WebSocketConnent {
     public void connect() throws Exception{
         while (true){
             try {
-                System.out.printf("正在" + (this.WS_CONNENT_NUM == 0 ? "" : ("第" + this.WS_CONNENT_NUM + "次")) + "连接WebSocket[" + this.WS_URL_NAME + "]......");
+                System.out.println("正在" + (this.WS_CONNENT_NUM == 0 ? "" : ("第" + this.WS_CONNENT_NUM + "次")) + "连接WebSocket[" + this.WS_URL_NAME + "]......");
                 if(Common.GANME_ONE_NAME.equals(this.WS_URL_NAME)){
                     GameOneClient client = SpringContextSetting.getBean(GameOneClient.class);
                     ContainerProvider.getWebSocketContainer().connectToServer(client, new URI(this.WS_URL));
                 }
 
-                System.out.printf(this.WS_URL_NAME + " 已成功连接Websocket[" + this.WS_URL + "]");
+                System.out.println(this.WS_URL_NAME + " 已成功连接Websocket[" + this.WS_URL + "]");
                 this.WS_CONNENT_NUM = 0;
                 break;
             }catch (Exception e){
                 if(this.WS_CONNENT_MAX_NUM > this.WS_CONNENT_NUM){
                     this.WS_CONNENT_NUM ++;
                 }
-                System.out.printf("连接[" + this.WS_URL_NAME + "]异常，" + this.WS_CONNENT_NUM + "秒后尝试重新连接：" + e.getMessage());
+                System.out.println("连接[" + this.WS_URL_NAME + "]异常，" + this.WS_CONNENT_NUM + "秒后尝试重新连接：" + e.getMessage());
                 Thread.sleep(this.WS_CONNENT_NUM * 1000);
             }
         }

game-business/src/main/java/com/game/business/websocket/client/GameOneClient.java

@@ -20,6 +20,9 @@ import org.springframework.stereotype.Component;
 
 import javax.websocket.*;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Component
 @ClientEndpoint
@@ -39,20 +42,20 @@ public class GameOneClient {
 
     @OnOpen
     public void onOpen(Session session) throws Exception{
-        System.out.printf("game one 游戏已连接 server");
+        System.out.println("game one 游戏已连接 server");
         // 发送游戏编码
         session.getBasicRemote().sendText("{\"code\":\"" + Common.GAME_ONE_CODE + "\"}");
     }
 
     @OnClose
     public void onClose(Session session) throws Exception{
-        System.out.printf("game on 游戏已断开 server");
+        System.out.println("game on 游戏已断开 server");
         connect();
     }
 
     @OnError
     public void onError(Session session, Throwable throwable) throws Exception{
-        System.out.printf("game one 连接异常 [" + throwable.getMessage() + "]");
+        System.out.println("game one 连接异常 [" + throwable.getMessage() + "]");
         connect();
     }
 
@@ -61,7 +64,7 @@ public class GameOneClient {
             try {
                 GameOneConfig.webSocketConnent.connect();
             }catch (Exception e){
-                System.out.printf("连接 game on [socket] 异常" + e.getMessage());
+                System.out.println("连接 game on [socket] 异常" + e.getMessage());
             }
         }
     }
@@ -121,7 +124,7 @@ public class GameOneClient {
                     return;
                 }
 
-                if(time == null){
+                if(time == null || time.isEmpty()){
                     System.out.println("游戏socket推送倒计时，time为空。");
                     return;
                 }
@@ -129,7 +132,15 @@ public class GameOneClient {
                 AppGameClassify appGameClassify = appGameClassifyService.getByCode(classCode);
                 if(appGameClassify == null){
                     System.out.println("开奖游戏平台不存在：" + classCode);
+                    return;
+                }
+
+                List<AppGame> appGameList = appGameService.selectAppGameByClassId(appGameClassify.getId());
+                if(appGameList == null || appGameList.isEmpty()){
+                    System.out.println("开奖游戏平台没有游戏：" + classCode);
+                    return;
                 }
+                Map<String, List<AppGame>> codeGameMap = appGameList.stream().collect(Collectors.groupingBy(AppGame::getCode));
 
                 for (int i = 0; i < gameDataArry.size(); i++) {
                     JSONObject jsonObject = gameDataArry.getJSONObject(i);
@@ -138,11 +149,11 @@ public class GameOneClient {
                         System.out.println("游戏socket推送倒计时，游戏id为空。");
                         continue;
                     }
-
-                    AppGame appGame = appGameService.selectAppGameByClassIdAndCode(appGameClassify.getId(), gameCode);
-                    if(appGame == null){
+                    if(!codeGameMap.containsKey(gameCode)){
                         System.out.println("开奖游戏不存在：" + gameCode);
+                        continue;
                     }
+                    AppGame appGame = codeGameMap.get(gameCode).get(0);
                     appGame.setGameTime(time);
                     appGameService.updateAppGame(appGame);
                 }
@@ -158,7 +169,7 @@ public class GameOneClient {
             for (int i = 0; i < dataArry.size(); i++) {
                 JSONObject jsonObject = dataArry.getJSONObject(i);
                 if(jsonObject.containsKey("gameTypeSortArrayVOS")){
-                    gameArry = jsonObject.getJSONArray("data");
+                    gameArry = jsonObject.getJSONArray("gameTypeSortArrayVOS");
                 }
                 if(jsonObject.containsKey("id")){
                     classCode = jsonObject.getString("id");
@@ -180,6 +191,13 @@ public class GameOneClient {
                 System.out.println("开奖游戏平台不存在：" + classCode);
             }
 
+            List<AppGame> appGameList = appGameService.selectAppGameByClassId(appGameClassify.getId());
+            if(appGameList == null || appGameList.isEmpty()){
+                System.out.println("开奖游戏平台没有游戏：" + classCode);
+                return;
+            }
+            Map<String, List<AppGame>> codeGameMap = appGameList.stream().collect(Collectors.groupingBy(AppGame::getCode));
+
             for (int i = 0; i < gameArry.size(); i++) {
                 JSONObject gameLotteryObject = gameArry.getJSONObject(i);
                 String gameCode = gameLotteryObject.getString("id");
@@ -189,13 +207,13 @@ public class GameOneClient {
                     return;
                 }
 
-                AppGame appGame = appGameService.selectAppGameByClassIdAndCode(appGameClassify.getId(), gameCode);
-                if(appGame == null){
+                if(!codeGameMap.containsKey(gameCode)){
                     System.out.println("开奖游戏不存在：" + gameCode);
+                    continue;
                 }
+                AppGame appGame = codeGameMap.get(gameCode).get(0);
 
                 String gameDate = gameLotteryObject.getString("gameDate");
-
                 if(gameDate == null){
                     System.out.println("游戏socket推送期号或开奖，期号为空。");
                     return;
@@ -220,6 +238,7 @@ public class GameOneClient {
                 // 保存开奖记录
                 AppGameLottery appGameLottery = new AppGameLottery();
                 appGameLottery.setGameId(appGame.getId());
+                appGameLottery.setClassId(appGame.getClassifyId());
                 appGameLottery.setGameDate(gameDate);
                 appGameLottery.setIsLottery(isLottery);
                 appGameLottery.setGameRecordDate(new Date());
@@ -234,7 +253,7 @@ public class GameOneClient {
             }
         }catch (Exception e){
             e.printStackTrace();
-            System.out.printf("game one 接收数据异常[" + e.getMessage() + "]");
+            System.out.println("game one 接收数据异常[" + e.getMessage() + "]");
         }
     }
 }