添加常量，定义输出坐标系，修改耕地保护报文取值问题

onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/constant/ServiceConstants.java

@@ -9,5 +9,7 @@ public class ServiceConstants {
     public final static int SRID_4326 = 4326;
     //面积计算的坐标系
     public final static int SRID_4525 = 4525;
+    //系统输出面积使用的坐标系
+    public final static int SERVER_OUT_AREA_SRID = SRID_4525;
 
 }

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

@@ -125,12 +125,12 @@ public class GdbhHandleService {
         }
         Map jdMap_0 = (Map) res_1.get(RequestResult.DATA_TAG);
         RequestResult res_2 = analyseService.gdbhGenerateDocx(jdMap_0);
-        if (res_1.isError()) {
+        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_1.get(RequestResult.DATA_TAG);
+        String path_0 = (String) res_2.get(RequestResult.DATA_TAG);
         insertFxrwrz(StringUtils.getUUID(), gdbhDto.getBsm(), gdbhDto.getXmmc(), "耕地保护分析报告生成结束。。。", "info");
 
         updateGdbg(gdbhDto.getBsm(), 2, null, new Date(), path_0);

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

@@ -3,6 +3,7 @@ package com.onemap.file.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.onemap.common.core.constant.ServiceConstants;
 import com.onemap.common.core.utils.StringUtils;
 import com.onemap.common.core.web.domain.AjaxResult;
 import com.onemap.common.core.web.domain.RequestResult;
@@ -81,7 +82,7 @@ public class SpaceFileRecordServiceImpl implements ISpaceFileRecordService {
             //分组查询
             GeomGroupSummaryVo geomGroupSummaryVo = new GeomGroupSummaryVo();
             geomGroupSummaryVo.setSiweiArea(true);
-            geomGroupSummaryVo.setSrid(4525);
+            geomGroupSummaryVo.setSrid(ServiceConstants.SERVER_OUT_AREA_SRID);
             geomGroupSummaryVo.setIsGeography(false);
             geomGroupSummaryVo.setTableName(tTable.getTableName());
             RequestResult rawTableSumData = analyseService.getGeomGroupSummary(geomGroupSummaryVo);
@@ -111,7 +112,7 @@ public class SpaceFileRecordServiceImpl implements ISpaceFileRecordService {
             RawTableVo rawTableVo = new RawTableVo();
             rawTableVo.setRawTableName(tTable.getTableName());
             rawTableVo.setColumns(columns);
-            rawTableVo.setSrid(4525);
+            rawTableVo.setSrid(ServiceConstants.SERVER_OUT_AREA_SRID);
             rawTableVo.setIsGeography(false);
             rawTableVo.setSiweiArea(true);
             RequestResult rawTableData = analyseService.rawTable(rawTableVo);