#

luxiaotao1123

2024-11-09 20aa51767d2bcc0baf30e1eee5ccce05ace9a6fe

 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;
@@ -34,6 +36,8 @@
    @Autowired
    private AgvDetailService agvDetailService;
    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private CodeService codeService;
    @Autowired
    private MapDataDispatcher mapDataDispatcher;
@@ -48,12 +52,12 @@
            i=0;
        }
        key = i /2;
        MapWebSocket.broadcast(mockData.get(key));
//        MapWebSocket.broadcast(mockData.get(key));


        MapWsVo mapWsVo = new MapWsVo();
        mapWsVo.setAgvVos(syncAgv());
//        MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
        MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
    }

    private List<MapWsAgvVo> syncAgv() {
@@ -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());