| src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/utils/RedisUtil.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/webSocketConfig/LedWebsocket.java
@@ -44,6 +44,8 @@ private WrkDetlService wrkDetlService; @Autowired private OrderDetlService orderDetlService; @Autowired private RedisUtil redisUtil; @Scheduled(cron = "0/2 * * * * ? ") private void send() { @@ -158,8 +160,14 @@ if (basDevp == null ){ return; } String key = "wms_websocket_error"; Object object = redisUtil.get(key); if (null != object && object.equals(basDevp.getDecDesc())){ return; } map.put("message",Cools.add("type", "error").add("errMsg",basDevp.getDecDesc())); webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002"); redisUtil.set(key,basDevp.getDecDesc()); } @@ -171,6 +179,11 @@ if (basDevp == null ){ return; } String key = "wms_websocket_task"; Object object = redisUtil.get(key); if (null != object && object.equals(basDevp.getWrkNo())){ return; } List<LedCommand> commandList = new ArrayList<>(); if (basDevp.getWrkNo() != 0){ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo())); @@ -180,6 +193,7 @@ } map.put("message",Cools.add("type", "task").add("taskList",commandList)); webSocketServer.onMessage(JSONObject.toJSONString(map),null,"1002"); redisUtil.set(key,basDevp.getWrkNo()); } public List<LedCommand> getCommandList(String taskNo){ src/main/java/com/zy/common/utils/RedisUtil.java
@@ -2,8 +2,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -13,13 +15,16 @@ * redisTemplate封装 * */ //@Component @Component public class RedisUtil { @Autowired private RedisTemplate<String, Object> redisTemplate; // @Autowired // private RedisTemplate<String, Object> redisTemplate; public RedisUtil(RedisTemplate<String, Object> redisTemplate) { @Autowired private RedisTemplate redisTemplate; public RedisUtil(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; } @@ -96,6 +101,21 @@ } /** * 获取全部数据 * @return */ public HashMap<Object, Object> getRedis() { Set<String> keys = redisTemplate.keys("*"); HashMap<Object, Object> map = new HashMap<>(); for (String key : keys) { Object value = redisTemplate.opsForValue().get(key); map.put(key, value); } return map;//返回全部数据集合 } /** * 普通缓存放入 * * @param key 键