From ffc3b1151655f258fb1db0b24c3434bd294b0598 Mon Sep 17 00:00:00 2001 From: dubin <bindu_bean@163.com> Date: 星期日, 05 十月 2025 10:35:32 +0800 Subject: [PATCH] 联调 --- src/main/java/com/zy/core/MainProcess.java | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index 7e35314..dfc6741 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -1,19 +1,13 @@ package com.zy.core; import com.zy.asrs.service.impl.MainServiceImpl; -import com.zy.common.utils.News; -import com.zy.core.cache.MessageQueue; -import com.zy.core.enums.SlaveType; -import com.zy.core.model.Task; import com.zy.core.properties.SystemProperties; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.PreDestroy; -import java.util.ArrayList; /** * WCS涓绘祦绋� @@ -49,7 +43,7 @@ } // 婕旂ず -// mainService.crnDemoOfLocMove1(); + mainService.crnDemoOfLocMove1(); // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁� // mainService.ioConvert(); @@ -82,20 +76,22 @@ // if(MessageQueue.offer(SlaveType.Led, 1, new Task(3, "鏉$爜宸插瓨鍦ㄧ姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑浠诲姟,宸ヤ綔鍙�="))){ // News.info("杈撳叆鎴愬姛"); // } + //鍫嗗灈鏈烘棤浠诲姟鍥炲叆搴撳彛寰呮満 + //mainService.crnMove(); // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅 mainService.ledReset(); // mainService.outOfDevp(11); -// if (i>10){ -// //绌烘墭鐩樿嚜鍔ㄥ嚭搴� -// mainService.autoEmptyOut(); -// //绌烘墭鐩樿嚜鍔ㄥ叆搴� -// mainService.autoEmptyIn(); -// i=0; -// } -// i++; + if (i>10){ + //绌烘墭鐩樿嚜鍔ㄥ嚭搴� +// mainService.autoEmptyOut(); + //绌烘墭鐩樿嚜鍔ㄥ叆搴� +// mainService.autoEmptyIn(); + i=0; + } + i++; } catch (Exception e) { -- Gitblit v1.9.1