From f32968b7eca070814080dc60237ad340f558c8d2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 20 三月 2025 16:36:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java | 25 ++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 27 +++++++++++++
src/main/webapp/static/js/basShuttle/basShuttle.js | 22 +++++++++++
src/main/java/com/zy/asrs/domain/ShuttleGatherResult.java | 14 +++++++
src/main/webapp/views/admin/basShuttle/basShuttle.html | 1
5 files changed, 88 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 06b1e9d..7c0b8fd 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -3,7 +3,7 @@
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;
@@ -355,6 +355,31 @@
return R.ok().add(list);
}
+ @PostMapping("/shuttleGather")
+ @OpenApiLog(memo = "灏忚溅闆嗗悎")
+ public R shuttleGather() {
+ List<ShuttleGatherResult> shuttleGather = shuttleDispatchUtils.shuttleGather();
+
+ 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");
diff --git a/src/main/java/com/zy/asrs/domain/ShuttleGatherResult.java b/src/main/java/com/zy/asrs/domain/ShuttleGatherResult.java
new file mode 100644
index 0000000..457f33a
--- /dev/null
+++ b/src/main/java/com/zy/asrs/domain/ShuttleGatherResult.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.domain;
+
+import lombok.Data;
+
+@Data
+public class ShuttleGatherResult {
+
+ private Integer shuttleNo;
+
+ private String idleLoc;
+
+ private Boolean result;
+
+}
diff --git a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
index a0e6732..d76f41b 100644
--- a/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/core/dispatcher/ShuttleDispatchUtils.java
@@ -1,7 +1,9 @@
package com.zy.core.dispatcher;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.ShuttleGatherResult;
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasShuttleService;
@@ -295,6 +297,29 @@
}
/**
+ * 灏忚溅闆嗗悎
+ */
+ public List<ShuttleGatherResult> shuttleGather() {
+ List<BasShuttle> basShuttles = basShuttleService.selectList(new EntityWrapper<BasShuttle>().eq("status", 1));
+ List<ShuttleGatherResult> list = new ArrayList<>();
+ for (BasShuttle basShuttle : basShuttles) {
+ String idleLoc = basShuttle.getIdleLoc();
+ if(Cools.isEmpty(idleLoc)) {
+ continue;
+ }
+
+ boolean result = shuttleMoveGenerate(null, idleLoc, basShuttle.getShuttleNo());
+
+ ShuttleGatherResult gatherResult = new ShuttleGatherResult();
+ gatherResult.setShuttleNo(basShuttle.getShuttleNo());
+ gatherResult.setIdleLoc(idleLoc);
+ gatherResult.setResult(result);
+ list.add(gatherResult);
+ }
+ return list;
+ }
+
+ /**
* 妫�娴嬬洰鏍囨ゼ灞傝溅鏁伴噺鏄惁灏忎簬鍏佽鐨勬渶澶ф暟閲�
* true: 灏忎簬鏈�澶ф暟閲� false: 澶т簬鎴栫瓑浜庢渶澶ф暟閲�
*/
diff --git a/src/main/webapp/static/js/basShuttle/basShuttle.js b/src/main/webapp/static/js/basShuttle/basShuttle.js
index 5b54268..2c6b8f2 100644
--- a/src/main/webapp/static/js/basShuttle/basShuttle.js
+++ b/src/main/webapp/static/js/basShuttle/basShuttle.js
@@ -100,6 +100,28 @@
case 'oneUpdateCharge':
showUpdateCharge();
break;
+ case 'shuttleGather':
+ admin.confirm('纭畾闆嗗悎鍏ㄩ儴灏忚溅鍚楋紵', {shadeClose: true}, function(){
+ $.ajax({
+ url: baseUrl+"/openapi/shuttleGather",
+ headers: {'token': localStorage.getItem('token')},
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ layer.msg("璇锋眰鎴愬姛", {icon: 1});
+ tableReload();
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
case 'exportData':
admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
var titles=[];
diff --git a/src/main/webapp/views/admin/basShuttle/basShuttle.html b/src/main/webapp/views/admin/basShuttle/basShuttle.html
index 79e3dcd..9405603 100644
--- a/src/main/webapp/views/admin/basShuttle/basShuttle.html
+++ b/src/main/webapp/views/admin/basShuttle/basShuttle.html
@@ -47,6 +47,7 @@
<button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm" lay-event="oneUpdateCharge">涓�閿慨鏀圭數閲忕嚎</button>
+ <button class="layui-btn layui-btn-sm" lay-event="shuttleGather">灏忚溅闆嗗悎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
</script>
--
Gitblit v1.9.1