From 58ea363a8a183fefbfb8fa700505be485e9bd760 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 26 十二月 2023 20:48:56 +0800 Subject: [PATCH] #日志采集 --- src/main/java/com/zy/core/thread/LiftThread.java | 24 +++++++++++++++--------- src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java | 5 +++++ src/main/java/com/zy/core/thread/NyShuttleThread.java | 24 +++++++++++++++--------- src/main/java/com/zy/core/model/protocol/LiftProtocol.java | 5 +++++ 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java b/src/main/java/com/zy/core/model/protocol/LiftProtocol.java index e64959d..9a607af 100644 --- a/src/main/java/com/zy/core/model/protocol/LiftProtocol.java +++ b/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) { diff --git a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java index ae9bea8..9961293 100644 --- a/src/main/java/com/zy/core/model/protocol/NyShuttleProtocol.java +++ b/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 { diff --git a/src/main/java/com/zy/core/thread/LiftThread.java b/src/main/java/com/zy/core/thread/LiftThread.java index 977730e..4195f76 100644 --- a/src/main/java/com/zy/core/thread/LiftThread.java +++ b/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())); diff --git a/src/main/java/com/zy/core/thread/NyShuttleThread.java b/src/main/java/com/zy/core/thread/NyShuttleThread.java index 592adc1..5fcce03 100644 --- a/src/main/java/com/zy/core/thread/NyShuttleThread.java +++ b/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(); -- Gitblit v1.9.1