From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java
index 0240e02..69cf0a8 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java
@@ -1,10 +1,11 @@
package org.dromara.demo.service.impl;
+import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import jakarta.servlet.http.HttpServletResponse;
import lombok.Data;
import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.enums.UserStatus;
+import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.excel.core.DropDownOptions;
import org.dromara.common.excel.utils.ExcelUtil;
@@ -34,7 +35,7 @@
// 妯℃嫙鏁版嵁搴撲腑鐨勪竴鏉℃暟鎹�
ExportDemoVo everyRowData = new ExportDemoVo();
everyRowData.setNickName("鐢ㄦ埛-" + i);
- everyRowData.setUserStatus(UserStatus.OK.getCode());
+ everyRowData.setUserStatus(SystemConstants.NORMAL);
everyRowData.setGender("1");
everyRowData.setPhoneNumber(String.format("175%08d", i));
everyRowData.setEmail(String.format("175%08d", i) + "@163.com");
@@ -121,8 +122,9 @@
List<DemoCityData> provinceList = new ArrayList<>();
// 瀹為檯涓氬姟涓竴鑸噰鐢ㄦ暟鎹簱璇诲彇鐨勫舰寮忥紝杩欓噷鐩存帴鎷兼帴鍒涘缓
- provinceList.add(new DemoCityData(0, null, "瀹夊窘鐪�"));
- provinceList.add(new DemoCityData(1, null, "姹熻嫃鐪�"));
+ provinceList.add(new DemoCityData(0, null, "P100000"));
+ provinceList.add(new DemoCityData(1, null, "P200000"));
+ provinceList.add(new DemoCityData(2, null, "P300000"));
return provinceList;
}
@@ -137,11 +139,11 @@
List<DemoCityData> cityList = new ArrayList<>();
// 瀹為檯涓氬姟涓竴鑸噰鐢ㄦ暟鎹簱璇诲彇鐨勫舰寮忥紝杩欓噷鐩存帴鎷兼帴鍒涘缓
- cityList.add(new DemoCityData(0, 0, "鍚堣偉甯�"));
- cityList.add(new DemoCityData(1, 0, "鑺滄箹甯�"));
- cityList.add(new DemoCityData(2, 1, "鍗椾含甯�"));
- cityList.add(new DemoCityData(3, 1, "鏃犻敗甯�"));
- cityList.add(new DemoCityData(4, 1, "寰愬窞甯�"));
+ cityList.add(new DemoCityData(0, 0, "C110000"));
+ cityList.add(new DemoCityData(1, 0, "C120000"));
+ cityList.add(new DemoCityData(2, 1, "C210000"));
+ cityList.add(new DemoCityData(3, 1, "C220000"));
+ cityList.add(new DemoCityData(4, 1, "C230000"));
selectParentData(provinceList, cityList);
@@ -157,17 +159,29 @@
private List<DemoCityData> getAreaList(List<DemoCityData> cityList) {
List<DemoCityData> areaList = new ArrayList<>();
+ int minCount = 500;
+ int maxCount = 10000;
+
// 瀹為檯涓氬姟涓竴鑸噰鐢ㄦ暟鎹簱璇诲彇鐨勫舰寮忥紝杩欓噷鐩存帴鎷兼帴鍒涘缓
- areaList.add(new DemoCityData(0, 0, "鐟舵捣鍖�"));
- areaList.add(new DemoCityData(1, 0, "搴愭睙鍖�"));
- areaList.add(new DemoCityData(2, 1, "鍗楀畞鍘�"));
- areaList.add(new DemoCityData(3, 1, "闀滄箹鍖�"));
- areaList.add(new DemoCityData(4, 2, "鐜勬鍖�"));
- areaList.add(new DemoCityData(5, 2, "绉︽樊鍖�"));
- areaList.add(new DemoCityData(6, 3, "瀹滃叴甯�"));
- areaList.add(new DemoCityData(7, 3, "鏂板惔鍖�"));
- areaList.add(new DemoCityData(8, 4, "榧撴ゼ鍖�"));
- areaList.add(new DemoCityData(9, 4, "涓板幙"));
+ for (int i = 0; i < RandomUtil.randomInt(minCount, maxCount); i++) {
+ areaList.add(new DemoCityData(areaList.size(), 0, String.format("A11%04d", i)));
+ }
+
+ for (int i = 0; i < RandomUtil.randomInt(minCount, maxCount); i++) {
+ areaList.add(new DemoCityData(areaList.size(), 1, String.format("A12%04d", i)));
+ }
+
+ for (int i = 0; i < RandomUtil.randomInt(minCount, maxCount); i++) {
+ areaList.add(new DemoCityData(areaList.size(), 2, String.format("A21%04d", i)));
+ }
+
+ for (int i = 0; i < RandomUtil.randomInt(minCount, maxCount); i++) {
+ areaList.add(new DemoCityData(areaList.size(), 3, String.format("A22%04d", i)));
+ }
+
+ for (int i = 0; i < RandomUtil.randomInt(minCount, maxCount); i++) {
+ areaList.add(new DemoCityData(areaList.size(), 4, String.format("A23%04d", i)));
+ }
selectParentData(cityList, areaList);
--
Gitblit v1.9.3