From 93cf1a27f5d4ff504d691d68c40a622a6424e782 Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期三, 14 五月 2025 09:40:20 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 2 +- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++------- src/main/java/com/zy/asrs/controller/TVController.java | 7 ++++--- src/main/java/com/zy/core/thread/impl/NyLiftThread.java | 5 ++--- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java index ffe3711..c0160b0 100644 --- a/src/main/java/com/zy/asrs/controller/TVController.java +++ b/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(); diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index 5f339dc..8ce3dc2 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/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); diff --git a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java b/src/main/java/com/zy/core/thread/impl/NyLiftThread.java index 9694939..3b91b2b 100644 --- a/src/main/java/com/zy/core/thread/impl/NyLiftThread.java +++ b/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); diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java index b09e551..1602251 100644 --- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java +++ b/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锛屼繚瀛樹竴娆℃暟鎹褰� //淇濆瓨鏁版嵁璁板綍 -- Gitblit v1.9.1