修改代码

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpAreaImageTotalBiz.java

@@ -131,6 +131,8 @@ public class RscpAreaImageTotalBiz extends BaseBiz<RscpAreaImageTotalMapper, Rsc
                 dto.setAreaDataId(areaImageTotal.getId());
                 updateGeom(dto);
 
+
+
             }
 
             // 第七步：更新rscm_image_data_total_v2
@@ -148,6 +150,7 @@ public class RscpAreaImageTotalBiz extends BaseBiz<RscpAreaImageTotalMapper, Rsc
                     setImageCity(StrUtil.join(",", cityNameSet));
 //                    setImageArea(StrUtil.join(",", ));
                 }});
+                rscpImageDataTotalBiz.updateImageAreaByRange(dto.getId());
             } catch (Exception e) {
                 e.printStackTrace();
             }

rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java

@@ -80,6 +80,7 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
                     rscpImageDataTotalBiz.updateSelectiveById(rscpImageDataTotal);
                 }else {
                     rscpImageDataTotal = BeanUtil.toBean(ii, RscpImageDataTotal.class);
+                    rscpImageDataTotal.setImageProductType("0101");
                     rscpImageDataTotalBiz.insertSelective(rscpImageDataTotal);
                     RscpImageDataTotal finalRscpImageDataTotal = rscpImageDataTotal;
                     rscpImageDataTotalBiz.updateSelectiveById(new RscpImageDataTotal(){{
@@ -287,9 +288,6 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
 
         imageDataDto.setImageSceneId(rscpImageDataTotal.getImageSceneId());
 
-        imageDataDto.setImageFilePath(rscpImageDataTotal.getImageFilePath());
-        imageDataDto.setThumbnailPath(rscpImageDataTotal.getThumbnailPath());
-
         //复制到zmp目录
         String sourcePath = rscpImageDataTotal.getImageFilePath();
         Integer index = rscpImageDataTotal.getImageFilePath().lastIndexOf(rscpImageDataTotal.getName()+".tar.gz");
@@ -351,13 +349,18 @@ public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, Rsc
                 }
             }
         }
-
+        imageDataDto.setImageFilePath(targetPath);
+        imageDataDto.setThumbnailPath(rscpImageDataTotal.getThumbnailPath());
 
         return
 //                CollUtil.newHashMap();
                 rscloudboxClientRest.saveImage(imageDataDto);
     }
 
+    public void updateImageAreaByRange(Long id){
+        mapper.updateImageAreaByRange(id);
+    }
+
     public static void main(String[] args) {
         String name = "GF6_PMS_E126.5_N46.8_20230903_L1A1420349421";
         String path = "/rscloudmart/data/GF6//GF6_PMS_E126.5_N46.8_20230903_L1A1420349421//GF6_PMS_E126.5_N46.8_20230903_L1A1420349421.tar.gz";