#

Junjie

2023-12-26 bfdefee9b5c28c431891ebf4686d0fdeed6c4665

 src/main/java/com/zy/core/thread/LiftThread.java

@@ -351,11 +351,15 @@
            return false;
        }

        BasLiftOptService basLiftOptService = SpringUtils.getBean(BasLiftOptService.class);
        BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString());
        if (basLiftOpt != null) {
            wrkNo = basLiftOpt.getWrkNo().shortValue();
        if (wrkNo >= 20000 && wrkNo <= 30000) {
            //提升机设备工作号，需要查询对应任务号
            BasLiftOptService basLiftOptService = SpringUtils.getBean(BasLiftOptService.class);
            BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString(), liftProtocol.getLiftNo().intValue());
            if (basLiftOpt != null) {
                wrkNo = basLiftOpt.getWrkNo().shortValue();
            }
        }

        Object o = redisUtil.get(RedisKeyType.LIFT.key + wrkNo);
        if (o == null) {
            return false;