From 9dd2b6186b18c6d3281fe8c48f1ff4c2bc1fc8d7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 14 十月 2024 14:00:56 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/http.js | 4 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/MapItem.java | 6 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 24 +++++++++--
zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java | 14 +++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/LogDataScheduler.java | 15 ++++---
5 files changed, 47 insertions(+), 16 deletions(-)
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index 89d6129..a9f8d4a 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -22,9 +22,9 @@
'Content-Type': 'application/x-www-form-urlencoded'
}
}).then((res) => {
- const { code, msg, data: { data } } = res.data;
+ const { code, msg, data: { common, point } } = res.data;
if (code === 200) {
- const mapItemList = eval(data);
+ const mapItemList = eval(common);
mapItemList.forEach(item => {
if (item.type !== DEVICE_TYPE.AGV) {
const sprite = Tool.generateSprite(item.type);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java
new file mode 100644
index 0000000..e872748
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java
@@ -0,0 +1,14 @@
+package com.zy.acs.manager.common.constant;
+
+public enum MapItemType {
+
+ SHELF,
+ STATION,
+ CHARGE,
+ AGV,
+ DIRECTION,
+ POINT,
+ ;
+
+
+}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/LogDataScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/LogDataScheduler.java
index ec7c2bf..5494b43 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/LogDataScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/LogDataScheduler.java
@@ -5,6 +5,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
@@ -13,7 +14,7 @@
* Created by vincent on 5/8/2024
*/
@Slf4j
-//@Component
+@Component
@SuppressWarnings("all")
public class LogDataScheduler {
@@ -26,11 +27,13 @@
@Transactional
public void syncLog() {
Integer dataExpiredDays = Optional.ofNullable(configService.getVal("dataExpiredDays", Integer.class)).orElse(7);
- this.syncTaskLog(dataExpiredDays);
- this.syncActionLog(dataExpiredDays);
- this.syncSegmentLog(dataExpiredDays);
- this.syncJamLog(dataExpiredDays);
- this.syncTravelLog(dataExpiredDays);
+ if (dataExpiredDays > 0) {
+ this.syncTaskLog(dataExpiredDays);
+ this.syncActionLog(dataExpiredDays);
+ this.syncSegmentLog(dataExpiredDays);
+ this.syncJamLog(dataExpiredDays);
+ this.syncTravelLog(dataExpiredDays);
+ }
}
public void syncTaskLog(Integer dataExpiredDays){
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 69f147e..7512db7 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -7,6 +7,7 @@
import com.zy.acs.framework.common.R;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.framework.exception.CoolException;
+import com.zy.acs.manager.common.constant.MapItemType;
import com.zy.acs.manager.common.domain.MapAgvDto;
import com.zy.acs.manager.common.domain.MapCodeDto;
import com.zy.acs.manager.common.domain.MapDto;
@@ -17,6 +18,7 @@
import com.zy.acs.manager.manager.controller.param.MapDataParam;
import com.zy.acs.manager.manager.controller.param.MapParam;
import com.zy.acs.manager.manager.entity.*;
+import com.zy.acs.manager.manager.entity.Map;
import com.zy.acs.manager.manager.enums.AgvStsType;
import com.zy.acs.manager.manager.mapper.MapMapper;
import com.zy.acs.manager.manager.service.*;
@@ -27,10 +29,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
/**
* Created by vincent on 2023/6/1
@@ -63,8 +62,23 @@
@PreAuthorize("hasAuthority('manager:loc:list')")
@PostMapping("/data/fetch")
public R fetch(@RequestParam(required = false) Long zoneId, @RequestParam(required = false) Integer floor) {
+ // code
+ List<Code> codeList = codeService.list(new LambdaQueryWrapper<Code>().eq(Code::getStatus, 1));
+ List<MapItem> mapCodeItems = new ArrayList<>();
+ codeList.forEach(code -> {
+ MapItem mapItem = new MapItem();
+ mapItem.setType(MapItemType.POINT.toString());
+ mapItem.setNo(code.getData());
+ mapItem.setPositionX(code.getX());
+ mapItem.setPositionY(code.getY());
+ mapCodeItems.add(mapItem);
+ });
+ // common
Map activeMap = mapMapper.selectActive(zoneId, floor);
- return R.ok().add(activeMap);
+ return R.ok().add(Cools
+ .add("point", GsonUtils.toJson(mapCodeItems))
+ .add("common", activeMap.getData())
+ );
}
@PreAuthorize("hasAuthority('manager:loc:update')")
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/MapItem.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/MapItem.java
index 76deb26..02a4ee6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/MapItem.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/MapItem.java
@@ -27,10 +27,10 @@
private Double positionY;
- private Double scaleX;
+ private Double scaleX = 1D;
- private Double scaleY;
+ private Double scaleY = 1D;
- private Double rotation;
+ private Double rotation = 0D;
}
--
Gitblit v1.9.1