From 6ee5f8a9a8cbec6bfe559debfc08ad4b8035add5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 14:11:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   87 ++++++++++++++++---------------------------
 1 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index d173e1a..6b9793f 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,14 +31,12 @@
 
     @Autowired
     private OpenService openService;
-    @Autowired
-    private ApiLogService apiLogService;
 
     @PostMapping("/order/matSync/default/v1")
     @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);
@@ -199,7 +196,6 @@
             orderDetails.add(detlDto);
         }
         System.out.println(JSON.toJSONString(param));
-        // 2
         System.out.println("======================================");
         OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
         param1.setOrderNo("963001846497017856");
@@ -208,57 +204,39 @@
 
     /*...........................璧e窞鏂板..............浠ヤ笅.............璧e窞鏂板...........................*/
     @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 = "鍏ュ簱閫氱煡鍗曟帴鍙h皟鐢�")
+    @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙h皟鐢�")
     public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                    @RequestBody(required = false) CombParam param,
-                                   HttpServletRequest request){
-        appkey="ea1f0459efc02a79f046f982767939ae";
+                                   HttpServletRequest request) {
+        log.info("鍏ュ簱閫氱煡鍗曟帴鍙h皟鐢�"+appkey+param);
         auth(appkey, 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 = "鍑哄簱閫氱煡鍗曟帴鍙h皟鐢�")
+    @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙h皟鐢�")
     public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
-                                   @RequestBody(required = false) CombParam param,
-                                   HttpServletRequest request){
+                                     @RequestBody(required = false) CombParam param,
+                                     HttpServletRequest request) {
 
         auth(appkey, param, request);
         if (Cools.isEmpty(param)) {
@@ -267,48 +245,49 @@
         //鍑哄簱寮�濮�
         openService.combPackOut(param);
 
-        Map<String,Boolean> map=new HashMap<>();
-        map.put("isComplete",true);
+        Map<String, Boolean> map = new HashMap<>();
+        map.put("isComplete", true);
         return R.ok(map);
     }
 
     @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";
+                                     @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){
+        if (testMast.getStatus() == 3) {
             return R.ok();
-        }else if (testMast.getStatus()==2){
+        } 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) {
+        appkey = "ea1f0459efc02a79f046f982767939ae";
         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 if(param.getTestResult().equals("NG")){
+        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);
+            map.put("isComplete", false);
+        } else {
+            map.put("isComplete", false);
         }
         return R.ok(map);
     }

--
Gitblit v1.9.1