1

13693261870

2023-02-28 2521886564b373469941ac33e53f14ad53cb2b99

1

 data/update.sql

@@ -329,10 +329,9 @@
delete from lf.sys_attach where guid in ('bbfcfb74cd4f31d755d2795f8da48bfe','deb91a0cfe0df67bb71b66c366cac043')
select * from lf.sys_meta where guid='6bf9b041-29b6-465a-b247-b05d1b29e6f6'





select exts,checks from lf.sys_dir where code='0200000002'
select st_astext(geom) from bs.m_pipeline
select * from lf.sys_dir where pid=0 order by code




 src/main/java/com/lf/server/helper/GdbHelper.java

@@ -1,6 +1,5 @@
package com.lf.server.helper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.lf.server.entity.all.BaseGeoEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.mapper.all.BasicMapper;
@@ -258,10 +257,16 @@
                field.set(t, f.GetFieldAsInteger(i));
                break;
            case "java.sql.Timestamp":
                field.set(t, getTimestamp(f, i));
                Timestamp ts = getTimestamp(f, i);
                if (null != ts) {
                    field.set(t, ts);
                }
                break;
            case "java.time.LocalDate":
                field.set(t, getLocalDate(f, i));
                LocalDate ld = getLocalDate(f, i);
                if (null != ld) {
                    field.set(t, ld);
                }
                break;
            default:
                field.set(t, f.GetFieldAsString(i));
@@ -288,20 +293,15 @@
            String geo = "null";
            if (null != f.GetGeometryRef()) {
                String wkt = f.GetGeometryRef().ExportToWkt();
                // noinspection AlibabaRemoveCommentedCode
                switch (f.GetGeometryRef().GetGeometryType()) {
                    //case 1:
                    //    wkt = wkt.replace("POINT", "MULTIPOINT");
                    //    break;
                    case 2:
                        wkt = wkt.replace("LINESTRING (", "MULTILINESTRING ((") + ")";
                        break;
                    case 3:
                        wkt = wkt.replace("POLYGON (", "MULTIPOLYGON ((") + ")";
                        break;
                    default:
                        break;
                // f.GetGeometryRef().GetGeometryType()
                if (wkt.contains("LINESTRING") && !wkt.contains("MULTILINESTRING")) {
                    wkt = wkt.replace("LINESTRING (", "MULTILINESTRING ((") + ")";
                }
                if (wkt.contains("POLYGON") && !wkt.contains("MULTIPOLYGON")) {
                    wkt = wkt.replace("POLYGON (", "MULTIPOLYGON ((") + ")";
                }
                wkt = wkt.replace(" 0,", ",").replace(" 0)", ")");

                geo = String.format("ST_GeomFromText('%s')", wkt);
            }


 src/main/java/com/lf/server/service/data/UploadService.java

@@ -3,7 +3,6 @@
import com.lf.server.entity.all.BaseEntity;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.data.*;
import com.lf.server.entity.sys.DepEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.mapper.all.BasicMapper;