From f548bd5e0c9e73f56fffa528ef14d92599a71cce Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 06 十月 2022 20:33:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 475b2dc..a35cc59 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;
@@ -205,7 +206,7 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@PostMapping("/rpc/watchDog/auth/v1")
- @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
+// @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
public synchronized R hostName(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) HeartBeat param,
HttpServletRequest request){
@@ -222,7 +223,7 @@
}
@PostMapping("/rpc/pakIn/auth/v1")
- @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+// @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
public synchronized R combPack(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request){
@@ -239,7 +240,7 @@
return R.ok(map);
}
@PostMapping("/rpc/pakOut/auth/v1")
- @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+// @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request){
@@ -257,7 +258,7 @@
}
@PostMapping("/rpv/infoReview/auth/v1")
- @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
+// @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
public synchronized R infoReview(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) Review param,
HttpServletRequest request){
@@ -266,12 +267,16 @@
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 = "娴嬭瘯瀹屾垚")
+// @AppAuth(memo = "娴嬭瘯瀹屾垚")
public synchronized R testFinish(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) Review param,
HttpServletRequest request){
--
Gitblit v1.9.1