Merge remote-tracking branch 'origin/dev-1208' into dev-1208

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/yzt/UrbanExpansionConfigVO.java

@@ -11,7 +11,7 @@ import java.util.Map;
 @Data
 public class UrbanExpansionConfigVO {
     /** 服务ID */
-    private String serviceId;
+
     /** 年份列表 */
     private List<Integer> years;
     /** 边界图层: {"2009": {"layerName": "xxx", "data": 125.36}} */
@@ -19,17 +19,18 @@ public class UrbanExpansionConfigVO {
     /** 扩张图层: {"2009_2010": {"layerName": "xxx", "data": 7.22}} */
     private Map<String, LayerInfo> expandLayers;
 
+    private Map<String, LayerInfo>  mapLayers;
+
     @Data
     public static class LayerInfo {
         private String layerName;
         private BigDecimal data;
+        private String serviceId;
 
-        public LayerInfo() {
-        }
-
-        public LayerInfo(String layerName, BigDecimal data) {
+        public LayerInfo(String layerName, BigDecimal data, String serviceId) {
             this.layerName = layerName;
             this.data = data;
+            this.serviceId = serviceId;
         }
     }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/yzt/UrbanMonitorServiceImpl.java

@@ -230,19 +230,18 @@ public class UrbanMonitorServiceImpl implements IUrbanMonitorService {
         List<Integer> years = new ArrayList<>();
         Map<String, UrbanExpansionConfigVO.LayerInfo> boundaryLayers = new LinkedHashMap<>();
         Map<String, UrbanExpansionConfigVO.LayerInfo> expandLayers = new LinkedHashMap<>();
+        Map<String, UrbanExpansionConfigVO.LayerInfo> mapLayers = new LinkedHashMap<>();
 
         if (list != null && !list.isEmpty()) {
-            config.setServiceId(list.get(0).getServiceId());
             // 提取年份并去重排序
             years = list.stream()
                     .map(UrbanExpansionLayerVO::getYear)
                     .distinct()
                     .sorted()
                     .collect(Collectors.toList());
-
             for (UrbanExpansionLayerVO item : list) {
                 UrbanExpansionConfigVO.LayerInfo info = new UrbanExpansionConfigVO.LayerInfo(item.getLayerName(),
-                        item.getData());
+                        item.getData(), item.getServiceId());
 
                 if ("boundary".equals(item.getLayerType())) {
                     // key is year string
@@ -253,6 +252,8 @@ public class UrbanMonitorServiceImpl implements IUrbanMonitorService {
                         String key = item.getPrevYear() + "_" + item.getYear();
                         expandLayers.put(key, info);
                     }
+                } else if ("map".equals(item.getLayerType())) {
+                    mapLayers.put(String.valueOf(item.getYear()), info);
                 }
             }
         }
@@ -260,6 +261,7 @@ public class UrbanMonitorServiceImpl implements IUrbanMonitorService {
         config.setYears(years);
         config.setBoundaryLayers(boundaryLayers);
         config.setExpandLayers(expandLayers);
+        config.setMapLayers(mapLayers);
 
         return config;
     }