gushoubang 4 сар өмнө
parent
commit
8fde39be36

+ 6 - 2
onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/FzssServiceImpl.java

@@ -336,7 +336,7 @@ public class FzssServiceImpl implements IFzssService {
                 System.out.println("燃气");
                 System.out.println("燃气");
             }
             }
 
 
-            System.out.println("因子名称:"+factorUseDTO.getFactorName());
+            System.out.println("因子名称:" + factorUseDTO.getFactorName());
 
 
             FactorSpatialVo factorSpatialVo = factorUseDTO.getConditionInfoObj();
             FactorSpatialVo factorSpatialVo = factorUseDTO.getConditionInfoObj();
             if (factorSpatialVo.getSpatialType().equals("intersect")) {
             if (factorSpatialVo.getSpatialType().equals("intersect")) {
@@ -354,7 +354,7 @@ public class FzssServiceImpl implements IFzssService {
                         rawTable = createUtilsDBService.intersectionTableWkt(rawTable, null, calculateEwkt);
                         rawTable = createUtilsDBService.intersectionTableWkt(rawTable, null, calculateEwkt);
                     } else {
                     } else {
                         // TODO:永久基本农田暂时不做处理(太慢需要优化)
                         // TODO:永久基本农田暂时不做处理(太慢需要优化)
-                        if(factorUseDTO.getFactorName().equals("永久基本农田"))continue;
+                        if (factorUseDTO.getFactorName().equals("永久基本农田")) continue;
                         // 地块与因子求差集
                         // 地块与因子求差集
                         rawTable = createUtilsDBService.differenceTableWkt(rawTable, null, calculateEwkt);
                         rawTable = createUtilsDBService.differenceTableWkt(rawTable, null, calculateEwkt);
                     }
                     }
@@ -451,6 +451,10 @@ public class FzssServiceImpl implements IFzssService {
                     rawTable = createUtilsDBService.getLtBandValue(rawTable, factorUseDTO.getFactorBsm(), Double.valueOf(valueArray[0]));
                     rawTable = createUtilsDBService.getLtBandValue(rawTable, factorUseDTO.getFactorBsm(), Double.valueOf(valueArray[0]));
                     rawTable = createUtilsDBService.getGtBandValue(rawTable, factorUseDTO.getFactorBsm(), Double.valueOf(valueArray[1]));
                     rawTable = createUtilsDBService.getGtBandValue(rawTable, factorUseDTO.getFactorBsm(), Double.valueOf(valueArray[1]));
                 }
                 }
+            } else if (factorSpatialVo.getSpatialType().equals("heigh")) {
+                if (factorSpatialVo.getDefaultType().equals("use")) {
+
+                }
             }
             }
             Integer tableCount = tableDateService.getTableCount(rawTable);
             Integer tableCount = tableDateService.getTableCount(rawTable);
             if (tableCount == 0) {
             if (tableCount == 0) {