bugxiugai

Administrator

5 小时以前 c1376645c9ea45db0bd0f90ac693b22ab6ecad05

bugxiugai

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

@@ -193,7 +193,7 @@
                            }
                        }
                        if (back) {
                            staProtocol.setWorkNo((short)9991);
                            staProtocol.setWorkNo((short) 9991);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -238,34 +238,66 @@
                        staProtocol = staProtocol.clone();
                    }
                    if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == 0)) {
                        // 查询工作档
                        TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo() - 1));
                        if (taskWrk == null) {
                            continue;
                        }
                        log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                        staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                        staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                        if (!Cools.isEmpty(taskWrk.getType())) {
                            staProtocol.setHeight(taskWrk.getType());
                        }
                        boolean offer = false;
                        try {
                            offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                        } catch (Exception e) {
                            log.error("下发输送线任务失败：异常:" + e);
                            log.error("下发输送线任务失败：异常:offer:" + offer);
                        }
                        if (offer) {
                            log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                            taskWrk.setStatus(5);
                            taskWrk.setWrkSts(14);
                            taskWrk.setCompleteTime(new Date());
                            taskWrkService.updateById(taskWrk);
                        if (crnStn.getStaNo() >= 200) {
                            // 查询工作档
                            TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo() + 2));
                            if (taskWrk == null) {
                                continue;
                            }
                            log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                            staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                            staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                            if (!Cools.isEmpty(taskWrk.getType())) {
                                staProtocol.setHeight(taskWrk.getType());
                            }
                            boolean offer = false;
                            try {
                                offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                            } catch (Exception e) {
                                log.error("下发输送线任务失败：异常:" + e);
                                log.error("下发输送线任务失败：异常:offer:" + offer);
                            }
                            if (offer) {
                                log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                                taskWrk.setStatus(5);
                                taskWrk.setWrkSts(14);
                                taskWrk.setCompleteTime(new Date());
                                taskWrkService.updateById(taskWrk);

                            } else {
                                log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                            }
                        } else {
                            log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                            // 查询工作档
                            TaskWrk taskWrk = taskWrkMapper.selectCrnStaWorking(crnSlave.getId(), String.valueOf(crnStn.getStaNo() - 1));
                            if (taskWrk == null) {
                                continue;
                            }
                            log.info("下发输送线任务：taskWrk:" + JSON.toJSONString(taskWrk));
                            staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
                            staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
                            if (!Cools.isEmpty(taskWrk.getType())) {
                                staProtocol.setHeight(taskWrk.getType());
                            }
                            boolean offer = false;
                            try {
                                offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
                            } catch (Exception e) {
                                log.error("下发输送线任务失败：异常:" + e);
                                log.error("下发输送线任务失败：异常:offer:" + offer);
                            }
                            if (offer) {
                                log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                                taskWrk.setStatus(5);
                                taskWrk.setWrkSts(14);
                                taskWrk.setCompleteTime(new Date());
                                taskWrkService.updateById(taskWrk);

                            } else {
                                log.error("下发输送线任务失败：taskWrk:" + JSON.toJSONString(taskWrk));
                            }
                        }

//                            }
                    }
                } catch (Exception e) {

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

@@ -438,11 +438,11 @@
            }

            // 读侧面故障反馈
            OperateResultExOne<byte[]> resultErrCM = siemensS7Net.Read("DB101.2540.0", (short) (12 * 4));
            OperateResultExOne<byte[]> resultErrCM = siemensS7Net.Read("DB101.2540.0", (short) (12 * 2));
            if (resultErrCM.IsSuccess) {
                for (int i = 16; i < staNoSize; i++) {
                    Integer siteId = staNos.get(i); // 站点编号
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErrCM.Content, (i - 16) * 4, 1);
                    boolean[] status = siemensS7Net.getByteTransform().TransBool(resultErrCM.Content, (i - 16) * 2, 1);
                    StaProtocol staProtocol = station.get(siteId);
                    staProtocol.setBreakerErr(status[0]);
                    staProtocol.setInfraredErr(status[1]);

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 9090
  port: 9091
  servlet:
    context-path: /@pom.build.finalName@