没有结果状态修改

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/RwztDTO.java

@@ -9,7 +9,7 @@ public class RwztDTO {
     private Integer Run = 1;
     private Integer Complete = 2;
     private Integer Error = 3;
-    private Integer NoJX = 99;
+    private Integer NoRes = 99;
 
     public Integer getNone() {
         return None;
@@ -31,7 +31,7 @@ public class RwztDTO {
         return Error;
     }
 
-    public Integer getNoJX() {
-        return NoJX;
+    public Integer getNoRes() {
+        return NoRes;
     }
 }

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

@@ -183,7 +183,7 @@ public class FzssServiceImpl implements IFzssService {
         Integer integer = tableDateService.getTableCount(temporaryTable);
         if (integer == 0) {
             iLogService.saveLog(taskId, "辅助选址", "计算完成，未找到区域内数据", "info");
-            updateFzxzStatus(taskId, Rwzt.getNoJX());
+            updateFzxzStatus(taskId, Rwzt.getNoRes());
             return RequestResult.error("区域筛选条件筛选未找到符合条件数据！", null);
         }
 
@@ -196,7 +196,7 @@ public class FzssServiceImpl implements IFzssService {
             integer = tableDateService.getTableCount(temporaryTable);
             if (integer == 0) {
                 iLogService.saveLog(taskId, "辅助选址", "计算完成，未找到符合用地性质条件数据", "info");
-                updateFzxzStatus(taskId, Rwzt.getNoJX());
+                updateFzxzStatus(taskId, Rwzt.getNoRes());
                 return RequestResult.error("区域筛选条件筛选未找到符合条件数据！", null);
             }
         }
@@ -282,7 +282,7 @@ public class FzssServiceImpl implements IFzssService {
                     if (factorSpatialVo.getDefaultType().equals("intersect")) {
                         if (calculateEwkt.equals("")) {
                             iLogService.saveLog(taskId, "辅助选址", factorUseDTO.getFactorName() + "因子影响分析完成,未找到符合要求地块", "info");
-                            updateFzxzStatus(taskId, Rwzt.getNoJX());
+                            updateFzxzStatus(taskId, Rwzt.getNoRes());
                             return "";
                         }
                         // 地块与因子求交集
@@ -311,7 +311,7 @@ public class FzssServiceImpl implements IFzssService {
                     if (factorSpatialVo.getDefaultType().equals("contain")) {
                         if (calculateEwkt.equals("")) {
                             iLogService.saveLog(taskId, "辅助选址", factorUseDTO.getFactorName() + "因子影响分析完成,未找到符合要求地块", "info");
-                            updateFzxzStatus(taskId, Rwzt.getNoJX());
+                            updateFzxzStatus(taskId, Rwzt.getNoRes());
                             return "";
                         }
                         // 地块与因子求差集
@@ -340,7 +340,7 @@ public class FzssServiceImpl implements IFzssService {
                         // 地块与因子求差集
                         if (calculateEwkt.equals("")) {
                             iLogService.saveLog(taskId, "辅助选址", factorUseDTO.getFactorName() + "因子影响分析完成,未找到符合要求地块", "info");
-                            updateFzxzStatus(taskId, Rwzt.getNoJX());
+                            updateFzxzStatus(taskId, Rwzt.getNoRes());
                             return "";
                         }
                         rawTable = createUtilsDBService.intersectionTableWkt(rawTable, null, calculateEwkt);
@@ -354,7 +354,7 @@ public class FzssServiceImpl implements IFzssService {
                         // 删除不包含的地块
                         if (calculateEwkt.equals("")) {
                             iLogService.saveLog(taskId, "辅助选址", factorUseDTO.getFactorName() + "因子影响分析完成,未找到符合要求地块", "info");
-                            updateFzxzStatus(taskId, Rwzt.getNoJX());
+                            updateFzxzStatus(taskId, Rwzt.getNoRes());
                             return "";
                         } else {
                             List<String> tableIds = analyseUtilsDBService.intersectsTableWkt(rawTable, null, calculateEwkt);
@@ -373,7 +373,7 @@ public class FzssServiceImpl implements IFzssService {
             Integer tableCount = tableDateService.getTableCount(rawTable);
             if (tableCount == 0) {
                 iLogService.saveLog(taskId, "辅助选址", factorUseDTO.getFactorName() + "计算完成，未找到符合条件数据", "info");
-                updateFzxzStatus(taskId, Rwzt.getNoJX());
+                updateFzxzStatus(taskId, Rwzt.getNoRes());
                 return "";
             }
             iLogService.saveLog(taskId, "辅助选址", factorUseDTO.getFactorName() + "因子影响分析完成", "info");
@@ -444,7 +444,6 @@ public class FzssServiceImpl implements IFzssService {
             return RequestResult.error("辅助选址记录查为未空！", null);
         }
 
-
         // 构建返回结果
         FzxzResultDTO result = DozerUtils.map(selectionInfo, FzxzResultDTO.class);
 
@@ -455,10 +454,8 @@ public class FzssServiceImpl implements IFzssService {
 
         // 3.查询分析结果地块信息
         List<SelectionResDTO> selectionResList = fzxzResMapper.getListByRwbsm(result.getBsm());
-
         List<Map<String, Object>> dkMaps = new ArrayList<>();
         for (SelectionResDTO selectionRes : selectionResList) {
-
             // 查询地块信息
             String rawTableName = selectionInfo.getSjy();
             Integer rawItemId = selectionRes.getDkid();
@@ -467,7 +464,6 @@ public class FzssServiceImpl implements IFzssService {
             columns.add("kzxxgydmc");
             Map<String, Object> rawTable = ghdkaMapper.getInfoByColumn(rawTableName, rawItemId.toString(), columns);
 
-
             // 构建地块返回结果
             Map<String, Object> dkMap = new HashMap<>();
             if (rawTable != null && rawTable.containsKey("kzxxgyddm") && rawTable.containsKey("kzxxgydmc")) {
@@ -482,34 +478,9 @@ public class FzssServiceImpl implements IFzssService {
 
             dkMaps.add(dkMap);
         }
-
-        // Map<String, Object> paramMap = new HashMap<>();
-        // paramMap.put("sjy", resourceTable);
-        // paramMap.put("idList", dkIds);
-        // List<Map<String, Object>> dkSelectMap = ghdkaMapper.getInfo(paramMap);
-        // Map<Integer, Map<String, Object>> dkRawMap = new HashMap<>();
-        // for (Map<String, Object> map : dkSelectMap) {
-        //     dkRawMap.put((Integer) map.get("id"), map);
-        // }
-        //
-        //
-        // for (SelectionResDTO fzxzResDTO : selectionResList) {
-        //     Map<String, Object> dkMap = new HashMap<>();
-        //     if (dkRawMap.containsKey(fzxzResDTO.getDkid())) {
-        //         Integer dkId = fzxzResDTO.getDkid();
-        //         Map<String, Object> dkInfoMap = dkRawMap.get(fzxzResDTO.getDkid());
-        //         dkMap.put("dkbm", dkInfoMap.get("dkbm"));// 地块编码
-        //         dkMap.put("kzxxgydmc", dkInfoMap.get("kzxxgydmc"));// 地块类型
-        //         dkMap.put("landPrice", NumberUtil.double2TwoDecimal(fzxzResDTO.getLandPrice()));// 地价
-        //         dkMap.put("geom", dkResMap.get(dkId).getGeom());
-        //         dkMap.put("id", dkResMap.get(dkId).getBsm());
-        //         dkMap.put("area", NumberUtil.double2TwoDecimal(UnitsUtil.m2ToMu(dkResMap.get(dkId).getArea())));// 面积
-        //     }
-        //     dkMaps.add(dkMap);
-        // }
         result.setDks(dkMaps);
 
-        // 查询选址因子
+        // 4.查询选址因子
         QueryWrapper<FactorUseDTO> xzyzWrapper = new QueryWrapper<>();
         xzyzWrapper.eq("task_id", result.getBsm());
         List<FactorUseDTO> fzxzXzyzDTOS = fzxzXzyzMapper.selectList(xzyzWrapper);

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/FtpSchedule.java

@@ -111,7 +111,7 @@ public class FtpSchedule {
                         String uuid = StringUtils.getUUID();
                         chscDto.setBsm(uuid);
                         chscDto.setNydmj(mj);
-                        chscDto.setRwzt(rwztDTO.getNoJX());
+                        chscDto.setRwzt(rwztDTO.getNoRes());
                         chscDto.setCjsj(new Date());
                         fzssChscMapper.insert(chscDto);
                     } else {