From 253e9b3735533c4d8c69cf5e6983d5fa1e984ae9 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期五, 05 十二月 2025 12:34:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 229 ++-------------------------------------------------------
1 files changed, 8 insertions(+), 221 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..730403a 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -63,22 +63,6 @@
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
boolean dispatchShuttle = shuttleDispatchUtils.dispatchShuttle(null, param.getLocNo(), param.getShuttleNo());
- apiLogService.insert(new ApiLog(
- null
- , "灏忚溅绉诲姩浠诲姟"
- , "/createMoveTask"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , null
- , null
- , dispatchShuttle ? 1 : 0
- , 1
- , new Date()
- , null
- , null
- ));
if (dispatchShuttle) {
return R.ok();
}
@@ -93,22 +77,6 @@
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
boolean result = commonService.createLocMoveTask(param);
- apiLogService.insert(new ApiLog(
- null
- , "绉诲簱浠诲姟"
- , "/createLocMoveTask"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , null
- , null
- , result ? 1 : 0
- , 1
- , new Date()
- , null
- , null
- ));
if (result) {
return R.ok();
}
@@ -118,27 +86,11 @@
//鍏ュ簱浠诲姟
@PostMapping("/createInTask")
@OpenApiLog(memo = "鍏ュ簱浠诲姟")
- public R createInTask(@RequestBody CreateInTaskParam param) {
+ public synchronized R createInTask(@RequestBody CreateInTaskParam param) {
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
boolean result = commonService.createInTask(param);
- apiLogService.insert(new ApiLog(
- null
- , "鍏ュ簱浠诲姟"
- , "/createInTask"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , null
- , null
- , result ? 1 : 0
- , 1
- , new Date()
- , null
- , null
- ));
if (result) {
return R.ok();
}
@@ -148,27 +100,11 @@
//鍑哄簱浠诲姟
@PostMapping("/createOutTask")
@OpenApiLog(memo = "鍑哄簱浠诲姟")
- public R createOutTask(@RequestBody CreateOutTaskParam param) {
+ public synchronized R createOutTask(@RequestBody CreateOutTaskParam param) {
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
boolean result = commonService.createOutTask(param);
- apiLogService.insert(new ApiLog(
- null
- , "鍑哄簱浠诲姟"
- , "/createOutTask"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , null
- , null
- , result ? 1 : 0
- , 1
- , new Date()
- , null
- , null
- ));
if (result) {
return R.ok();
}
@@ -182,22 +118,6 @@
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
boolean completeTask = commonService.completeTask(param);
- apiLogService.insert(new ApiLog(
- null
- , "浠诲姟瀹屾垚"
- , "/completeTask"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , null
- , null
- , completeTask ? 1 : 0
- , 1
- , new Date()
- , null
- , null
- ));
if (completeTask) {
return R.ok();
}
@@ -211,22 +131,6 @@
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
boolean completeTask = commonService.cancelTask(param);
- apiLogService.insert(new ApiLog(
- null
- , "浠诲姟鍙栨秷"
- , "/cancelTask"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , null
- , null
- , completeTask ? 1 : 0
- , 1
- , new Date()
- , null
- , null
- ));
if (completeTask) {
return R.ok();
}
@@ -234,7 +138,7 @@
}
@RequestMapping("/deviceStatus")
- @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
+// @OpenApiLog(memo = "鑾峰彇璁惧鐘舵��")
public R getDeviceStatus() {
HashMap<String, Object> map = new HashMap<>();
//鑾峰彇灏忚溅鏁版嵁
@@ -292,28 +196,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 +214,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);
}
@@ -363,23 +232,6 @@
HashMap<String, Object> map = new HashMap<>();
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);
}
@@ -400,23 +252,6 @@
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);
}
@@ -424,24 +259,6 @@
@OpenApiLog(memo = "灏忚溅闆嗗悎")
public R shuttleGather(@RequestBody ShuttleGatherParam param) {
List<ShuttleGatherResult> shuttleGather = shuttleDispatchUtils.shuttleGather(param);
-
- apiLogService.insert(new ApiLog(
- null
- , "灏忚溅闆嗗悎"
- , "/shuttleGather"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , JSON.toJSONString(shuttleGather)
- , null
- , null
- , 1
- , new Date()
- , null
- , null
- ));
-
return R.ok().add(shuttleGather);
}
@@ -449,24 +266,6 @@
@OpenApiLog(memo = "灏忚溅婕旂ず")
public R shuttleDemo(@RequestBody ShuttleDemoParam param) {
shuttleDispatchUtils.shuttleDemo(param);
-
- apiLogService.insert(new ApiLog(
- null
- , "灏忚溅婕旂ず"
- , "/shuttleDemo"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , null
- , null
- , null
- , 1
- , new Date()
- , null
- , null
- ));
-
return R.ok();
}
@@ -486,26 +285,14 @@
wrapper.eq("io_type", ioType.id);
}
List<WrkMast> wrkMasts = wrkMastService.selectList(wrapper);
- apiLogService.insert(new ApiLog(
- null
- , "鏌ヨ浠诲姟"
- , "/queryTask"
- , null
- , null
- , null
- , JSON.toJSONString(param)
- , JSON.toJSONString(wrkMasts)
- , null
- , null
- , 1
- , new Date()
- , null
- , null
- ));
-
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