1.查询泵站小区楼号绑定关系增加分页处理 2.和大模型创哥返回手机号改成中文并且按344分割

slibra-admin/src/main/java/com/slibra/web/controller/business/TPumpingStationController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSON;
+import com.github.pagehelper.PageHelper;
 import com.slibra.business.domain.TNeighborhood;
 import com.slibra.business.mapper.TNeighborhoodMapper;
 import com.slibra.business.mapper.TPumpingStationMapper;
@@ -11,6 +12,8 @@ import com.slibra.business.req.NeighbourhoodNumberAndAddFlagReq;
 import com.slibra.business.res.NeighbourhoodNumberAndAddFlag;
 import com.slibra.business.service.ITNeighborhoodService;
 import com.slibra.common.core.domain.R;
+import com.slibra.common.core.page.PageDomain;
+import com.slibra.common.core.page.TableSupport;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.tomcat.Jar;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -125,12 +128,15 @@ public class TPumpingStationController extends BaseController
     /**
      * 获取所有的小区(简单信息 没有查询复杂数据)
      * 2024年11月19日17:31:38 逻辑调整：前端再把对应的泵站ID传过来，然后查询绑定的小区楼号相关的信息
+     * 2025年02月11日10:50:41 返回结果改成分页的，因为数据量太大了，pageSize先改成很大，因为前端还没实现分页功能，只是让后台先有次功能
      * @return
      */
     @GetMapping("/getSimpleNeighbourhoodList")
-    public R<List<TNeighborhood>> getSimpleNeighbourhoodList(TNeighborhood tNeighborhood){
+    public TableDataInfo getSimpleNeighbourhoodList(TNeighborhood tNeighborhood){
         log.info("进入了 获取小区列表基本信息 接口");
-        return R.ok(this.tPumpingStationService.getSimpleNeighbourhoodList(tNeighborhood));
+//        startPage();
+        PageHelper.startPage(1, 10000);//先写死 等前端上了以后再用上面的startPage()
+        return getDataTable(this.tPumpingStationService.getSimpleNeighbourhoodList(tNeighborhood));
     }
 
 

slibra-common/src/main/java/com/slibra/common/utils/PhoneNumberToChineseUtil.java

@@ -0,0 +1,40 @@
+package com.slibra.common.utils;
+
+public class PhoneNumberToChineseUtil {
+
+    // 中文数字映射
+    private static final String[] CHINESE_DIGITS = {"零", "幺", "二", "三", "四", "五", "六", "七", "八", "九"};
+
+    // 将数字转换为中文数字
+    private static String numberToChinese(int number) {
+        return CHINESE_DIGITS[number];
+    }
+
+    // 将手机号转换为中文数字并按照3-4-4格式拆分
+    public static String convertPhoneNumber(String phoneNumber) {
+        if (phoneNumber == null || phoneNumber.length() != 11) {
+            return phoneNumber;
+        }
+
+        StringBuilder chinesePhoneNumber = new StringBuilder();
+        for (char ch : phoneNumber.toCharArray()) {
+            int digit = Character.getNumericValue(ch);
+            chinesePhoneNumber.append(numberToChinese(digit));
+        }
+
+        // 移除最后一个空格，并按照3-4-4格式拆分
+        String result = chinesePhoneNumber.toString().trim();
+        //        return result.substring(0, 3) + " " + result.substring(3, 7) + " " + result.substring(7, 11);
+        return String.format("%s %s %s",
+            result.substring(0, 3),
+            result.substring(3, 7),
+            result.substring(7, 11)
+        );
+    }
+
+    public static void main(String[] args) {
+        String phoneNumber = "15075275358";
+        String chineseFormattedPhoneNumber = PhoneNumberToChineseUtil.convertPhoneNumber(phoneNumber);
+        System.out.println(chineseFormattedPhoneNumber);
+    }
+}

slibra-system/src/main/java/com/slibra/business/domain/TUserInfo.java

@@ -4,6 +4,8 @@ import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.slibra.common.utils.PhoneNumberToChineseUtil;
+import com.slibra.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -129,4 +131,9 @@ public class TUserInfo extends BaseEntity
     @Excel(name = "乐观锁")
     private Long revision;
 
+    public String getMeterReaderPhone() {
+        if(StringUtils.isBlank(meterReaderPhone))
+            return "";
+        return PhoneNumberToChineseUtil.convertPhoneNumber(meterReaderPhone);
+    }
 }

slibra-system/src/main/java/com/slibra/business/res/FeeInfo.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.slibra.common.annotation.Excel;
 import com.slibra.common.core.domain.BaseEntity;
+import com.slibra.common.utils.PhoneNumberToChineseUtil;
+import com.slibra.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -60,4 +62,9 @@ public class FeeInfo
     @Excel(name = "抄表员电话")
     private String meterReaderPhone;
 
+    public String getMeterReaderPhone() {
+        if(StringUtils.isBlank(meterReaderPhone))
+            return "";
+        return PhoneNumberToChineseUtil.convertPhoneNumber(meterReaderPhone);
+    }
 }

slibra-system/src/main/java/com/slibra/business/res/NeighbourAndMeterPhoneResp.java

@@ -2,6 +2,8 @@ package com.slibra.business.res;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.slibra.common.annotation.Excel;
+import com.slibra.common.utils.PhoneNumberToChineseUtil;
+import com.slibra.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -32,4 +34,12 @@ public class NeighbourAndMeterPhoneResp implements Serializable {
     @Excel(name = "抄表员电话")
     private String meterReaderPhone;
 
+
+    public String getMeterReaderPhone() {
+        if(StringUtils.isBlank(meterReaderPhone))
+            return "";
+        return PhoneNumberToChineseUtil.convertPhoneNumber(meterReaderPhone);
+    }
+
+
 }