zy-acs-flow/src/map/insight/agv/AgvMain.jsx
@@ -91,6 +91,8 @@ useEffect(() => { if (info) { console.log(info); endThree(); setLoading(true); setTimeout(() => { @@ -100,7 +102,7 @@ }; renderThree(info, curAgvNo); setLoading(false); }, 300); }, 200); } return endThree; }, [info]); zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -54,24 +54,12 @@ vo.setAgvNo(agv.getUuid()); vo.setCode(code.getData()); vo.setDirection(agvDetail.getAgvAngle()); vo.setBackpack(GsonUtils.fromJson(agvDetail.getBackpack(), List.class)); vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class)); vo.setBattery(agvDetail.getSoc()); agvVos.add(vo); } return agvVos; } public static void main(String[] args) { List<BackpackDto> backpackDtoList = new ArrayList<>(); backpackDtoList.add(new BackpackDto(1, true)); backpackDtoList.add(new BackpackDto(2, true)); backpackDtoList.add(new BackpackDto(3, false)); backpackDtoList.add(new BackpackDto(4, false)); backpackDtoList.add(new BackpackDto(5, false)); backpackDtoList.add(new BackpackDto(6, false)); backpackDtoList.add(new BackpackDto(7, false)); System.out.println(GsonUtils.toJson(backpackDtoList)); } } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -13,6 +13,7 @@ import com.zy.acs.manager.common.domain.MapDto; import com.zy.acs.manager.common.domain.MapRouteDto; import com.zy.acs.manager.common.exception.BusinessException; import com.zy.acs.manager.core.domain.BackpackDto; import com.zy.acs.manager.core.service.MapService; import com.zy.acs.manager.core.service.floyd.FloydNavigateService; import com.zy.acs.manager.manager.controller.param.MapDataParam; @@ -21,16 +22,17 @@ import com.zy.acs.manager.manager.entity.Map; import com.zy.acs.manager.manager.entity.*; import com.zy.acs.manager.manager.enums.AgvStsType; import com.zy.acs.manager.manager.enums.TaskStsType; import com.zy.acs.manager.manager.mapper.MapMapper; import com.zy.acs.manager.manager.service.*; import com.zy.acs.manager.system.controller.BaseController; import com.zy.acs.manager.system.service.ConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import java.util.*; import java.util.stream.Collectors; /** * Created by vincent on 2023/6/1 @@ -54,7 +56,7 @@ @Autowired private MapService mapService; @Autowired private ConfigService configService; private TaskService taskService; @Autowired private MapMapper mapMapper; @Autowired @@ -134,6 +136,20 @@ AgvDetail agvDetail = agvDetailService.selectByAgvNo(agvNo); MapAgvVo vo = new MapAgvVo(); vo.setAgvNo(agv.getUuid()); if (null != agvDetail) { vo.setOnline(agvService.judgeOnline(agvDetail.getAgvId())); vo.setAgvStatus(agvDetail.getStatusDesc()); vo.setVol(String.valueOf(agvDetail.getVol())); vo.setSoc(String.valueOf(agvDetail.getSoc())); vo.setPos(String.valueOf(agvDetail.getPos())); vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData()); vo.setDirection(agvDetail.getAgvAngle()); vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class)); } List<Task> tasks = taskService.selectInSts(agv.getId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS); if (!Cools.isEmpty(tasks)) { vo.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList())); } return R.ok().add(vo); }
@@ -26,6 +26,8 @@ private String vol = "-"; private String soc = "-"; private String pos = "-"; private String code = "-"; @@ -46,6 +48,9 @@ if (null != agvDetail.getVol()) { this.setVol(String.valueOf(agvDetail.getVol())); } if (null != agvDetail.getSoc()) { this.setSoc(String.valueOf(agvDetail.getSoc())); } if (null != agvDetail.getRecentCode()) { this.setCode(codeService.getById(agvDetail.getRecentCode()).getData()); } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java
@@ -14,7 +14,7 @@ private String agvNo; private List<BackpackDto> backpack = new ArrayList<>(); private Boolean online = Boolean.FALSE; private String agvStatus = "-"; @@ -28,7 +28,7 @@ private Double direction = 0.0; private Boolean online = Boolean.FALSE; private List<BackpackDto> backpack = new ArrayList<>(); private List<Long> taskIds = new ArrayList<>();
