Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-versi...

zwl

15 小时以前 b172bbb35399bd3958f177a75361070a114fc19c

Merge remote-tracking branch 'origin/jxhcwcs-version1.0' into jxhcwcs-version1.0

 src/main/java/com/zy/core/enums/RedisKeyType.java

@@ -59,7 +59,7 @@
    PLANNER_SCHEDULE("planner_schedule_"),

    RECEIVE_IN_TASK_CHANGE_STATION_TASK("receive_in_task_change_station_task_"),
    RECEIVE_IN_TASK_CHANGE_STATION_TASK_SEND_LIMIT("receive_in_task_change_station_task_send_limit_"),
    SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK("send_limit_receive_in_task_change_station_task_"),
    ;

    public String key;

 src/main/java/com/zy/core/plugin/NormalProcess.java

@@ -332,7 +332,7 @@
            Integer stationId = data.getInteger("stationId");
            Integer deviceNo = data.getInteger("deviceNo");

            Object lock = redisUtil.get(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK_SEND_LIMIT.key + stationId);
            Object lock = redisUtil.get(RedisKeyType.SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + stationId);
            if(lock != null){
                continue;
            }
@@ -368,7 +368,7 @@

            //缓存命令相同，下发命令改变入库任务号信息
            MessageQueue.offer(SlaveType.Devp, deviceNo, new Task(2, command));
            redisUtil.set(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK_SEND_LIMIT.key + stationId, "lock", 5);
            redisUtil.set(RedisKeyType.SEND_LIMIT_RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + stationId, "lock", 5);
        }

    }