From 555e2110078d566ae5a9914641bd1b3db2fa9e25 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 09 十一月 2024 13:24:47 +0800
Subject: [PATCH] #
---
/dev/null | 29 --------------
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/AgvModelType.java | 29 ++++++++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java | 2 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java | 6 +++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 6 +++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvModelService.java | 2 +
6 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
index 182f1f3..38863f0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
@@ -11,6 +11,8 @@
@Data
public class MapWsAgvVo {
+ private String agvModel;
+
private String agvNo;
private String code;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataPatchScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataPatchScheduler.java
deleted file mode 100644
index d0550a3..0000000
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataPatchScheduler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.zy.acs.manager.core.scheduler;
-
-import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
-import com.zy.acs.manager.manager.service.AgvDetailService;
-import com.zy.acs.manager.manager.service.AgvService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by vincent on 8/7/2024
- */
-@Slf4j
-@Component
-public class MapDataPatchScheduler {
-
- @Autowired
- private AgvService agvService;
- @Autowired
- private AgvDetailService agvDetailService;
- @Autowired
- private MapDataDispatcher mapDataDispatcher;
-
- @Scheduled(cron = "0 */1 * * * ? ")
- public void autoClearRedundantFromDynamicMatrix() {
- }
-
-}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
index 63eb23e..ca9a97c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -8,8 +8,10 @@
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
+import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.service.AgvDetailService;
+import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.websocket.MapWebSocket;
@@ -33,6 +35,8 @@
private AgvService agvService;
@Autowired
private AgvDetailService agvDetailService;
+ @Autowired
+ private AgvModelService agvModelService;
@Autowired
private CodeService codeService;
@Autowired
@@ -64,6 +68,7 @@
);
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
if (null == agvDetail) { continue; }
Long recentCode = agvDetail.getRecentCode();
if (null == recentCode) { continue; }
@@ -71,6 +76,7 @@
if (null == code) { continue; }
MapWsAgvVo vo = new MapWsAgvVo();
+ vo.setAgvModel(agvModel.getType());
vo.setAgvNo(agv.getUuid());
vo.setCode(code.getData());
vo.setDirection(agvDetail.getAgvAngle());
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/AgvModelType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/AgvModelType.java
new file mode 100644
index 0000000..ab1bcd1
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/AgvModelType.java
@@ -0,0 +1,29 @@
+package com.zy.acs.manager.manager.enums;
+
+import com.zy.acs.framework.common.SpringUtils;
+import com.zy.acs.manager.common.exception.BusinessException;
+import com.zy.acs.manager.manager.entity.AgvModel;
+import com.zy.acs.manager.manager.service.AgvModelService;
+
+public enum AgvModelType {
+
+ CTU_BOX_TRANSPORT_AGV,
+ UNDERDRIVE_AGV,
+ HEAVY_LOAD_STACKING_ROBOT,
+ FORKLIFT_AGV,
+ TOW_TRACTOR_AGV,
+ ;
+
+ AgvModelType() {
+ }
+
+ public long val() {
+ AgvModelService service = SpringUtils.getBean(AgvModelService.class);
+ AgvModel agvModel = service.selectByType(this.toString());
+ if (agvModel == null) {
+ throw new BusinessException("AgvModelType Error!");
+ }
+ return agvModel.getId();
+ }
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvModelService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvModelService.java
index 86651b9..e70b4fe 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvModelService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/AgvModelService.java
@@ -5,4 +5,6 @@
public interface AgvModelService extends IService<AgvModel> {
+ AgvModel selectByType(String type);
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java
index cae99f7..86dc58b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.acs.manager.manager.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.mapper.AgvModelMapper;
@@ -9,4 +10,9 @@
@Service("agvModelService")
public class AgvModelServiceImpl extends ServiceImpl<AgvModelMapper, AgvModel> implements AgvModelService {
+ @Override
+ public AgvModel selectByType(String type) {
+ return this.getOne(new LambdaQueryWrapper<AgvModel>().eq(AgvModel::getType, type));
+ }
+
}
--
Gitblit v1.9.1