cl
12 小时以前 13fbd2d9fdc7146cc5709b30b3f04e81c829f86f
src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -308,19 +308,23 @@
        }
        if (System.currentTimeMillis() - deviceDataLogTime > 1000 * 1) {
            //采集时间超过5s,保存一次数据记录
            //保存数据记录
            DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
            DeviceDataLog deviceDataLog = new DeviceDataLog();
            deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
            deviceDataLog.setWcsData(JSON.toJSONString(station));
            deviceDataLog.setType("devp");
            deviceDataLog.setDeviceNo(slave.getId());
            deviceDataLog.setCreateTime(new Date());
            deviceDataLogService.insert(deviceDataLog);
            //更新采集时间
            deviceDataLogTime = System.currentTimeMillis();
            try {
                //采集时间超过5s,保存一次数据记录
                //保存数据记录
                if (result != null && result.IsSuccess && result.Content != null) {
                    DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                    DeviceDataLog deviceDataLog = new DeviceDataLog();
                    deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
                    deviceDataLog.setWcsData(JSON.toJSONString(station));
                    deviceDataLog.setType("devp");
                    deviceDataLog.setDeviceNo(slave.getId());
                    deviceDataLog.setCreateTime(new Date());
                    deviceDataLogService.insert(deviceDataLog);
                }
            } finally {
                //更新采集时间
                deviceDataLogTime = System.currentTimeMillis();
            }
        }
        if (result.IsSuccess && result2.IsSuccess && result3.IsSuccess && result4.IsSuccess) {