From 50afd615ec83e0e141991ef0658b19087cd8fd86 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期五, 13 六月 2025 16:08:37 +0800 Subject: [PATCH] 1 --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/OpenAgvParam.java | 19 ++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java | 40 +++++++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/OpenAlgorithmServiceImpl.java | 49 ++++++++++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/OpenAgvInfo.java | 59 +++++++++++++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/OpenAlgorithmService.java | 11 +++ 5 files changed, 178 insertions(+), 0 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java new file mode 100644 index 0000000..6eac6be --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/OpenAlgorithmController.java @@ -0,0 +1,40 @@ +package com.zy.acs.manager.manager.controller; + +import com.zy.acs.framework.common.Cools; +import com.zy.acs.framework.common.R; +import com.zy.acs.manager.common.annotation.OperationLog; +import com.zy.acs.manager.manager.controller.param.OpenAgvParam; +import com.zy.acs.manager.manager.service.OpenAlgorithmService; +import com.zy.acs.manager.system.controller.BaseController; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Created by vincent on 2023/6/12 + */ +@Api(tags = "Open Api") +@RestController +@RequestMapping("/api/open/algorithm") +public class OpenAlgorithmController extends BaseController { + + @Autowired + private OpenAlgorithmService openAlgorithmService; + + + @PostMapping("/getAgv") + @OperationLog("get agv msg") + public R save(@RequestBody OpenAgvParam param) { + if (Cools.isEmpty(param)) { + return R.error("涓嶈兘涓虹┖"); + } + if (Cools.isEmpty(param.getMapId())) { + return R.error("鍦板浘缂栧彿涓嶈兘涓虹┖"); + } + return R.ok(openAlgorithmService.listAgv(param)); + } + +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/OpenAgvParam.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/OpenAgvParam.java new file mode 100644 index 0000000..25ca0b6 --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/OpenAgvParam.java @@ -0,0 +1,19 @@ +package com.zy.acs.manager.manager.controller.param; + +import com.zy.acs.manager.common.domain.TaskDto; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by vincent on 2023/6/12 + */ +@Data +public class OpenAgvParam { + + private String agvId; + + + private String mapId; +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/OpenAgvInfo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/OpenAgvInfo.java new file mode 100644 index 0000000..022ccf4 --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/OpenAgvInfo.java @@ -0,0 +1,59 @@ +package com.zy.acs.manager.manager.controller.result; + +import lombok.Data; + +import java.util.List; + +@Data +public class OpenAgvInfo { + + /** + * AGV缂栧彿 + */ + private String agvNo; + /* + * 鐘舵�� + */ + private Integer status; + /** + * 褰撳墠鐢甸噺 + */ + private Integer vol; + /** + * 褰撳墠鏂瑰悜 + */ + private Double direction; + /** + * 閿欒淇℃伅 + */ + private String error; + + private List<Backpack> backpack; + /** + * 褰撳墠鎵�鍦ㄤ綅缃� + */ + private String position; + /** + * 鍓╀綑绌洪棽 + */ + private Integer empty; + /** + * 鑷姩鍏呯數 + */ + private Integer autoCharge; + /** + * 浣庣數閲� + */ + private Integer lowVol; + + @Data + public class Backpack { + private Integer index; + + private Boolean loaded; + + private Boolean execute; + + private String taskId; + } +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/OpenAlgorithmService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/OpenAlgorithmService.java new file mode 100644 index 0000000..689946a --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/OpenAlgorithmService.java @@ -0,0 +1,11 @@ +package com.zy.acs.manager.manager.service; + +import com.zy.acs.manager.manager.controller.param.OpenAgvParam; +import com.zy.acs.manager.manager.controller.result.OpenAgvInfo; + +import java.util.List; + +public interface OpenAlgorithmService { + + List<OpenAgvInfo> listAgv(OpenAgvParam param); +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/OpenAlgorithmServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/OpenAlgorithmServiceImpl.java new file mode 100644 index 0000000..6ac6575 --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/OpenAlgorithmServiceImpl.java @@ -0,0 +1,49 @@ +package com.zy.acs.manager.manager.service.impl; + +import com.zy.acs.manager.manager.controller.param.OpenAgvParam; +import com.zy.acs.manager.manager.controller.result.OpenAgvInfo; +import com.zy.acs.manager.manager.entity.AgvDetail; +import com.zy.acs.manager.manager.service.AgvDetailService; +import com.zy.acs.manager.manager.service.AgvModelService; +import com.zy.acs.manager.manager.service.OpenAlgorithmService; +import com.zy.acs.manager.manager.service.TaskService; +import com.zy.acs.manager.system.service.ConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service("openAlgorithmService") +public class OpenAlgorithmServiceImpl implements OpenAlgorithmService { + + @Autowired + private AgvDetailService agvDetailService; + @Autowired + private TaskService taskService; + @Autowired + private AgvModelService agvModelService; + @Autowired + private ConfigService configService; + + + @Override + public List<OpenAgvInfo> listAgv(OpenAgvParam param) { + List<AgvDetail> list = agvDetailService.list(); + List<OpenAgvInfo> result = new ArrayList<>(); + for (AgvDetail agvDetail : list) { + taskService.findTransportTasksByAgv(agvDetail.getId()) + OpenAgvInfo info = new OpenAgvInfo(); + info.setAgvNo(agvDetail.getUuid()); + info.setStatus(agvDetail.getStatus()); + info.setDirection(agvDetail.getAgvAngle()); + info.setPosition(agvDetail.getCode$() ); + info.setVol(agvDetail.getVol()); + //info.setEmpty(agvDetail.getBackpack()); + result.add(info); + } + return result; + } + + +} -- Gitblit v1.9.1