From de13d0881f9729af5abf9a389dda2224d2e503fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 1 Dec 2025 10:56:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=E6=9C=8D=E5=8A=A1=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E5=B9=B6=E5=A2=9E=E5=BC=BA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/request/TicketCallHangUpRequest.java |  8 ++++++++
 .../impl/TBaseDeviceTypeServiceImpl.java      | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/TicketCallHangUpRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/TicketCallHangUpRequest.java
index 16a46469..bf78d1ad 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/TicketCallHangUpRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/TicketCallHangUpRequest.java
@@ -1,5 +1,6 @@
 package com.nflg.mobilebroken.common.pojo.request;
 
+import cn.hutool.core.util.StrUtil;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -28,6 +29,13 @@ public class TicketCallHangUpRequest {
     @NotNull
     private Integer fromUserId;
 
+    public Integer getFromUserId() {
+        if (fromUserId < 2000000) {
+            return fromUserId;
+        }
+        return Integer.valueOf(StrUtil.removePrefix(String.valueOf(fromUserId).substring(1), "0"));
+    }
+
     /**
      * 是否拒绝接听
      */
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDeviceTypeServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDeviceTypeServiceImpl.java
index 069e0997..f2fc8e2a 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDeviceTypeServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseDeviceTypeServiceImpl.java
@@ -9,9 +9,11 @@ import com.nflg.mobilebroken.common.pojo.vo.CqmPersonVO;
 import com.nflg.mobilebroken.repository.entity.TBaseDeviceType;
 import com.nflg.mobilebroken.repository.mapper.TBaseDeviceTypeMapper;
 import com.nflg.mobilebroken.repository.service.ITBaseDeviceTypeService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,37 +21,38 @@ import java.util.stream.Collectors;
  * <p>
  * 设备类型 服务实现类
  * </p>
- *
  * @author 曹鹏飞
  * @since 2025-01-24
  */
+@Slf4j
 @Service
 public class TBaseDeviceTypeServiceImpl extends ServiceImpl<TBaseDeviceTypeMapper, TBaseDeviceType> implements ITBaseDeviceTypeService {
 
     @Override
     public Page<TBaseDeviceType> getList(Page<PageBaseQuery> page, PageBaseQuery query) {
-        return  this.getBaseMapper().getList(page, query);
+        return this.getBaseMapper().getList(page, query);
     }
 
-    public List<String> getDistinctDeviceType(){
+    public List<String> getDistinctDeviceType() {
         return this.getBaseMapper().getDistinctDeviceType();
     }
 
 
-    public List<CqmPersonVO> getCqmPersonList(@Param("cqms") List<String> cqms){
+    public List<CqmPersonVO> getCqmPersonList(@Param("cqms") List<String> cqms) {
         return this.getBaseMapper().getCqmPersonList(cqms);
     }
 
     @Override
     public List<Integer> getCqmsByDeviceType(String deviceNo) {
-        String cqms=this.getBaseMapper().getCqmsByDeviceType(deviceNo);
-        if (StrUtil.isBlank(cqms)){
-            return null;
+        String cqms = this.getBaseMapper().getCqmsByDeviceType(deviceNo);
+        if (StrUtil.isBlank(cqms)) {
+            log.warn("设备{}未设置CQM", deviceNo);
+            return Collections.emptyList();
         }
         return StrUtil.split(cqms, ",").stream().map(Integer::parseInt).collect(Collectors.toList());
     }
 
-    public List<CqmPersionResultVO> getDeviceTypeCqmList(@Param("ids") List<Integer> ids){
+    public List<CqmPersionResultVO> getDeviceTypeCqmList(@Param("ids") List<Integer> ids) {
         return this.getBaseMapper().getDeviceTypeCqmList(ids);
     }
 }