1

13693261870

2022-10-21 d0aa9a577e9641654a54dfc1a9fc974545d06611

1

 pom.xml

@@ -109,18 +109,13 @@
            <artifactId>log4j</artifactId>
            <version>1.2.17</version>
        </dependency>
        <!--hutool-->
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>
            <version>4.5.7</version>
        </dependency>
        <!--test-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
        <!--text-->
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-text</artifactId>
@@ -160,6 +155,7 @@
            <artifactId>oshi-core</artifactId>
            <version>4.4.2</version>
        </dependency>
        <!--hutool-->
        <dependency>
            <groupId>cn.hutool</groupId>
            <artifactId>hutool-all</artifactId>

 src/main/java/com/lf/server/config/InitConfig.java

@@ -5,11 +5,7 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.entity.bd.DlgAgnpEntity;
import com.lf.server.entity.ctrl.ShpRecord;
import com.lf.server.helper.GdalHelper;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.Zip4jHelper;
import com.lf.server.helper.ZipHelper;
import com.lf.server.mapper.bd.DlgAgnpMapper;
import com.lf.server.service.sys.ArgsService;
import org.apache.commons.logging.Log;

 src/main/java/com/lf/server/controller/show/ComprehensiveController.java

@@ -5,8 +5,7 @@
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.bd.DlgAgnpEntity;
import com.lf.server.entity.ctrl.ShpRecord;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.ctrl.ShpRecordEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.service.data.UploaderService;
@@ -84,7 +83,7 @@
    @ApiOperation(value = "涓婁紶Shp鏂囦欢鑾峰彇绗竴鏉¤褰曠殑WKT")
    @ResponseBody
    @PostMapping(value = "/uploadShp")
    public ResponseMsg<ShpRecord> uploadShp(HttpServletRequest req, HttpServletResponse res) {
    public ResponseMsg<ShpRecordEntity> uploadShp(HttpServletRequest req, HttpServletResponse res) {
        try {
            UserEntity ue = tokenService.getCurrentUser(req);
            if (ue == null) {
@@ -96,7 +95,7 @@
                return fail("娌℃湁鎵惧埌宸蹭笂浼犵殑鏁版嵁鎴栦笉瀹屾暣", null);
            }

            ShpRecord sr = comprehensiveService.readShpFirstRecord(list);
            ShpRecordEntity sr = comprehensiveService.readShpFirstRecord(list);
            return success(sr);
        } catch (Exception ex) {
            return fail(ex.getMessage(), null);

 src/main/java/com/lf/server/entity/ctrl/FileInfoEntity.java

文件名从 src/main/java/com/lf/server/entity/ctrl/FileInfo.java 修改
@@ -4,7 +4,7 @@
 * 鏂囦欢淇℃伅
 * @author WWW
 */
public class FileInfo {
public class FileInfoEntity {
    private String fileName;

    private Long size;
@@ -13,10 +13,10 @@

    private String path;

    public FileInfo() {
    public FileInfoEntity() {
    }

    public FileInfo(String fileName) {
    public FileInfoEntity(String fileName) {
        this.fileName = fileName;
    }


 src/main/java/com/lf/server/entity/ctrl/ShpRecordEntity.java

文件名从 src/main/java/com/lf/server/entity/ctrl/ShpRecord.java 修改
@@ -6,18 +6,18 @@
 * Shp璁板綍
 * @author WWW
 */
public class ShpRecord implements Serializable {
public class ShpRecordEntity implements Serializable {
    private static final long serialVersionUID = -1366388818651675941L;

    private String wkt;

    private String csid;

    public ShpRecord() {
    public ShpRecordEntity() {

    }

    public ShpRecord(String wkt, String csid) {
    public ShpRecordEntity(String wkt, String csid) {
        this.wkt = wkt;
        this.csid = csid;
    }

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

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

import com.lf.server.entity.ctrl.ShpRecord;
import com.lf.server.entity.ctrl.ShpRecordEntity;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.gdal.gdal.Band;
@@ -47,7 +47,7 @@
    /**
     * 鑾峰彇Shp绗竴鏉¤褰曠殑WKT
     */
    public static ShpRecord readShpFirstRecord(String filePath) {
    public static ShpRecordEntity readShpFirstRecord(String filePath) {
        try {
            org.gdal.ogr.Driver driver = ogr.GetDriverByName("ESRI shapefile");
            if (driver == null) {
@@ -70,7 +70,7 @@
            dataSource.delete();
            driver.delete();

            return new ShpRecord(wkt, csid);
            return new ShpRecordEntity(wkt, csid);
        } catch (Exception ex) {
            ex.printStackTrace();
            return null;

 src/main/java/com/lf/server/service/all/CommonsFileuploadService.java

@@ -1,6 +1,6 @@
package com.lf.server.service.all;

import com.lf.server.entity.ctrl.FileInfo;
import com.lf.server.entity.ctrl.FileInfoEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
@@ -72,7 +72,7 @@
     */
    private Object copeFileItems(UserEntity ue, List<FileItem> items, HttpServletRequest req) throws Exception {
        Map<String, String> map = new HashMap<String, String>(3);
        List<FileInfo> list = new ArrayList<FileInfo>();
        List<FileInfoEntity> list = new ArrayList<FileInfoEntity>();

        String path = pathHelper.getTempPath(ue.getId());
        for (FileItem item : items) {
@@ -83,7 +83,7 @@
                continue;
            }

            FileInfo fi = copeFile(item, path, req);
            FileInfoEntity fi = copeFile(item, path, req);
            if (fi != null) {
                list.add(fi);
            }
@@ -95,10 +95,10 @@
    /**
     * 澶勭悊鏂囦欢
     */
    private FileInfo copeFile(FileItem item, String path, HttpServletRequest req) {
    private FileInfoEntity copeFile(FileItem item, String path, HttpServletRequest req) {
        try {
            // 鑾峰彇鏂囦欢鍚嶏紝鍒ゆ柇鏄惁鍚堟硶
            FileInfo fi = new FileInfo(item.getName());
            FileInfoEntity fi = new FileInfoEntity(item.getName());
            if (StringHelper.isEmpty(fi.getFileName())) {
                return null;
            }

 src/main/java/com/lf/server/service/show/ComprehensiveService.java

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lf.server.entity.bd.DlgAgnpEntity;
import com.lf.server.entity.ctrl.ShpRecord;
import com.lf.server.entity.ctrl.ShpRecordEntity;
import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.FileHelper;
import com.lf.server.helper.GdalHelper;
@@ -41,7 +41,7 @@
        return dlgAgnpMapper.selectWktById(id);
    }

    public ShpRecord readShpFirstRecord(List<MetaFileEntity> list) {
    public ShpRecordEntity readShpFirstRecord(List<MetaFileEntity> list) {
        String fileName = null;
        for (MetaFileEntity mf : list) {
            if (mf.getName().toLowerCase().indexOf(".shp") > -1) {
@@ -53,7 +53,7 @@
            return null;
        }

        ShpRecord sr = GdalHelper.readShpFirstRecord(fileName);
        ShpRecordEntity sr = GdalHelper.readShpFirstRecord(fileName);
        FileHelper.deleteFiles(list);

        return sr;