#日志采集

Junjie

2023-12-26 58ea363a8a183fefbfb8fa700505be485e9bd760

#日志采集

 src/main/java/com/zy/core/model/protocol/LiftProtocol.java

@@ -143,6 +143,11 @@
    private Long sendTime = 0L;

    /**
     * 日志采集时间
     */
    private Long deviceDataLog = System.currentTimeMillis();

    /**
     * 设置提升机状态
     */
    public void setProtocolStatus(Integer status) {

 src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java

@@ -249,6 +249,11 @@
     */
    private Long sendTime = 0L;

    /**
     * 日志采集时间
     */
    private Long deviceDataLog = System.currentTimeMillis();

    //总里程数
    @Data
    public static class StatusSumClass {

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

@@ -278,15 +278,21 @@
                liftProtocol.setErrorCode(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));//错误码
            }

            //保存数据记录
            DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
            DeviceDataLog deviceDataLog = new DeviceDataLog();
            deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result1.Content));
            deviceDataLog.setWcsData(JSON.toJSONString(liftProtocol));
            deviceDataLog.setType("lift");
            deviceDataLog.setDeviceNo(liftProtocol.getLiftNo().intValue());
            deviceDataLog.setCreateTime(new Date());
            deviceDataLogService.insert(deviceDataLog);
            if (System.currentTimeMillis() - liftProtocol.getDeviceDataLog() > 1000 * 5) {
                //采集时间超过5s，保存一次数据记录
                //保存数据记录
                DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                DeviceDataLog deviceDataLog = new DeviceDataLog();
                deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result1.Content));
                deviceDataLog.setWcsData(JSON.toJSONString(liftProtocol));
                deviceDataLog.setType("lift");
                deviceDataLog.setDeviceNo(liftProtocol.getLiftNo().intValue());
                deviceDataLog.setCreateTime(new Date());
                deviceDataLogService.insert(deviceDataLog);

                //更新采集时间
                liftProtocol.setDeviceDataLog(System.currentTimeMillis());
            }

        } catch (Exception e) {
            OutputQueue.LIFT.offer(MessageFormat.format("【{0}】提升机plc状态信息失败 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));

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

@@ -243,15 +243,21 @@
                }
//                log.warn(JSON.toJSONString(shuttleProtocol));//输出小车状态

                //保存数据记录
                DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                DeviceDataLog deviceDataLog = new DeviceDataLog();
                deviceDataLog.setOriginData(JSON.toJSONString(jsonObject));
                deviceDataLog.setWcsData(JSON.toJSONString(shuttleProtocol));
                deviceDataLog.setType("shuttle");
                deviceDataLog.setDeviceNo(shuttleProtocol.getShuttleNo().intValue());
                deviceDataLog.setCreateTime(new Date());
                deviceDataLogService.insert(deviceDataLog);
                if (System.currentTimeMillis() - shuttleProtocol.getDeviceDataLog() > 1000 * 5) {
                    //采集时间超过5s，保存一次数据记录
                    //保存数据记录
                    DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                    DeviceDataLog deviceDataLog = new DeviceDataLog();
                    deviceDataLog.setOriginData(JSON.toJSONString(jsonObject));
                    deviceDataLog.setWcsData(JSON.toJSONString(shuttleProtocol));
                    deviceDataLog.setType("shuttle");
                    deviceDataLog.setDeviceNo(shuttleProtocol.getShuttleNo().intValue());
                    deviceDataLog.setCreateTime(new Date());
                    deviceDataLogService.insert(deviceDataLog);

                    //更新采集时间
                    shuttleProtocol.setDeviceDataLog(System.currentTimeMillis());
                }
            }
        } catch (Exception e) {
            e.printStackTrace();