From 7c4fa0b57d45926a5328e1650605f30c46b63341 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期二, 11 十月 2022 18:56:58 +0800
Subject: [PATCH] #lsh

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   31 +++++++++++--------------------
 1 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 91d9d9e..103054e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.annotations.AppAuth;
 import com.core.common.*;
 import com.core.exception.CoolException;
@@ -209,6 +210,7 @@
     public synchronized R hostName(@RequestHeader(required = false) String appkey,
                                    @RequestBody(required = false) HeartBeat param,
                                    HttpServletRequest request){
+        appkey="ea1f0459efc02a79f046f982767939ae";
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
@@ -226,7 +228,6 @@
     public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                    @RequestBody(required = false) CombParam param,
                                    HttpServletRequest request){
-
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
@@ -261,21 +262,25 @@
     public synchronized R infoReview(@RequestHeader(required = false) String appkey,
                                    @RequestBody(required = false) Review param,
                                    HttpServletRequest request){
-
+        appkey="ea1f0459efc02a79f046f982767939ae";
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
-        openService.infoReview(param);
-
-        return R.ok();
+        TestMast testMast = openService.infoReview(param);
+        if (testMast.getStatus()==3){
+            return R.ok();
+        }else if (testMast.getStatus()==2){
+            return R.error("绛夊緟鍛樺伐鎿嶄綔");
+        }
+        return R.error();
     }
     @PostMapping("/rpv/testFinish/auth/v1")
 //    @AppAuth(memo = "娴嬭瘯瀹屾垚")
     public synchronized R testFinish(@RequestHeader(required = false) String appkey,
                                 @RequestBody(required = false) Review param,
                                 HttpServletRequest request){
-
+        appkey="ea1f0459efc02a79f046f982767939ae";
         auth(appkey, param, request);
         Map<String,Boolean> map=new HashMap<>();
 
@@ -287,20 +292,6 @@
         }else {
             map.put("isComplete",false);
         }
-        return R.ok(map);
-    }
-    @PostMapping("/rpv/test/open/auth")
-    @AppAuth(memo = "妯℃嫙娴嬭瘯鎺ュ彛")
-    public synchronized R test1(@RequestHeader(required = false) String appkey,
-                                     @RequestBody(required = false) Object param,
-                                     HttpServletRequest request){
-
-        auth(appkey, param, request);
-
-        System.out.println(param);
-
-        Map<String,Boolean> map=new HashMap<>();
-        map.put("isComplete",true);
         return R.ok(map);
     }
 

--
Gitblit v1.9.1