#ZH

野心家

2025-05-26 97cfc84c932f52c6419eebfd4888f2d8212edb5b

#ZH

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -1404,7 +1404,10 @@
            return false;
        }
        if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1
                || (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
                || ((!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
            return false;
        }
        if (rgvProtocol.getLoaded()==1){
            return false;
        }
        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
@@ -1428,7 +1431,7 @@
            return false;
        }
        if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1
                || (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
                || ((!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
            return false;
        }

@@ -1445,7 +1448,7 @@
            return false;
        }
        if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1
                || (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
                || ((!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
            return false;
        }
        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());

 src/main/java/com/zy/common/utils/excel/EnInitDataListener.java

@@ -20,7 +20,7 @@
    /**
     * 每隔5条存储数据库，实际使用中可以3000条，然后清理list ，方便内存回收
     */
    private static final int BATCH_COUNT = 5;
    private static final int BATCH_COUNT = 20;

    private List<EnInitData> list = new ArrayList<>();


 src/main/java/com/zy/core/MainProcess.java

@@ -32,7 +32,7 @@
                try {

                    // 间隔
                    Thread.sleep(1000);
                    Thread.sleep(500);

                    // 系统运行状态判断
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {

 src/main/java/com/zy/core/model/protocol/RgvTaskProtocol.java

@@ -21,5 +21,7 @@
     */
    public Long AvoidingTheDestination;

    public boolean signRun = true;

    public RgvTaskProtocol(){}
}

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

@@ -56,6 +56,7 @@
    private Long trackBenchmark = 1L;
    //  # 避让距离
    private Long avoidDistance = 5000L;
    private Long currentTimeMilliOld = 0L;

    /**
     * 工位1复位信号
@@ -132,6 +133,7 @@
        while (true) {
            try {
                Thread.sleep(20);
                System.out.println("读线程"+ slave.getId());

                readStatus();

@@ -187,103 +189,103 @@
    /**
     * 任务下发
     */
    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 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 {
                // 休眠 1 秒
                Thread.sleep(100);

                if (!deviceDetection()) {
                    continue;
                }
                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                if (rgvTaskProtocol == null) {
                    initRgv();
                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                }
                if (rgvTaskProtocol.getAvoid() != 1) {
                    continue;
                }
                TaskProtocol issued = new TaskProtocol();
                issued.setTaskNo(32222L);
                issued.setTargetPosition(rgvTaskProtocol.getAvoidingTheDestination());
                issued.setTaskStatus(1);
                issued.setDirection(true);
                write(issued);
                rgvTaskProtocol.setAvoid(0);

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

            } catch (Exception e) {
                log.error("RGV行走任务下发线程异常！！！" + e.getMessage());
//                e.printStackTrace();
            }
        }
    }
//    private void taskWalkIssued() {
//        while (true) {
//            try {
//                // 休眠 1 秒
//                Thread.sleep(100);
//
//                if (!deviceDetection()) {
//                    continue;
//                }
//                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
//                if (rgvTaskProtocol == null) {
//                    initRgv();
//                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
//                }
//                if (rgvTaskProtocol.getAvoid() != 1) {
//                    continue;
//                }
//                TaskProtocol issued = new TaskProtocol();
//                issued.setTaskNo(32222L);
//                issued.setTargetPosition(rgvTaskProtocol.getAvoidingTheDestination());
//                issued.setTaskStatus(1);
//                issued.setDirection(true);
//                write(issued);
//                rgvTaskProtocol.setAvoid(0);
//
//                Thread.sleep(200);
//                RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
//
//            } catch (Exception e) {
//                log.error("RGV行走任务下发线程异常！！！" + e.getMessage());
////                e.printStackTrace();
//            }
//        }
//    }

    /**
     * 任务下发
@@ -292,10 +294,20 @@
        while (true) {
            try {
                // 休眠 1 秒
                Thread.sleep(50);
                if (!deviceDetection()) {
                if (System.currentTimeMillis() - currentTimeMilliOld > 100) {
                    currentTimeMilliOld = System.currentTimeMillis()+50;
                } else {
                    continue;
                }
                if (!deviceDetection()) {
                    currentTimeMilliOld = System.currentTimeMillis()+50;
                    continue;
                }
                if (!signRunStart()){
                    currentTimeMilliOld = System.currentTimeMillis()+50;
                    continue;
                }

                RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
                RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                if (rgvProtocol == null || rgvTaskProtocol == null) {
@@ -303,10 +315,14 @@
                    rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
                    rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
                }
                if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE)){
                if (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)){
                    signRunEnd();
                    currentTimeMilliOld = System.currentTimeMillis()+50;
                    continue;
                }
                if (rgvProtocol.getLoaded() == -1){
                    signRunEnd();
                    currentTimeMilliOld = System.currentTimeMillis()+50;
                    continue;
                }
                if (rgvTaskProtocol.getAvoid() != 0) {
@@ -319,10 +335,12 @@
                        write(issued);
                        rgvTaskProtocol.setAvoid(0);

                        try{Thread.sleep(50L);} catch (Exception e){}
//                        try{Thread.sleep(50L);} catch (Exception e){}

                        RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
                    }
                    signRunEnd();
                    currentTimeMilliOld = System.currentTimeMillis()+50;
                    continue;
                }

@@ -335,7 +353,7 @@
                            if (rgvOtherStatusEnable()) {
                                //另一台车是否允许此台车执行
                                if (!otherRgvAvoid(taskProtocol.getTargetPosition())) {
                                    continue;
                                    break;
                                }
                            }
                            if (taskProtocol.getTargetPosition()<=rgvProtocol.getRgvPos()+50
@@ -357,7 +375,7 @@
                            if (rgvOtherStatusEnable()) {
                                //另一台车是否允许此台车执行
                                if (!otherRgvAvoid(taskProtocol.getTargetPosition())) {
                                    continue;
                                    break;
                                }
                            }
                            if (taskProtocol.getTargetPosition()<=rgvProtocol.getRgvPos()+50
@@ -370,7 +388,6 @@
                                    }
                                    // 判断是否满足入库条件
                                    if (!staProtocol.isAutoing() || staProtocol.isLoading()
                                            || staProtocol.getWorkNo() != 0
                                    ){
                                        continue;
                                    }
@@ -387,6 +404,8 @@
                        }
                    }
                }
                signRunEnd();
                currentTimeMilliOld = System.currentTimeMillis()+50;
            } catch (Exception e) {
                log.error("RGV任务下发线程异常！！！ ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
                try{
@@ -399,16 +418,9 @@
            }
        }
    }

    public boolean deviceDetection() {
        RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
    public boolean isSignRgvTaskProtocol() {
        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());

        if (rgvProtocol == null || rgvTaskProtocol == null) {
            return false;
        }
        if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1 || rgvProtocol.getRgvPosDestination() == 0L
                || (!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
        if (rgvTaskProtocol == null) {
            return false;
        }
        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
@@ -418,7 +430,89 @@
            return false;
        }
        if (rgvProtocolOther.statusEnable) {
            if (rgvTaskProtocolOther == null) {
                return false;
            }
        }
        return true;
    }

    public boolean signRunStart() {
        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
        if (rgvTaskProtocol == null) {
            return false;
        }
        RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());
        if (rgvTaskProtocolOther == null) {
            return false;
        }
        if(!rgvTaskProtocol.isSignRun()) {
            return false;
        }
        if(rgvTaskProtocolOther.isSignRun()) {
            rgvTaskProtocol.setSignRun(rgvTaskProtocol.getRgvNo()==1);
            RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
            return false;
        }
        rgvTaskProtocol.setSignRun(false);
        RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
        return true;
    }

    public boolean signRunEnd() {
        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());
        if (rgvTaskProtocol == null) {
            return false;
        }
        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
        if (rgvProtocolOther == null) {
            return false;
        }
        if (rgvProtocolOther.statusEnable) {
            RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());
            if (rgvTaskProtocolOther == null) {
                return false;
            }
            rgvTaskProtocol.setSignRun(false);
            RgvTaskCache.updateRgvStatus(rgvTaskProtocol);

            rgvTaskProtocolOther.setSignRun(true);
            RgvTaskCache.updateRgvStatus(rgvTaskProtocolOther);
        } else {
            rgvTaskProtocol.setSignRun(true);
            RgvTaskCache.updateRgvStatus(rgvTaskProtocol);
        }
        return true;
    }


    public boolean deviceDetection() {
        RgvProtocol rgvProtocol = RgvStatusCache.getRgvStatus(slave.getId());
        RgvTaskProtocol rgvTaskProtocol = RgvTaskCache.getRgvStatus(slave.getId());

        if (rgvProtocol == null || rgvTaskProtocol == null) {
            return false;
        }
        if (!rgvProtocol.getModeType().equals(RgvModeType.AUTO) || rgvProtocol.getRgvPos().equals(0L) || rgvTaskProtocol.getAvoid() == -1 || rgvProtocol.getRgvPosDestination() == 0L
                || ((!rgvProtocol.getStatusType().equals(RgvStatusType.IDLE) || (Math.abs(rgvProtocol.getRgvPos() - rgvProtocol.getRgvPosDestination())>100)) && !rgvProtocol.getStatusType().equals(RgvStatusType.ROAM))) {
            if (signRunStart()){
                signRunEnd();
            }
            return false;
        }
        RgvProtocol rgvProtocolOther = RgvStatusCache.getRgvStatus(slave.getOtherId());
        RgvTaskProtocol rgvTaskProtocolOther = RgvTaskCache.getRgvStatus(slave.getOtherId());
//        System.out.println("rgvTaskProtocol:"+slave.getId()+"sign:"+rgvTaskProtocol.isSignRun()+"/n"+
//                "rgvTaskProtocolOther:"+slave.getOtherId()+"sign:"+rgvTaskProtocolOther.isSignRun()+"/n");

        if (rgvProtocolOther == null) {
            return false;
        }
        if (rgvProtocolOther.statusEnable) {
            if (!rgvProtocolOther.getModeType().equals(RgvModeType.AUTO) || rgvProtocolOther.getRgvPos().equals(0L) || rgvTaskProtocolOther.getAvoid() == -1 || rgvProtocolOther.getRgvPosDestination() == 0L) {
                if (signRunStart()){
                    signRunEnd();
                }
                return false;
            }
        }
@@ -447,8 +541,7 @@
        Long[][] avoidRange = new TrackRangeUtils().avoidRange(slave, trackEntireLength, trackBenchmark, avoidDistance);

        if (new TrackRangeUtils().IsItSmall(slave)) {

            if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)) {
            if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE) && (Math.abs(rgvProtocolOther.getRgvPos() - rgvProtocolOther.getRgvPosDestination())<50)) {
                if ((rgvProtocolOther.getRgvPos() - rgvProtocolOther.getCarBodyJiaoMing())
                        - (targetPosition + rgvProtocol.getCarBodyKunPeng())
                        > avoidDistance - 50) {//无需避让
@@ -469,7 +562,6 @@
                            if (signNowPosRun){
                                // 判断是否满足入库条件
                                if (!staProtocol.isAutoing() || staProtocol.isLoading()
                                        || staProtocol.getWorkNo() != 0
                                ){
                                    if (targetPosition.equals(nowPosRunTask.getTargetPosition())){
                                        if (rgvProtocolOther.getRgvPosDestination() >= rgvProtocolOther.getRgvPos()-50) {
@@ -585,7 +677,7 @@
                }
            }
        } else {
            if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)) {
            if (rgvProtocolOther.getStatusType().equals(RgvStatusType.IDLE)  && (Math.abs(rgvProtocolOther.getRgvPos() - rgvProtocolOther.getRgvPosDestination())<50)) {
                if ((targetPosition - rgvProtocol.getCarBodyJiaoMing())
                        - (rgvProtocolOther.getRgvPos() + rgvProtocolOther.getCarBodyKunPeng())
                        > avoidDistance - 50) {//无需避让
@@ -605,7 +697,6 @@
                            if (signNowPosRun){
                                // 判断是否满足入库条件
                                if (!staProtocol.isAutoing() || staProtocol.isLoading()
                                        || staProtocol.getWorkNo() != 0
                                ){
                                    if (targetPosition.equals(nowPosRunTask.getTargetPosition())){
                                        if (rgvProtocolOther.getRgvPosDestination() <= rgvProtocolOther.getRgvPos() + 50) {
@@ -844,6 +935,7 @@
                rgvProtocol.setErr4(status[11]);
                rgvProtocol.setErr5(status[12]);
                rgvProtocol.setErr6(status[13]);
                System.out.println("读线程"+ slave.getId()+"---"+JSON.toJSONString(rgvProtocol));

                OutputQueue.RGV.offer(MessageFormat.format("【{0}】[id:{1}] <<<<< 实时数据更新成功", DateUtils.convert(new Date()), slave.getId()));
//                // 工位1复位信号

 src/main/resources/application.yml

@@ -12,13 +12,13 @@
#    username: sa
#    password: sa@123
    driver-class-name: dm.jdbc.driver.DmDriver
    url: jdbc:dm://27.172.2.102:5236/SOURCE
#    url: jdbc:dm://27.172.1.129:5236/SOURCE
#    url: jdbc:dm://27.172.2.102:5236/SOURCE
    url: jdbc:dm://27.172.1.130:5236/SOURCE
#    url: jdbc:dm://127.0.0.1:5236/SOURCE
    username: SYSDBA
    password: Zy@12345
#    username: ZOS_ZEMIC
#    password: k3Mq6xRv9frOxb7n
#    username: SYSDBA
#    password: Zy@12345
    username: ZOS_ZEMIC
    password: k3Mq6xRv9frOxb7n
#    username: ENC(++MryJD2j+X3rpmocG4vPH5vxXbpJNrF)
#    password: ENC(zOcPLHRUpllsRBQRlRrtQmljC8cKAoSzrGQaBST81MY=)
  mvc:

 src/main/webapp/views/deviceOperate/rgvOperate.html

@@ -57,7 +57,7 @@
                            <el-button @click="requestOperate('TakeAndPut')" type="primary">取放货</el-button>
                            <el-button @click="requestOperate('walk')" type="warning">行走</el-button>
                            <el-button @click="requestOperate('del')" type="warning">任务清空</el-button>
                            <el-button @click="requestOperate('delRgvTask')" type="warning">小车强制复位（有任务或者运行时不要操作）</el-button>
                            <el-button @click="requestOperate('delRgvTask')" type="warning">小车强制复位（运行时不要操作,需要配合按钮）</el-button>
                        </div>
                    </div>
                </el-card>