修改选址应用因子

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/query/GhdkaFilter.java

@@ -12,5 +12,5 @@ import java.util.List;
 public class GhdkaFilter {
     List<Integer> idList;
     String sjy;
-    FactorUseDTO fzxzXzyzDTO;
+    FactorUseDTO factorUseDTO;
 }

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

@@ -209,6 +209,7 @@ public class FzssServiceImpl implements IFzssService {
         List<Integer> ids = ghdkaMapper.getIdByGeom(paramMap);
         if (ids.size() == 0) {
             iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "计算完成，未找到符合条件数据", "info");
+            updateFzxzStatus(fzxzDTO.getBsm(), Rwzt.getNoJX());
             return RequestResult.error("区域筛选条件筛选未找到符合条件数据！", null);
         }
 
@@ -222,6 +223,7 @@ public class FzssServiceImpl implements IFzssService {
         ids = ghdkaMapper.getIdByArea(areaMap);
         if (ids.size() == 0) {
             iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "计算完成，未找到符合条件数据", "info");
+            updateFzxzStatus(fzxzDTO.getBsm(), Rwzt.getNoJX());
             return RequestResult.error("面积筛选条件筛选未找到符合条件数据！", null);
         }
 
@@ -235,6 +237,7 @@ public class FzssServiceImpl implements IFzssService {
         ids = ghdkaMapper.getIdLandType(landTypeMap);
         if (ids.size() == 0) {
             iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "计算完成，未找到符合条件数据", "info");
+            updateFzxzStatus(fzxzDTO.getBsm(), Rwzt.getNoJX());
             return RequestResult.error("用地性质条件筛选未找到符合条件数据！", null);
         }
 
@@ -243,10 +246,11 @@ public class FzssServiceImpl implements IFzssService {
         ghdkaFilter.setSjy(fzxzDTO.getSjy());
         ghdkaFilter.setIdList(ids);
         for (FactorUseDTO fzxzXzyzDTO : fzxzCalc.getXzyxList()) {
-            ghdkaFilter.setFzxzXzyzDTO(fzxzXzyzDTO);
+            ghdkaFilter.setFactorUseDTO(fzxzXzyzDTO);
             ids = ghdkaMapper.getIdByFilter(ghdkaFilter);
             if (ids.size() == 0) {
                 iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "计算完成，未找到符合条件数据", "info");
+                updateFzxzStatus(fzxzDTO.getBsm(), Rwzt.getNoJX());
                 return RequestResult.error(fzxzXzyzDTO.getFactorName() + "条件筛选未找到符合条件数据！", null);
             }
             iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", fzxzXzyzDTO.getFactorName() + "因子影响分析完成", "info");
@@ -255,6 +259,7 @@ public class FzssServiceImpl implements IFzssService {
 
         if (ids.size() == 0) {
             iLogService.saveLog(fzxzDTO.getBsm(), "辅助选址", "计算完成，未找到符合条件数据", "info");
+            updateFzxzStatus(fzxzDTO.getBsm(), Rwzt.getNoJX());
             String yxyzmc = fzxzCalc.getXzyxList().size() != 0 ? fzxzCalc.getXzyxList().get(0).getFactorName() : "";
             return RequestResult.error(yxyzmc + "条件筛选未找到符合条件数据！", null);
         }
@@ -277,7 +282,6 @@ public class FzssServiceImpl implements IFzssService {
 
         // 7.开始规划,更新任务状态
         updateFzxzStatus(fzxzDTO.getBsm(), Rwzt.getComplete());
-
         Map<String, Object> resMap = new HashMap<>();
         resMap.put("rwbsm", fzxzDTO.getBsm());
         resMap.put("dkIds", ids);

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

@@ -31,23 +31,18 @@ import java.util.*;
  */
 @Service
 public class ReportServiceImpl implements IReportService {
-    @Autowired
+    @Resource
     private FzxzMapper fzxzMapper;
-    @Autowired
+    @Resource
     private FzxzResMapper fzxzResMapper;
     // 日志服务
-    @Autowired
+    @Resource
     private ILogService iLogService;
-
-    @Autowired
-    private FzxzTbMapper fzxzTbMapper;
     @Resource
     private FactorUseMapper fzxzXzyzMapper;
 
     @Value("${Hgxfx.temp}")
     private String temp;
-    // @Value("${Fzxz.fzxzShp}")
-    // private String fzxzShp;
 
     // 根据选址任务生成报告
     public FzxzReport createReport(String bsm, List<String> xzbsmList) {
@@ -140,34 +135,35 @@ public class ReportServiceImpl implements IReportService {
             tableTitle.setWidth(2880);
             tabYzTitles.add(tableTitle);
             // 查询选址因子，并且转换为List<Map> 因子条件（包含:C、不包含:N、分析:A）
-            QueryWrapper<FzxzXzyzDTO> wrapper = new QueryWrapper<FzxzXzyzDTO>();
-            wrapper.eq("rwbsm", res.getBsm());
-            List<FzxzXzyzDTO> fzxzXzyzDTOList = fzxzXzyzMapper.selectList(wrapper);
+            QueryWrapper<FactorUseDTO> wrapper = new QueryWrapper<FactorUseDTO>();
+            wrapper.eq("task_id", res.getBsm());
+            List<FactorUseDTO> fzxzXzyzDTOList = fzxzXzyzMapper.selectList(wrapper);
             List<Map<String, Object>> dataTablelist = new ArrayList<>();
             for (int i = 0; i < fzxzXzyzDTOList.size(); i++) {
-                Map<String, Object> map = new HashMap<>();
-                FzxzXzyzDTO fzxzXzyzDTO = fzxzXzyzDTOList.get(i);
-                map.put("YXYZMC", fzxzXzyzDTO.getYxyzmc());
-                String yztj = "";
-                if (fzxzXzyzDTO.getSpatialType() != null) {
-                    if ("contain".equals(fzxzXzyzDTO.getSpatialType())) {
-                        yztj = "包含";
-                    } else if ("n_contain".equals(fzxzXzyzDTO.getSpatialType())) {
-                        yztj = "不包含";
-                    } else if ("identity".equals(fzxzXzyzDTO.getSpatialType())) {
-                        yztj = "相交";
-                    } else if ("n_identity".equals(fzxzXzyzDTO.getSpatialType())) {
-                        yztj = "不相交";
-                    }
-                }
-
-                map.put("YZTJ_TEXT", yztj);
-                Float yxz = (float) 0;
-                if (fzxzXzyzDTO.getYxz() != null) {
-                    yxz = fzxzXzyzDTO.getYxz();
-                }
-                map.put("YXZ", yxz);
-                dataTablelist.add(map);
+                // TODO 添加选址因子
+                // Map<String, Object> map = new HashMap<>();
+                // FactorUseDTO fzxzXzyzDTO = fzxzXzyzDTOList.get(i);
+                // map.put("YXYZMC", fzxzXzyzDTO.getFactorName());
+                // String yztj = "";
+                // if (fzxzXzyzDTO.getSpatialType() != null) {
+                //     if ("contain".equals(fzxzXzyzDTO.getSpatialType())) {
+                //         yztj = "包含";
+                //     } else if ("n_contain".equals(fzxzXzyzDTO.getSpatialType())) {
+                //         yztj = "不包含";
+                //     } else if ("identity".equals(fzxzXzyzDTO.getSpatialType())) {
+                //         yztj = "相交";
+                //     } else if ("n_identity".equals(fzxzXzyzDTO.getSpatialType())) {
+                //         yztj = "不相交";
+                //     }
+                // }
+                //
+                // map.put("YZTJ_TEXT", yztj);
+                // Float yxz = (float) 0;
+                // if (fzxzXzyzDTO.getYxz() != null) {
+                //     yxz = fzxzXzyzDTO.getYxz();
+                // }
+                // map.put("YXZ", yxz);
+                // dataTablelist.add(map);
             }
             XWPFTable tableYz = NpoiHelper.setComTable(document, tabYzTitles, dataTablelist, "表1：选址影响因子", pos++);
 
@@ -369,29 +365,21 @@ public class ReportServiceImpl implements IReportService {
                 XWPFParagraph para6 = table.getRow(6).getCell(0).addParagraph();
                 para6.setAlignment(ParagraphAlignment.LEFT);
 
-                // 查询辅助选址因子
-                // QueryWrapper<FzxzResDTO> jgyzWrapper = new QueryWrapper<>();
-                // jgyzWrapper.eq("jbbsm", item.getBsm());
-                // jgyzWrapper.ne("yztj", "F");
-                // List<FzxzXzyzDTO> jgyzList = fzxzJgyzMapper.selectList(jgyzWrapper);
+
 
                 int jgyzid = 1;
                 for (int j = 0; j < fzxzXzyzDTOList.size(); j++) {
-                    FzxzXzyzDTO fzxzJgyzDTO = fzxzXzyzDTOList.get(j);
+                    FactorUseDTO fzxzJgyzDTO = fzxzXzyzDTOList.get(j);
                     XWPFRun run = para6.createRun();
                     // TODO
                     // run.setText(jgyzid + "、" + fzxzJgyzDTO.getFxjg());
                     run.addBreak(BreakType.TEXT_WRAPPING);
                     jgyzid++;
                 }
-                // 查询辅助选址因子
-                // jgyzWrapper = new QueryWrapper<FzxzJgyzDTO>();
-                // jgyzWrapper.eq("jbbsm", item.getBsm());
-                // jgyzWrapper.eq("yztj", "F");
-                // jgyzList = fzxzJgyzMapper.selectList(jgyzWrapper);
+
 
                 for (int j = 0; j < fzxzXzyzDTOList.size(); j++) {
-                    FzxzXzyzDTO jgyz = fzxzXzyzDTOList.get(j);
+                    FactorUseDTO jgyz = fzxzXzyzDTOList.get(j);
                     XWPFRun run = para6.createRun();
                     // String jg = jgyz.getFxjg();
                     // TODO
@@ -400,7 +388,7 @@ public class ReportServiceImpl implements IReportService {
                     try {
                         // jgDouble = Double.parseDouble(jg);
                         // TODO
-                        run.setText(jgyzid + "、压占" + jgyz.getYxyzmc() + "面积" + jg + "平方米");
+                        // run.setText(jgyzid + "、压占" + jgyz.getYxyzmc() + "面积" + jg + "平方米");
                     } catch (Exception e) {
                         run.setText(jg);
                     }