From 2e586ec3808b5a6d170aba9ddcbf5ef7b69f9eef Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:56:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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..be9b3b4 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
@@ -204,4 +203,56 @@
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);
+ }
+
+ //........
+ System.out.println(String.format("id:%s,hostName:%s,requestTime:%s",
+ param.getId(),param.getHostName(),param.getRequestTime()));
+
+ return R.ok();
+ }
+
+ @PostMapping("/rcp/pakIn/auth/v1")
+ @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+ public synchronized R combPack(@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.combPACK(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){
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.infoReview(param);
+
+ return R.ok();
+ }
+ /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
}
--
Gitblit v1.9.1