大屏机在线更新

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

@@ -43,7 +43,7 @@ public class AppUpgradeRecordController {
     @ApiOperation("获取新版本")
     public ResultResponse selectNewVersion(Integer versionCode){
 
-        AppUpgradeRecord appUpgradeRecord =appUpgradeRecordService.selectNewVersion(versionCode);
+        AppUpgradeRecord appUpgradeRecord =appUpgradeRecordService.selectNewVersion(versionCode,0);
 
         AppUpgradeRecordVo appUpgradeRecordVo = EntityConverter.convertToTarget(appUpgradeRecord, AppUpgradeRecordVo.class);
 

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

@@ -19,6 +19,8 @@ public class AppUpgradeRecord{
 
     private String status;
 
+    private Integer appType;
+
     private Date createTime;
 
     private Date updateTime;

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

@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2023/8/29 0029 10:42
  */
 public interface AppUpgradeRecordService extends IService<AppUpgradeRecord> {
-    AppUpgradeRecord selectNewVersion(Integer versionCode);
+    AppUpgradeRecord selectNewVersion(Integer versionCode,Integer appType);
 
     List<AppUpgradeRecord> selectAllVersion();
 }

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

@@ -1,4 +1,5 @@
 package com.yingyangfly.core.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yingyangfly.core.domain.AppUpgradeRecord;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -20,13 +22,14 @@ import java.util.List;
 @Service
 public class AppUpgradeRecordServiceImpl extends ServiceImpl<AppUpgradeRecordMapper, AppUpgradeRecord> implements AppUpgradeRecordService {
 
-    @Autowired
+    @Resource
     private AppUpgradeRecordMapper appUpgradeRecordMapper;
     @Override
-    public AppUpgradeRecord selectNewVersion(Integer versionCode) {
+    public AppUpgradeRecord selectNewVersion(Integer versionCode,Integer appType) {
 
         QueryWrapper<AppUpgradeRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status",0);
+        queryWrapper.eq("app_type", appType);
         queryWrapper.gt("version_code",versionCode);
         queryWrapper.orderByDesc("create_time");
         List<AppUpgradeRecord> appUpgradeRecords = appUpgradeRecordMapper.selectList(queryWrapper);
@@ -40,7 +43,8 @@ public class AppUpgradeRecordServiceImpl extends ServiceImpl<AppUpgradeRecordMap
     @Override
     public List<AppUpgradeRecord> selectAllVersion() {
 
-        QueryWrapper<AppUpgradeRecord> queryWrapper = new QueryWrapper<>();
+        LambdaQueryWrapper<AppUpgradeRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AppUpgradeRecord::getAppType,0);
         return appUpgradeRecordMapper.selectList(queryWrapper);
     }
 }

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

@@ -707,6 +707,10 @@ public class PayServiceImpl implements PayService {
             ReviewTask reviewTask = new ReviewTask();
             reviewTask.setUserId(payOrder.getUserId());
             reviewTask.setCreateBy(appUser.getCreateBy());
+            List<String> scaleNameList = new ArrayList<>();
+            scaleNameList.add("MMSE");
+            scaleNameList.add("MOCA");
+            reviewTask.setScaleNameList(scaleNameList);
             //生成测评任务
             reviewTaskService.saveReviewTask(reviewTask);
             //记录测评任务消息
@@ -832,7 +836,7 @@ public class PayServiceImpl implements PayService {
     }
 
 
-    private void updateStatusByOrderNo(PayOrder payOrder,Boolean isRefund,Boolean isSub) {
+    private void    updateStatusByOrderNo(PayOrder payOrder,Boolean isRefund,Boolean isSub) {
         log.info("<<<<<<<<<<<<更改订单状态payOrder：{}， isRefund：{}，isSub：{}>>>>>>>>>>",JSON.toJSONString(payOrder),isRefund,isSub);
         QueryWrapper<PayOrder> queryWrapper = new QueryWrapper<>();
         if(isSub){

hcp-core/src/main/java/com/yingyangfly/core/vo/AppUpgradeRecordVo.java

@@ -17,6 +17,8 @@ public class AppUpgradeRecordVo {
 
     private String versionUrl;
 
+    private Integer appType;
+
     private String status;
 
     private Date createTime;

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

@@ -0,0 +1,32 @@
+package com.yingyangfly.large.screen.controller;
+
+import com.yingyangfly.common.dto.ResultResponse;
+import com.yingyangfly.common.log.annotation.TraceLog;
+import com.yingyangfly.core.domain.AppUpgradeRecord;
+import com.yingyangfly.core.service.AppUpgradeRecordService;
+import com.yingyangfly.core.util.EntityConverter;
+import com.yingyangfly.core.vo.AppUpgradeRecordVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/version")
+public class LargeScreenVersionController {
+
+    @Resource
+    private AppUpgradeRecordService appUpgradeRecordService;
+
+    @PostMapping("/selectNewVersion")
+    @TraceLog
+    public ResultResponse selectNewVersion(Integer versionCode) {
+        AppUpgradeRecord appUpgradeRecord =appUpgradeRecordService.selectNewVersion(versionCode,1);
+
+        AppUpgradeRecordVo appUpgradeRecordVo = EntityConverter.convertToTarget(appUpgradeRecord, AppUpgradeRecordVo.class);
+
+        return ResultResponse.success(appUpgradeRecordVo);
+    }
+
+}

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

@@ -123,6 +123,7 @@ security:
       - /im/**
       - /game_voice/**
       - /home/index
+      - /version/selectNewVersion
 
 baidu:
   appId: 116714556

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

@@ -118,6 +118,7 @@ security:
       - /im/**
       - /game_voice/**
       - /home/index
+      - /version/selectNewVersion
 
 baidu:
   appId: 116714556