1

zhangchao

2024-10-26 6914066d08d3aeee4f1092668d6a125ae21a4def

1

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

@@ -270,7 +270,7 @@
    public R monitorLedError(@RequestParam("ledId") Integer ledId) {
        String errorMsg = "";
        for (LedSlave slave : slaveProperties.getLed()) {
            if (slave.getStaArr().contains(ledId)) {
            if (slave.getId().equals(ledId)) {
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
                if (null != ledThread) {
                    errorMsg = ledThread.getErrorMsg().toString();

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

@@ -310,16 +310,17 @@
                            staProtocol.setWorkNo((short) 9999);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
                            }

                            // led 异常显示
                            if (ledThread != null) {
                                String errorMsg = jsonObject.getString("msg");
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                            }
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
                            }


                        }

                    } catch (Exception e) {

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

@@ -373,7 +373,6 @@
                    log.error("写入工作号命令失败。堆垛机plc编号={}，站点数据={},写入次数={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
                }
            }
            Thread.sleep(200);
            if (!staNoFlag) {
                write1 = siemensS7Net.Write("DB100." + (index * 6 + 4), staProtocol.getStaNo());    // 目标站
                if (write1.IsSuccess) {
@@ -401,6 +400,7 @@
            if (wrkNoFlag && staNoFlag) {
                break;
            }
            Thread.sleep(200);
        } while (writeCount < 20);

        if (!write.IsSuccess) {
@@ -470,10 +470,19 @@
    }

    public static void main(String[] args) {
        int i=1;
        do {
            System.out.println(i);
            i++;
            if (i==4){
                break;
            }

        }while (i<6);
        StaProtocol staProtocol = new StaProtocol();
        staProtocol.setWorkNo((short) 6071);
        short i = (short) 6071;
        System.out.println(staProtocol.getWorkNo().equals(i));
        //short i = (short) 6071;
        //System.out.println(staProtocol.getWorkNo().equals(i));
//        System.out.println(staNos1.indexOf(129));
//        System.out.println(staNos1.size());
//        for (int i = 0; i < staNos1.size(); i++) {

 src/main/resources/application.yml

@@ -26,7 +26,7 @@
#    field-strategy: 0

logging:
  path: /stock/out/@pom.build.finalName@/logs
  path: stock/out/@pom.build.finalName@/logs

super:
  pwd: xltys1995
@@ -184,7 +184,7 @@
    ip: 10.10.10.248
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 108
    staArr: 101
  # LED3
  led[2]:
    id: 3
@@ -192,13 +192,13 @@
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 117
  # LED4
  led[3]:
    id: 4
    ip: 10.10.10.246
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 126
#  # LED4
#  led[3]:
#    id: 4
#    ip: 10.10.10.246
#    port: 5005
#    devpPlcId: ${wcs-slave.devp[0].id}
#    staArr: 126
#  # LED5
#  led[4]:
#    id: 5

 src/main/resources/logback-spring.xml

@@ -24,9 +24,9 @@

    <!--info级别-->
    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${LOG_PATH}/${datetime}/info.log</file>
        <file>${LOG_PATH}/info.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <FileNamePattern>${LOG_PATH}/${datetime}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
            <FileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
            <maxHistory>3600</maxHistory>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>10MB</maxFileSize>
@@ -43,9 +43,9 @@
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>ERROR</level>
        </filter>
        <file>${LOG_PATH}/${datetime}/error.log</file>
        <file>${LOG_PATH}/error.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <FileNamePattern>${LOG_PATH}/${datetime}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
            <FileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
            <maxHistory>3600</maxHistory>
            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                <maxFileSize>10MB</maxFileSize>