Merge branch 'hotfix/20251202' into feature/gongfu

# Conflicts:
#	nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java

@@ -143,7 +143,9 @@ public class AdminDeviceService {
         List<TBaseCustomer> agents = customerService.lambdaQuery().select(TBaseCustomer::getAgencyCompanyCode, TBaseCustomer::getAgencyCompanyName).list();
         Set<String> 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));

nflg-mobilebroken-admin/src/main/resources/logback-sit.xml

@@ -9,7 +9,8 @@
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder" charset="UTF-8">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度,%logger:显示类名 %msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %method:%line %msg%n
+            </pattern>
         </encoder>
     </appender>
 
@@ -31,7 +32,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder" charset="UTF-8">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度，%logger:显示类名 %msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{50} %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{30} %method:%line %msg%n
+            </pattern>
         </encoder>
     </appender>
 

nflg-mobilebroken-cfs-app/src/main/resources/logback-sit.xml

@@ -9,7 +9,8 @@
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder" charset="UTF-8">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度,%logger:显示类名 %msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %method:%line %msg%n
+            </pattern>
         </encoder>
     </appender>
 
@@ -31,7 +32,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder" charset="UTF-8">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度，%logger:显示类名 %msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{50} %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{30} %method:%line %msg%n
+            </pattern>
         </encoder>
     </appender>
 

nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/service/AdminDeviceService.java

@@ -144,7 +144,9 @@ public class AdminDeviceService {
         List<TBaseCustomer> agents = customerService.lambdaQuery().select(TBaseCustomer::getAgencyCompanyCode, TBaseCustomer::getAgencyCompanyName).list();
         Set<String> 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));

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 "";
     }

nflg-mobilebroken-gongfu/src/main/resources/logback-sit.xml

@@ -9,7 +9,8 @@
     <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder" charset="UTF-8">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度,%logger:显示类名 %msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{10} %method:%line %msg%n
+            </pattern>
         </encoder>
     </appender>
 
@@ -31,7 +32,8 @@
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder" charset="UTF-8">
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度，%logger:显示类名 %msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{50} %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %X{traceId} [%thread] %-5level %logger{30} %method:%line %msg%n
+            </pattern>
         </encoder>
     </appender>
 

nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java

@@ -708,11 +708,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
         request.getIds().forEach(id -> {
             AppUser appUser = getById(id);
             VUtils.trueThrowBusinessError(Objects.isNull(appUser))
-                    .throwMessage("用户不存在");
+                    .throwMessage("用户不存在:" + id);
             VUtils.trueThrowBusinessError(Objects.equals(appUser.getState(), UserState.ToBeActivated.getState()))
-                    .throwMessage(id + "未激活不能续期");
-            VUtils.trueThrowBusinessError(Objects.equals(appUser.getIsPrimary(), false))
-                    .throwMessage(id + "不是主账号");
+                    .throwMessage(appUser.getName() + "未激活不能续期");
             appUser.setExpireTime(appUser.getExpireTime().plusMonths(request.getMonth()));
             appUser.setUpdateBy(AdminUserUtil.getUserName());
             appUser.setUpdateTime(now);