From d35dd49decd2207b80b8c9410427d4ff25d3e3d0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 11 二月 2023 13:12:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8363ae3..d173e1a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -31,6 +32,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private ApiLogService apiLogService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -205,10 +208,11 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@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";
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -221,12 +225,12 @@
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){
-
+ appkey="ea1f0459efc02a79f046f982767939ae";
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -235,11 +239,23 @@
openService.combPACK(param);
Map<String,Boolean> map=new HashMap<>();
+ apiLogService.save(
+ "mes鐢宠鍏ュ簱",
+ "172.28.15.251",
+ null,
+ "127.0.0.1",
+ JSON.toJSONString("PackNo:"+param.getPackNo()
+ +" PackName:"+param.getPackName()
+ +" RequestTime:"+param.getRequestTime()
+ +" SettingTimes:"+param.getSettingTimes()),
+ "172.28.15.251",
+ true
+ );
map.put("isComplete",true);
return R.ok(map);
}
- @PostMapping("/rcp/pakOut/auth/v1")
- @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+ @PostMapping("/rpc/pakOut/auth/v1")
+// @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request){
@@ -257,50 +273,43 @@
}
@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){
-
+ 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){
-
+ appkey="ea1f0459efc02a79f046f982767939ae";
auth(appkey, param, request);
Map<String,Boolean> map=new HashMap<>();
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (param.getTestResult().equals("ok")){
+ if (param.getTestResult().equals("OK")){
map.put("isComplete",openService.testFinish(param));
- }else {
+ }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