From 64d3e9657fb45b6415b19e23f483d46a82efe939 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 06 三月 2023 13:56:42 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/FmeService.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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..dad628a 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,17 +220,16 @@
}
/**
- * 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("depid", meta.getDepid()));
+ list.add(new NameValueEntity("COORDSYS", meta.getEpsgCode()));
+ list.add(new NameValueEntity("dirid", meta.getName()));
+ list.add(new NameValueEntity("depid", meta.getDepcode()));
list.add(new NameValueEntity("verid", meta.getVerid()));
list.add(new NameValueEntity("createuser", meta.getCreateUser()));
list.add(new NameValueEntity("parentid", meta.getEventid()));
@@ -240,6 +238,21 @@
}
/**
+ * 14.CRDS骞冲彴浜や粯
+ */
+ public String crdsPackaging(String dirCode, String major, String isCut, HttpServletRequest req) {
+ // datax/task/run/CRDS骞冲彴浜や粯_娴嬭瘯
+ String url = getUrl("datax/task/run/CRDS骞冲彴浜や粯_code娴嬭瘯", req);
+
+ List<NameValueEntity> list = getKeyValues("CRDS骞冲彴浜や粯");
+ list.add(new NameValueEntity("S_FFXMMC", dirCode));
+ list.add(new NameValueEntity("MBZY", major));
+ list.add(new NameValueEntity("P_WBFW", isCut));
+
+ return RestHelper.postForRest(url, list);
+ }
+
+ /**
* 鑾峰彇Url
*/
public String getUrl(String subUrl, HttpServletRequest req) {
--
Gitblit v1.9.3