From 3372ad6e59c7da5abf28e65447c7b428e5793326 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 07 一月 2023 09:54:30 +0800
Subject: [PATCH] 1.7
---
src/main/java/com/lf/server/service/data/FmeService.java | 34 +++++++++++++++++++++++++---------
1 files changed, 25 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 69f9df0..d47c870 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;
@@ -85,13 +86,13 @@
/**
* 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);
}
@@ -100,7 +101,24 @@
* 11.鍏冩暟鎹鏌ワ細*鍏冩暟鎹�*.xls/.xlsx
*/
public void checkMeta() {
+
+ }
+ /**
+ * 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,12 +132,10 @@
/**
* 鑾峰彇鍚嶇О鍊煎闆嗗悎
- *
- * @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("IID", ""));
--
Gitblit v1.9.3