1.修改返回值

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/scanrecord/ScanRecordServiceImpl.java

@@ -1,5 +1,7 @@
 package com.cjy.traceability.module.traceability.service.scanrecord;
 
+import com.cjy.traceability.framework.ip.core.Area;
+import com.cjy.traceability.framework.ip.core.enums.AreaTypeEnum;
 import com.cjy.traceability.framework.ip.core.utils.AreaUtils;
 import org.springframework.stereotype.Service;
 
@@ -86,13 +88,41 @@ public class ScanRecordServiceImpl implements ScanRecordService {
 		List<String> categories = new ArrayList<>();
 		List<Map<String, Object>> seriesData = new ArrayList<>();
 		List<Integer> series = new ArrayList<>();
+		if (list.size()>0){
+			list.stream().forEach(item -> {
+				if (item.get("city") != null) {
+					categories.add(AreaUtils.getArea(Integer.parseInt(item.get("city").toString())).getName());
+					series.add(Integer.parseInt(item.get("total").toString()));
+				}
+			});
+		}else {
+//			List<String> cityNames = AreaUtils.getByType(AreaTypeEnum.CITY, area -> area.getName());
+//			// 打乱城市名称列表
+//			Collections.shuffle(cityNames);
+//			// 创建一个新的集合来存储随机获取的10个城市名称
+			List<String> randomCityNames = new ArrayList<>();
+			randomCityNames.add("石家庄市");
+			randomCityNames.add("唐山市");
+			randomCityNames.add("秦皇岛市");
+			randomCityNames.add("邯郸市");
+			randomCityNames.add("邢台市");
+			randomCityNames.add("保定市");
+			randomCityNames.add("张家口市");
+			randomCityNames.add("承德市");
+			randomCityNames.add("沧州市");
+			randomCityNames.add("廊坊市");
+			// 获取前10个城市名称
+//			int limit = Math.min(10, cityNames.size()); // 防止超出列表大小
+//			for (int i = 0; i < limit; i++) {
+//				randomCityNames.add(cityNames.get(i));
+//			}
+			randomCityNames.stream().forEach(e->{
+				categories.add(e);
+				series.add(0);
+			});
+
+		}
 
-		list.stream().forEach(item -> {
-			if (item.get("city") != null) {
-                categories.add(AreaUtils.getArea(Integer.parseInt(item.get("city").toString())).getName());
-				series.add(Integer.parseInt(item.get("total").toString()));
-			}
-		});
 		Map<String, Object> map = new HashMap();
 		map.put("name", "目标值");
 		map.put("value", series);