zy-asrs-master.git

			@@ -8,7 +8,9 @@
			import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
			import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
			import com.zy.asrs.wcs.core.map.controller.result.LocVo;
			import com.zy.asrs.wcs.core.map.controller.result.ShuttleVo;
			import com.zy.asrs.wcs.core.utils.Utils;
			import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
			import com.zy.asrs.wcs.system.entity.Dict;
			import com.zy.asrs.wcs.system.service.DictService;
			import com.zy.asrs.wcs.system.service.UserService;
			@@ -29,7 +31,7 @@
			private DictService dictService;

			public String getMapFloorList(Long userId) {
			String floorKey = "map-floor-list";
			String floorKey = "floor-list";
			Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, floorKey));
			if (null == dict) {
			dict = new Dict();
			@@ -91,6 +93,27 @@
			return locVos;
			}

			public ShuttleVo getShuttleInfo(String shuttleNo) {
			ShuttleVo vo = new ShuttleVo();
			vo.setShuttleNo(shuttleNo);
			ShuttleProtocol protocol = new ShuttleProtocol();
			// todo checkout protocol
			// vo.setTaskNo(String.valueOf(protocol.getTaskNo()));
			// vo.setStatus(protocol.getProtocolStatusType().desc);
			// vo.setOriginLocNo(protocol.getSourceLocNo());
			// vo.setDestLocNo(protocol.getLocNo());
			// vo.setCurrentCode(protocol.getCurrentCode());
			// vo.setBatteryPower(protocol.getBatteryPower());
			// vo.setErrorCode(protocol.getErrorCode());
			// vo.setBatteryTemp(protocol.getBatteryTemp());
			// vo.setHasLift(protocol.getHasLift());
			// vo.setHasPallet(protocol.getHasPallet());
			// vo.setHasCharge(protocol.getHasCharge());
			// vo.setBatteryVoltage(String.valueOf(protocol.getBatteryVoltage()));
			// vo.setPakMk(protocol.getPakMk());
			return vo;
			}

			private String getMapKey(Integer floor) {
			if (null != floor) {
			return "map-" + floor;