123

zc

2025-05-14 93cf1a27f5d4ff504d691d68c40a622a6424e782

123

 src/main/java/com/zy/asrs/controller/TVController.java

@@ -1,5 +1,6 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONObject;
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
@@ -241,13 +242,13 @@
        Object o2 = redisUtil.get("LED_" + dev_no2);
        Object o3 = redisUtil.get("LED_" + dev_no3);
        if (o1 != null) {
            //log.info("电视机显示1：{}", JSONObject.toJSONString(o1));
            log.info("电视机显示1：{}", JSONObject.toJSONString(o1));
            return R.ok().add(o1);
        } else if (o2 != null) {
            //log.info("电视机显示2：{}", JSONObject.toJSONString(o2));
            log.info("电视机显示2：{}", JSONObject.toJSONString(o2));
            return R.ok().add(o2);
        } else if (o3 != null) {
            //log.info("电视机显示3：{}", JSONObject.toJSONString(o3));
            log.info("电视机显示3：{}", JSONObject.toJSONString(o3));
            return R.ok().add(o3);
        }
        return R.ok();

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -225,7 +225,7 @@
                            staProtocol.setWorkNo(Short.parseShort(String.valueOf(wrkMast.getWrkNo())));
                            staProtocol.setStaNo(Short.parseShort(String.valueOf(inSta.getStaNo() + 1)));
                            MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                            News.taskInfo(wrkMast.getWrkNo(), "输送线入库命令下发，任务数据={}", JSON.toJSON(wrkMast));
                            News.info("输送线入库命令下发，任务数据={}", JSON.toJSON(wrkMast));
                            wrkMast.setWrkSts(WrkStsType.INBOUND_DEVICE_RUN.sts);
                            wrkMast.setModiTime(new Date());
                            wrkMastService.updateById(wrkMast);
@@ -1411,12 +1411,8 @@
            //获取提升机命令
            List<LiftCommand> liftCommands = liftThread.getPalletOutCommand(wrkMast.getWrkNo(), sourceLev, wrkMast.getStaNo());
            LiftCommand liftCommand = liftCommands.get(0);
//            if (wrkMast.getMainWrkNo() != null) {
            liftCommand.setTaskNo(wrkMast.getWrkNo());
//            } else {
//                int deviceWrk = commonService.getWorkNo(8);//生成提升机设备工作号
//                liftCommand.setTaskNo(deviceWrk);//更换随机任务号
//            }
            int deviceWrk = commonService.getWorkNo(8);//生成提升机设备工作号
            liftCommand.setTaskNo(deviceWrk);//更换随机任务号

            ArrayList<LiftCommand> commands = new ArrayList<>();
            commands.add(liftCommand);

 src/main/java/com/zy/core/thread/impl/NyLiftThread.java

@@ -17,11 +17,9 @@
import com.zy.common.ExecuteSupport;
import com.zy.common.model.NavigateNode;
import com.zy.common.service.CommonService;
import com.zy.common.utils.LiftUtils;
import com.zy.common.utils.NavigatePositionConvert;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.action.ForkLiftAction;
import com.zy.core.action.LiftAction;
import com.zy.core.cache.OutputQueue;
import com.zy.core.enums.ForkLiftTaskModeType;
@@ -36,6 +34,7 @@
import com.zy.core.thread.LiftThread;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

import java.text.MessageFormat;
import java.util.*;

@@ -249,7 +248,7 @@
                }
            }

            if (System.currentTimeMillis() - liftProtocol.getDeviceDataLog() > 1000 * 5) {
            if (System.currentTimeMillis() - liftProtocol.getDeviceDataLog() > 1000 * 3) {
                //采集时间超过5s，保存一次数据记录
                //保存数据记录
                DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);

 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java

@@ -151,7 +151,7 @@
            return;
        }

        if (System.currentTimeMillis() - shuttleProtocol.getDeviceDataLog() > 1000 * 5) {
        if (System.currentTimeMillis() - shuttleProtocol.getDeviceDataLog() > 1000 * 1) {
            if (this.originDeviceData != null) {
                //采集时间超过5s，保存一次数据记录
                //保存数据记录