数据上传和图斑入库

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/ApplyService.java

@@ -26,4 +26,10 @@ public interface ApplyService {
 
     @GetMapping("/gdbh/QueryGdbhJg/geom")
     RequestResult QueryGdbhJgGeom(@RequestParam("bsm") String bsm);
+
+    @GetMapping("/gdbh/jctb/store")
+    RequestResult handleGdbhJctbStore(@RequestParam("bsm") String bsm);
+
+//    @GetMapping("/gdbh/upload/geom")
+//    public RequestResult SelectGdbhList(String type, String[] ids) {
 }

onemap-api/onemap-api-system/src/main/java/com/onemap/system/api/factory/ApplyFallbackFactory.java

@@ -37,6 +37,11 @@ public class ApplyFallbackFactory implements FallbackFactory<ApplyService> {
             public RequestResult QueryGdbhJgGeom(String bsm) {
                 return RequestResult.error("内部错误");
             }
+
+            @Override
+            public RequestResult handleGdbhJctbStore(String bsm) {
+                return RequestResult.error("内部错误");
+            }
         };
     }
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/gdbh/GdbhController.java

@@ -9,6 +9,7 @@ import com.onemap.common.core.web.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Arrays;
 import java.util.List;
 
 @RestController
@@ -78,7 +79,7 @@ public class GdbhController extends BaseController {
     }
 
     @GetMapping("/QueryGdbhJg/id")
-    public RequestResult QueryGdbhJgId(String bsm,String id) {
+    public RequestResult QueryGdbhJgId(String bsm, String id) {
         if (StringUtils.isEmpty(bsm)) {
             return RequestResult.error("bsm is null");
         }
@@ -100,4 +101,13 @@ public class GdbhController extends BaseController {
         List<GdbhDto> list = gdbhService.SelectGdbhList(gdbhDto);
         return getDataTable(list);
     }
+
+    @GetMapping("/upload/geom")
+    public RequestResult SelectGdbhList(String type, String[] ids) {
+        System.out.println("type:" + type);
+        System.out.println("ids:" + Arrays.asList(ids).toString());
+        return RequestResult.success("处理成功", "0");
+    }
+
+
 }

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/gdbh/TGdbhJctbController.java

@@ -1,5 +1,6 @@
 package com.onemap.apply.controller.gdbh;
 
+import java.io.IOException;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -10,14 +11,7 @@ import com.onemap.common.core.web.page.TableDataInfo;
 import com.onemap.common.log.annotation.Log;
 import com.onemap.common.log.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.onemap.apply.domain.gdbh.TGdbhJctb;
 import com.onemap.apply.service.gdbh.ITGdbhJctbService;
 
@@ -94,10 +88,10 @@ public class TGdbhJctbController extends BaseController {
      * 新增耕地保护-检测图标数据入库
      */
     @Log(title = "耕地保护-检测图标数据入库", businessType = BusinessType.INSERT)
-    @PostMapping("/store")
-    public AjaxResult addStore(String uploadShpId) {
-        tGdbhJctbService.handleUploadShpGdbhJctb(uploadShpId);
-        return toAjax(1);
+    @GetMapping("/store")
+    public AjaxResult addStore(@RequestParam("bsm") String bsm) throws IOException {
+        tGdbhJctbService.handleUploadShpGdbhJctb(bsm);
+        return AjaxResult.success("执行成功", 0);
     }
 
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/gdbh/TGdbhJctb.java

@@ -29,7 +29,7 @@ public class TGdbhJctb extends BaseEntity {
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String pcsj;
     private String geom;
-    private String year;
+    private Integer year;
     private String issuedate;
     private String batchinfo;
     private String regioncode;
@@ -44,15 +44,15 @@ public class TGdbhJctb extends BaseEntity {
     private String qsx;
     private String hsx;
     private String dqjh;
-    private String lzb;
-    private String bzb;
+    private Double lzb;
+    private Double bzb;
     private String cxbh;
     private String bz;
-    private String jcmj;
-    private String gdmj;
-    private String nydmj;
-    private String dlrdjsydmj;
-    private String yjjbntmj;
+    private Double jcmj;
+    private Double gdmj;
+    private Double nydmj;
+    private Double dlrdjsydmj;
+    private Double yjjbntmj;
     private String tbxzqdmmax;
     private String tbxzqmcmax;
     private String tbxzjxzqdm;
@@ -61,19 +61,19 @@ public class TGdbhJctb extends BaseEntity {
     private String tbcjxzqmc;
     private String nzy2018;
     private String sklx;
-    private String tskqmj;
-    private String yjkcmj;
-    private String ysxgdmj;
-    private String ysxnydmj;
-    private String ysxjsydmj;
-    private String ysxwlydmj;
-    private String ysxjbntmj;
-    private String wsxgdmj;
-    private String wsxstmj;
-    private String wsxnydmj;
-    private String wsxjsydmj;
-    private String wsxwlydmj;
-    private String wsxjbntmj;
+    private Double tskqmj;
+    private Double yjkcmj;
+    private Double ysxgdmj;
+    private Double ysxnydmj;
+    private Double ysxjsydmj;
+    private Double ysxwlydmj;
+    private Double ysxjbntmj;
+    private Double wsxgdmj;
+    private Double wsxstmj;
+    private Double wsxnydmj;
+    private Double wsxjsydmj;
+    private Double wsxwlydmj;
+    private Double wsxjbntmj;
     private String sfsk;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -108,11 +108,11 @@ public class TGdbhJctb extends BaseEntity {
         this.geom = geom;
     }
 
-    public String getYear() {
+    public Integer getYear() {
         return year;
     }
 
-    public void setYear(String year) {
+    public void setYear(Integer year) {
         this.year = year;
     }
 
@@ -228,19 +228,19 @@ public class TGdbhJctb extends BaseEntity {
         this.dqjh = dqjh;
     }
 
-    public String getLzb() {
+    public Double getLzb() {
         return lzb;
     }
 
-    public void setLzb(String lzb) {
+    public void setLzb(Double lzb) {
         this.lzb = lzb;
     }
 
-    public String getBzb() {
+    public Double getBzb() {
         return bzb;
     }
 
-    public void setBzb(String bzb) {
+    public void setBzb(Double bzb) {
         this.bzb = bzb;
     }
 
@@ -260,43 +260,43 @@ public class TGdbhJctb extends BaseEntity {
         this.bz = bz;
     }
 
-    public String getJcmj() {
+    public Double getJcmj() {
         return jcmj;
     }
 
-    public void setJcmj(String jcmj) {
+    public void setJcmj(Double jcmj) {
         this.jcmj = jcmj;
     }
 
-    public String getGdmj() {
+    public Double getGdmj() {
         return gdmj;
     }
 
-    public void setGdmj(String gdmj) {
+    public void setGdmj(Double gdmj) {
         this.gdmj = gdmj;
     }
 
-    public String getNydmj() {
+    public Double getNydmj() {
         return nydmj;
     }
 
-    public void setNydmj(String nydmj) {
+    public void setNydmj(Double nydmj) {
         this.nydmj = nydmj;
     }
 
-    public String getDlrdjsydmj() {
+    public Double getDlrdjsydmj() {
         return dlrdjsydmj;
     }
 
-    public void setDlrdjsydmj(String dlrdjsydmj) {
+    public void setDlrdjsydmj(Double dlrdjsydmj) {
         this.dlrdjsydmj = dlrdjsydmj;
     }
 
-    public String getYjjbntmj() {
+    public Double getYjjbntmj() {
         return yjjbntmj;
     }
 
-    public void setYjjbntmj(String yjjbntmj) {
+    public void setYjjbntmj(Double yjjbntmj) {
         this.yjjbntmj = yjjbntmj;
     }
 
@@ -364,107 +364,107 @@ public class TGdbhJctb extends BaseEntity {
         this.sklx = sklx;
     }
 
-    public String getTskqmj() {
+    public Double getTskqmj() {
         return tskqmj;
     }
 
-    public void setTskqmj(String tskqmj) {
+    public void setTskqmj(Double tskqmj) {
         this.tskqmj = tskqmj;
     }
 
-    public String getYjkcmj() {
+    public Double getYjkcmj() {
         return yjkcmj;
     }
 
-    public void setYjkcmj(String yjkcmj) {
+    public void setYjkcmj(Double yjkcmj) {
         this.yjkcmj = yjkcmj;
     }
 
-    public String getYsxgdmj() {
+    public Double getYsxgdmj() {
         return ysxgdmj;
     }
 
-    public void setYsxgdmj(String ysxgdmj) {
+    public void setYsxgdmj(Double ysxgdmj) {
         this.ysxgdmj = ysxgdmj;
     }
 
-    public String getYsxnydmj() {
+    public Double getYsxnydmj() {
         return ysxnydmj;
     }
 
-    public void setYsxnydmj(String ysxnydmj) {
+    public void setYsxnydmj(Double ysxnydmj) {
         this.ysxnydmj = ysxnydmj;
     }
 
-    public String getYsxjsydmj() {
+    public Double getYsxjsydmj() {
         return ysxjsydmj;
     }
 
-    public void setYsxjsydmj(String ysxjsydmj) {
+    public void setYsxjsydmj(Double ysxjsydmj) {
         this.ysxjsydmj = ysxjsydmj;
     }
 
-    public String getYsxwlydmj() {
+    public Double getYsxwlydmj() {
         return ysxwlydmj;
     }
 
-    public void setYsxwlydmj(String ysxwlydmj) {
+    public void setYsxwlydmj(Double ysxwlydmj) {
         this.ysxwlydmj = ysxwlydmj;
     }
 
-    public String getYsxjbntmj() {
+    public Double getYsxjbntmj() {
         return ysxjbntmj;
     }
 
-    public void setYsxjbntmj(String ysxjbntmj) {
+    public void setYsxjbntmj(Double ysxjbntmj) {
         this.ysxjbntmj = ysxjbntmj;
     }
 
-    public String getWsxgdmj() {
+    public Double getWsxgdmj() {
         return wsxgdmj;
     }
 
-    public void setWsxgdmj(String wsxgdmj) {
+    public void setWsxgdmj(Double wsxgdmj) {
         this.wsxgdmj = wsxgdmj;
     }
 
-    public String getWsxstmj() {
+    public Double getWsxstmj() {
         return wsxstmj;
     }
 
-    public void setWsxstmj(String wsxstmj) {
+    public void setWsxstmj(Double wsxstmj) {
         this.wsxstmj = wsxstmj;
     }
 
-    public String getWsxnydmj() {
+    public Double getWsxnydmj() {
         return wsxnydmj;
     }
 
-    public void setWsxnydmj(String wsxnydmj) {
+    public void setWsxnydmj(Double wsxnydmj) {
         this.wsxnydmj = wsxnydmj;
     }
 
-    public String getWsxjsydmj() {
+    public Double getWsxjsydmj() {
         return wsxjsydmj;
     }
 
-    public void setWsxjsydmj(String wsxjsydmj) {
+    public void setWsxjsydmj(Double wsxjsydmj) {
         this.wsxjsydmj = wsxjsydmj;
     }
 
-    public String getWsxwlydmj() {
+    public Double getWsxwlydmj() {
         return wsxwlydmj;
     }
 
-    public void setWsxwlydmj(String wsxwlydmj) {
+    public void setWsxwlydmj(Double wsxwlydmj) {
         this.wsxwlydmj = wsxwlydmj;
     }
 
-    public String getWsxjbntmj() {
+    public Double getWsxjbntmj() {
         return wsxjbntmj;
     }
 
-    public void setWsxjbntmj(String wsxjbntmj) {
+    public void setWsxjbntmj(Double wsxjbntmj) {
         this.wsxjbntmj = wsxjbntmj;
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/ITGdbhJctbService.java

@@ -1,5 +1,6 @@
 package com.onemap.apply.service.gdbh;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -65,7 +66,7 @@ public interface ITGdbhJctbService {
      *
      * @return 结果
      */
-    public int handleUploadShpGdbhJctb(String uploadShpId);
+    public int handleUploadShpGdbhJctb(String uploadShpId) throws IOException;
 
 
     /**

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhJctbServiceImpl.java

@@ -1,6 +1,9 @@
 package com.onemap.apply.service.gdbh.impl;
 
 import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -14,9 +17,11 @@ import com.onemap.apply.domain.gdbh.TUploadGeomDetailsDTO;
 import com.onemap.apply.mapper.gdbh.TGdbhJctbFileMapper;
 import com.onemap.apply.service.gdbh.ITGdbhJctbService;
 import com.onemap.common.core.utils.DateUtils;
+import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.RequestResult;
 import com.onemap.system.api.RemoteFileService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import com.onemap.apply.mapper.gdbh.TGdbhJctbMapper;
 import com.onemap.apply.domain.gdbh.TGdbhJctb;
@@ -33,12 +38,12 @@ import javax.annotation.Resource;
 public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
     @Resource
     private TGdbhJctbMapper tGdbhJctbMapper;
-
     @Resource
     private RemoteFileService fileService;
-
     @Resource
     private TGdbhJctbFileMapper gdbhJctbFileMapper;
+    @Value("${file.path}")
+    private String uploadFilePath;
 
     /**
      * 查询耕地保护-检测图标数据详情表
@@ -111,66 +116,66 @@ public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
      *
      * @return 结果
      */
-    public int handleUploadShpGdbhJctb(String uploadShpId) {
+    @Override
+    public int handleUploadShpGdbhJctb(String uploadShpId) throws IOException {
         RequestResult resultGeom = fileService.uploadGeomV1Query(uploadShpId, 1);
         if (resultGeom.isError()) {
             return 0;
         }
         String jsonString = JSON.toJSONString(resultGeom.get(RequestResult.DATA_TAG));
+        if (StringUtils.isEmpty(jsonString) || "null".equals(jsonString)) {
+            return 0;
+        }
         TUploadGeomDTO tUploadGeomDTO = JSON.parseObject(jsonString, TUploadGeomDTO.class);
+
         TGdbhJctbFileDTO gdbhJctbFileDTO = new TGdbhJctbFileDTO();
         gdbhJctbFileDTO.setId(tUploadGeomDTO.getId());
         gdbhJctbFileDTO.setGeom(tUploadGeomDTO.getGeom());
         gdbhJctbFileDTO.setName(tUploadGeomDTO.getName());
         gdbhJctbFileDTO.setUploaduser(tUploadGeomDTO.getUploaduser());
         gdbhJctbFileDTO.setUploadtime(tUploadGeomDTO.getUploadtime());
-        gdbhJctbFileDTO.setShppath(tUploadGeomDTO.getShppath());
-        gdbhJctbFileDTO.setUnzippath(tUploadGeomDTO.getUnzippath());
         gdbhJctbFileDTO.setFiletype(tUploadGeomDTO.getFiletype());
         gdbhJctbFileDTO.setSpotsnumber(tUploadGeomDTO.getSpotsnumber());
         gdbhJctbFileDTO.setSpotsarea(tUploadGeomDTO.getSpotsarea());
         gdbhJctbFileDTO.setFromtype(1);
         gdbhJctbFileDTO.setReadstatus("0");
-
-        String shpFilePath = tUploadGeomDTO.getShppath();
+        String shpFilePath = uploadFilePath + tUploadGeomDTO.getShppath();
         //获取文件夹
         String shpFileParemtPath = new File(shpFilePath).getParentFile().getAbsolutePath();
-//        if (!(new File(shpFileParemtPath + "/QDOM").exists())) {
-//            //验证QDOM
-//            gdbhJctbFileDTO.setReadstatus("1");
-//            gdbhJctbFileDTO.setReadmessage("验证QDOM文件夹缺失");
-//        } else if (!(new File(shpFileParemtPath + "/DDOM").exists())) {
-//            //验证DDOM
-//            gdbhJctbFileDTO.setReadstatus("1");
-//            gdbhJctbFileDTO.setReadmessage("验证DDOM文件夹缺失");
-//        }
+        if (!(new File(shpFileParemtPath + "/QDOM").exists())) {
+            //验证QDOM
+            gdbhJctbFileDTO.setReadstatus("1");
+            gdbhJctbFileDTO.setReadmessage("验证QDOM文件夹缺失");
+        } else if (!(new File(shpFileParemtPath + "/DDOM").exists())) {
+            //验证DDOM
+            gdbhJctbFileDTO.setReadstatus("1");
+            gdbhJctbFileDTO.setReadmessage("验证DDOM文件夹缺失");
+        }
         gdbhJctbFileMapper.insertTGdbhJctbFile(gdbhJctbFileDTO);
         if ("0".equals(gdbhJctbFileDTO.getReadstatus())) {
+            //数据迁移
+            String doShpPath = tUploadGeomDTO.getShppath();
+            String doUnzippath = tUploadGeomDTO.getUnzippath();
+            String gdbh_dir = "/gdbh/jctb/";
+            String d1_shpPath = gdbh_dir + doShpPath.substring(6);
+            String d1_unzippath = gdbh_dir + doUnzippath.substring(6);
+            String d2_unzippath = uploadFilePath + d1_unzippath;
+            if (!(new File(d2_unzippath).getParentFile().exists())) {
+                Files.createDirectories(Paths.get(new File(d2_unzippath).getParentFile().getAbsolutePath()));
+            }
+            Files.move(Paths.get(uploadFilePath + doUnzippath), Paths.get(d2_unzippath));
+            gdbhJctbFileDTO.setShppath(d1_shpPath);
+            gdbhJctbFileDTO.setUnzippath(d1_unzippath);
+            String tifpath = d1_shpPath.substring(0, d1_shpPath.lastIndexOf("/"));
+
             List<TUploadGeomDetailsDTO> detailsList = tUploadGeomDTO.gettUploadGeomDetailsDTOList();
             for (TUploadGeomDetailsDTO d_dto : detailsList) {
-                Map<String, Object> d_dto_map = JSON.parseObject(d_dto.getGeomJson(), Map.class);
-                String XZQDM = String.valueOf(d_dto_map.get("XZQDM"));
-                String XMC = String.valueOf(d_dto_map.get("XMC"));
-                String JCBH = String.valueOf(d_dto_map.get("JCBH"));
-                String JGDJ = String.valueOf(d_dto_map.get("JGDJ"));
-                String TBLX = String.valueOf(d_dto_map.get("TBLX"));
-                String QLX = String.valueOf(d_dto_map.get("QLX"));
-                String HLX = String.valueOf(d_dto_map.get("HLX"));
-                String HLB = String.valueOf(d_dto_map.get("HLB"));
-                String QSX = String.valueOf(d_dto_map.get("QSX"));
-                String HSX = String.valueOf(d_dto_map.get("HSX"));
-                String DQJH = String.valueOf(d_dto_map.get("DQJH"));
-                String LZB = String.valueOf(d_dto_map.get("LZB"));
-                String BZB = String.valueOf(d_dto_map.get("BZB"));
-                String JCMJ = String.valueOf(d_dto_map.get("JCMJ"));
-                String CXBH = String.valueOf(d_dto_map.get("CXBH"));
-                String WQBH = String.valueOf(d_dto_map.get("WQBH"));
-                String BZ = String.valueOf(d_dto_map.get("BZ"));
-                TGdbhJctb tGdbhJctb = new TGdbhJctb();
+                TGdbhJctb tGdbhJctb = JSON.parseObject(d_dto.getGeomJson(), TGdbhJctb.class);
                 tGdbhJctb.setPcsj(gdbhJctbFileDTO.getId());
                 tGdbhJctb.setGeom(d_dto.getGeom());
                 tGdbhJctb.setId(d_dto.getId());
-//                tGdbhJctb.setQsxtif();
+                tGdbhJctb.setQsxtif(tifpath + "/QDOM/" + tGdbhJctb.getJcbh() + ".tif");
+                tGdbhJctb.setHsxtif(tifpath + "/DDOM/" + tGdbhJctb.getJcbh() + ".tif");
                 tGdbhJctbMapper.insertTGdbhJctb(tGdbhJctb);
             }
         }

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/gdbh/TGdbhJctbMapper.xml

@@ -87,42 +87,110 @@
     <insert id="insertTGdbhJctb" parameterType="TGdbhJctb">
         insert into t_gdbh_jctb
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="pcsj != null and pcsj != ''">pcsj,</if>
-            <if test="xzqhdm != null">xzqhdm,</if>
-            <if test="xmc != null">xmc,</if>
-            <if test="jcbh != null and jcbh != ''">jcbh,</if>
-            <if test="qlx != null">qlx,</if>
-            <if test="qlxmc != null">qlxmc,</if>
-            <if test="hlx != null">hlx,</if>
-            <if test="hlxmc != null">hlxmc,</if>
-            <if test="lzb != null">lzb,</if>
-            <if test="bzb != null">bzb,</if>
-            <if test="jcmj != null">jcmj,</if>
-            <if test="qsx != null">qsx,</if>
-            <if test="hsx != null">hsx,</if>
-            <if test="geom != null">geom,</if>
-            <if test="qsxtif != null">qsxtif,</if>
-            <if test="hsxtif != null">hsxtif,</if>
+            <if test="geom	 != null">geom,</if>
+            <if test="year	 != null">year,</if>
+            <if test="issuedate	 != null">issuedate,</if>
+            <if test="batchinfo	 != null">batchinfo,</if>
+            <if test="regioncode	 != null">regioncode,</if>
+            <if test="shengmc	 != null">shengmc,</if>
+            <if test="shimc	 != null">shimc,</if>
+            <if test="xmc	 != null">xmc,</if>
+            <if test="jcbh	 != null">jcbh,</if>
+            <if test="tblx	 != null">tblx,</if>
+            <if test="qlx	 != null">qlx,</if>
+            <if test="hlx	 != null">hlx,</if>
+            <if test="hlb	 != null">hlb,</if>
+            <if test="qsx	 != null">qsx,</if>
+            <if test="hsx	 != null">hsx,</if>
+            <if test="dqjh	 != null">dqjh,</if>
+            <if test="lzb	 != null">lzb,</if>
+            <if test="bzb	 != null">bzb,</if>
+            <if test="cxbh	 != null">cxbh,</if>
+            <if test="bz	 != null">bz,</if>
+            <if test="jcmj	 != null">jcmj,</if>
+            <if test="gdmj	 != null">gdmj,</if>
+            <if test="nydmj	 != null">nydmj,</if>
+            <if test="dlrdjsydmj	 != null">dlrdjsydmj,</if>
+            <if test="yjjbntmj	 != null">yjjbntmj,</if>
+            <if test="tbxzqdmmax	 != null">tbxzqdmmax,</if>
+            <if test="tbxzqmcmax	 != null">tbxzqmcmax,</if>
+            <if test="tbxzjxzqdm	 != null">tbxzjxzqdm,</if>
+            <if test="tbxzjxzqmc	 != null">tbxzjxzqmc,</if>
+            <if test="tbcjxzqdm	 != null">tbcjxzqdm,</if>
+            <if test="tbcjxzqmc	 != null">tbcjxzqmc,</if>
+            <if test="nzy2018	 != null">nzy2018,</if>
+            <if test="sklx	 != null">sklx,</if>
+            <if test="tskqmj	 != null">tskqmj,</if>
+            <if test="yjkcmj	 != null">yjkcmj,</if>
+            <if test="ysxgdmj	 != null">ysxgdmj,</if>
+            <if test="ysxnydmj	 != null">ysxnydmj,</if>
+            <if test="ysxjsydmj	 != null">ysxjsydmj,</if>
+            <if test="ysxwlydmj	 != null">ysxwlydmj,</if>
+            <if test="ysxjbntmj	 != null">ysxjbntmj,</if>
+            <if test="wsxgdmj	 != null">wsxgdmj,</if>
+            <if test="wsxstmj	 != null">wsxstmj,</if>
+            <if test="wsxnydmj	 != null">wsxnydmj,</if>
+            <if test="wsxjsydmj	 != null">wsxjsydmj,</if>
+            <if test="wsxwlydmj	 != null">wsxwlydmj,</if>
+            <if test="wsxjbntmj	 != null">wsxjbntmj,</if>
+            <if test="sfsk	 != null">sfsk,</if>
+            <if test="pcsj	 != null">pcsj,</if>
+            <if test="id	 != null">id,</if>
+            <if test="qsxtif	 != null">qsxtif,</if>
+            <if test="hsxtif	 != null">hsxtif,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="pcsj != null and pcsj != ''">#{pcsj},</if>
-            <if test="xzqhdm != null">#{xzqhdm},</if>
-            <if test="xmc != null">#{xmc},</if>
-            <if test="jcbh != null and jcbh != ''">#{jcbh},</if>
-            <if test="qlx != null">#{qlx},</if>
-            <if test="qlxmc != null">#{qlxmc},</if>
-            <if test="hlx != null">#{hlx},</if>
-            <if test="hlxmc != null">#{hlxmc},</if>
-            <if test="lzb != null">#{lzb},</if>
-            <if test="bzb != null">#{bzb},</if>
-            <if test="jcmj != null">#{jcmj},</if>
-            <if test="qsx != null">#{qsx},</if>
-            <if test="hsx != null">#{hsx},</if>
-            <if test="geom != null">public.st_transform(public.st_geomfromewkt(#{geom}), 4326),</if>
-            <if test="qsxtif != null">#{qsxtif},</if>
-            <if test="hsxtif != null">#{hsxtif},</if>
+            <if test="geom	 != null">public.st_transform(public.st_geomfromewkt(#{geom}), 4326),</if>
+            <if test="year	 != null">#{year},</if>
+            <if test="issuedate	 != null">#{issuedate},</if>
+            <if test="batchinfo	 != null">#{batchinfo},</if>
+            <if test="regioncode	 != null">#{regioncode},</if>
+            <if test="shengmc	 != null">#{shengmc},</if>
+            <if test="shimc	 != null">#{shimc},</if>
+            <if test="xmc	 != null">#{xmc},</if>
+            <if test="jcbh	 != null">#{jcbh},</if>
+            <if test="tblx	 != null">#{tblx},</if>
+            <if test="qlx	 != null">#{qlx},</if>
+            <if test="hlx	 != null">#{hlx},</if>
+            <if test="hlb	 != null">#{hlb},</if>
+            <if test="qsx	 != null">#{qsx},</if>
+            <if test="hsx	 != null">#{hsx},</if>
+            <if test="dqjh	 != null">#{dqjh},</if>
+            <if test="lzb	 != null">#{lzb},</if>
+            <if test="bzb	 != null">#{bzb},</if>
+            <if test="cxbh	 != null">#{cxbh},</if>
+            <if test="bz	 != null">#{bz},</if>
+            <if test="jcmj	 != null">#{jcmj},</if>
+            <if test="gdmj	 != null">#{gdmj},</if>
+            <if test="nydmj	 != null">#{nydmj},</if>
+            <if test="dlrdjsydmj	 != null">#{dlrdjsydmj},</if>
+            <if test="yjjbntmj	 != null">#{yjjbntmj},</if>
+            <if test="tbxzqdmmax	 != null">#{tbxzqdmmax},</if>
+            <if test="tbxzqmcmax	 != null">#{tbxzqmcmax},</if>
+            <if test="tbxzjxzqdm	 != null">#{tbxzjxzqdm},</if>
+            <if test="tbxzjxzqmc	 != null">#{tbxzjxzqmc},</if>
+            <if test="tbcjxzqdm	 != null">#{tbcjxzqdm},</if>
+            <if test="tbcjxzqmc	 != null">#{tbcjxzqmc},</if>
+            <if test="nzy2018	 != null">#{nzy2018},</if>
+            <if test="sklx	 != null">#{sklx},</if>
+            <if test="tskqmj	 != null">#{tskqmj},</if>
+            <if test="yjkcmj	 != null">#{yjkcmj},</if>
+            <if test="ysxgdmj	 != null">#{ysxgdmj},</if>
+            <if test="ysxnydmj	 != null">#{ysxnydmj},</if>
+            <if test="ysxjsydmj	 != null">#{ysxjsydmj},</if>
+            <if test="ysxwlydmj	 != null">#{ysxwlydmj},</if>
+            <if test="ysxjbntmj	 != null">#{ysxjbntmj},</if>
+            <if test="wsxgdmj	 != null">#{wsxgdmj},</if>
+            <if test="wsxstmj	 != null">#{wsxstmj},</if>
+            <if test="wsxnydmj	 != null">#{wsxnydmj},</if>
+            <if test="wsxjsydmj	 != null">#{wsxjsydmj},</if>
+            <if test="wsxwlydmj	 != null">#{wsxwlydmj},</if>
+            <if test="wsxjbntmj	 != null">#{wsxjbntmj},</if>
+            <if test="sfsk	 != null">#{sfsk},</if>
+            <if test="pcsj	 != null">#{pcsj},</if>
+            <if test="id	 != null">#{id},</if>
+            <if test="qsxtif	 != null">#{qsxtif},</if>
+            <if test="hsxtif	 != null">#{hsxtif},</if>
         </trim>
     </insert>
 

onemap-modules/onemap-file/src/main/java/com/onemap/file/controller/SysFileController.java

@@ -317,6 +317,7 @@ public class SysFileController {
             headers.add(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + URLEncoder.encode(resource.getFilename(), "UTF-8") + "\"");
 //            headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"");
             headers.setContentType(MediaType.parseMediaType(contentType));
+            headers.setAccessControlAllowOrigin("*");
 
             // 返回文件资源
             return ResponseEntity.ok().headers(headers).contentLength(Files.size(filePath))  // 可选：设置内容长度
@@ -361,6 +362,7 @@ public class SysFileController {
 //            headers.add(HttpHeaders.CONTENT_DISPOSITION, "inline; filename=\"" + URLEncoder.encode(resource.getFilename(), "UTF-8") + "\"");
             headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + URLEncoder.encode(resource.getFilename() + "\""));
             headers.setContentType(MediaType.parseMediaType(contentType));
+            headers.setAccessControlAllowOrigin("*");
 
             // 返回文件资源
             return ResponseEntity.ok().headers(headers).contentLength(Files.size(filePath))  // 可选：设置内容长度

onemap-modules/onemap-file/src/main/java/com/onemap/file/service/impl/SpaceFileRecordServiceImpl.java

@@ -16,6 +16,7 @@ import com.onemap.file.service.ISpaceFileRecordService;
 import com.onemap.file.utils.FileUtils;
 import com.onemap.file.utils.UnPackageUtils;
 import com.onemap.system.api.AnalyseService;
+import com.onemap.system.api.ApplyService;
 import com.onemap.system.api.SpatialService;
 import com.onemap.system.api.TableFiledRelationService;
 import com.onemap.system.api.domain.GeomGroupSummaryVo;
@@ -71,6 +72,8 @@ public class SpaceFileRecordServiceImpl implements ISpaceFileRecordService {
     @Resource
     private AnalyseService analyseService;
     private final int sridArea = 4525;
+    @Resource
+    private ApplyService applyService;
 
     @Override
     public String saveSpaceFileRecord(SpaceFileRecordDTO spaceFileRecordDTO) {
@@ -374,6 +377,13 @@ public class SpaceFileRecordServiceImpl implements ISpaceFileRecordService {
     @Override
     public void handleUploadGeomFollowUp(String id, Integer followup) {
         System.out.println("handleUploadGeomFollowUp！！！！！！！");
+        if (followup != null) {
+            if (1 == followup) {
+                //类型1 用于处理耕地保护中上传的图斑信息
+                RequestResult ret = applyService.handleGdbhJctbStore(id);
+                System.out.println(ret.toString());
+            }
+        }
     }