From c424378f99fd395e3773dafb35cb71f2180b34fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 2 Dec 2025 17:34:00 +0800 Subject: [PATCH] =?UTF-8?q?fix(logging):=20=E4=BC=98=E5=8C=96=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=A0=BC=E5=BC=8F=E5=8F=8A=E8=AE=BE=E5=A4=87=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=BA=BF=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在日志输出格式中增加方法名和行号，便于定位问题 - 在AdminDeviceService中增加对设备产品线及设备类型字段为空的判断，避免错误处理 - 修正获取CRM-token时抛出异常信息，使错误信息更精准 - 添加调试日志输出响应数据，辅助问题排查 - 对移动破产品线设备的过滤逻辑进行了调整和日志优化 --- .../nflg/mobilebroken/admin/service/AdminDeviceService.java | 4 +++- nflg-mobilebroken-admin/src/main/resources/logback-sit.xml | 6 ++++-- .../src/main/resources/logback-sit.xml | 6 ++++-- .../mobilebroken/gongfu/service/AdminDeviceService.java | 4 +++- .../com/nflg/mobilebroken/gongfu/service/CrmService.java | 3 ++- nflg-mobilebroken-gongfu/src/main/resources/logback-sit.xml | 6 ++++-- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java index a6b618f2..35b5a521 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java @@ -143,7 +143,9 @@ public class AdminDeviceService { List agents = customerService.lambdaQuery().select(TBaseCustomer::getAgencyCompanyCode, TBaseCustomer::getAgencyCompanyName).list(); Set deviceNos = new HashSet<>(); crmDeviceList.forEach(u -> { - if (!StrUtil.equals(Constant.MOBILE_BROKEN, u.getProductLine__c())) { + if (StrUtil.isBlank(u.getProductLine__c()) || StrUtil.isBlank(u.getAssetProductLine3__c()) || StrUtil.isBlank(u.getAssetProductLine4__c())) { + log.info("跳过没有产品线或设备类型的设备"); + } else if (!StrUtil.equals(Constant.MOBILE_BROKEN, u.getProductLine__c())) { log.info("跳过非移动破产品线设备,{}", u.getMachine_Number__c()); } else if (StrUtil.isBlank(u.getProductLine5__c())) { log.error("设备机型为空,{}", JSONUtil.toJsonStr(u)); diff --git a/nflg-mobilebroken-admin/src/main/resources/logback-sit.xml b/nflg-mobilebroken-admin/src/main/resources/logback-sit.xml index 603950e1..b155b842 100644 --- a/nflg-mobilebroken-admin/src/main/resources/logback-sit.xml +++ b/nflg-mobilebroken-admin/src/main/resources/logback-sit.xml @@ -9,7 +9,8 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %method:%line %msg%n + @@ -31,7 +32,8 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{50} %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{30} %method:%line %msg%n + diff --git a/nflg-mobilebroken-cfs-app/src/main/resources/logback-sit.xml b/nflg-mobilebroken-cfs-app/src/main/resources/logback-sit.xml index 8e9dce87..7b2193a9 100644 --- a/nflg-mobilebroken-cfs-app/src/main/resources/logback-sit.xml +++ b/nflg-mobilebroken-cfs-app/src/main/resources/logback-sit.xml @@ -9,7 +9,8 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %method:%line %msg%n + @@ -31,7 +32,8 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{50} %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{30} %method:%line %msg%n + diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java index 75c75077..1b4a1f51 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java @@ -144,7 +144,9 @@ public class AdminDeviceService { List agents = customerService.lambdaQuery().select(TBaseCustomer::getAgencyCompanyCode, TBaseCustomer::getAgencyCompanyName).list(); Set deviceNos = new HashSet<>(); crmDeviceList.forEach(u -> { - if (StrUtil.equals(Constant.MOBILE_BROKEN, u.getProductLine__c())) { + if (StrUtil.isBlank(u.getProductLine__c()) || StrUtil.isBlank(u.getAssetProductLine3__c()) || StrUtil.isBlank(u.getAssetProductLine4__c())) { + log.info("跳过没有产品线或设备类型的设备"); + } else if (StrUtil.equals(Constant.MOBILE_BROKEN, u.getProductLine__c())) { log.info("跳过移动破产品线设备,{}", u.getMachine_Number__c()); } else if (StrUtil.isBlank(u.getProductLine5__c())) { log.error("设备机型为空,{}", JSONUtil.toJsonStr(u)); diff --git a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/CrmService.java b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/CrmService.java index 936980e4..ee7534e2 100644 --- a/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/CrmService.java +++ b/nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/CrmService.java @@ -74,6 +74,7 @@ public class CrmService { paramMp.put("password", password); paramMp.put("client_secret", clientSecret); String s = httpUtils.doformPost(tokenUrl, paramMp); + log.debug("响应数据:" + s); CrmGetTokenResultDTO result = JSONUtil.toBean(s, CrmGetTokenResultDTO.class); if (Objects.nonNull(result) && StrUtil.isNotBlank(result.getAccess_token())) { crmTokenCache.put(tokenCacheKey, result.getAccess_token()); @@ -84,7 +85,7 @@ public class CrmService { return crmTokenCache.get(tokenCacheKey); } catch (Exception e) { log.error("获取CRM-token 错误", e); - VUtils.trueThrow(true).throwMessage(STATE.ParamErr, "获取CRM-token 失败:" + e.getMessage()); + VUtils.trueThrow(true).throwMessage(STATE.ParamErr, e.getMessage()); } return ""; } diff --git a/nflg-mobilebroken-gongfu/src/main/resources/logback-sit.xml b/nflg-mobilebroken-gongfu/src/main/resources/logback-sit.xml index da863eb8..579e980c 100644 --- a/nflg-mobilebroken-gongfu/src/main/resources/logback-sit.xml +++ b/nflg-mobilebroken-gongfu/src/main/resources/logback-sit.xml @@ -9,7 +9,8 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %method:%line %msg%n + @@ -31,7 +32,8 @@ - %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{50} %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{30} %method:%line %msg%n +