#Ext

lsh

2024-04-22 7c2e048de56976c6ee3757cebf414a0f5c8dcb58

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

@@ -124,7 +124,7 @@
        }
//        List<Map<String, Object>> res = new ArrayList<>();
        for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
            if (rgvSlave.getId() == rgvNo){
            if (rgvSlave.getId().equals(rgvNo)){
                rgvSlave.setDemo(true);
            }
        }
@@ -137,13 +137,85 @@
        }
//        List<Map<String, Object>> res = new ArrayList<>();
        for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
            if (rgvSlave.getId() == rgvNo){
            if (rgvSlave.getId().equals(rgvNo)){
                rgvSlave.setDemo(false);
            }
        }
        return R.ok();
    }

    @GetMapping("/demo/status/rgvStatus")
    public R demoStatusTrue1(Integer rgvNo,Integer status){
        if (Cools.isEmpty(rgvNo)){
            return R.error("请选择rgv");
        }
        if (Cools.isEmpty(status)){
            return R.error("选择按钮有误");
        }
//        List<Map<String, Object>> res = new ArrayList<>();
        for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
            // 获取RGV信息
            SiemensRgvThread rgvThread = (SiemensRgvThread) SlaveConnection.get(SlaveType.Rgv, rgvNo);
            if (rgvThread == null) {
                throw new CoolException("RGV不在线");
            }
            RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
            if (rgvProtocol == null) {
                throw new CoolException("RGV不在线");
            }
            String DB = "";
            if (rgvSlave.getId().equals(rgvNo)){
               switch (status){
                   case 5://强制启动
                       DB="4.4";
                       break;
//                   case 6://复位信号
//                       DB="4.5";
//                       break;
                   case 7://报警消音
                       DB="4.6";
                       break;
                   case 8://启动
                       DB="4.7";
                       break;
                   case 9://停止
                       DB="5.0";
                       break;
                   case 10://急停
                       DB="5.1";
                       break;
                   case 11://复位按钮
                       DB="5.2";
                       break;
                   case 12://手动
                       DB="5.3";
                       break;
                   case 13://手动定位
                       DB="5.4";
                       break;
                   case 14://单机
                       DB="5.5";
                       break;
                   case 15://联机
                       DB="5.6";
                       break;
                   case 16://货叉定位回中
                       DB="5.7";
                       break;
                   default:
                       return R.error("按钮不存在？？？？！！！");
               }
               if (MessageQueue.offer(SlaveType.Rgv, rgvNo, new Task(10, DB))) {
                   return R.ok();
               } else {
                   return R.error("命令下发失败");
               }
            }

        }
        return R.ok();
    }



    @PostMapping("/demo/switch")