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/service/impl/table/TableDataSelectServiceImpl.java

@@ -153,7 +153,7 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
             return retList;
         }
 
-        List<TableFiledDTO> filedlist = getFieldListByTableId(tableId, null);
+        List<TableFiledDTO> filedlist = getFieldListByTableId(tableId, 0);
         List<String> outputColumn = new ArrayList<>();
         for (TableFiledDTO v_data : filedlist) {
             outputColumn.add(v_data.getFiledName());
@@ -164,6 +164,7 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
         rawTableVo.setIds(from_kj_ids);
         rawTableVo.setIsGeography(false);
         rawTableVo.setColumns(outputColumn);
+        rawTableVo.setSiweiArea(true);
         List<Map> retDataList = httpAnalyseService.rawTable(rawTableVo);
         if (retDataList == null || retDataList.size() <= 0) {
             return retList;
@@ -182,7 +183,7 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
             return retList;
         }
 
-        List<TableFiledDTO> list = getFieldListByTableId(tableId, null);
+        List<TableFiledDTO> list = getFieldListByTableId(tableId, 0);
         List<String> outputColumn = new ArrayList<>();
         for (TableFiledDTO v_data : list) {
             outputColumn.add(v_data.getFiledName());
@@ -203,6 +204,7 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
         targetTableVo.setRawTableName(tableName);
         targetTableVo.setIsGeography(false);
         targetTableVo.setSrid(SRID);
+        targetTableVo.setSiweiArea(true);
         List<Map> from_jg = httpAnalyseService.targetTable(targetTableVo);
         if (from_jg == null || from_jg.size() <= 0) {
             return retList;
@@ -232,8 +234,19 @@ public class TableDataSelectServiceImpl implements TableDataSelectService {
                 tableDataVo.setFiled(v_filedName);
                 v_dataList.add(tableDataVo);
             }
+            Object siweiarea = v_data.get("siweiarea");
+            if (StringUtils.isNotNull(siweiarea)) {
+                // 面积
+                TableDataVo tableDataVo = new TableDataVo();
+                tableDataVo.setData(siweiarea);
+                tableDataVo.setFiledZH("面积");
+                tableDataVo.setFiled("siweiarea");
+                v_dataList.add(tableDataVo);
+            }
             retList.add(v_dataList);
         }
+
+
         return retList;
     }