From 5ce6bfb2e237b9fbf092a03cf80e86d928ac7ca6 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 20 六月 2023 16:40:51 +0800
Subject: [PATCH] 孚能
---
src/main/java/com/zy/asrs/controller/OpenController.java | 107 +++++++++++++++++++++--------------------------------
1 files changed, 42 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 150e00f..7252acf 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -6,7 +6,6 @@
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;
@@ -32,8 +31,6 @@
@Autowired
private OpenService openService;
- @Autowired
- private ApiLogService apiLogService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -211,92 +208,72 @@
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);
}
-
- //........
- 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 = "PACK淇℃伅涓嬪彂")
public synchronized R combPack(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request) {
- appkey = "ea1f0459efc02a79f046f982767939ae";
- auth(appkey, param, request);
+ log.info("PACK淇℃伅涓嬪彂鎺ュ彛璋冪敤"+appkey+param);
+ auth("ea1f0459efc02a79f046f982767939ae", param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- //鐢熸垚鍏ュ簱閫氱煡妗�
+ //鐢熸垚鍟嗗搧妗ｆ
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);
+// 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) {
+// @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);
+// }
- 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/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<>();
--
Gitblit v1.9.1