添加打印报告，修改存储为记录坐标信息

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

@@ -127,26 +127,25 @@ public class GdbhHandleService {
             }
             insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护" + mx.getBsmmc() + "分析结束。。。", "info");
         }
-//        insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成开始。。。", "info");
-//        RequestResult res_1 = gdbhJgService.gdbhAnalysisHandle(gdbhDto.getBsm());
-//        if (res_1.isError()) {
-//            insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成失败。。。", "error");
-//            updateGdbg(gdbhDto.getBsm(), 3, null, new Date(), null);
-//            return;
-//        }
-//        Map jdMap_0 = (Map) res_1.get(RequestResult.DATA_TAG);
-//        RequestResult res_2 = analyseService.gdbhGenerateDocx(jdMap_0);
-//        if (res_2.isError()) {
-//            insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成失败。。。", "error");
-//            updateGdbg(gdbhDto.getBsm(), 3, null, new Date(), null);
-//            return;
-//        }
-//        String path_0 = (String) res_2.get(RequestResult.DATA_TAG);
-//        System.out.println("path_0:"+path_0);
+        insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成开始。。。", "info");
+        RequestResult res_1 = gdbhJgService.gdbhAnalysisHandle(gdbhDto.getBsm());
+        if (res_1.isError()) {
+            insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成失败。。。", "error");
+            updateGdbg(gdbhDto.getBsm(), 3, null, new Date(), null);
+            return;
+        }
+        Map jdMap_0 = (Map) res_1.get(RequestResult.DATA_TAG);
+        RequestResult res_2 = analyseService.gdbhGenerateDocx(jdMap_0);
+        if (res_2.isError()) {
+            insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成失败。。。", "error");
+            updateGdbg(gdbhDto.getBsm(), 3, null, new Date(), null);
+            return;
+        }
+        String path_0 = (String) res_2.get(RequestResult.DATA_TAG);
+        System.out.println("path_0:"+path_0);
         insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成结束。。。", "info");
 
-//        updateGdbg(gdbhDto.getBsm(), 2, null, new Date(), path_0);
-        updateGdbg(gdbhDto.getBsm(), 2, null, new Date(), null);
+        updateGdbg(gdbhDto.getBsm(), 2, null, new Date(), path_0);
         insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析结束。。。", "info");
     }
 

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

@@ -25,6 +25,7 @@ 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;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
@@ -117,6 +118,7 @@ public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int handleUploadShpGdbhJctb(String uploadShpId) throws IOException {
         RequestResult resultGeom = fileService.uploadGeomV1Query(uploadShpId, 1);
         if (resultGeom.isError()) {
@@ -151,7 +153,6 @@ public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
             gdbhJctbFileDTO.setReadstatus("1");
             gdbhJctbFileDTO.setReadmessage("验证DDOM文件夹缺失");
         }
-        gdbhJctbFileMapper.insertTGdbhJctbFile(gdbhJctbFileDTO);
         if ("0".equals(gdbhJctbFileDTO.getReadstatus())) {
             //数据迁移
             String doShpPath = tUploadGeomDTO.getShppath();
@@ -167,7 +168,6 @@ public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
             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) {
                 TGdbhJctb tGdbhJctb = JSON.parseObject(d_dto.getGeomJson(), TGdbhJctb.class);
@@ -179,6 +179,7 @@ public class TGdbhJctbServiceImpl implements ITGdbhJctbService {
                 tGdbhJctbMapper.insertTGdbhJctb(tGdbhJctb);
             }
         }
+        gdbhJctbFileMapper.insertTGdbhJctbFile(gdbhJctbFileDTO);
         return 1;
     }
 

sql/pgsql/0_init.sql

@@ -1,30 +1,13 @@
 20241126
 修改表
-base.t_tdzzyj_sjy
-
-20241129 表修改
-vector."tb_qytdzz_jsydzl"
-
-20241129 表修改
-t_jsc_sql
-
--- 视图
-vector.v_qytuzz_qhtb
-
-2024 需要影像多年的影像（暂定数据库记录，超图的影像服务）
-土地整治模块问题说明（完成数据只有海棠区）
-1.全域土地综合整治试点基本情况表 缺少崖州区
-2.vector.tb_qytdzz_jsmb
-2.vector.t_qytdzz_tdlyxz
-3.需要将历届影像地址存入到 vector.t_qytdzz_image中
-4.新发的数据跟之前录入驾驶舱的整治项目信息不匹配，不仅项目个数不一致，而且面积金额也不一致(是否已新文档为主，所以数据需要重新录入)
-5.项目、试点范围、整治范围、前后土地利用现状数据缺失。历届影像地址缺失
-6.土地整治前后土地利用现状数需要发服务，并将服务地址添加到vector.tb_qytdzz_sd_server表中
-
-2024-12-3
-ssxf 表修改
-
-
-20241210
-base.t_gdbh_yjjbnt_server
-需要将服务跟数据进行联动
+1.apply
+# 本地文件上传
+file:
+  #domain: http://192.168.100.120:9201
+  #path: F:\新建文件夹\TempFile
+  #prefix: /statics
+  domain: http://192.168.60.2:9201
+  path: /onemapfile
+  prefix: /statics
+
+vector.t_gdbh_rw_geom