#

yxFwq

2024-10-29 83894247616a45ad4201b0aa5956282936f1b18a

#

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

@@ -8788,7 +8788,7 @@
                    DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
                    StaProtocol staProtocolEnt = devpThread.getStation().get(staNoEnt);
                    if (staProtocolEnt == null || (staProtocolEnt.isLoading() && staProtocolEnt.getWorkNo()==0)){
                        log.error("站点异常,计数加一，站点号："+staNoEnt);
//                        log.error("站点异常,计数加一，站点号："+staNoEnt);
                        count++;
                    } else if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){
                        if (staProtocolEnt.getStaNo().equals(basJar.getEntStaNo$())){

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

@@ -161,7 +161,7 @@
    @Component
    class killThread {

        @Scheduled(cron = "0/3 * * * * ? ")
//        @Scheduled(cron = "0/3 * * * * ? ")
        public void kill() {
            for (Map.Entry<CrnThread, Thread> entry : map.entrySet()) {
                CRN_COUNT++;

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

@@ -205,6 +205,7 @@
                    crnProtocol = new CrnProtocol();
                    crnProtocol.setCrnNo(slave.getId());
                }
                crnProtocol.setCrnNo(slave.getId());
                crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
                crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
                crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));