Junjie
2023-12-26 58ea363a8a183fefbfb8fa700505be485e9bd760
#日志采集
4个文件已修改
22 ■■■■■ 已修改文件
src/main/java/com/zy/core/model/protocol/LiftProtocol.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/LiftThread.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/thread/NyShuttleThread.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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,6 +278,8 @@
                liftProtocol.setErrorCode(siemensS7Net.getByteTransform().TransInt16(result3.Content, 0));//错误码
            }
            if (System.currentTimeMillis() - liftProtocol.getDeviceDataLog() > 1000 * 5) {
                //采集时间超过5s,保存一次数据记录
            //保存数据记录
            DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
            DeviceDataLog deviceDataLog = new DeviceDataLog();
@@ -288,6 +290,10 @@
            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,6 +243,8 @@
                }
//                log.warn(JSON.toJSONString(shuttleProtocol));//输出小车状态
                if (System.currentTimeMillis() - shuttleProtocol.getDeviceDataLog() > 1000 * 5) {
                    //采集时间超过5s,保存一次数据记录
                //保存数据记录
                DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                DeviceDataLog deviceDataLog = new DeviceDataLog();
@@ -252,6 +254,10 @@
                deviceDataLog.setDeviceNo(shuttleProtocol.getShuttleNo().intValue());
                deviceDataLog.setCreateTime(new Date());
                deviceDataLogService.insert(deviceDataLog);
                    //更新采集时间
                    shuttleProtocol.setDeviceDataLog(System.currentTimeMillis());
                }
            }
        } catch (Exception e) {
            e.printStackTrace();