From 5909a516b549ae3be0fc7fe72b30c28377e61a41 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Wed, 1 Jul 2026 18:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/MainReceiverController.java | 4 +-- .../datacenter/sender/service/F10Service.java | 28 +++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/techsor/datacenter/sender/controllers/MainReceiverController.java b/src/main/java/com/techsor/datacenter/sender/controllers/MainReceiverController.java index 33cc406..64cf9fb 100644 --- a/src/main/java/com/techsor/datacenter/sender/controllers/MainReceiverController.java +++ b/src/main/java/com/techsor/datacenter/sender/controllers/MainReceiverController.java @@ -201,14 +201,14 @@ public class MainReceiverController { @RequestMapping(value = "generic/f10", method = RequestMethod.POST) public JsonResponse f10Process(@RequestBody RedisStreamEntity rawEntity){ - logger.debug("f10 data:{}", JSON.toJSONString(rawEntity)); + logger.info("[F10] http f10 data:{}", JSON.toJSONString(rawEntity)); //处理数据，转发数据 String resultJson=""; try{ //解析数据 this.f10Service.handle(rawEntity); }catch (Exception e){ - logger.error("f10Process error", e); + logger.error("[F10] f10Process error", e); } return JsonResponse.buildSuccess(resultJson); } diff --git a/src/main/java/com/techsor/datacenter/sender/service/F10Service.java b/src/main/java/com/techsor/datacenter/sender/service/F10Service.java index 619700c..ec9d612 100644 --- a/src/main/java/com/techsor/datacenter/sender/service/F10Service.java +++ b/src/main/java/com/techsor/datacenter/sender/service/F10Service.java @@ -63,7 +63,7 @@ public class F10Service { } else if (208 == src.length) { handle208(rawEntity); } else { - log.warn("原始报文长度不是328或者208字节"); + log.warn("[F10] 原始报文长度不是328或者208字节"); } } @@ -89,7 +89,7 @@ public class F10Service { try { latestTs = Long.parseLong(latestTsStr); } catch (Exception e) { - log.error("Redis数据异常，无法转换为Long: key={}, value={}", redisKey, latestTsStr); + log.error("[F10] Redis数据异常，无法转换为Long: key={}, value={}", redisKey, latestTsStr); } } @@ -104,31 +104,33 @@ public class F10Service { redisUtils.add(redisKey, String.valueOf(receivedCurrentTs)); } else if (receivedCurrentTs == latestTs) { // 重复数据 → 直接丢弃 - log.warn("重复处理，丢弃 deviceId={}", f10ProcessingData.getGatewayId()); + log.warn("重复处理，丢弃 gatewayId={}", f10ProcessingData.getGatewayId()); return; } else { // 旧数据 → 标记过期 isExpired = true; + log.warn("[F10] 过期数据, gatewayId={}", f10ProcessingData.getGatewayId()); } } TopCompanyInfo topCompanyInfo= commonOpt.getCompanyIdByDevicePrefix(f10ProcessingData.getGatewayId() + "_"); if (topCompanyInfo==null || "0".equals(topCompanyInfo.getTopCompanyId())){ - log.error("no companyId is found========================>>>> {}",f10ProcessingData.getGatewayId()); + log.error("[F10] no companyId is found========================>>>> {}",f10ProcessingData.getGatewayId()); return; } DataSourceContextHolder.clearCurrentDataSourceKey(); DataSourceContextHolder.setCurrentDataSourceKey("dataSourceForCompany_"+topCompanyInfo.getTopCompanyId()); - log.info("Use datasource for company:"+topCompanyInfo.getTopCompanyId()); + log.info("[F10] Use datasource for company:"+topCompanyInfo.getTopCompanyId()); Long companyId = Long.valueOf(topCompanyInfo.getSelfCompanyId()); f10ProcessingData.setCompanyId(companyId); f10Dao.insertF10ProcessingData(f10ProcessingData); + log.info("[F10] 解析入库成功, gatewayId: {}", f10ProcessingData.getGatewayId()); } catch (Exception e) { - log.error("F10解析入库失败", e); + log.error("[F10] F10解析208入库失败", e); } } @@ -158,7 +160,7 @@ public class F10Service { try { latestTs = Long.parseLong(latestTsStr); } catch (Exception e) { - log.error("Redis数据异常，无法转换为Long: key={}, value={}", redisKey, latestTsStr); + log.error("[F10] Redis数据异常，无法转换为Long: key={}, value={}", redisKey, latestTsStr); } } @@ -173,28 +175,29 @@ public class F10Service { redisUtils.add(redisKey, String.valueOf(receivedCurrentTs)); } else if (receivedCurrentTs == latestTs) { // 重复数据 → 直接丢弃 - log.warn("重复告警，丢弃 deviceId={}", f10JournalLog.getDeviceId()); + log.warn("[F10] 重复告警, 丢弃 deviceId={}", f10JournalLog.getDeviceId()); return; } else { // 旧数据 → 标记过期 isExpired = true; + log.warn("[F10] 过期数据, deviceId={}", f10JournalLog.getDeviceId()); } } f10JournalLog.setExpiredFlag(isExpired ? 1 : 0); String topCompanyId= commonOpt.getTopCompanyId(f10JournalLog.getDeviceId()); if (topCompanyId==null || topCompanyId.equals("0")){ - log.error("no companyId is found========================>>>> {}",f10JournalLog.getDeviceId()); + log.error("[F10] no companyId is found========================>>>> {}",f10JournalLog.getDeviceId()); return; } DataSourceContextHolder.clearCurrentDataSourceKey(); DataSourceContextHolder.setCurrentDataSourceKey("dataSourceForCompany_"+topCompanyId); - log.info("Use datasource for company:"+topCompanyId); + log.info("[F10] Use datasource for company:"+topCompanyId); List deviceEntity=this.deviceDao.getDeviceInfoByDeviceId(f10JournalLog.getDeviceId()); this.guavaRedisCache.incrementDailyDeviceIdCount(f10JournalLog.getDeviceId()); if (CollectionUtil.isEmpty(deviceEntity)){ - log.error("no deviceEntity is found========================>>>> {}",f10JournalLog.getDeviceId()); + log.error("[F10] no deviceEntity is found========================>>>> {}",f10JournalLog.getDeviceId()); return; } @@ -228,9 +231,10 @@ public class F10Service { f10Dao.insertF10Log(f10JournalLog); + log.info("[F10] 解析入库成功, deviceId: {}", f10JournalLog.getDeviceId()); } catch (Exception e) { - log.error("F10解析入库失败", e); + log.error("[F10] F10解析308入库失败", e); } }