From a6076e796892c476f7b38a5ee475a5f5591d7625 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期一, 26 九月 2022 20:28:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 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..475b2dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -221,7 +221,7 @@
         return R.ok();
     }
 
-    @PostMapping("/rcp/pakIn/auth/v1")
+    @PostMapping("/rpc/pakIn/auth/v1")
     @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙h皟鐢�")
     public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                    @RequestBody(required = false) CombParam param,
@@ -233,6 +233,23 @@
         }
         //鐢熸垚鍏ュ簱閫氱煡妗�
         openService.combPACK(param);
+
+        Map<String,Boolean> map=new HashMap<>();
+        map.put("isComplete",true);
+        return R.ok(map);
+    }
+    @PostMapping("/rpc/pakOut/auth/v1")
+    @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙h皟鐢�")
+    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);
@@ -253,6 +270,25 @@
 
         return R.ok();
     }
+    @PostMapping("/rpv/testFinish/auth/v1")
+    @AppAuth(memo = "娴嬭瘯瀹屾垚")
+    public synchronized R testFinish(@RequestHeader(required = false) String appkey,
+                                @RequestBody(required = false) Review param,
+                                HttpServletRequest request){
+
+        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 = "妯℃嫙娴嬭瘯鎺ュ彛")
     public synchronized R test1(@RequestHeader(required = false) String appkey,
@@ -260,9 +296,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