diff --git a/src/main/java/com/tongran/agent/client/scheduler/service/BusinessTasks.java b/src/main/java/com/tongran/agent/client/scheduler/service/BusinessTasks.java index 359fb5f..c0fa107 100644 --- a/src/main/java/com/tongran/agent/client/scheduler/service/BusinessTasks.java +++ b/src/main/java/com/tongran/agent/client/scheduler/service/BusinessTasks.java @@ -248,8 +248,7 @@ public class BusinessTasks { */ @Async("taskExecutor") public void switchBoardTask(String type) { - long timestamp = System.currentTimeMillis(); - timestamp = Math.round(timestamp / 1000.0); + long timestamp = AgentUtil.roundMinutes(); int count = task8Counter.incrementAndGet(); AssertLog.info("交换机信息采集定时任务执行 - 时间: {},task #{}", LocalDateTime.now(), count); // 判定客户端与服务端是否连接 @@ -259,11 +258,11 @@ public class BusinessTasks { // String data = JSONArray.toJSONString(list); // Message message = Message.builder().clientId(GlobalConfig.CLIENT_ID).dataType(MsgEnum.交换机上报.getValue()).data(data).build(); JSONObject jsonObject = new JSONObject(); + jsonObject.put("timestamp", timestamp); String data = switchBoardService.getSwitchDataByType(type); if(StringUtils.isNotBlank(data)){ jsonObject = JSONObject.parseObject(data); } - jsonObject.put("timestamp", timestamp); Message message = Message.builder().clientId(GlobalConfig.CLIENT_ID).dataType(MsgEnum.交换机上报.getValue()).data(jsonObject.toString()).build(); sessionManager.writeAndFlush(sessionManager.getSessionById(GlobalConfig.CLIENT_ID).getChannel(), message); AssertLog.info("发送交换机信息包={}",JSON.toJSONString(message));