From 7be83adcdc6ee45fce42d14d7da2be33b1bcc216 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 18 五月 2023 09:23:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 114 +++++++++++++++++++++++++++-----------------------------
1 files changed, 55 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 103054e..47b41f3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,7 +1,6 @@
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;
@@ -37,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);
@@ -197,7 +196,6 @@
orderDetails.add(detlDto);
}
System.out.println(JSON.toJSONString(param));
- // 2
System.out.println("======================================");
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
@@ -206,91 +204,89 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@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){
- appkey="ea1f0459efc02a79f046f982767939ae";
+ 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")
+
+// @PostMapping("/rpc/pakOut/auth/v1")
// @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
- public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) CombParam param,
- HttpServletRequest request){
+// 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);
+// }
- 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")
+// @PostMapping("/rpv/infoReview/auth/v1")
// @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
- 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);
- }
- TestMast testMast = openService.infoReview(param);
- if (testMast.getStatus()==3){
- return R.ok();
- }else if (testMast.getStatus()==2){
- return R.error("绛夊緟鍛樺伐鎿嶄綔");
- }
- return R.error();
- }
+// 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);
+// }
+// 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){
- appkey="ea1f0459efc02a79f046f982767939ae";
+ @RequestBody(required = false) Review param,
+ HttpServletRequest request) {
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);
}
--
Gitblit v1.9.1