From cbc6567e648288ad5183109f2d76a53fdbabfc81 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 15:17:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 95 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..6b9793f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,6 +4,7 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
@@ -13,9 +14,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -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,11 +196,102 @@
orderDetails.add(detlDto);
}
System.out.println(JSON.toJSONString(param));
- // 2
System.out.println("======================================");
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
System.out.println(JSON.toJSONString(param1));
}
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ @PostMapping("/rpc/watchDog/auth/v1")
+ @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
+ public synchronized R hostName(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) HeartBeat param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/rpc/pakIn/auth/v1")
+ @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+ public synchronized R combPack(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) CombParam param,
+ 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();
+ }
+
+ @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 = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
+ 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 = "娴嬭瘯瀹屾垚")
+ 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")) {
+ 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