From 3a50a0eb7ef239c80c4b7870e2ae589866ad66b6 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 15 十二月 2025 16:03:02 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAreaResult.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAreaResult.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAreaResult.java
index 50442bd..6076887 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAreaResult.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAreaResult.java
@@ -1,10 +1,19 @@
package com.zy.acs.manager.manager.controller.result;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.acs.framework.common.SpringUtils;
import com.zy.acs.manager.common.domain.AreaShapeDto;
import com.zy.acs.manager.common.domain.MapPointDto;
+import com.zy.acs.manager.core.service.AreaGovernService;
import com.zy.acs.manager.manager.entity.Area;
+import com.zy.acs.manager.manager.entity.AreaAgv;
+import com.zy.acs.manager.manager.service.AreaAgvService;
import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
@Data
public class MapAreaResult {
@@ -31,6 +40,10 @@
private String memo;
+ private List<String> codeList = new ArrayList<>();
+
+ private List<Long> agvList = new ArrayList<>();
+
public MapAreaResult sync(Area area) {
this.setId(area.getId());
this.setName(area.getName());
@@ -46,6 +59,13 @@
this.setSpeedLimit(area.getSpeedLimit());
this.setPriority(area.getPriority());
this.setMemo(area.getMemo());
+
+ this.setCodeList(AreaGovernService.AREA_CODE.get(area.getId()));
+
+ AreaAgvService areaAgvService = SpringUtils.getBean(AreaAgvService.class);
+ List<AreaAgv> areaAgvList = areaAgvService.list(new LambdaQueryWrapper<AreaAgv>().eq(AreaAgv::getAreaId, area.getId()));
+ this.setAgvList(areaAgvList.stream().map(AreaAgv::getAgvId).distinct().collect(Collectors.toList()));
+
return this;
}
--
Gitblit v1.9.1