#

Junjie

9 天以前 dc3f9cc91759823ce59486f19b138be4b296a0f1

 src/main/java/com/zy/core/thread/impl/ZyRgvThread.java

@@ -1,7 +1,7 @@
package com.zy.core.thread.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasRgv;
@@ -25,6 +25,7 @@
import com.zy.core.network.ZyRgvConnectDriver;
import com.zy.core.network.entity.ZyRgvStatusEntity;
import com.zy.core.thread.RgvThread;
import com.zy.core.task.DeviceAsyncLogPublisher;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

@@ -42,10 +43,12 @@
    private ZyRgvConnectDriver zyRgvConnectDriver;
    private RgvProtocol rgvProtocol;
    private int deviceLogCollectTime = 200;
    private final DeviceAsyncLogPublisher deviceAsyncLogPublisher;

    public ZyRgvThread(DeviceConfig deviceConfig, RedisUtil redisUtil) {
        this.deviceConfig = deviceConfig;
        this.redisUtil = redisUtil;
        this.deviceAsyncLogPublisher = SpringUtils.getBean(DeviceAsyncLogPublisher.class);
    }

    @Override
@@ -139,7 +142,7 @@
            deviceDataLog.setType(String.valueOf(SlaveType.Rgv));
            deviceDataLog.setDeviceNo(rgvProtocol.getRgvNo());
            deviceDataLog.setCreateTime(new Date());
            redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
            deviceAsyncLogPublisher.publishLatest(deviceDataLog);
            rgvProtocol.setDeviceDataLog(System.currentTimeMillis());
        }

@@ -158,7 +161,7 @@
                        log.setStatus(1);
                        log.setCreateTime(new Date());
                        log.setSystemStatus(JSON.toJSONString(rgvProtocol));
                        errLogService.insert(log);
                        errLogService.save(log);
                        if (log.getId() != null) {
                            redisUtil.set(errFlagKey, log.getId(), 60 * 60 * 24);
                        }
@@ -185,13 +188,13 @@

        }
        if (basRgvService != null) {
            BasRgv basRgv = basRgvService.selectOne(new EntityWrapper<BasRgv>().eq("rgv_no", deviceConfig.getDeviceNo()));
            BasRgv basRgv = basRgvService.getOne(new QueryWrapper<BasRgv>().eq("rgv_no", deviceConfig.getDeviceNo()));
            if(basRgv == null) {
                basRgv = new BasRgv();
                basRgv.setRgvNo(deviceConfig.getDeviceNo());
                basRgv.setStatus(1);
                basRgv.setCreateTime(new Date());
                basRgvService.insert(basRgv);
                basRgvService.save(basRgv);
            }
        }
    }
@@ -268,7 +271,7 @@
                    JSON.toJSONString(response)
            );
            if (bean != null) {
                bean.insert(basRgvOpt);
                bean.save(basRgvOpt);
            }
        }
    }