修改bug并且开发测评

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

@@ -37,7 +37,7 @@ public class AppUpgradeRecordController {
     /**
      * 获取新版本
      */
-    @Log(title = "获取新版本",operatorType= OperatorType.MOBILE)
+//    @Log(title = "获取新版本",operatorType= OperatorType.MOBILE)
     @PostMapping("/selectNewVersion")
     @TraceLog
     @ApiOperation("获取新版本")

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

@@ -40,7 +40,7 @@ public class GameParamsUserController{
      * @param gameParamsUser 查询实体
      * @return 所有数据
      */
-    @Log(title = "查询游戏设置列表",operatorType= OperatorType.MOBILE)
+//    @Log(title = "查询游戏设置列表",operatorType= OperatorType.MOBILE)
     @PostMapping("/list")
 //    @ApiOperation("列表")
     @TraceLog

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

@@ -70,7 +70,7 @@ public class GamePlayRecordController {
         return ResultResponse.success(gamePlayRecordDto);
     }
 
-    @Log(title = "查询当月记录",operatorType= OperatorType.MOBILE)
+//    @Log(title = "查询当月记录",operatorType= OperatorType.MOBILE)
     @PostMapping("/queryMonthRecord")
     @ApiOperation("查询当月记录")
     @TraceLog
@@ -87,7 +87,7 @@ public class GamePlayRecordController {
      * @param map
      * @return
      */
-    @Log(title = "查询记录详情",operatorType= OperatorType.MOBILE)
+//    @Log(title = "查询记录详情",operatorType= OperatorType.MOBILE)
     @PostMapping("/queryDayRecordDetail")
     @ApiOperation("查询记录详情")
     @TraceLog
@@ -102,7 +102,7 @@ public class GamePlayRecordController {
         return ResultResponse.success(gamePlayRecordDto);
     }
 
-    @Log(title = "统计训练天数，时长",operatorType= OperatorType.MOBILE)
+//    @Log(title = "统计训练天数，时长",operatorType= OperatorType.MOBILE)
     @PostMapping("/statisticRecord")
     @ApiOperation("统计训练天数、时长")
     @TraceLog

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

@@ -47,7 +47,7 @@ public class GameTaskController {
      * 查询推荐我的当前任务
      * @return
      */
-    @Log(title = "查询是否有进行中的任务",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询是否有进行中的任务",operatorType = OperatorType.MOBILE)
     @PostMapping(value = "/findMyCurrentTask")
     @TraceLog
     @ApiOperation("查询是否有进行中的任务")
@@ -83,7 +83,7 @@ public class GameTaskController {
      * 查询我所有的任务
      * @return
      */
-    @Log(title = "查询理疗报告列表",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询理疗报告列表",operatorType = OperatorType.MOBILE)
     @ApiOperation("查询理疗报告列表")
     @PostMapping(value = "/findMyAllTask")
     @TraceLog
@@ -188,7 +188,7 @@ public class GameTaskController {
     /**
      * 查询任务详情
      */
-    @Log(title = "查询任务详情",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询任务详情",operatorType = OperatorType.MOBILE)
     @ApiOperation("获取训练内容详情")
     @PostMapping(value = "/selectTaskDetailById")
     @TraceLog
@@ -201,7 +201,7 @@ public class GameTaskController {
     /**
      * 查询当天任务数量
      */
-    @Log(title = "查询当天任务数量",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询当天任务数量",operatorType = OperatorType.MOBILE)
     @PostMapping(value = "/countmyTask")
     @TraceLog
     public ResultResponse countmyTask() {

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

@@ -34,7 +34,7 @@ public class LearningPackageController {
     /**
      * 查询所有套餐
      */
-    @Log(title = "查询所有套餐",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询所有套餐",operatorType = OperatorType.MOBILE)
     @ApiOperation("获取服务套餐列表")
     @PostMapping("/list")
     @TraceLog

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

@@ -40,7 +40,7 @@ public class LiveController {
     @Autowired
     LiveStatService liveStatService;
 
-    @Log(title = "直播列表",operatorType = OperatorType.MOBILE)
+//    @Log(title = "直播列表",operatorType = OperatorType.MOBILE)
     @ApiOperation("直播列表")
     @PostMapping(value = "/page")
     @TraceLog
@@ -56,7 +56,7 @@ public class LiveController {
         return ResultResponse.success(liveService.reservation(dto.getId()));
     }
 
-    @Log(title = "获取直播间信息",operatorType = OperatorType.MOBILE)
+//    @Log(title = "获取直播间信息",operatorType = OperatorType.MOBILE)
     @ApiOperation("获取直播间信息")
     @PostMapping(value = "/detail")
     @TraceLog

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

@@ -45,7 +45,7 @@ public class MsgWarnController {
      * 查询有多少未读消息
      * @return
      */
-    @Log(title = "查询有多少未读消息",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询有多少未读消息",operatorType = OperatorType.MOBILE)
     @ApiOperation("获取未读消息数量")
     @PostMapping("/countMyMsg")
     @TraceLog
@@ -71,7 +71,7 @@ public class MsgWarnController {
      * 查询首页未读消息
      * @return
      */
-    @Log(title = "查询首页未读消息",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询首页未读消息",operatorType = OperatorType.MOBILE)
     @PostMapping("/selectHomePageMsg")
     @TraceLog
     public ResultResponse selectHomePageMsg(String msgType) {

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

@@ -49,7 +49,7 @@ public class PayOrderController {
     /**
      * 查询我的订单
      */
-    @Log(title = "查询我的订单",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询我的订单",operatorType = OperatorType.MOBILE)
     @ApiOperation("查询我的订单")
     @PostMapping("/queryMyOrder")
     @TraceLog

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

@@ -44,7 +44,7 @@ public class QuestionRecordController {
      * @param questionAnswerRecord
      * @return
      */
-    @Log(title = "查询测评记录",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询测评记录",operatorType = OperatorType.MOBILE)
     @ApiOperation("查询测评记录")
     @PostMapping("/selectAnswerRecord")
     @TraceLog
@@ -59,7 +59,7 @@ public class QuestionRecordController {
      * @param questionAnswerRecord
      * @return
      */
-    @Log(title = "查询测评记录详情",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询测评记录详情",operatorType = OperatorType.MOBILE)
     @ApiOperation("查询测评记录详情")
     @PostMapping("/selectAnswerRecordDetail")
     @TraceLog

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

@@ -34,7 +34,7 @@ public class ReviewController {
      * 查询我所有的任务
      * @return
      */
-    @Log(title = "获取评测试题",operatorType = OperatorType.MOBILE)
+//    @Log(title = "获取评测试题",operatorType = OperatorType.MOBILE)
     @ApiOperation("获取测评试题")
     @PostMapping(value = "/findAllReview")
     @TraceLog
@@ -62,7 +62,7 @@ public class ReviewController {
      * 查询测评结果
      * @return
      */
-    @Log(title = "查询测评结果",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询测评结果",operatorType = OperatorType.MOBILE)
     @ApiOperation("查询测评结果")
     @PostMapping(value = "/findReviewResult")
     @TraceLog
@@ -75,7 +75,7 @@ public class ReviewController {
      * 查询测评结果详情
      * @return
      */
-    @Log(title = "查询测评结果详情",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询测评结果详情",operatorType = OperatorType.MOBILE)
     @ApiOperation("查询测评结果详情")
     @PostMapping(value = "/findReviewResultDetail")
     @TraceLog

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

@@ -37,7 +37,7 @@ public class ReviewTaskController {
     private TokenUtil tokenUtil;
 
 
-    @Log(title = "获取测评任务",operatorType = OperatorType.MOBILE)
+//    @Log(title = "获取测评任务",operatorType = OperatorType.MOBILE)
     @PostMapping("/selectQuestions")
     @TraceLog
     @ApiOperation("获取测评任务")
@@ -54,7 +54,7 @@ public class ReviewTaskController {
      * app端查询测评任务列表，入参status，0未评测，1已评测
      * @return
      */
-    @Log(title = "测评任务列表",operatorType = OperatorType.MOBILE)
+//    @Log(title = "测评任务列表",operatorType = OperatorType.MOBILE)
     @ApiOperation("测评任务列表")
     @PostMapping("/his")
     @TraceLog

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

@@ -31,7 +31,7 @@ public class SysDictDataController {
     /**
      * 查询字典数据详细
      */
-    @Log(title = "查询字典数据详情",operatorType = OperatorType.MOBILE)
+//    @Log(title = "查询字典数据详情",operatorType = OperatorType.MOBILE)
     @ApiOperation("selectByDictType")
     @PostMapping(value = "/selectByDictType")
     @TraceLog

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

@@ -30,7 +30,7 @@ public class SysOrgController {
     SysOrgService sysOrgService;
 
 
-    @Log(title = "获取机构信息",operatorType = OperatorType.MOBILE)
+//    @Log(title = "获取机构信息",operatorType = OperatorType.MOBILE)
     @ApiOperation("/获取机构信息")
     @PostMapping("/findByOrgCode")
     @TraceLog

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

@@ -38,7 +38,7 @@ public class VideoLearnController {
     /**
      * 查询视频
      */
-    @Log(title = "获取休闲健脑视频列表",operatorType = OperatorType.MOBILE)
+//    @Log(title = "获取休闲健脑视频列表",operatorType = OperatorType.MOBILE)
     @ApiOperation("获取休闲健脑视频列表")
     @PostMapping("/list")
     @TraceLog

hcp-app/src/main/resources/application-dev.yml

@@ -98,9 +98,9 @@ yingyang:
     check-pwd: false
 
 baidu:
-  appId: 55480265
-  apiKey: px002Mxrj5K2CGyanMoQUcZU
-  secretKey: hiD6uuvNgRchMF0WVK3GN4bMxcmkq9Zt
+  appId: 116714556
+  apiKey: IsH2OofFaYYB88lO1zHTLDsF
+  secretKey: IkFp0lMRKN35g1Mw2LW9sFtylPfeTNl7
 query-daily-trai: https://yaorong.yaorongmedical.com/h5-training-daily/index.html
 
 review-task-space: 30

hcp-app/src/main/resources/application-prod.yml

@@ -98,9 +98,9 @@ yingyang:
     check-pwd: false
 
 baidu:
-  appId: 55480265
-  apiKey: px002Mxrj5K2CGyanMoQUcZU
-  secretKey: hiD6uuvNgRchMF0WVK3GN4bMxcmkq9Zt
+  appId: 116714556
+  apiKey: IsH2OofFaYYB88lO1zHTLDsF
+  secretKey: IkFp0lMRKN35g1Mw2LW9sFtylPfeTNl7
 query-daily-trai: https://yaorong.yaorongmedical.com/h5-training-daily/index.html
 
 review-task-space: 30

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

@@ -21,7 +21,7 @@ public interface GamePlayRecordService{
     void saveGamePlayRecord(GamePlayRecord gamePlayRecord,AppCurrentLoginUser appCurrentLoginUser);
 
     Integer sumTotalScoreByUserIdAndGameCode(Long userId, String gameCode,String playClass);
-    Map<String,Object> sumTotalScoreAndTotalDurationByUserIdAndGameCode(Long userId, String gameCode,String playClass);
+    Map<String,Object> sumTotalScoreAndTotalDurationByUserIdAndGameCode(Long userId, String gameCode,String playClass,String time);
     GamePlayRecordDto showResult(String gameCode,String playClass);
 
     Integer sumMaxScoreByGameCode(String gameCode,String playClass,String orgCode);

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

@@ -390,6 +390,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
     public IPage<AppUser> selectPage(AppUser appUser) {
         Page<AppUser> rowPage = new Page(appUser.getPage(), appUser.getLimit());
         QueryWrapper<AppUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("create_time");
         queryWrapper.eq("org_code", tokenUtil.getCurrentUser().getOrgCode());
         if(!StringUtils.isEmpty(appUser.getName())){
             queryWrapper.like("name", "%"+appUser.getName()+"%");

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

@@ -293,12 +293,14 @@ public class GamePlayRecordServiceImpl implements GamePlayRecordService {
     }
 
     @Override
-    public Map<String, Object> sumTotalScoreAndTotalDurationByUserIdAndGameCode(Long userId, String gameCode, String playClass) {
-
+    public Map<String, Object> sumTotalScoreAndTotalDurationByUserIdAndGameCode(Long userId, String gameCode, String playClass,String time) {
 
+        Date startDate = DateUtils.parseDate(time+" 00:00:00");
+        Date endDate = DateUtils.parseDate(time+" 23:59:59");
         Criteria criteria = Criteria.where("user_id").is(userId)
                 .and("game_code").is(gameCode)
                 .and("play_class").is(playClass)
+                .and("create_time").gte(startDate).lte(endDate)
                 .and("del_flag").is(0);
         Aggregation aggregation = Aggregation.newAggregation(
                 Aggregation.match(criteria),

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

@@ -171,7 +171,7 @@ public class GameTaskServiceImpl extends ServiceImpl<GameTaskMapper, GameTask> i
         List<TaskDetailDto> details = new ArrayList<>();
         DecimalFormat df = new DecimalFormat("0.##");
         for (GameTaskDetail detail : gameTaskDetails) {
-            Map<String, Object> map = gamePlayRecordService.sumTotalScoreAndTotalDurationByUserIdAndGameCode(appCurrentLoginUser.getId(), detail.getGameCode(), "A");
+            Map<String, Object> map = gamePlayRecordService.sumTotalScoreAndTotalDurationByUserIdAndGameCode(appCurrentLoginUser.getId(), detail.getGameCode(), "A",gameTask.getTaskStartTime());
             TaskDetailDto taskDetailDto = new TaskDetailDto();
             taskDetailDto.setGameType(GameTypeEnums.getInfo(detail.getGameType()));
             taskDetailDto.setGameTotalScore(map == null ? "0" : map.get("gameScore").toString());

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

@@ -101,7 +101,7 @@ public class GameUserServiceImpl extends ServiceImpl<GameUserMapper, GameUser> i
         }
         queryWrapper.eq("play_class","C");
         queryWrapper.ne("status","99");
-        queryWrapper.orderByAsc("order_num");
+        queryWrapper.orderByDesc("order_num");
         Page<GameUser> gameUserPage = gameUserMapper.selectPage(rowPage, queryWrapper);
         List<GameUser> gameUsers = gameUserPage.getRecords();
         for (GameUser gameUser : gameUsers) {

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

@@ -25,6 +25,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -100,33 +102,42 @@ public class ReviewServiceImpl extends ServiceImpl<ReviewMapper, Review> impleme
         reviewTask.setStatus("1");
         reviewTask.setReviewTime(DateUtils.getTime());
         reviewTaskMapper.update(reviewTask,reviewTaskQueryWrapper);
-        //更新脑力值
-        int i = getI(list);
-        AppUser appUserUpdate = new AppUser();
-        AppUser appUser = appUserMapper.selectById(appCurrentLoginUser.getId());
-        appUserUpdate.setId(appUser.getId());
-        if(appUser.getTestFlag().equals("2")){
-
-            appUserUpdate.setMentalEnergy(i+appUser.getMentalEnergy());
-            appUserUpdate.setTestFlag("0");
-            appUserMapper.updateById(appUserUpdate);
-
-            // 完成测评任务，推荐专属任务
-            List<Game> gameList = recommendFacade.recommendationA(appUser);
-            GameRecommendRule ruleA = recommendFacade.getRule("A");
-            List<GameUser> gameUsers = recommendFacade.buildGameUsers(gameList, appUser, ruleA);
-
-            gameTaskService.generateTask(gameUsers, ruleA.getOrgCode(), ruleA.getOrgName());
-            log.info("<<<<<<<<<<<<保存推荐游戏记录>>>>>>>>>>>>>>");
-            boolean gameRecommend = gameRecommendRecordService.saveBatch(gameUsers, ruleA.getOrgCode(), ruleA.getOrgName(), ruleA.getRecommendPlayClass());
-            log.info("<<<<<<<<<<<<保存推荐游戏记录响应:{}>>>>>>>>>>>>>>",gameRecommend);
-        }else{
-            appUserUpdate.setMentalEnergy(i);
-            appUserUpdate.setTestFlag("2");
-            appUserMapper.updateById(appUserUpdate);
+        ReviewTask reviewTask1 = reviewTaskMapper.selectById(list.get(0).getReviewTaskId());
+        if (reviewTask1.getType().equals("MMSE") || reviewTask1.getType().equals("MOCA")){
+            //更新脑力值
+            int i = getI(list);
+            int synthesisScore = (new BigDecimal(i).divide(new BigDecimal("30"))).multiply(new BigDecimal("500")).setScale(0, RoundingMode.DOWN).intValue();
+
+
+            AppUser appUserUpdate = new AppUser();
+            AppUser appUser = appUserMapper.selectById(appCurrentLoginUser.getId());
+            appUserUpdate.setId(appUser.getId());
+            if(appUser.getTestFlag().equals("2")){
+
+                appUserUpdate.setMentalEnergy(synthesisScore+appUser.getMentalEnergy());
+                appUserUpdate.setTestFlag("0");
+                appUserMapper.updateById(appUserUpdate);
+
+                // 完成测评任务，推荐专属任务
+                List<Game> gameList = recommendFacade.recommendationA(appUser);
+                GameRecommendRule ruleA = recommendFacade.getRule("A");
+                List<GameUser> gameUsers = recommendFacade.buildGameUsers(gameList, appUser, ruleA);
+
+                gameTaskService.generateTask(gameUsers, ruleA.getOrgCode(), ruleA.getOrgName());
+                log.info("<<<<<<<<<<<<保存推荐游戏记录>>>>>>>>>>>>>>");
+                boolean gameRecommend = gameRecommendRecordService.saveBatch(gameUsers, ruleA.getOrgCode(), ruleA.getOrgName(), ruleA.getRecommendPlayClass());
+                log.info("<<<<<<<<<<<<保存推荐游戏记录响应:{}>>>>>>>>>>>>>>",gameRecommend);
+            }else{
+                appUserUpdate.setMentalEnergy(synthesisScore);
+                appUserUpdate.setTestFlag("2");
+                appUserMapper.updateById(appUserUpdate);
+            }
         }
     }
 
+
+
+
     @Override
     public Map<String, Object> findReviewResult(ReviewRecord reviewRecord) {
         Map<String, Object> map = new HashMap<>();
@@ -228,19 +239,11 @@ public class ReviewServiceImpl extends ServiceImpl<ReviewMapper, Review> impleme
 
 
 
-                            if(re.getReviewId() == 33 || re.getReviewId() == 34|| re.getReviewId() == 35|| re.getReviewId() == 36|| re.getReviewId() == 37){
-                                if(re.getCorrect().equals("1")){//如果正确
-                                    j++;
-                                }
-                                g=25;
-                                if(j==5){
-                                    i += Integer.parseInt(re.getScore());
-                                }
-                            }else if(re.getReviewId() == 52 || re.getReviewId() == 53 || re.getReviewId() == 54|| re.getReviewId() == 55|| re.getReviewId() == 56){
+                            if(re.getReviewId() == 52 || re.getReviewId() == 53 || re.getReviewId() == 54|| re.getReviewId() == 55|| re.getReviewId() == 56){
                                 if(re.getCorrect().equals("1")){
                                     h++;
                                 }
-                                g=45;
+                                g=3;
 
                             }else{
                                 i += Integer.parseInt(re.getScore());
@@ -249,11 +252,11 @@ public class ReviewServiceImpl extends ServiceImpl<ReviewMapper, Review> impleme
                             }
 
                         if(h == 1){
-                            i = 15;
+                            i = 1;
                         }else if(h == 2 || h == 3){
-                            i = 30;
+                            i = 2;
                         } else if (h==4 || h==5) {
-                            i=45;
+                            i=3;
                         }
 
 
@@ -342,14 +345,7 @@ public class ReviewServiceImpl extends ServiceImpl<ReviewMapper, Review> impleme
         int j = 0;
         int h = 0;
         for (ReviewRecord record : reviewRecords) {
-            if(record.getReviewId() == 33 || record.getReviewId() == 34|| record.getReviewId() == 35|| record.getReviewId() == 36|| record.getReviewId() == 37){
-                if(record.getCorrect().equals("1")){//如果正确
-                    j++;
-                }
-                if(j==5){
-                    i += Integer.parseInt(record.getScore());
-                }
-            }else if(record.getReviewId() == 52 || record.getReviewId() == 53 || record.getReviewId() == 54|| record.getReviewId() == 55|| record.getReviewId() == 56){
+            if (record.getReviewId() == 52 || record.getReviewId() == 53 || record.getReviewId() == 54|| record.getReviewId() == 55|| record.getReviewId() == 56){
                 if(record.getCorrect().equals("1")){
                     h++;
                 }
@@ -361,11 +357,11 @@ public class ReviewServiceImpl extends ServiceImpl<ReviewMapper, Review> impleme
             }
         }
         if(h == 1){
-            i += 15;
+            i += 1;
         }else if(h == 2 || h == 3){
-            i += 30;
+            i += 2;
         } else if (h==4 || h==5) {
-            i+=45;
+            i+=3;
         }
         return i;
     }

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

@@ -86,6 +86,7 @@ public class ReviewTaskServiceImpl extends ServiceImpl<ReviewTaskMapper, ReviewT
             queryWrapper.eq("type",reviewTask.getType());
         }
         queryWrapper.eq("user_id",userId);
+        queryWrapper.orderByDesc("create_time");
         List<ReviewTask> records = reviewTaskMapper.selectList(queryWrapper);
         List<ReviewTaskDto> recordDtos = new ArrayList<>();
         for (ReviewTask record : records) {

hcp-large-screen/src/main/java/com/yingyangfly/large/screen/controller/ReviewController.java

@@ -31,7 +31,7 @@ public class ReviewController {
      * 查询我所有的任务
      * @return
      */
-    @Log(title = "查询我所有的任务",operatorType = OperatorType.OTHER)
+//    @Log(title = "查询我所有的任务",operatorType = OperatorType.OTHER)
     @PostMapping(value = "/findAllReview")
     @TraceLog
     public ResultResponse findAllReview(@RequestBody Review review) {
@@ -57,7 +57,7 @@ public class ReviewController {
      * 查询测评结果
      * @return
      */
-    @Log(title = "查询测评结果",operatorType = OperatorType.OTHER)
+//    @Log(title = "查询测评结果",operatorType = OperatorType.OTHER)
     @PostMapping(value = "/findReviewResult")
     @TraceLog
     public ResultResponse findReviewResult(@RequestBody ReviewRecord reviewRecord) {
@@ -69,7 +69,7 @@ public class ReviewController {
      * 查询测评结果详情
      * @return
      */
-    @Log(title = "查询测评结果详情",operatorType = OperatorType.OTHER)
+//    @Log(title = "查询测评结果详情",operatorType = OperatorType.OTHER)
     @PostMapping(value = "/findReviewResultDetail")
     @TraceLog
     public ResultResponse findReviewResultDetail(@RequestBody ReviewRecord reviewRecord) {

hcp-large-screen/src/main/resources/application-dev.yml

@@ -125,9 +125,9 @@ security:
       - /home/index
 
 baidu:
-  appId: 55480265
-  apiKey: px002Mxrj5K2CGyanMoQUcZU
-  secretKey: hiD6uuvNgRchMF0WVK3GN4bMxcmkq9Zt
+  appId: 116714556
+  apiKey: IsH2OofFaYYB88lO1zHTLDsF
+  secretKey: IkFp0lMRKN35g1Mw2LW9sFtylPfeTNl7
 query-daily-trai: https://yaorong.yaorongmedical.com/h5-training-daily/index.html
 
 review-task-space: 30

hcp-large-screen/src/main/resources/application-prod.yml

@@ -120,9 +120,9 @@ security:
       - /home/index
 
 baidu:
-  appId: 55480265
-  apiKey: px002Mxrj5K2CGyanMoQUcZU
-  secretKey: hiD6uuvNgRchMF0WVK3GN4bMxcmkq9Zt
+  appId: 116714556
+  apiKey: IsH2OofFaYYB88lO1zHTLDsF
+  secretKey: IkFp0lMRKN35g1Mw2LW9sFtylPfeTNl7
 query-daily-trai: https://yaorong.yaorongmedical.com/h5-training-daily/index.html
 
 review-task-space: 30

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

@@ -39,7 +39,7 @@ public class DepartmentController {
     private TokenUtil tokenUtil;
 
 
-    @Log(title = "查询科室列表")
+//    @Log(title = "查询科室列表")
     @PostMapping("/list")
     @TraceLog
     public ResultResponse list(){
@@ -53,7 +53,7 @@ public class DepartmentController {
         return ResultResponse.success(departmentVoList);
     }
 
-    @Log(title = "根据id查询科室")
+//    @Log(title = "根据id查询科室")
     @PostMapping("/selectById")
     @TraceLog
     public ResultResponse selectById(Long id){

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

@@ -96,7 +96,7 @@ public class DoctorController {
         return ResultResponse.success();
     }
 
-    @Log(title = "查询医师详情")
+//    @Log(title = "查询医师详情")
     @ApiOperation("详情")
     @PostMapping("/detail")
     @TraceLog

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

@@ -46,7 +46,7 @@ public class EquipmentController {
      * 分页查询所有数据
      * @return 所有数据
      */
-    @Log(title = "查询设备列表")
+//    @Log(title = "查询设备列表")
     @PostMapping("/list")
     @ApiOperation("列表")
     @TraceLog

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

@@ -57,7 +57,7 @@ public class GameController {
      * @param game 查询实体
      * @return 所有数据
      */
-    @Log(title = "查询游戏列表")
+//    @Log(title = "查询游戏列表")
     @PostMapping("/list")
     @ApiOperation("列表")
     @TraceLog
@@ -69,7 +69,7 @@ public class GameController {
         if(!StringUtils.isEmpty(game.getGameType())){
             queryWrapper.eq("game_type",game.getGameType());
         }
-
+        queryWrapper.orderByDesc("order_num");
         Page<Game> gamePage = gameService.page(new Page<>(game.getPage(), game.getLimit())
                 , queryWrapper);
         IPage<GameVo> gameVoIPage = EntityConverter.convertPage(gamePage, GameVo.class);
@@ -82,7 +82,7 @@ public class GameController {
      * @param dto 主键
      * @return 单条数据
      */
-    @Log(title = "查询游戏详情")
+//    @Log(title = "查询游戏详情")
     @PostMapping("/detail")
     @ApiOperation("详情")
     @TraceLog
@@ -195,7 +195,7 @@ public class GameController {
         return ResultResponse.success();
     }
 
-    @Log(title = "根据患者id和玩游戏类型查询游戏")
+//    @Log(title = "根据患者id和玩游戏类型查询游戏")
     @PostMapping("/hisGame")
     @TraceLog
     public ResultResponse hisGame(Long userId,String playClass){

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

@@ -34,7 +34,7 @@ public class GamePastRecordsController {
     @Resource
     private GamePastRecordsService gamePastRecordsService;
 
-    @Log(title = "查询历史游戏列表")
+//    @Log(title = "查询历史游戏列表")
     @PreAuthorize("@SSPermissionChecker.hasPermission('game_past_records')")
     @PostMapping("/list")
     @ApiOperation("列表")

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

@@ -45,7 +45,7 @@ public class GamePlayRecordController {
      * @param time yyyy-MM
      * @return
      */
-    @Log(title = "查询当月记录")
+//    @Log(title = "查询当月记录")
     @PostMapping("/queryMonthRecord")
     @ApiOperation("查询当月记录")
     @TraceLog
@@ -59,7 +59,7 @@ public class GamePlayRecordController {
      * @param map
      * @return
      */
-    @Log(title = "查询记录详情")
+//    @Log(title = "查询记录详情")
     @PostMapping("/queryDayRecordDetail")
     @ApiOperation("查询记录详情")
     @TraceLog

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

@@ -53,7 +53,7 @@ public class GameRecommendRuleController{
      * @param dto 主键
      * @return 单条数据
      */
-    @Log(title = "查询游戏推荐规则详情")
+//    @Log(title = "查询游戏推荐规则详情")
     @PostMapping("/detail")
     @ApiOperation("详情")
     @TraceLog

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

@@ -46,7 +46,7 @@ public class GameVoiceController{
      * @param gameVoice 查询实体
      * @return 所有数据
      */
-    @Log(title = "查询游戏声音列表")
+//    @Log(title = "查询游戏声音列表")
     @PreAuthorize("@SSPermissionChecker.hasPermission('system_gameVideo')")
     @PostMapping("/list")
     @ApiOperation("列表")

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

@@ -32,7 +32,7 @@ public class LearningPackageController {
     /**
      * 查询所有套餐
      */
-    @Log(title = "查询所有套餐")
+//    @Log(title = "查询所有套餐")
     @PostMapping("/selectAll")
     @TraceLog
     public ResultResponse list(String  packageType,String packageName,String status) {

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

@@ -43,7 +43,7 @@ public class LiveController {
         return ResultResponse.success(liveService.addLive(dto));
     }
 
-    @Log(title = "直播间列表")
+//    @Log(title = "直播间列表")
     @ApiOperation("直播间列表")
     @PostMapping(value = "/page")
     @TraceLog
@@ -51,7 +51,7 @@ public class LiveController {
         return ResultResponse.success(liveService.page(dto));
     }
 
-    @Log(title = "获取直播间信息")
+//    @Log(title = "获取直播间信息")
     @ApiOperation("获取直播间信息")
     @PostMapping(value = "/detail")
     @TraceLog

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

@@ -38,7 +38,7 @@ public class MedicalConsultationController{
      * @param dto 查询实体
      * @return 所有数据
      */
-    @Log(title = "查询医疗咨询服务列表")
+//    @Log(title = "查询医疗咨询服务列表")
     @PreAuthorize("@SSPermissionChecker.hasPermission('onLine_list')")
     @PostMapping("/list")
     @ApiOperation("列表")
@@ -50,7 +50,7 @@ public class MedicalConsultationController{
         return ResultResponse.success(medicalConsultationAlterVoIPage);
     }
 
-    @Log(title = "我的患者列表")
+//    @Log(title = "我的患者列表")
     @PostMapping("/patient/list")
     @ApiOperation("我的患者列表")
     @TraceLog
@@ -61,7 +61,7 @@ public class MedicalConsultationController{
         return ResultResponse.success(medicalConsultationAlterVoIPage);
     }
 
-    @Log(title = "我的患者-问诊记录")
+//    @Log(title = "我的患者-问诊记录")
     @PostMapping("/patient/record")
     @ApiOperation("我的患者-问诊记录")
     @TraceLog
@@ -72,7 +72,7 @@ public class MedicalConsultationController{
         return ResultResponse.success(medicalConsultationAlterVos);
     }
 
-    @Log(title = "我的收入列表")
+//    @Log(title = "我的收入列表")
     @PostMapping("/income/list")
     @ApiOperation("我的收入列表")
     @TraceLog

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

@@ -31,7 +31,7 @@ public class OrgMerchantController {
     @Autowired
     OrgMerchantService orgMerchantService;
 
-    @Log(title = "查询支付")
+//    @Log(title = "查询支付")
     @PostMapping("/list")
     @TraceLog
     public ResultResponse list(@RequestBody OrgMerchant orgMerchant){

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

@@ -70,7 +70,7 @@ public class PatientController {
         return appUserService.findPayParam(findPayParamDto);
     }
 
-    @Log(title = "患者列表")
+//    @Log(title = "患者列表")
     @PostMapping("/list")
     @TraceLog
     public ResultResponse list(@RequestBody AppUser appUser){
@@ -87,7 +87,7 @@ public class PatientController {
         return appUserService.delById(id);
     }
 
-    @Log(title = "查询患者详情")
+//    @Log(title = "查询患者详情")
     @PostMapping("/detail")
     @TraceLog
     public ResultResponse detailById(Long id){
@@ -95,7 +95,7 @@ public class PatientController {
         return ResultResponse.success(patientDto);
     }
 
-    @Log(title = "查询患者关联游戏列表")
+//    @Log(title = "查询患者关联游戏列表")
     @PostMapping("/games")
     @ApiOperation("游戏列表")
     @TraceLog

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

@@ -38,7 +38,7 @@ public class PayOrderController {
     private PayService payService;
 
 
-    @Log(title = "获取设备退款信息")
+//    @Log(title = "获取设备退款信息")
     @PostMapping("/getRefundParam")
     @ApiOperation("获取设备退款信息")
     @TraceLog
@@ -69,7 +69,7 @@ public class PayOrderController {
     /**
      * 列表
      */
-    @Log(title = "订单列表")
+//    @Log(title = "订单列表")
     @PreAuthorize("@SSPermissionChecker.hasPermission('order_list')")
     @PostMapping("/list")
     @TraceLog
@@ -84,7 +84,7 @@ public class PayOrderController {
     /**
      * 关闭订单
      */
-    @Log(title = "订单列表")
+//    @Log(title = "订单列表")
     @PostMapping("/delPayOrder")
     @TraceLog
     public ResultResponse delPayOrder(String orderNo) {

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

@@ -141,7 +141,7 @@ public class QuestionRecordController {
      * @param questionAnswerRecord
      * @return
      */
-    @Log(title = "查询测评记录")
+//    @Log(title = "查询测评记录")
     @PostMapping("/selectAnswerRecord")
     @TraceLog
     public ResultResponse selectAnswerRecord(@RequestBody QuestionAnswerRecord questionAnswerRecord){
@@ -154,7 +154,7 @@ public class QuestionRecordController {
      * @param questionAnswerRecord
      * @return
      */
-    @Log(title = "查询测评记录详情")
+//    @Log(title = "查询测评记录详情")
     @PostMapping("/selectAnswerRecordDetail")
     @TraceLog
     public ResultResponse selectAnswerRecordDetail(@RequestBody QuestionAnswerRecord questionAnswerRecord){

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

@@ -52,7 +52,7 @@ public class ReviewTaskController {
         return ResultResponse.success();
     }
 
-    @Log(title = "获取测评列表")
+//    @Log(title = "获取测评列表")
     @PostMapping("/selectQuestions")
     @TraceLog
     public ResultResponse selectQuestions(@RequestBody ReviewTask reviewTask){
@@ -63,7 +63,7 @@ public class ReviewTaskController {
     }
 
 
-    @Log(title = "获取测评历史数据")
+//    @Log(title = "获取测评历史数据")
     @PostMapping("/his")
     @TraceLog
     public ResultResponse list(@RequestBody ReviewTask reviewTask) {
@@ -83,7 +83,7 @@ public class ReviewTaskController {
      * 查询测评结果详情
      * @return
      */
-    @Log(title = "查询测评结果详情")
+//    @Log(title = "查询测评结果详情")
     @PostMapping(value = "/findReviewResultDetail")
     @TraceLog
     public ResultResponse findReviewResultDetail(@RequestBody ReviewRecord reviewRecord) {

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

@@ -44,7 +44,7 @@ public class SysParamController {
     /**
      * 列表
      */
-    @Log(title = "系统参数列表")
+//    @Log(title = "系统参数列表")
     @PreAuthorize("@SSPermissionChecker.hasPermission('system_params')")
     @PostMapping("/list")
     @TraceLog

hcp-platform/src/main/java/com/yingyangfly/platform/sys/controller/SysDictDataController.java

@@ -47,7 +47,7 @@ public class SysDictDataController
     /**
      * 查询字典数据详细
      */
-    @Log(title = "查询所有数据字典")
+//    @Log(title = "查询所有数据字典")
     @PostMapping(value = "/selectByDictType")
     @TraceLog
     public ResultResponse findByDictType(String dictType,String status) {
@@ -59,7 +59,7 @@ public class SysDictDataController
     /**
      * 查询字典数据详细
      */
-    @Log(title = "查询数据字典详情")
+//    @Log(title = "查询数据字典详情")
     @PostMapping(value = "/selectByDictTypeAndVal")
     @TraceLog
     public ResultResponse selectByDictTypeAndVal(String  dictType)

hcp-platform/src/main/java/com/yingyangfly/platform/sys/controller/SysDictTypeController.java

@@ -41,7 +41,7 @@ public class SysDictTypeController {
     /**
      * 查询字典类型详细
      */
-    @Log(title = "查询字典类型详细")
+//    @Log(title = "查询字典类型详细")
     @TraceLog
     @PostMapping(value = "/findById")
     public ResultResponse findById(Long id) {

hcp-platform/src/main/java/com/yingyangfly/platform/sys/controller/SysOperLogController.java

@@ -29,7 +29,7 @@ public class SysOperLogController {
     @Autowired
     private SysOperLogService sysOperLogService;
 
-    @Log(title = "分页条件查询操作记录")
+//    @Log(title = "分页条件查询操作记录")
     @PreAuthorize("@SSPermissionChecker.hasPermission('operate_log')")
     @PostMapping("/list")
     public ResultResponse list(@RequestBody SysOperLogDto sysOperLogDto){

hcp-platform/src/main/java/com/yingyangfly/platform/sys/controller/SysRoleController.java

@@ -44,7 +44,7 @@ public class SysRoleController
     /**
      * 查询所有角色
      */
-    @Log(title = "查询所有角色")
+//    @Log(title = "查询所有角色")
     @PostMapping("/selectAll")
     @TraceLog
     public ResultResponse selectAll()

hcp-platform/src/main/java/com/yingyangfly/platform/sys/job/controller/SysJobController.java

@@ -32,7 +32,7 @@ public class SysJobController {
     /**
      * 查询定时任务列表
      */
-    @Log(title = "查询定时任务列表")
+//    @Log(title = "查询定时任务列表")
     @PreAuthorize("@SSPermissionChecker.hasPermission('task_list')")
     @PostMapping("/list")
     @TraceLog
@@ -45,7 +45,7 @@ public class SysJobController {
     /**
      * 获取定时任务详细信息
      */
-    @Log(title = "查询定时任务详细信息")
+//    @Log(title = "查询定时任务详细信息")
     @PostMapping(value = "/selectByJobId")
     @TraceLog
     public ResultResponse getInfo( Long id) {