From 9bce48a9f30f7d80c43f43f46d40df20fcb00e15 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 03 二月 2023 09:39:59 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/FmeService.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/lf/server/service/data/FmeService.java b/src/main/java/com/lf/server/service/data/FmeService.java
index da6f0ef..f549523 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -2,7 +2,6 @@
 
 import com.lf.server.entity.ctrl.FmeReqEntity;
 import com.lf.server.entity.ctrl.NameValueEntity;
-import com.lf.server.entity.data.MetaEntity;
 import com.lf.server.entity.data.MetaFileEntity;
 import com.lf.server.helper.RestHelper;
 import com.lf.server.helper.StringHelper;
@@ -120,9 +119,9 @@
         List<NameValueEntity> list = getKeyValues("鎷撴墤妫�鏌�");
         list.add(new NameValueEntity("XMMC", fme.xmmc));
         list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
-        list.add(new NameValueEntity("S_MCDRC", fme.polyTolerance));
-        list.add(new NameValueEntity("S_XCDRC", fme.lineTolerance));
-        list.add(new NameValueEntity("S_DCDRC", fme.pointTolerance));
+        list.add(new NameValueEntity("S_MCDRC", fme.tolerance));
+        list.add(new NameValueEntity("S_XCDRC", fme.tolerance));
+        list.add(new NameValueEntity("S_DCDRC", fme.tolerance));
         list.add(new NameValueEntity("OFFSET_GCD", fme.gcdOffset));
         list.add(new NameValueEntity("OFFSET_KZD", fme.kzdOffset));
         list.add(new NameValueEntity("Range_OFFSET", fme.rangeOffset));
@@ -221,16 +220,15 @@
     }
 
     /**
-     * 13.琛ㄦ牸鍏ュ簱
+     * 13.琛ㄦ牸鍏ュ簱锛歋_RKBG銆乨irid銆乸arentid锛屽涓互鑻辨枃閫楀彿闅斿紑
      */
     public String excelLoader(MetaFileEntity meta, HttpServletRequest req) {
         String url = getUrl("datax/task/run/琛ㄦ牸鍏ュ簱", req);
 
-        // S_RKBG锛氫负鍏ュ簱琛ㄦ牸鐨勫畬鏁磋矾寰勶紝澶氫釜浠ヨ嫳鏂囬�楀彿闅斿紑
         List<NameValueEntity> list = getKeyValues("琛ㄦ牸鍏ュ簱");
         list.add(new NameValueEntity("S_RKBG", meta.getPath()));
-        list.add(new NameValueEntity("COORDSYS", meta.getCs()));
-        list.add(new NameValueEntity("dirid", meta.getDirid()));
+        list.add(new NameValueEntity("COORDSYS", meta.getEpsgCode()));
+        list.add(new NameValueEntity("dirid", meta.getName()));
         list.add(new NameValueEntity("depid", meta.getDepid()));
         list.add(new NameValueEntity("verid", meta.getVerid()));
         list.add(new NameValueEntity("createuser", meta.getCreateUser()));

--
Gitblit v1.9.3