Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/table/TableDataSelectController.java

@@ -14,12 +14,13 @@ import org.springframework.web.bind.annotation.RestController;
 public class TableDataSelectController extends BaseController {
     @Autowired
     private TableDataSelectService tableDataSelectService;
+    String Srid4326 = "SRID=4326;";
 
     @GetMapping("/GetTableData")
     public RequestResult GetTestList(String wkt, String id) {
 //        String id = "fa10c8ee6c3c499ea6e09438eeeb18af";
 //        String wkt = "SRID=4326;POINT(109.5139541 18.3146153)";
-        return RequestResult.success(tableDataSelectService.dataSelectByPoint(wkt, id));
+        return RequestResult.success(tableDataSelectService.dataSelectByPoint(Srid4326 + wkt, id));
     }
 
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/table/TableDataSelectServiceImpl.java

@@ -214,26 +214,48 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
 
     public List<String> intersectsTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectsWkt, Integer intersectsWktSRID) {
         RequestResult result = analyseService.intersectsTableWkt(inputTable, inputSRID, inputIds, intersectsWkt, intersectsWktSRID);
-        Integer statuscode = (Integer) result.get("statuscode");
-        if (statuscode == 200) {
-            Object resultDataObject = result.get("data");
-            if (StringUtils.isNotNull(resultDataObject)) {
-                List<String> idsList = (List<String>) resultDataObject;
-                return idsList;
-            }
+        if (StringUtils.isNull(result)) {
+            return null;
+        }
+        Object code = result.get("code");
+        Object statuscode = result.get("statuscode");
+        if (code == null && statuscode == null) {
+            return null;
+        }
+        if (code != null) {
+            return null;
+        }
+        if (statuscode != null && (Integer) statuscode != 200) {
+            return null;
+        }
+        Object resultDataObject = result.get("data");
+        if (StringUtils.isNotNull(resultDataObject)) {
+            List<String> idsList = (List<String>) resultDataObject;
+            return idsList;
         }
         return null;
     }
 
     public List<Map> intersectionTableWkt(String inputTable, Integer inputSRID, List<String> inputIds, String intersectsWkt, Integer intersectsWktSRID, List<String> outputColumn) {
         RequestResult result = analyseService.intersectionTableWkt(inputTable, inputSRID, inputIds, intersectsWkt, intersectsWktSRID, outputColumn);
-        Integer statuscode = (Integer) result.get("statuscode");
-        if (statuscode == 200) {
-            Object resultDataObject = result.get("data");
-            if (StringUtils.isNotNull(resultDataObject)) {
-                List<Map> idsList = (List<Map>) resultDataObject;
-                return idsList;
-            }
+        if (StringUtils.isNull(result)) {
+            return null;
+        }
+        Object code = result.get("code");
+        Object statuscode = result.get("statuscode");
+        if (code == null && statuscode == null) {
+            return null;
+        }
+        if (code != null) {
+            return null;
+        }
+        if (statuscode != null && (Integer) statuscode != 200) {
+            return null;
+        }
+        Object resultDataObject = result.get("data");
+        if (StringUtils.isNotNull(resultDataObject)) {
+            List<Map> idsList = (List<Map>) resultDataObject;
+            return idsList;
         }
         return null;
     }