Merge branch 'f-xiaogu' into dev

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/controller/FzssController.java

@@ -6,7 +6,6 @@ import com.onemap.analyse.domain.calculation.FzxzCalc;
 import com.onemap.analyse.domain.vo.DkReportVo;
 import com.onemap.analyse.domain.vo.SelectPilotVo;
 import com.onemap.analyse.service.IFzssService;
-import com.onemap.analyse.domain.HgxfxEntityDTO;
 import com.onemap.analyse.service.IReportService;
 import com.onemap.analyse.utils.UnitsUtil;
 import com.onemap.common.core.utils.file.FileUtils;
@@ -17,11 +16,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;

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

@@ -213,6 +213,13 @@ public class FzssServiceImpl implements IFzssService {
         } else {
             // 不允许多地块，删除面积不符合要求的地块
             tableDateService.delByArea(rawTable, fzxzDTO.getYdmjbegin(), fzxzDTO.getYdmjend());
+
+            integer = tableDateService.getTableCount(rawTable);
+            if (integer == 0) {
+                iLogService.saveLog(taskId, "辅助选址", "计算完成，未找到符合用地性质条件数据", "info");
+                updateFzxzStatus(taskId, Rwzt.getNoRes());
+                return RequestResult.error("区域筛选条件筛选未找到符合条件数据！", null);
+            }
         }
 
         // 6.保存规划结果
@@ -273,6 +280,10 @@ public class FzssServiceImpl implements IFzssService {
     // TODO 重构
     private String factorClip(String taskId, String rawTable, List<FactorUseDTO> factorUseDTOS, String ewkt) {
         for (FactorUseDTO factorUseDTO : factorUseDTOS) {
+            if (factorUseDTO.getFactorName().equals("燃气")) {
+                System.out.println("燃气");
+            }
+
             FactorSpatialVo factorSpatialVo = factorUseDTO.getConditionInfoObj();
             if (factorSpatialVo.equals("intersect")) {
                 // 1.先切割因子地块

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/ReportServiceImpl.java

@@ -428,7 +428,7 @@ public class ReportServiceImpl implements IReportService {
         }
         // 转PDF
         String outfilepath = reportPath.replace(".docx", ".pdf");
-        NpoiHelper.doc2pdf(reportPath, outfilepath);
+        // NpoiHelper.doc2pdf(reportPath, outfilepath);
         System.out.println(outfilepath);
     }
 

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/vector/TableDateMapper.xml

@@ -135,7 +135,7 @@
         WHERE NOT EXISTS (SELECT 1
                           FROM "${rawTable}" raw
                           WHERE raw.id = temp.id
-                            AND (raw.kzxxgyddm like '${landTypeCode}%' or raw.kzxxgyddm like '%\${landTypeCode}%'))
+                            AND (raw.kzxxgyddm like '${landTypeCode}%' or raw.kzxxgyddm like '%/${landTypeCode}%'))
     </delete>
 
     <delete id="delByArea">