From 70909ef529fb89861672306222f7491d236ad5d2 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 06 十月 2022 20:14:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 78ded4b..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){
@@ -221,8 +222,8 @@
return R.ok();
}
- @PostMapping("/rcp/pakIn/auth/v1")
- @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+ @PostMapping("/rpc/pakIn/auth/v1")
+// @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
public synchronized R combPack(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request){
@@ -238,9 +239,26 @@
map.put("isComplete",true);
return R.ok(map);
}
+ @PostMapping("/rpc/pakOut/auth/v1")
+// @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+ public synchronized R combpakOut(@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);
+ }
+ //鍑哄簱寮�濮�
+ openService.combPackOut(param);
+
+ Map<String,Boolean> map=new HashMap<>();
+ map.put("isComplete",true);
+ return R.ok(map);
+ }
@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){
@@ -249,9 +267,32 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- openService.infoReview(param);
+ 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){
- return R.ok();
+ auth(appkey, param, request);
+ Map<String,Boolean> map=new HashMap<>();
+
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (param.getTestResult().equals("ok")){
+ map.put("isComplete",openService.testFinish(param));
+ }else {
+ map.put("isComplete",false);
+ }
+ return R.ok(map);
}
@PostMapping("/rpv/test/open/auth")
@AppAuth(memo = "妯℃嫙娴嬭瘯鎺ュ彛")
@@ -260,9 +301,7 @@
HttpServletRequest request){
auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
+
System.out.println(param);
Map<String,Boolean> map=new HashMap<>();
--
Gitblit v1.9.1