|
|
@@ -21,16 +21,10 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.geotools.data.DefaultTransaction;
|
|
|
-import org.geotools.data.FeatureSource;
|
|
|
import org.geotools.data.FeatureWriter;
|
|
|
import org.geotools.data.Transaction;
|
|
|
-import org.geotools.data.collection.ListFeatureCollection;
|
|
|
import org.geotools.data.shapefile.ShapefileDataStore;
|
|
|
import org.geotools.data.shapefile.ShapefileDataStoreFactory;
|
|
|
-import org.geotools.data.simple.SimpleFeatureCollection;
|
|
|
-import org.geotools.data.simple.SimpleFeatureSource;
|
|
|
-import org.geotools.data.simple.SimpleFeatureStore;
|
|
|
import org.geotools.feature.simple.SimpleFeatureBuilder;
|
|
|
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
|
|
|
import org.geotools.referencing.CRS;
|
|
|
@@ -56,7 +50,6 @@ import java.io.Serializable;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.net.URLEncoder;
|
|
|
import java.nio.charset.Charset;
|
|
|
-import java.nio.charset.StandardCharsets;
|
|
|
import java.nio.file.Files;
|
|
|
import java.nio.file.Path;
|
|
|
import java.nio.file.Paths;
|
|
|
@@ -75,7 +68,7 @@ import static com.siwei.apply.common.Constant.ZD_PROPERTY_TABLE_LIST;
|
|
|
@Service
|
|
|
public class ConvergeServiceImpl implements ConvergeService {
|
|
|
|
|
|
- private static final ThreadLocal<String> CURRENT_SCHEMA_NAME = new ThreadLocal<>();
|
|
|
+ private static final ThreadLocal<String> CURRENT_SCHEMA_NAME = new InheritableThreadLocal<>();
|
|
|
|
|
|
///home/siwei/uploadPath/converge/
|
|
|
@Value("${converge_dir}")
|
|
|
@@ -247,7 +240,9 @@ public class ConvergeServiceImpl implements ConvergeService {
|
|
|
|
|
|
String schemaName = "";
|
|
|
if(type.equals("2")){
|
|
|
- schemaName = Common.DB_SCHEMA_NAME_NATURAL;
|
|
|
+ //todo 目前只支持不动产
|
|
|
+ schemaName = Common.DB_SCHEMA_NAME_VECTOR;
|
|
|
+ //schemaName = Common.DB_SCHEMA_NAME_NATURAL;
|
|
|
}else if(type.equals("1")){
|
|
|
schemaName = Common.DB_SCHEMA_NAME_VECTOR;
|
|
|
}
|
