From 65b7935caa01d5bc3e80066eab9576d329a5867d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 08 一月 2023 14:16:07 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/FmeService.java | 49 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 43 insertions(+), 6 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 fe7a280..46027d5 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -21,24 +21,61 @@
private String fmeUrl;
/**
+ * 鑾峰彇浠诲姟鐘舵��
+ */
+ public Object getTaskStatus(String id, HttpServletRequest req) {
+ String url = getUrl("datax/task/get", req) + "&id=" + id;
+
+ return RestHelper.getForRest(url, Object.class);
+ }
+
+ /**
+ * 涓嬭浇璐ㄦ閿欒缁撴灉
+ */
+ public String getDownloadUrl(String id, HttpServletRequest req) {
+ return getUrl("datax/task/downloadResult", req) + "&id=" + id;
+ }
+
+ /**
* 1.OSGB妫�鏌ワ細.osgb + *鍊炬枩鎽勫奖*.xls/.xlsx
*/
- public void checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
+ public String checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A8鎴愭灉璐ㄦ_OSGB妫�鏌�", req);
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+ list.add(new NameValueEntity("DMYX_FBL", fme.imgResolution));
+
+ return RestHelper.postForRest(url, list);
}
/**
* 2.琛ㄦ牸鏁版嵁妫�鏌ワ細.xls/.xlsx锛堟帓闄ゅ厓鏁版嵁锛�
*/
- public void checkXls(FmeReqEntity fme, HttpServletRequest req) {
+ public String checkXls(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A3鎴愭灉璐ㄦ_琛ㄦ牸鏁版嵁妫�鏌�", 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);
}
/**
* 3.鐐逛簯妫�鏌ワ細.laz + *婵�鍏夌偣浜�*.xls/.xlsx
*/
- public void checkLaz(FmeReqEntity fme, HttpServletRequest req) {
+ public String checkLaz(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/A9鎴愭灉璐ㄦ_鐐逛簯妫�鏌�", req);
+ List<NameValueEntity> list = getKeyValues(fme.name);
+ list.add(new NameValueEntity("XMMC", fme.xmmc));
+ list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
+ list.add(new NameValueEntity("LAZ_MD", fme.lazDensity));
+
+ return RestHelper.postForRest(url, list);
}
/**
@@ -198,9 +235,9 @@
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"));
- list.add(new NameValueEntity("S_ZJXZ", "$(OrgUserStorage)\\璐ㄦ閰嶇疆鏂囦欢\\璐ㄦ缁嗗垯鎬�.xlsx"));
- list.add(new NameValueEntity("S_BZPZB", "$(OrgUserStorage)\\璐ㄦ閰嶇疆鏂囦欢\\璐ㄦ閰嶇疆琛ㄦ��.xlsx"));
+ list.add(new NameValueEntity("IID_JL", "$(ZJPZWJ)\\IID璁板綍琛�.xlsx"));
+ list.add(new NameValueEntity("S_ZJXZ", "$(ZJPZWJ)\\璐ㄦ缁嗗垯鎬�.xlsx"));
+ list.add(new NameValueEntity("S_BZPZB", "$(ZJPZWJ)\\璐ㄦ閰嶇疆琛ㄦ��.xlsx"));
return list;
}
--
Gitblit v1.9.3