From b6dcef04330829868060b0cf2d0c479e2f73994f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 11:10:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/FmeService.java | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 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 69f9df0..1562e88 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -1,5 +1,6 @@
package com.lf.server.service.data;
+import com.lf.server.entity.ctrl.FmeReqEntity;
import com.lf.server.entity.ctrl.NameValueEntity;
import com.lf.server.helper.RestHelper;
import com.lf.server.helper.WebHelper;
@@ -22,76 +23,85 @@
/**
* 1.OSGB妫�鏌ワ細.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx
*/
- public void checkOsgb(String path) {
+ public void checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 2.琛ㄦ牸鏁版嵁妫�鏌ワ細.xls/.xlsx锛堟帓闄ゅ厓鏁版嵁锛�
*/
- public void checkXls() {
+ public void checkXls(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 3.鐐逛簯妫�鏌ワ細.laz + *婵�鍏夌偣浜�*.xls/.xlsx
*/
- public void checkLaz() {
+ public void checkLaz(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 4.楂樼▼妫�鏌ワ細.tif/.prj/.tfw/.tif.ovr + *鍦板舰鍥�*.dwg
*/
- public void checkDem() {
+ public void checkDem(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 5.灞炴�ф鏌ワ細*dlg*.gdb + *鍦板舰鍥�*.dwg
*/
- public void checkAttrs() {
+ public void checkAttrs(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 6.鎷撴墤妫�鏌ワ細*鍦板舰鍥�*.dwg
*/
- public void checkTopology() {
+ public void checkTopology(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 7.鍥鹃潰鏁撮グ妫�鏌ワ細.dwg
*/
- public void checkDecorate() {
+ public void checkDecorate(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 8.鍘熺偣妫�鏌ワ細*鍓栭潰鍥�*.dwg
*/
- public void checkOrigin() {
+ public void checkOrigin(FmeReqEntity fme, HttpServletRequest req) {
}
/**
* 9.鏍呮牸妫�鏌ワ細.tif/.prj/.tfw/.tif.ovr + .xls/.xlsx
*/
- public void checkDom() {
+ public String checkDom(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A7鎴愭灉璐ㄦ_鏍呮牸妫�鏌�", req);
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("SJZY", fme.sjzy));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+ list.add(new NameValueEntity("S_CoordinateSystem", fme.coordinateSystem));
+ list.add(new NameValueEntity("DMYX_FBL", fme.imgResolution));
+
+ return RestHelper.postForRest(url, list);
}
/**
* 10.鏁板鍩虹妫�鏌ワ細.shp, .gdb, *鍏冩暟鎹�*.xls/.xlsx
*/
- public String checkMath(String taskGuid, String xmmc, String sjzy, String filePath, HttpServletRequest req) {
+ public String checkMath(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B1鍏ュ簱璐ㄦ_鏁板鍩虹妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(taskGuid);
- list.add(new NameValueEntity("XMMC", xmmc));
- list.add(new NameValueEntity("SJZY", sjzy));
- list.add(new NameValueEntity("GCXMYSB", filePath));
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("SJZY", fme.sjzy));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
return RestHelper.postForRest(url, list);
}
@@ -99,8 +109,32 @@
/**
* 11.鍏冩暟鎹鏌ワ細*鍏冩暟鎹�*.xls/.xlsx
*/
- public void checkMeta() {
+ public String checkMeta(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/B5鍏ュ簱璐ㄦ_鍏冩暟鎹鏌�", req);
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("SJZY", fme.sjzy));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+
+ return RestHelper.postForRest(url, list);
+ }
+
+ /**
+ * 12.鎬昏川妫�锛�.zip/.7z + .xls/.xlsx
+ */
+ public String checkMain(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/B0鍏ュ簱璐ㄦ__鎬�", req);
+
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("SJZY", fme.sjzy));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+ list.add(new NameValueEntity("S_WBSBG", fme.wbsPath));
+ list.add(new NameValueEntity("S_DZDK", fme.isDiZai));
+ list.add(new NameValueEntity("DZ_ZLLX", fme.diZaiType));
+
+ return RestHelper.postForRest(url, list);
}
/**
@@ -114,14 +148,12 @@
/**
* 鑾峰彇鍚嶇О鍊煎闆嗗悎
- *
- * @return 鍚嶇О鍊煎闆嗗悎
*/
- public List<NameValueEntity> getKeyValues(String taskGuid) {
+ public List<NameValueEntity> getKeyValues(String guid) {
List<NameValueEntity> list = new ArrayList<>();
- list.add(new NameValueEntity("_name", taskGuid));
+ list.add(new NameValueEntity("_name", guid));
list.add(new NameValueEntity("_priority", 100));
- list.add(new NameValueEntity("_terminate_on_error", true));
+ list.add(new NameValueEntity("_terminate_on_error", false));
list.add(new NameValueEntity("IID", ""));
list.add(new NameValueEntity("FANOUT_DIR", "$(OrgResultStorage)"));
list.add(new NameValueEntity("IID_JL", "$(OrgUserStorage)\\璐ㄦ閰嶇疆鏂囦欢\\IID璁板綍琛�.xlsx"));
--
Gitblit v1.9.3