From ae71b59d481be89095b4035307b5c679c1832fe0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 八月 2020 10:07:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/enums/CrnTaskModeType.java         |    1 
 src/main/webapp/views/crn.html                               |   12 ++
 src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java |    2 
 src/main/java/com/zy/core/cache/MessageQueue.java            |   22 ++++
 src/main/java/com/zy/asrs/controller/CrnController.java      |  263 +++++++++++++++++++++++----------------------------
 5 files changed, 153 insertions(+), 147 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index cbc1d78..ee847a6 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -2,7 +2,6 @@
 
 import com.alibaba.fastjson.JSON;
 import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
 import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.domain.enums.CrnStatusType;
@@ -173,147 +172,40 @@
     @ManagerAuth(memo = "鍏ュ簱")
     @PostMapping("/operator/put")
     public R crnPut(CrnOperatorParam param){
-        if (param.getCrnNo() == null) {
-            return R.error(BaseRes.PARAM);
-        }
-        for (CrnSlave crn : slaveProperties.getCrn()) {
-            // 鑾峰彇鍫嗗灈鏈轰俊鎭�
-            if (param.getCrnNo().equals(crn.getId())) {
-                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
-                if (crnThread == null) {
-                    break;
-                }
-                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-                if (crnProtocol == null) {
-                    break;
-                }
-                // 绌洪棽鍒ゆ柇
-                if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
-                    CrnCommand command = new CrnCommand();
-                    command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
-                    command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-                    command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
-                    command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
-                    command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
-                    command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
-                    command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
-                    command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
-                    command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
-                    command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
-                    if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) {
-                        return R.error("鍛戒护涓嬪彂澶辫触");
-                    } else {
-                        return R.ok();
-                    }
-                } else {
-                    return R.error("鍫嗗灈鏈洪潪绌洪棽鐘舵��");
-                }
-            }
-        }
-        return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+        command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
+        command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
+        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
+        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
+        command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        return crnControl(command)?R.ok():R.error();
     }
 
     @ManagerAuth(memo = "鍑哄簱")
     @PostMapping("/operator/take")
     public R crnTake(CrnOperatorParam param){
-        if (param.getCrnNo() == null) {
-            return R.error(BaseRes.PARAM);
-        }
-        for (CrnSlave crn : slaveProperties.getCrn()) {
-            // 鑾峰彇鍫嗗灈鏈轰俊鎭�
-            if (param.getCrnNo().equals(crn.getId())) {
-                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
-                if (crnThread == null) {
-                    break;
-                }
-                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-                if (crnProtocol == null) {
-                    break;
-                }
-                // 绌洪棽鍒ゆ柇
-                if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
-                    CrnCommand command = new CrnCommand();
-                    command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
-                    command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-                    command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
-                    command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
-                    command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
-                    command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
-                    command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
-                    command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
-                    command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
-                    command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
-                    if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) {
-                        return R.error("鍛戒护涓嬪彂澶辫触");
-                    } else {
-                        return R.ok();
-                    }
-                } else {
-                    return R.error("鍫嗗灈鏈洪潪绌洪棽鐘舵��");
-                }
-            }
-        }
-        return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+        command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
+        command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
+        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
+        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
+        command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        return crnControl(command)?R.ok():R.error();
     }
 
     @ManagerAuth(memo = "搴撲綅杞Щ")
     @PostMapping("/operator/stockMove")
     public R crnStockMove(CrnOperatorParam param){
-        if (param.getCrnNo() == null) {
-            return R.error(BaseRes.PARAM);
-        }
-        for (CrnSlave crn : slaveProperties.getCrn()) {
-            // 鑾峰彇鍫嗗灈鏈轰俊鎭�
-            if (param.getCrnNo().equals(crn.getId())) {
-                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
-                if (crnThread == null) {
-                    break;
-                }
-                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-                if (crnProtocol == null) {
-                    break;
-                }
-                // 绌洪棽鍒ゆ柇
-                if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
-                    CrnCommand command = new CrnCommand();
-                    command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
-                    command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-                    command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
-                    command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡
-                    command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
-                    command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
-                    command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
-                    command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
-                    command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
-                    command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
-                    if (!MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) {
-                        return R.error("鍛戒护涓嬪彂澶辫触");
-                    } else {
-                        return R.ok();
-                    }
-                } else {
-                    return R.error("鍫嗗灈鏈洪潪绌洪棽鐘舵��");
-                }
-            }
-        }
-        return R.error("鍫嗗灈鏈轰笉鍦ㄧ嚎");
-    }
-
-    @ManagerAuth(memo = "绔欏埌绔�")
-    @PostMapping("/operator/siteMove")
-    public R crnSiteMove(CrnOperatorParam param){
-        return R.ok("绔欏埌绔欐垚鍔�");
-    }
-
-    @ManagerAuth(memo = "鍧愭爣绉诲姩")
-    @PostMapping("/operator/coorMove")
-    public R crnCoorMove(CrnOperatorParam param){
-        return R.ok("鍧愭爣绉诲姩鎴愬姛");
-    }
-
-    @ManagerAuth(memo = "鍥炲師鐐�")
-    @PostMapping("/operator/bacOrigin")
-    public R crnBacOrigin(CrnOperatorParam param){
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -328,27 +220,110 @@
         return crnControl(command)?R.ok():R.error();
     }
 
+    @ManagerAuth(memo = "绔欏埌绔�")
+    @PostMapping("/operator/siteMove")
+    public R crnSiteMove(CrnOperatorParam param){
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+        command.setTaskMode(CrnTaskModeType.SITE_MOVE); // 浠诲姟妯″紡
+        command.setSourcePosX(param.getSourceStaNo());     // 婧愬簱浣嶆帓
+        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
+        command.setSourcePosZ((short) 1);     // 婧愬簱浣嶅眰
+        command.setDestinationPosX(param.getStaNo());     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY((short) 0);     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ((short) 1);     // 鐩爣搴撲綅灞�
+        return crnControl(command)?R.ok():R.error();
+    }
+
+    @ManagerAuth(memo = "鍧愭爣绉诲姩")
+    @PostMapping("/operator/coorMove")
+    public R crnCoorMove(CrnOperatorParam param){
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+        command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
+        command.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
+        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
+        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
+        command.setDestinationPosX((short) 0);     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        return crnControl(command)?R.ok():R.error();
+    }
+
+    @ManagerAuth(memo = "鍥炲師鐐�")
+    @PostMapping("/operator/bacOrigin")
+    public R crnBacOrigin(CrnOperatorParam param){
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+        command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+        command.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
+        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
+        command.setSourcePosZ((short) 0);     // 婧愬簱浣嶅眰
+        command.setDestinationPosX((short) 0);     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY((short) 0);     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ((short) 1);     // 鐩爣搴撲綅灞�
+        return crnControl(command)?R.ok():R.error();
+    }
+
+    @ManagerAuth(memo = "鍙嶅師鐐�")
+    @PostMapping("/operator/reverseOrigin")
+    public R reverseOrigin(CrnOperatorParam param){
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
+        command.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 浠诲姟妯″紡
+        command.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
+        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
+        command.setSourcePosZ((short) 0);     // 婧愬簱浣嶅眰
+        command.setDestinationPosX((short) 0);     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY((short) 34);     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ((short) 5);     // 鐩爣搴撲綅灞�
+        return crnControl(command)?R.ok():R.error();
+    }
+
     @ManagerAuth(memo = "浠诲姟瀹屾垚")
     @PostMapping("/operator/taskComplete")
     public R crnTaskComplete(CrnOperatorParam param){
-        return R.ok("浠诲姟瀹屾垚");
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAckFinish((short) 1);  // 浠诲姟瀹屾垚纭浣�
+        command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
+        command.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
+        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
+        command.setSourcePosZ((short) 0);     // 婧愬簱浣嶅眰
+        command.setDestinationPosX((short) 0);     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosY((short) 0);     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ((short) 0);     // 鐩爣搴撲綅灞�
+        return crnControl(command)?R.ok():R.error();
     }
 
-    @ManagerAuth(memo = "鏆傚仠")
-    @PostMapping("/operator/pause")
-    public R crnPause(CrnOperatorParam param){
-        return R.ok("鏆傚仠鎴愬姛");
-    }
-
-    @ManagerAuth(memo = "鍚姩")
-    @PostMapping("/operator/boot")
-    public R crnBoot(CrnOperatorParam param){
-        return R.ok("鍚姩鎴愬姛");
-    }
+//    @ManagerAuth(memo = "鏆傚仠")
+//    @PostMapping("/operator/pause")
+//    public R crnPause(CrnOperatorParam param){
+//        return R.ok("鏆傚仠鎴愬姛");
+//    }
+//
+//    @ManagerAuth(memo = "鍚姩")
+//    @PostMapping("/operator/boot")
+//    public R crnBoot(CrnOperatorParam param){
+//        return R.ok("鍚姩鎴愬姛");
+//    }
 
     @ManagerAuth(memo = "娓呴櫎鍛戒护")
     @PostMapping("/operator/clearCommand")
     public R crnClearCommand(CrnOperatorParam param){
+        if (param.getCrnNo() == null) {
+            throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
+        }
+        MessageQueue.clear(SlaveType.Crn, param.getCrnNo());
         return R.ok("娓呴櫎鍛戒护鎴愬姛");
     }
 
diff --git a/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
index ae0f47e..f85698e 100644
--- a/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
+++ b/src/main/java/com/zy/asrs/domain/param/CrnOperatorParam.java
@@ -12,7 +12,7 @@
     private Integer crnNo;
 
     // 婧愮珯
-    private Integer sourceStaNo;
+    private Short sourceStaNo;
 
     // 婧愬簱浣�-鎺�
     private Short sourceRow;
diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java
index f2c92ad..11d207d 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -112,4 +112,26 @@
         }
     }
 
+    public static void clear(SlaveType type, Integer id){
+        switch (type) {
+            case Crn:
+                CRN_EXCHANGE.get(id).clear();
+                break;
+            case Devp:
+                DEVP_EXCHANGE.get(id).clear();
+                break;
+            case Barcode:
+                BARCODE_EXCHANGE.get(id).clear();
+                break;
+            case Led:
+                LED_EXCHANGE.get(id).clear();
+                break;
+            case Scale:
+                SCALE_EXCHANGE.get(id).clear();
+                break;
+            default:
+                break;
+        }
+    }
+
 }
diff --git a/src/main/java/com/zy/core/enums/CrnTaskModeType.java b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
index 2d31ca3..c34a8d2 100644
--- a/src/main/java/com/zy/core/enums/CrnTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
@@ -7,6 +7,7 @@
     PAKOUT(2),    // 鍑哄簱
     LOC_MOVE(3),    // 搴撲綅绉昏浆
     SITE_MOVE(4),    // 绔欎綅绉昏浆
+    GO_ORIGIN(5),    // 鍥炲師鐐�
     OFFSET_MOVE(7),    // 鍧愭爣绉昏
     ;
 
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 5758023..b676a60 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -150,9 +150,10 @@
                 <button class="item" onclick="siteMove()">绔欏埌绔�</button>
                 <button class="item" onclick="coorMove()">鍧愭爣绉诲姩</button>
                 <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>
+                <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>
                 <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
-                <button class="item" onclick="pause()">鏆傚仠</button>
-                <button class="item" onclick="boot()">鍚姩</button>
+<!--                <button class="item" onclick="pause()">鏆傚仠</button>-->
+<!--                <button class="item" onclick="boot()">鍚姩</button>-->
                 <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
             </div>
         </fieldset>
@@ -362,6 +363,13 @@
         });
     }
 
+    // 鍥炲師鐐�
+    function reverseOrigin() {
+        http.post(baseUrl+"/crn/operator/reverseOrigin", getReqParam(), function (res) {
+            layer.msg(res.msg);
+        });
+    }
+
     // 浠诲姟瀹屾垚
     function taskComplete() {
         http.post(baseUrl+"/crn/operator/taskComplete", getReqParam(), function (res) {

--
Gitblit v1.9.1