From 3284076d954004eed648633eed9b8abed4f0b277 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 16:16:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 90 +++++++++++++++++++-------------------------
1 files changed, 39 insertions(+), 51 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..4ea809c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -36,7 +36,7 @@
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -196,7 +196,6 @@
orderDetails.add(detlDto);
}
System.out.println(JSON.toJSONString(param));
- // 2
System.out.println("======================================");
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
@@ -205,44 +204,39 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@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){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
-
- //........
- System.out.println(String.format("id:%s,hostName:%s,requestTime:%s",
- param.getId(),param.getHostName(),param.getRequestTime()));
-
return R.ok();
}
@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){
-
+ HttpServletRequest request) {
+ log.info("鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�"+appkey+param);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
//鐢熸垚鍏ュ簱閫氱煡妗�
openService.combPACK(param);
-
- Map<String,Boolean> map=new HashMap<>();
- map.put("isComplete",true);
- return R.ok(map);
+// Map<String, Boolean> map = new HashMap<>();
+// map.put("isComplete", true);
+ return R.ok();
}
+
@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){
+ @RequestBody(required = false) CombParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -251,56 +245,50 @@
//鍑哄簱寮�濮�
openService.combPackOut(param);
- Map<String,Boolean> map=new HashMap<>();
- map.put("isComplete",true);
+ 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){
-
+ @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 = "娴嬭瘯瀹屾垚")
+ @AppAuth(memo = "娴嬭瘯瀹屾垚")
public synchronized R testFinish(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Review param,
- HttpServletRequest request){
-
+ @RequestBody(required = false) Review param,
+ HttpServletRequest request) {
+ appkey = "ea1f0459efc02a79f046f982767939ae";
auth(appkey, param, request);
- Map<String,Boolean> map=new HashMap<>();
+ 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);
+ if (param.getTestResult().equals("OK")) {
+ map.put("isComplete", openService.testFinish(param));
+ } else if (param.getTestResult().equals("NG")) {
+ openService.testNG(param);
+ map.put("isComplete", false);
+ } 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