音效视频统一

hcp-app/src/main/java/com/yingyangfly/app/controller/GameVoiceController.java

@@ -41,8 +41,8 @@ public class GameVoiceController {
     @PostMapping("/get")
     @ApiOperation("获取游戏音乐")
     public ResultResponse<IPage<GameVoice>> selectAll(@RequestBody GameVoiceDto dto) {
-        AppCurrentLoginUser appCurrentLoginUser = tokenUtil.getAppCurrentLoginUser();
-        return ResultResponse.success(gameVoiceService.selectAll(appCurrentLoginUser.getOrgCode()));
+//        AppCurrentLoginUser appCurrentLoginUser = tokenUtil.getAppCurrentLoginUser();
+        return ResultResponse.success(gameVoiceService.selectAll("system"));
     }
 
 }

hcp-app/src/main/java/com/yingyangfly/app/controller/VideoLearnController.java

@@ -43,8 +43,8 @@ public class VideoLearnController {
     @PostMapping("/list")
     @TraceLog
     public ResultResponse list(String videoType) {
-        AppCurrentLoginUser currentUser = tokenUtil.getAppCurrentLoginUser();
-        List<VideoLearn> videoLearnList = videoLearnService.list(videoType, "0", currentUser.getOrgCode());
+
+        List<VideoLearn> videoLearnList = videoLearnService.list(videoType, "0");
 
         List<VideoLearnVo> videoLearnVoList = EntityConverter.convertList(videoLearnList, VideoLearnVo.class);
         return ResultResponse.success(videoLearnVoList);

hcp-core/src/main/java/com/yingyangfly/core/recommend/RecommendFacade.java

@@ -372,6 +372,11 @@ public class RecommendFacade {
         return randomElements;
     }
 
+    /**
+     * 理疗任务 推荐
+     * @param appUser
+     * @return
+     */
     private List<Game> recommendationA(AppUser appUser){
         // 以生成理疗任务的返回空
         List<Game> gameList = Lists.newArrayList();
@@ -440,6 +445,7 @@ public class RecommendFacade {
         // 获取这个评估任务以前推荐的游戏
         LambdaQueryWrapper<GameRecommendationRecord> gameRecommendationRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
         gameRecommendationRecordLambdaQueryWrapper.eq(GameRecommendationRecord::getReviewTaskId,reviewTaskId);
+        gameRecommendationRecordLambdaQueryWrapper.eq(GameRecommendationRecord::getPlayClass,"A");
         gameRecommendationRecordLambdaQueryWrapper.orderByDesc(GameRecommendationRecord::getCreateTime)
                 .last("limit 1");
         GameRecommendationRecord one = gameRecommendationRecordService.getOne(gameRecommendationRecordLambdaQueryWrapper);
@@ -466,6 +472,7 @@ public class RecommendFacade {
                 LambdaQueryWrapper<GameRecommendationRecord> gameRecommendationRecordQueryWrapper = new LambdaQueryWrapper<>();
                 gameRecommendationRecordQueryWrapper.eq(GameRecommendationRecord::getReviewTaskId,reviewTaskId);
                 gameRecommendationRecordQueryWrapper.eq(GameRecommendationRecord::getFrequency,one.getFrequency());
+                gameRecommendationRecordQueryWrapper.eq(GameRecommendationRecord::getPlayClass,"A");
                 List<GameRecommendationRecord> gameRecommendationRecordList = gameRecommendationRecordService.list(gameRecommendationRecordLambdaQueryWrapper);
                 List<String> gameCodes = new ArrayList<>();
                 for (GameRecommendationRecord gameRecommendationRecord : gameRecommendationRecordList) {
@@ -528,10 +535,19 @@ public class RecommendFacade {
                 }
             }
         }
-        if (CollectionUtil.isNotEmpty(gameList)){
-            gameRecommendationRecordService.saveBatch(gameList,appUser.getId(),"A",reviewTaskId,recommendNum,frequency);
-        }
+
+        gameRecommendationRecordService.saveBatch(gameList,appUser.getId(),"A",reviewTaskId,recommendNum,frequency);
+
         return gameList;
     }
 
+    /**
+     * 推荐 认知训练游戏
+     * @param appUser
+     * @return
+     */
+    private List<Game> recommendationB(AppUser appUser) {
+        List<Game> gameList = new ArrayList<>();
+        return gameList;
+    }
 }

hcp-core/src/main/java/com/yingyangfly/core/service/VideoLearnService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 @Service
 public interface VideoLearnService {
-    List<VideoLearn> list(String videoType,String status,String orgCode);
+    List<VideoLearn> list(String videoType,String status);
 
     IPage<VideoLearn> page(VideoLearn videoLearn);
 

hcp-core/src/main/java/com/yingyangfly/core/service/impl/GamePastRecordsServiceImpl.java

@@ -1,18 +1,28 @@
 package com.yingyangfly.core.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yingyangfly.core.domain.AppUser;
 import com.yingyangfly.core.domain.Game;
 import com.yingyangfly.core.domain.GamePastRecords;
+import com.yingyangfly.core.domain.GameUser;
+import com.yingyangfly.core.enums.StatusEnums;
+import com.yingyangfly.core.mapper.GameMapper;
 import com.yingyangfly.core.mapper.GamePastRecordsMapper;
 import com.yingyangfly.core.service.GamePastRecordsService;
 import com.yingyangfly.core.service.GameService;
+import com.yingyangfly.core.service.GameUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 
 @Service
@@ -22,6 +32,15 @@ public class GamePastRecordsServiceImpl extends ServiceImpl<GamePastRecordsMappe
     @Resource
     private GameService gameService;
 
+    @Resource
+    private GameMapper gameMapper;
+
+    @Resource
+    private AppUserService appUserService;
+
+    @Resource
+    private GameUserService gameUserService;
+
     /**
      * 恢复游戏
      * @return
@@ -33,8 +52,49 @@ public class GamePastRecordsServiceImpl extends ServiceImpl<GamePastRecordsMappe
         Game game = new Game();
         BeanUtils.copyProperties(gamePastRecords,game);
         game.setId(IdWorker.getId());
-        gameService.saveGame(game);
+        Game game1 = gameService.selectByGameCode(game.getGameCode());
+        if (ObjectUtils.isNotNull(game1)){
+            Game gameDb = gameMapper.selectMaxGameCode();
+            Integer gamecode = Integer.parseInt(gameDb.getGameCode())+1;
+            game.setGameCode(String.valueOf(gamecode));
+        }
+        game.setStatus(StatusEnums.OK.getIntCode());
+        // 新增给所有用户加上游戏
+        List<AppUser> appUsers = appUserService.list();
+        List<GameUser> gameUsers = buildGameUsers(game, appUsers);
+        gameUserService.saveBatch(gameUsers);
+        gameService.save(game);
         // 历史游戏表中删除
         int result = baseMapper.deleteById(gamePastRecords.getId());
     }
+
+
+    private List<GameUser> buildGameUsers(Game game, List<AppUser> appUsers){
+        Date current = DateUtil.date();
+        List<GameUser> gameUsers = new ArrayList<>();
+        for (AppUser appUser : appUsers) {
+            GameUser gameUser = new GameUser();
+            gameUser.setId(IdWorker.getId());
+            gameUser.setGameCode(game.getGameCode());
+            gameUser.setGameName(game.getGameName());
+            gameUser.setGameUrl(game.getGameUrl());
+            gameUser.setGameType(game.getGameType());
+            gameUser.setUserId(appUser.getId());
+            gameUser.setUserName(appUser.getName());
+            gameUser.setPlayClass("C");
+            gameUser.setStatus("1");
+            gameUser.setCurrentLevel(1);
+            gameUser.setTotalNum(game.getTotalNum());
+            gameUser.setCreateTime(current);
+            gameUser.setUpdateTime(current);
+            gameUser.setOrgCode(game.getOrgCode());
+            gameUser.setOrgName(game.getOrgName());
+            gameUser.setGameDifficulty(game.getGameDifficulty());
+            gameUser.setGameDifficultyRate(game.getGameDifficultyRate());
+            gameUser.setGameDuration(game.getGameDuration());
+            gameUser.setGameCoverImage(game.getGameCoverImage());
+            gameUsers.add(gameUser);
+        }
+        return gameUsers;
+    }
 }

hcp-core/src/main/java/com/yingyangfly/core/service/impl/VideoLearnServiceImpl.java

@@ -36,13 +36,13 @@ public class VideoLearnServiceImpl implements VideoLearnService {
     private TokenUtil tokenUtil;
 
     @Override
-    public List<VideoLearn> list(String videoType,String status,String orgCode) {
+    public List<VideoLearn> list(String videoType,String status) {
         QueryWrapper<VideoLearn> queryWrapper = new QueryWrapper<>();
         if(!StringUtils.isEmpty(videoType)){
             queryWrapper.eq("video_type",videoType);
         }
         queryWrapper.eq("status",status);
-        queryWrapper.eq("org_code",orgCode);
+//        queryWrapper.eq("org_code",orgCode);
         return videoLearnMapper.selectList(queryWrapper);
     }
 
@@ -57,7 +57,7 @@ public class VideoLearnServiceImpl implements VideoLearnService {
         if(!StringUtils.isEmpty(videoLearn.getVideoName())){
             queryWrapper.eq("video_name",videoLearn.getVideoName());
         }
-        queryWrapper.eq("org_code",tokenUtil.getCurrentUser().getOrgCode());
+//        queryWrapper.eq("org_code",tokenUtil.getCurrentUser().getOrgCode());
 
         return videoLearnMapper.selectPage(page,queryWrapper);
     }

hcp-platform/src/main/java/com/yingyangfly/platform/controller/GameVoiceController.java

@@ -59,7 +59,7 @@ public class GameVoiceController{
         if(!StringUtils.isEmpty(gameVoice.getVoiceType())){
             queryWrapper.eq("voice_type",gameVoice.getVoiceType());
         }
-        queryWrapper.eq("org_code",currentUser.getOrgCode());
+//        queryWrapper.eq("org_code",currentUser.getOrgCode());
         return ResultResponse.success(gameVoiceService.list(queryWrapper));
     }