From d34366b9d348f47a8083aa3dd2e3e0efa2377dcf Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期五, 25 四月 2025 20:57:18 +0800
Subject: [PATCH] 初步调试
---
src/main/java/com/zy/asrs/controller/OpenController.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 104 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 20ac3c6..36213ba 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,12 +1,15 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.R;
-import com.zy.asrs.domain.NotifyDto;
+import com.zy.asrs.domain.ShuttleGatherResult;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.domain.param.*;
import com.zy.asrs.entity.ApiLog;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.NotifyUtils;
import com.zy.common.annotations.OpenApiLog;
import com.zy.common.service.CommonService;
@@ -27,6 +30,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
@Slf4j
@RestController
@@ -43,6 +47,8 @@
private SlaveProperties slaveProperties;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private LocMastService locMastService;
@PostMapping("/createMoveTask")
@OpenApiLog(memo = "灏忚溅绉诲姩浠诲姟")
@@ -50,7 +56,7 @@
if (param == null) {
return R.error("鍙傛暟涓嶈兘涓虹┖");
}
- boolean dispatchShuttle = shuttleDispatchUtils.dispatchShuttle(null, param.getLocNo(), param.getShuttleNo());
+ boolean dispatchShuttle = shuttleDispatchUtils.dispatchShuttle(null, param.getSourceLocNo(), param.getLocNo(), param.getShuttleNo(), param.getFlag());
apiLogService.insert(new ApiLog(
null
, "灏忚溅绉诲姩浠诲姟"
@@ -278,6 +284,102 @@
return R.ok().add(map);
}
+ @PostMapping("/getLocInformation")
+ @OpenApiLog(memo = "鑾峰彇鎸囧畾搴撲綅淇℃伅")
+ public R getLocInformation(@RequestBody GetLocInformationParam param) {
+ if (param == null) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖");
+ }
+ LocMast locMast = locMastService.queryByLoc(param.getLocNo());
+ if (locMast == null) {
+ return R.error("搴撲綅淇℃伅涓嶅瓨鍦�");
+ }
+
+ 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);
+ }
+
+ @PostMapping("/getAllLocInformation")
+ @OpenApiLog(memo = "鑾峰彇鍏ㄩ儴搴撲綅淇℃伅")
+ public R getAllLocInformation() {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>());
+ if (locMasts.isEmpty()) {
+ return R.error("搴撲綅淇℃伅涓嶅瓨鍦�");
+ }
+
+ ArrayList<HashMap<String, Object>> list = new ArrayList<>();
+ for (LocMast locMast : locMasts) {
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("locNo", locMast.getLocNo());
+ map.put("locSts", locMast.getLocSts());
+ list.add(map);
+ }
+
+ apiLogService.insert(new ApiLog(
+ null
+ , "鑾峰彇鎸囧畾搴撲綅淇℃伅"
+ , "/getLocInformation"
+ , null
+ , null
+ , null
+ , null
+ , JSON.toJSONString(list)
+ , null
+ , null
+ , 1
+ , new Date()
+ , null
+ , null
+ ));
+
+ return R.ok().add(list);
+ }
+
+ @PostMapping("/shuttleGather")
+ @OpenApiLog(memo = "灏忚溅闆嗗悎")
+ public R shuttleGather(@RequestBody ShuttleGatherParam param) {
+ List<ShuttleGatherResult> shuttleGather = shuttleDispatchUtils.shuttleGather(param);
+
+ apiLogService.insert(new ApiLog(
+ null
+ , "鑾峰彇鎸囧畾搴撲綅淇℃伅"
+ , "/getLocInformation"
+ , null
+ , null
+ , null
+ , null
+ , JSON.toJSONString(shuttleGather)
+ , null
+ , null
+ , 1
+ , new Date()
+ , null
+ , null
+ ));
+
+ return R.ok().add(shuttleGather);
+ }
+
@GetMapping("/test")
public R test() {
notifyUtils.notify("task", 1, "9999", "W9999", NotifyMsgType.SHUTTLE_MOVING, "data");
--
Gitblit v1.9.1