*

L

3 天以前 85d0972114327e5a1f515a00895d51dc32a4f2b4

 src/main/java/com/zy/core/thread/RgvThread.java

@@ -65,7 +65,11 @@
    private boolean resetFlag2 = false;

    private boolean connectRgv = false;
    private boolean connectRgv2 = false;
    public Long currentTimeMilliConnectRgv= 0L;

    private boolean delRgvTask = false;
    private short wrkSign = 0;

    public RgvThread(RgvSlave slave) {
        this.slave = slave;
@@ -74,16 +78,7 @@
    @Override
    @SuppressWarnings("InfiniteLoopStatement")
    public void run() {
        connectRgv = this.connect();
        while(!connectRgv){
            try {
                connectRgv = this.connect();
                Thread.sleep(100);
            } catch (Exception e){

            }
        }

//        initRgv();
        // 启动线程自动重连
        new Thread(this::rgvConnect).start();

@@ -114,10 +109,12 @@
                    }
                }
            } catch (Exception e) {
                connectRgv = false;
                connectRgv2 = false;
                log.error("rgv连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "rgv连接失败"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "rgv连接失败"+e.getMessage());
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -131,8 +128,9 @@
        while (true) {
            try {
                if(!connectRgv){
                    connectRgv2 = false;
                    try {
                        Thread.sleep(1000L);
                        Thread.sleep(20L);
                    } catch (Exception e){

                    }
@@ -140,15 +138,18 @@
                    continue;
                }
                Thread.sleep(20);
//                System.out.println("读线程"+ slave.getId());
//                System.out.println("读线程,小车号"+ slave.getId()+"时间戳："+System.currentTimeMillis());

                readStatus();
                connectRgv2 = connectRgv;

            } catch (Exception e) {
                connectRgv = false;
                connectRgv2 = false;
                log.error("RGV数据读取线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV数据读取线程异常"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV数据读取线程异常"+e.getMessage());
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -179,21 +180,25 @@
                    delRgvTask = false;
                    continue;
                }
                Thread.sleep(40);
                Thread.sleep(100L);

                OperateResultExOne<byte[]> result = siemensNet.Read("DB100.12", (short) 1);
                boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, 0, 1);
                if (status[0]){
                    Thread.sleep(500L);
                    OperateResult result4 = siemensNet.Write("DB100.12.0", false);
                }
            } catch (Exception e) {
                connectRgv = false;
                connectRgv2 = false;
                log.error("RGV数据任务下发复位线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV数据任务下发复位线程异常"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV数据任务下发复位线程异常"+e.getMessage());
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
                initRgv();
                initRgv2();
//                e.printStackTrace();
            }

@@ -202,75 +207,12 @@
    }

    /**
     * 任务下发
     */
//    private void taskWalkIssued2() {
//        while (true) {
//            try {
//                // 休眠 1 秒
//                Thread.sleep(100);
//                if (!deviceDetection()) {
//                    continue;
//                }
//                RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
//                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
//                if (rgvProtocol == null || rgvTaskProtocol == null) {
//                    initRgv();
//                    rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
//                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
//                }
//                if (rgvTaskProtocol.getAvoid() != 0) {
//                    continue;
//                }
//                if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE)){
//                    continue;
//                }
//                if (rgvProtocol.getLoaded() == -1){
//                    continue;
//                }
//
//                List<TaskProtocol> allTakeTaskProtocol = taskProtocolCache.getAllWalkTaskProtocol();
//                for (TaskProtocol taskProtocol : allTakeTaskProtocol) {
//                    if (taskProtocol.getIsRunning() == 1) {//准备下发
//                        // 双车
//                        if (rgvOtherStatusEnable()) {
//                            //另一台车是否允许此台车执行
//                            if (!otherRgvAvoid(taskProtocol.getTargetPosition())) {
//                                continue;
//                            }
//                        }
//                        if (taskProtocol.getTargetPosition()<=rgvProtocol.getRgvPos()+50
//                                && taskProtocol.getTargetPosition()>=rgvProtocol.getRgvPos()-50){
//                            taskProtocolCache.removeTaskProtocol(taskProtocol.getTaskNoDirection());
//                            break;
//                        } else {
//                            TaskProtocol issued = new TaskProtocol(taskProtocol,true);
//                            write(issued);
//                            taskProtocolCache.removeTaskProtocol(taskProtocol.getTaskNoDirection());
//                            break;
//                        }
//                    }
//                }
//            } catch (Exception e) {
//                log.error("RGV任务下发线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
//                try{
//                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
//                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV任务下发线程异常"+e.getMessage());
//                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
//                }
////                e.printStackTrace();
//            }
//        }
//    }

    /**
     * 漫游
     */
    private void taskWalkIssued() {
        while (true) {
            try {
                if(!connectRgv){
                if(!connectRgv2){
                    try {
                        Thread.sleep(1000L);
                    } catch (Exception e){
@@ -278,7 +220,7 @@
                    }
                    continue;
                }
                // 休眠 1 秒
                // 休眠 0.1 秒
                Thread.sleep(100);

                if (!deviceDetection()) {
@@ -286,7 +228,7 @@
                }
                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                if (rgvTaskProtocol == null) {
                    initRgv();
                    initRgv2();
                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                }
                if (rgvTaskProtocol.getAvoid() != 1) {
@@ -300,10 +242,12 @@
                write(issued);
                rgvTaskProtocol.setAvoid(0);

                Thread.sleep(200);
//                Thread.sleep(200);
                RgvTaskCache.updateRgvStatus(rgvTaskProtocol);

            } catch (Exception e) {
                connectRgv = false;
                connectRgv2 = false;
                log.error("RGV行走任务下发线程异常！！！" + e.getMessage());
//                e.printStackTrace();
            }
@@ -315,7 +259,7 @@
     */
    private void taskIssued() {
        while (true) {
            if(!connectRgv){
            if(!connectRgv2){
                try {
                    Thread.sleep(1000L);
                } catch (Exception e){
@@ -328,12 +272,12 @@
                continue;
            }
            try {
                Thread.sleep(50);
                Thread.sleep(200);
                rgvRun = RgvRunCache.getRgvRun();
//                System.out.println(JSON.toJSON(rgvRun));

                // 休眠 1 秒
                if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 1000) {
                if (System.currentTimeMillis() - rgvRun.currentTimeMilliOld > 500L) {
                    rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
                } else {
                    continue;
@@ -351,7 +295,7 @@
                RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                if (rgvProtocol == null || rgvTaskProtocol == null) {
                    initRgv();
                    initRgv2();
                    rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                }
@@ -461,10 +405,12 @@
                rgvRun.setRgvNo(slave.getOtherId());
                RgvRunCache.updateRgvStatus(rgvRun);
            } catch (Exception e) {
                connectRgv = false;
                connectRgv2 = false;
                log.error("RGV任务下发线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV任务下发线程异常"+e.getMessage());
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV任务下发线程异常"+e.getMessage());
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
@@ -597,7 +543,7 @@
                                                errorRgv = "RGV行走目标超出范围";
                                                try{
                                                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                                                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                                                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                                                } catch (Exception e2){
//                                                    log.error("e2:"+e2.getMessage());
                                                }
@@ -689,7 +635,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -717,7 +663,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -746,7 +692,7 @@

                            try{
                                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                            } catch (Exception e2){
//                                log.error("e2:"+e2.getMessage());
                            }
@@ -803,7 +749,7 @@

                                                try{
                                                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                                                    deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                                                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                                                } catch (Exception e2){
//                                                    log.error("e2:"+e2.getMessage());
                                                }
@@ -896,7 +842,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -924,7 +870,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -954,7 +900,7 @@

                            try{
                                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV行走超出范围");
                                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV行走超出范围");
                            } catch (Exception e2){
//                                log.error("e2:"+e2.getMessage());
                            }
@@ -1016,12 +962,47 @@
            log.error("RGV异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV异常"+e.getMessage());
                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV异常"+e.getMessage());
            } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
            }
            rgvProtocol.setStatusEnable(true);
        }

        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
        if (rgvTaskProtocol == null) {
            rgvTaskProtocol = new RgvTaskProtocol();
            rgvTaskProtocol.setRgvNo(slave.getId());
        }
        rgvTaskProtocol.setAvoid(0);
        rgvTaskProtocol.setAvoidingTheDestination(0L);

        RgvStatusCache.updateRgvStatus(rgvProtocol);

        RgvTaskCache.updateRgvStatus(rgvTaskProtocol);

    }

    /**
     * 初始化RGV状态
     */
    private void initRgv2() {
        RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
        if (rgvProtocol == null) {
            rgvProtocol = new RgvProtocol();
            rgvProtocol.setRgvNo(slave.getId());
        }
        rgvProtocol.setMode((short) -1);
        rgvProtocol.setStatus((short) -1);
        rgvProtocol.setWalkPos((short) 0);
        rgvProtocol.setRgvPos(0L);
        rgvProtocol.setAlarm((short) 0);
        rgvProtocol.setxSpeed((short) 0);
        rgvProtocol.setxDistance((short) 0);
        rgvProtocol.setxDuration((short) 0);
        rgvProtocol.setCarBodyJiaoMing(0L);
        rgvProtocol.setCarBodyKunPeng(0L);
        rgvProtocol.setStatusEnable(true);

        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
        if (rgvTaskProtocol == null) {
@@ -1052,14 +1033,21 @@
//            OutputQueue.RGV.offer(MessageFormat.format("【{0}】RGV plc连接失败！！！ ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
            log.error("RGV plc连接失败！！！ ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());

            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGVplc连接失败");
            } catch (Exception e2){
            if (System.currentTimeMillis()-currentTimeMilliConnectRgv>1000*60*10){
                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGVplc连接失败");
                } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
                }
                if (currentTimeMilliConnectRgv == 0){
                    currentTimeMilliConnectRgv = System.currentTimeMillis()-1000*60*10-1;
                } else {
                    currentTimeMilliConnectRgv = System.currentTimeMillis();
                }
            }
        }
        initRgv();
        initRgv2();
//        siemensNet.ConnectClose();
        return result;
    }
@@ -1087,6 +1075,16 @@
                }

                rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 8));
//                rgvProtocol.setStatus((short)1);

                //作业启动中  解决任务下发后小车状态未更新，小车状态不及时
                if (this.wrkSign == 1 && rgvProtocol.getStatus()!=(short)1){
                    this.wrkSign = 0;
                }
                if (this.wrkSign == 1){
                    rgvProtocol.setStatus((short)110);
                }

                rgvProtocol.setTaskNo((long)siemensNet.getByteTransform().TransInt32(result.Content, 10));

                rgvProtocol.setRgvNo((int)siemensNet.getByteTransform().TransInt16(result.Content, 14));
@@ -1105,8 +1103,10 @@
                rgvProtocol.setErr4(status[11]);
                rgvProtocol.setErr5(status[12]);
                rgvProtocol.setErr6(status[13]);
                rgvProtocol.setErr7(status[14]);
                rgvProtocol.setErr8(status[15]);
//                System.out.println("读线程"+ slave.getId()+"---"+JSON.toJSONString(rgvProtocol));

//                System.out.println("读线程,小车号"+ slave.getId()+"时间戳："+System.currentTimeMillis()+"小车数据："+JSON.toJSONString(rgvProtocol));
                OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
//                // 工位1复位信号
//                if (rgvProtocol.getStatusType().equals(RgvStatusType.WAITING)
@@ -1140,7 +1140,7 @@

                        try{
                            DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                            deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV plc数据库更新失败");
                            deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV plc数据库更新失败");
                        } catch (Exception e2){
//                            log.error("e2:"+e2.getMessage());
                        }
@@ -1154,26 +1154,29 @@
                RgvStatusCache.updateRgvStatus(rgvProtocol);

            } else {
                initRgv();
                connectRgv = false;
                connectRgv2 = false;
                initRgv();
//                OutputQueue.RGV.offer(MessageFormat.format("【{0}】读取RGV plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
                log.error("读取RGV plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());

                try{
                    DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                    deviceErrorService.addDeviceError("rgv", slave.getId(), "读取RGV plc状态信息失败");
                    deviceErrorService.addDeviceError("rgvErr", slave.getId(), "读取RGV plc状态信息失败");
                } catch (Exception e2){
//                    log.error("e2:"+e2.getMessage());
                }
            }
        } catch (Exception e) {
            connectRgv = false;
            connectRgv2 = false;
//            e.printStackTrace();
//            OutputQueue.RGV.offer(MessageFormat.format("【{0}】读取RGV plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
            log.error("读取RGV plc状态信息失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());

            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "读取RGV plc状态信息失败");
                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "读取RGV plc状态信息失败");
            } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
            }
@@ -1190,7 +1193,7 @@

            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV写入命令为空");
                deviceErrorService.addDeviceError("rgvErr", slave.getId(), "RGV写入命令为空");
            } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
            }
@@ -1198,9 +1201,8 @@
        }
//        convertRow(command);
//        taskProtocol.setRgvNo(slave.getId());
        Long[] array = new Long[11];
//        Long[] array = new Long[11];
        OperateResult result41 = siemensNet.Write("DB100.12.0", false);

//        array[0] = taskProtocol.getAckFinish1();
//        array[1] = taskProtocol.getTaskNo();
//        array[2] = taskProtocol.getTaskMode();
@@ -1212,8 +1214,13 @@
        OperateResult result1 = siemensNet.Write("DB100.4", (short) taskStatus);
        OperateResult result2 = siemensNet.Write("DB100.6", taskProtocol.getTaskNo().intValue());
        OperateResult result3 = siemensNet.Write("DB100.10", taskProtocol.isDirection()? (short) 1 :  (short) 2); // 执行方向（面朝轨道 定位值左小右大）    true:左   false:右
        Thread.sleep(20L);

        OperateResult result4 = siemensNet.Write("DB100.12.0", true);
        this.wrkSign = 1;

//        log.info("任务下发线程,小车号"+ slave.getId()+"时间戳："+System.currentTimeMillis());

//        if (taskProtocol.getAckFinish1() == 0) {
//            short commandFinish = 3;  //工位1、2任务同时写入
//            Thread.sleep(100L);
@@ -1241,6 +1248,7 @@
        } catch (Exception ignore) {
        }

        readStatus();
        if (result != null && result.IsSuccess) {
//            Thread.sleep(50);
//            this.readStatus();
@@ -1249,7 +1257,7 @@

            try{
                DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
                deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV 命令下发"+JSON.toJSON(taskProtocol));
                deviceErrorService.addDeviceError("rgvWrite", slave.getId(), "RGV 命令下发"+JSON.toJSON(taskProtocol));
            } catch (Exception e2){
//                log.error("e2:"+e2.getMessage());
            }
@@ -1269,6 +1277,7 @@
        OperateResult result1 = siemensNet.Write("DB100.4", (short) 0);
        OperateResult result2 = siemensNet.Write("DB100.6", (int) 0);
        OperateResult result3 = siemensNet.Write("DB100.10", (short) 0); // 执行方向（面朝轨道 定位值左小右大）    true:左   false:右
        log.info("任务完成下发线程,小车号"+ slave.getId()+"时间戳："+System.currentTimeMillis());

        try {
            // 日志记录
@@ -1305,6 +1314,14 @@
    }


    /**
     * 清除作业启动中
     */
    @Override
    public void setWrkSign() {
        this.wrkSign = 0;
    }

    public void setDelRgvTask() {
        delRgvTask = true;
    }