bug修复

hcp-core/src/main/java/com/yingyangfly/core/domain/AppUpgradeRecord.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-public class AppUpgradeRecord {
+public class AppUpgradeRecord{
     private Long id;
 
     private Integer versionCode;
@@ -24,4 +24,9 @@ public class AppUpgradeRecord {
 
     private String updateBy;
     private String createBy;
+
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private java.lang.Integer page;
+    @com.baomidou.mybatisplus.annotation.TableField(exist = false)
+    private java.lang.Integer limit;
 }

hcp-core/src/main/java/com/yingyangfly/core/dto/CurrentLoginUser.java

@@ -41,11 +41,13 @@ public class CurrentLoginUser implements UserDetails {
     /**
      * 用户邮箱
      */
+    @JsonSerialize(using = Sm4JacksonSerialize.class)
     private String email;
 
     /**
      * 手机号码
      */
+    @JsonSerialize(using = Sm4JacksonSerialize.class)
     private String mobile;
     private String phone;
     /**

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

@@ -157,6 +157,10 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements Ga
         BeanUtils.copyProperties(game,gamePastRecords);
         gamePastRecords.setId(IdWorker.getId());
         gamePastRecordsService.save(gamePastRecords);
+        // 删除 用户游戏
+        LambdaQueryWrapper<GameUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GameUser::getGameCode,game.getGameCode());
+        gameUserMapper.delete(wrapper);
         // 删除游戏
         return removeById(gameId);
     }

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

@@ -32,6 +32,7 @@ public class GameTaskDetailServiceImpl extends ServiceImpl<GameTaskDetailMapper,
         QueryWrapper<GameTaskDetail> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id",gameDto.getPatientId());
         queryWrapper.eq("game_code",gameDto.getGameCode());
+        queryWrapper.eq("id",gameDto.getGameId());
         GameTaskDetail gameTaskDetail = gameTaskDetailMapper.selectOne(queryWrapper);
         gameTaskDetail.setGameDifficultyRate(gameDto.getGameDifficultyRate());
         gameTaskDetail.setGameDuration(gameDto.getGameDuration());

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

@@ -35,7 +35,6 @@ public class SlideshowServiceImpl extends ServiceImpl<SlideshowMapper, Slideshow
             if(slideshowDb != null){
                 return ResultResponse.fail("该类型的轮播图已经存在，不允许新增");
             }
-            slideshow.setStatus("1");
             slideshow.setCreateTime(new Date());
             slideshow.setOrgCode(currentUser.getOrgCode());
             slideshow.setOrgName(currentUser.getOrgName());

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

@@ -1,5 +1,10 @@
 package com.yingyangfly.platform.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yingyangfly.common.dto.ResultResponse;
 import com.yingyangfly.common.log.annotation.TraceLog;
 import com.yingyangfly.core.domain.AppUpgradeRecord;
@@ -34,8 +39,16 @@ public class UpgradeRecordController {
      */
     @PostMapping("/list")
     @TraceLog
-    public ResultResponse list(){
-        return ResultResponse.success(appUpgradeRecordService.selectAllVersion());
+    public ResultResponse list(@RequestBody AppUpgradeRecord appUpgradeRecord){
+        LambdaQueryWrapper<AppUpgradeRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotEmpty(appUpgradeRecord.getVersionName())){
+            lambdaQueryWrapper.like(AppUpgradeRecord::getVersionName,appUpgradeRecord.getVersionName());
+        }
+        if (ObjectUtils.isNotNull(appUpgradeRecord.getVersionCode())){
+            lambdaQueryWrapper.eq(AppUpgradeRecord::getVersionCode,appUpgradeRecord.getVersionCode());
+        }
+        return ResultResponse.success(appUpgradeRecordService.page(new Page<>(appUpgradeRecord.getPage(),appUpgradeRecord.getLimit())
+                , lambdaQueryWrapper));
     }
 
     /**

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

@@ -7,6 +7,7 @@ import com.yingyangfly.core.domain.SysUser;
 import com.yingyangfly.core.security.util.TokenUtil;
 import com.yingyangfly.core.service.impl.SysUserService;
 import com.yingyangfly.core.dto.CurrentLoginUser;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -67,7 +68,7 @@ public class SysUserController {
     public ResultResponse info() {
         CurrentLoginUser currentUser = tokenUtil.getCurrentUser();
         SysUser sysUser = sysUserService.getById(currentUser.getUserId());
-        currentUser.setIsOnline(sysUser.getIsOnline());
+        BeanUtils.copyProperties(sysUser,currentUser);
         return ResultResponse.success(currentUser);
     }