#

Junjie

1 天以前 319114168ac26843b06431c3a10e0075526398d4

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

@@ -26,6 +26,7 @@
import com.zy.core.network.entity.ZyDualCrnStatusEntity;
import com.zy.core.thread.DualCrnThread;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.DeviceLogRedisKeyBuilder;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;

@@ -302,7 +303,7 @@
    public boolean connect() {
        zyDualCrnConnectDriver = new ZyDualCrnConnectDriver(deviceConfig);
        zyDualCrnConnectDriver.start();
        DeviceConnectPool.put(SlaveType.Crn, deviceConfig.getDeviceNo(), zyDualCrnConnectDriver);
        DeviceConnectPool.put(SlaveType.DualCrn, deviceConfig.getDeviceNo(), zyDualCrnConnectDriver);
        return true;
    }

@@ -371,7 +372,7 @@
            deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
            deviceDataLog.setCreateTime(new Date());

            redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
            redisUtil.set(DeviceLogRedisKeyBuilder.build(deviceDataLog), deviceDataLog, 60 * 60 * 24);
            //更新采集时间
            crnProtocol.setDeviceDataLog(System.currentTimeMillis());
        }
@@ -523,7 +524,7 @@
            BasDualCrnpOptService bean = SpringUtils.getBean(BasDualCrnpOptService.class);
            ZyDualCrnStatusEntity statusEntity = zyDualCrnConnectDriver.getStatus();
            BasDualCrnpOpt basDualCrnpOpt = new BasDualCrnpOpt(
                    command.getTaskNo().intValue(),
                    command.getTaskNo(),
                    command.getCrnNo(),
                    new Date(),
                    String.valueOf(command.getTaskMode()),
@@ -537,9 +538,7 @@
                    1,
                    JSON.toJSONString(response)
            );
            if (bean != null) {
                bean.save(basDualCrnpOpt);
            }
            bean.save(basDualCrnpOpt);
        }
    }