From a5d3d6b0df0c0de059864e18e17aa690139a14f2 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 19 六月 2023 15:53:07 +0800 Subject: [PATCH] log --- src/main/java/com/zy/core/MainProcess.java | 36 +++++++++++------------------------- 1 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index de83b75..ae94d5c 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -51,14 +51,10 @@ // 闂撮殧 Thread.sleep(500); + //鍒濆鍖栧疄鏃跺湴鍥� + mainService.initRealtimeBasMap(); //浠巖edis涓噸鍚换鍔� mainService.restartTaskFromRedis(); -// // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 -// mainService.stnToCrnStnPick(); -// // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 -// mainService.crnStnToOutStn(); -// // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 -// mainService.crnIoExecute(); // 鍏ュ簱 ===>> 鍥涘悜绌挎杞﹀叆搴撲綔涓氫笅鍙� mainService.shuttleIoInExecute(); // 鍑哄簱 ===>> 鍥涘悜绌挎杞﹀嚭搴撲綔涓氫笅鍙� @@ -69,10 +65,6 @@ mainService.liftIoExecute(); //鎻愬崌鏈轰换鍔″畬鎴� mainService.liftFinished(); -// // 鍏ュ簱 ===>> 鎵ц鍫嗗灈鏈哄宸ヤ綔妗g殑瀹屾垚鎿嶄綔 -// mainService.storeFinished(); -// // 鍏ュ簱 ===>> 鎵ц绌挎杞﹀宸ヤ綔妗g殑瀹屾垚鎿嶄綔 -// mainService.carGenerateStore(); // 寮傚父淇℃伅璁板綍 mainService.recErr(); // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐� @@ -82,24 +74,18 @@ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅 mainService.ledReset(); // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢� - mainService.loopShuttleCharge(); - mainService.executeShuttleCharge(); -// // 绌挎杞� ===>> 灏忚溅鐢甸噺妫�娴嬪厖鐢� -// mainService.loopSteCharge(); -// mainService.executeSteCharge(); - //鍑哄叆搴撴ā寮� - i++; - if (i > 1) { - mainService.outAndIn(); - i = 0; - } +// mainService.loopShuttleCharge(); +// mainService.executeShuttleCharge(); + +// //鍑哄叆搴撴ā寮� +// i++; +// if (i > 1) { +// mainService.outAndIn(); +// i = 0; +// } // 闂撮殧 Thread.sleep(200); - // 绌挎杞� ===>> 灏忚溅澶嶄綅鑷冲緟鏈哄簱浣� -// mainService.queryChargeLocOfComplete(); -// mainService.steFromChargeToIdleLoc(); - } catch (Exception e) { e.printStackTrace(); } -- Gitblit v1.9.1