zy-asrs-master.git

			@@ -6,6 +6,7 @@
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.zy.asrs.framework.common.Cools;
			import com.zy.asrs.framework.common.SnowflakeIdWorker;
			import com.zy.asrs.wcs.core.domain.dto.RedisMapDto;
			import com.zy.asrs.wcs.core.entity.*;
			import com.zy.asrs.wcs.core.kernel.AnalyzeService;
			import com.zy.asrs.wcs.core.model.MapNode;
			@@ -174,11 +175,11 @@

			Integer lev = entry.getKey();
			Date now = new Date();
			HashMap<String, Object> map = new HashMap<>();
			map.put("data", JSON.toJSONString(lists));
			map.put("create_time", now);
			map.put("update_time", now);
			map.put("lev", lev);
			RedisMapDto map = new RedisMapDto();
			map.setData(JSON.toJSONString(lists));
			map.setCreateTime(now);
			map.setUpdateTime(now);
			map.setLev(lev);

			//将地图数据存入redis
			redisUtil.set(DeviceRedisConstant.MAP + lev, JSON.toJSONString(map));
			@@ -441,6 +442,11 @@
			continue;
			}

			ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
			if (shuttleProtocol == null) {
			continue;
			}

			if (!shuttleThread.isCharging()) {
			continue;
			}