From 5eb299fcff5db1bcb49629b311809dd7ae086f27 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 17 十一月 2025 08:14:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   80 ++++------------------------------------
 1 files changed, 8 insertions(+), 72 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index fd3e4f6..4b2914a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -118,7 +118,7 @@
     //鍏ュ簱浠诲姟
     @PostMapping("/createInTask")
     @OpenApiLog(memo = "鍏ュ簱浠诲姟")
-    public R createInTask(@RequestBody CreateInTaskParam param) {
+    public synchronized R createInTask(@RequestBody CreateInTaskParam param) {
         if (param == null) {
             return R.error("鍙傛暟涓嶈兘涓虹┖");
         }
@@ -148,7 +148,7 @@
     //鍑哄簱浠诲姟
     @PostMapping("/createOutTask")
     @OpenApiLog(memo = "鍑哄簱浠诲姟")
-    public R createOutTask(@RequestBody CreateOutTaskParam param) {
+    public synchronized R createOutTask(@RequestBody CreateOutTaskParam param) {
         if (param == null) {
             return R.error("鍙傛暟涓嶈兘涓虹┖");
         }
@@ -234,7 +234,7 @@
     }
 
     @RequestMapping("/deviceStatus")
-    @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
+//    @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
     public R getDeviceStatus() {
         HashMap<String, Object> map = new HashMap<>();
         //鑾峰彇灏忚溅鏁版嵁
@@ -292,28 +292,10 @@
         map.put("forkLift", forkLiftProtocols);
         map.put("lift", liftProtocols);
 
-        apiLogService.insert(new ApiLog(
-                null
-                , "鑾峰彇璁惧鐘舵��"
-                , "/deviceStatus"
-                , null
-                , null
-                , null
-                , null
-                , JSON.toJSONString(map)
-                , null
-                , null
-                , 1
-                , new Date()
-                , null
-                , null
-        ));
-
         return R.ok().add(map);
     }
 
     @RequestMapping("/liftDeviceOriginData")
-    @OpenApiLog(memo = "鑾峰彇鎻愬崌鏈哄師濮嬫暟鎹�")
     public R getLiftDeviceOriginData() {
         HashMap<Integer, String> map = new HashMap<>();
 
@@ -328,23 +310,6 @@
 
             map.put(device.getDeviceNo(), liftThread.getRealtimeOriginData());
         }
-
-        apiLogService.insert(new ApiLog(
-                null
-                , "鑾峰彇鎻愬崌鏈哄師濮嬫暟鎹�"
-                , "/liftDeviceOriginData"
-                , null
-                , null
-                , null
-                , null
-                , JSON.toJSONString(map)
-                , null
-                , null
-                , 1
-                , new Date()
-                , null
-                , null
-        ));
 
         return R.ok().add(map);
     }
@@ -364,23 +329,6 @@
         map.put("locNo", locMast.getLocNo());
         map.put("locSts", locMast.getLocSts());
 
-        apiLogService.insert(new ApiLog(
-                null
-                , "鑾峰彇鎸囧畾搴撲綅淇℃伅"
-                , "/getLocInformation"
-                , null
-                , null
-                , null
-                , JSON.toJSONString(param)
-                , JSON.toJSONString(map)
-                , null
-                , null
-                , 1
-                , new Date()
-                , null
-                , null
-        ));
-
         return R.ok().add(map);
     }
 
@@ -399,23 +347,6 @@
             map.put("locSts", locMast.getLocSts());
             list.add(map);
         }
-
-        apiLogService.insert(new ApiLog(
-                null
-                , "鑾峰彇鍏ㄩ儴搴撲綅淇℃伅"
-                , "/getAllLocInformation"
-                , null
-                , null
-                , null
-                , null
-                , JSON.toJSONString(list)
-                , null
-                , null
-                , 1
-                , new Date()
-                , null
-                , null
-        ));
 
         return R.ok().add(list);
     }
@@ -506,6 +437,11 @@
         return R.ok().add(wrkMasts);
     }
 
+    @GetMapping("/systemStatus")
+    public R systemStatus() {
+        return R.ok();
+    }
+
     @GetMapping("/test")
     public R test() {
         notifyUtils.notify("task", 1, "9999", "W9999", NotifyMsgType.SHUTTLE_MOVING, "data");

--
Gitblit v1.9.1