#

yxFwq

2024-11-19 54c965b6e35719dbbf4a538dc137e1c42e450ea0

#

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

@@ -13,6 +13,7 @@
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.ErrMsg;
import com.zy.core.model.LedSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
@@ -268,6 +269,7 @@
    public R monitorLed(@RequestParam("ledId") Integer ledId) {
        String ledContent = "";
        List<LedCommand> commandList = null;
        List<ErrMsg> errMsgs = null;
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getStaArr().contains(ledId)) {
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());

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

@@ -5822,6 +5822,15 @@
                        log.error("JarWrkMastExecute任务创建===>执行异常===》异常数据：BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMastSign));
                    }
                    return true;
                } else if (jarProtocol.isAutoing() && jarProtocol.statusType != JarStatusType.SOS
                        && jarProtocol.statusType != JarStatusType.WAITING2 && jarProtocol.jarErr==0
                            && jarProtocol.isLeftDoor() && jarProtocol.isRightDoor()
                            && jarProtocol.leftDoorOpen==0  && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0  && jarProtocol.rightDoorClose==0){
                        Integer integer = basJarMastService.updateStatus(jarProtocol.getJarNo(), 6, 8);
                        if (basJarMastList.size()!=integer){
                            log.error("{}号硫化罐硫化完成后开门完成修改硫化档案状态结果数量不一致！！！查询资料数量={}，更新返回数量={}",jarProtocol.getJarNo(),basJarMastList.size(),integer);
                        }
                        return true;
                }
                return false;
            } else {
@@ -5916,6 +5925,13 @@
                }

                if (basJarOther.getJarCount() == 0) {
                    return false;
                }

                List<BasJarMast> basJarMastListOther = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getJarOtherId(), new ArrayList<Integer>() {{
                    add(8);
                }});
                if (!basJarMastListOther.isEmpty() && basJarMastListOther.size() < basJarOther.getJarCount()){
                    return false;
                }
                if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && !basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(), 4).equals(basJarOther.getJarCount() )){
@@ -8109,7 +8125,7 @@
                        && (jarProtocol.leftDoorClose==2  || jarProtocol.rightDoorClose==2)){
                    if (jarProtocol.getJarTemperature()>jarTemperature){
                        log.error("{}号硫化罐查询设备温度过高，等待降温....！！！",jarProtocol.getJarNo());
                        return false;
                        continue;
                    }
                    WrkMastExecute wrkMastExecuteSou = new WrkMastExecute();
                    wrkMastExecuteSou.setWrkSts(3);
@@ -8680,6 +8696,37 @@
            }
        }

        try{
            for (int idi = 1;idi<5;idi++){
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, idi);

                if (ledThread != null) {
                    ErrMsg errMsg1 = new ErrMsg();
                    errMsg1.setErrMsg("测试："+idi);
                    errMsg1.setArea("1");
                    MessageQueue.offer(SlaveType.Led, idi, new Task(5, errMsg1));
                } try {
                    Thread.sleep(500);
                } catch (Exception e){

                }
            }
            LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);

            if (ledThread3 != null) {
                ErrMsg errMsg1 = new ErrMsg();
                errMsg1.setErrMsg("测试测试测试测试测试测试测试测试测试测试测试测试测试："+3);
                errMsg1.setArea("1");
                MessageQueue.offer(SlaveType.Led, 3, new Task(5, errMsg1));
            } try {
                Thread.sleep(500);
            } catch (Exception e){

            }
        } catch (Exception e){

        }


    }
    public synchronized Integer jarGetStartStaNo(Integer staNo) {