From cab87dcfaa7b1e2bc1298572b775026bb17ef38b Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期四, 17 十月 2024 13:54:41 +0800 Subject: [PATCH] # --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java index c452134..5b5eff6 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java @@ -1,14 +1,19 @@ package com.zy.asrs.wcs.core.map.websocket; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.wcs.core.domain.dto.MapLockPathDto; +import com.zy.asrs.wcs.core.entity.BasConveyorSta; import com.zy.asrs.wcs.core.entity.BasShuttle; import com.zy.asrs.wcs.core.map.entity.MapWsShuttleVo; import com.zy.asrs.wcs.core.map.entity.MapWsVo; import com.zy.asrs.wcs.core.model.NavigateNode; import com.zy.asrs.wcs.core.model.enums.DeviceCtgType; +import com.zy.asrs.wcs.core.service.BasConveyorStaService; import com.zy.asrs.wcs.core.service.BasShuttleService; +import com.zy.asrs.wcs.core.utils.NavigateMapUtils; import com.zy.asrs.wcs.core.utils.Utils; import com.zy.asrs.wcs.rcs.cache.SlaveConnection; import com.zy.asrs.wcs.rcs.entity.Device; @@ -17,6 +22,8 @@ import com.zy.asrs.wcs.rcs.service.DeviceService; import com.zy.asrs.wcs.rcs.service.DeviceTypeService; import com.zy.asrs.wcs.rcs.thread.ShuttleThread; +import com.zy.asrs.wcs.system.entity.Dict; +import com.zy.asrs.wcs.system.service.DictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -38,12 +45,20 @@ private DeviceService deviceService; @Autowired private BasShuttleService basShuttleService; + @Autowired + private DictService dictService; + @Autowired + private NavigateMapUtils navigateMapUtils; + @Autowired + private BasConveyorStaService basConveyorStaService; @Scheduled(cron = "0/1 * * * * ? ") public void sync() { MapWsVo wsVo = new MapWsVo(); // shuttle wsVo.setShuttleVos(syncShuttle()); + wsVo.setLockPath(getMapLocPath()); + wsVo.setConveyorSta(getMapConveyorSta()); MapWebSocket.broadcast(JSON.toJSONString(wsVo)); } @@ -92,4 +107,28 @@ return shuttleVos; } + private List<MapLockPathDto> getMapLocPath() { + List<MapLockPathDto> list = new ArrayList<>(); + Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>() + .eq(Dict::getFlag, "floor-list") + .eq(Dict::getStatus, 1)); + if (dict != null) { + for (Object o : JSON.parseArray(dict.getValue())) { + JSONObject jsonObject = JSON.parseObject(o.toString()); + Integer lev = jsonObject.getInteger("value"); + List<NavigateNode> path = navigateMapUtils.getLockPath(lev); + + MapLockPathDto lockPathDto = new MapLockPathDto(); + lockPathDto.setPath(path); + lockPathDto.setLev(lev); + list.add(lockPathDto); + } + } + return list; + } + + private List<BasConveyorSta> getMapConveyorSta() { + return basConveyorStaService.list(); + } + } -- Gitblit v1.9.1