From 7bfbdcdab10c58ecf96b45543c0d0df948af4ba5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 12 三月 2024 16:43:18 +0800
Subject: [PATCH] 修改根据类型查询元数据方法
---
src/main/java/com/lf/server/service/data/FmeService.java | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 152 insertions(+), 19 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 139aad6..7fb782d 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -2,13 +2,17 @@
import com.lf.server.entity.ctrl.FmeReqEntity;
import com.lf.server.entity.ctrl.NameValueEntity;
+import com.lf.server.entity.ctrl.RegisterEntity;
+import com.lf.server.entity.data.MetaFileEntity;
import com.lf.server.helper.RestHelper;
+import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -21,12 +25,28 @@
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 String checkOsgb(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A8鎴愭灉璐ㄦ_OSGB妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("OSGB妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
list.add(new NameValueEntity("DMYX_FBL", fme.imgResolution));
@@ -40,7 +60,7 @@
public String checkXls(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A3鎴愭灉璐ㄦ_琛ㄦ牸鏁版嵁妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("琛ㄦ牸鏁版嵁妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -54,7 +74,7 @@
public String checkLaz(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A9鎴愭灉璐ㄦ_鐐逛簯妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鐐逛簯妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
list.add(new NameValueEntity("LAZ_MD", fme.lazDensity));
@@ -68,7 +88,7 @@
public String checkDem(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A6鎴愭灉璐ㄦ_楂樼▼妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("楂樼▼妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
list.add(new NameValueEntity("GCZWC", fme.demTolerance));
@@ -83,7 +103,7 @@
public String checkAttrs(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A5鎴愭灉璐ㄦ_灞炴�ф鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("灞炴�ф鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -97,12 +117,12 @@
public String checkTopology(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A4鎴愭灉璐ㄦ_鎷撴墤妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ 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));
@@ -117,11 +137,11 @@
public String checkDecorate(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A10鎴愭灉璐ㄦ_鍥鹃潰鏁撮グ妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鍥鹃潰鏁撮グ妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
- list.add(new NameValueEntity("S_XLS2", fme.xlsList));
- list.add(new NameValueEntity("S_XLS", "$(OrgUserStorage)\\璐ㄦ閰嶇疆鏂囦欢\\璐ㄦ閰嶇疆琛ㄦ��.xlsx"));
+ list.add(new NameValueEntity("S_XLS", "$(ZJPZWJ)\\璐ㄦ閰嶇疆琛ㄦ��.xlsx"));
+ list.add(new NameValueEntity("S_XLS2", "D:\\Project\\Data\\LF\\temp\\20230107010101\\鏂囦欢娓呭崟.xlsx"));
return RestHelper.postForRest(url, list);
}
@@ -132,7 +152,7 @@
public String checkOrigin(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A11鎴愭灉璐ㄦ_鍘熺偣妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鍘熺偣妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -145,7 +165,7 @@
public String checkDom(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/A7鎴愭灉璐ㄦ_鏍呮牸妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鏍呮牸妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -161,7 +181,7 @@
public String checkMath(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B1鍏ュ簱璐ㄦ_鏁板鍩虹妫�鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鏁板鍩虹妫�鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -175,7 +195,7 @@
public String checkMeta(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B5鍏ュ簱璐ㄦ_鍏冩暟鎹鏌�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鍏冩暟鎹鏌�");
list.add(new NameValueEntity("XMMC", fme.xmmc));
list.add(new NameValueEntity("SJZY", fme.sjzy));
list.add(new NameValueEntity("GCXMYSB", fme.zipPath));
@@ -189,13 +209,126 @@
public String checkMain(FmeReqEntity fme, HttpServletRequest req) {
String url = getUrl("datax/task/run/B0鍏ュ簱璐ㄦ__鎬�", req);
- List<NameValueEntity> list = getKeyValues(fme.name);
+ List<NameValueEntity> list = getKeyValues("鎬昏川妫�");
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);
+ }
+
+ /**
+ * 13.閫昏緫涓�鑷存�ф鏌ワ細.dwg/.xls/.xlsx
+ */
+ public String checkLogical(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/B3鍏ュ簱璐ㄦ_閫昏緫涓�鑷存�ф鏌�", req);
+
+ List<NameValueEntity> list = getKeyValues("閫昏緫涓�鑷存�ф鏌�");
+ 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);
+ }
+
+ /**
+ * 14.鍗曢」鎴愭灉瀹屾暣鎬ф鏌ワ細.*
+ */
+ public String checkSingleIntegrity(FmeReqEntity fme, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/B6鍏ュ簱璐ㄦ_鍗曢」鎴愭灉瀹屾暣鎬ф鏌�", req);
+
+ List<NameValueEntity> list = getKeyValues("鍗曢」鎴愭灉瀹屾暣鎬ф鏌�");
+ 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("SJFL", fme.sjfl));
+
+ return RestHelper.postForRest(url, list);
+ }
+
+ /**
+ * a.琛ㄦ牸鍏ュ簱锛歋_RKBG銆乨irid銆乸arentid锛屽涓互鑻辨枃閫楀彿闅斿紑
+ */
+ public String excelLoader(MetaFileEntity meta, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/琛ㄦ牸鍏ュ簱", req);
+
+ List<NameValueEntity> list = getKeyValues("琛ㄦ牸鍏ュ簱");
+ list.add(new NameValueEntity("S_RKBG", meta.getPath()));
+ 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()));
+
+ return RestHelper.postForRest(url, list);
+ }
+
+ /**
+ * b.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);
+ }
+
+ /**
+ * c.鏈嶅姟娉ㄥ唽
+ */
+ public RegisterEntity serverRegister(String name, String serverUri, String type, HttpServletRequest req) {
+ String url = getUrl("resource/res/item", req);
+
+ RegisterEntity entity = new RegisterEntity(name, serverUri, type);
+
+ String resid = RestHelper.postForRest(url, entity);
+ entity.setSerialnum(resid);
+
+ return entity;
+ }
+
+ /**
+ * d.鏈嶅姟鐢宠
+ */
+ public void serverApply(String id, Integer pubid, HttpServletRequest req) {
+ String url = getUrl("resource/res/request", req) + "&resourceid=" + id;
+
+ RegisterEntity entity = new RegisterEntity(pubid);
+
+ RestHelper.postForRest(url, entity);
+ }
+
+ /**
+ * e.鍒犻櫎璧勬簮
+ */
+ public void deleteRes(String id, HttpServletRequest req) {
+ String url = getUrl("resource/res/hashid", req) + "&hashid=" + id;
+
+ RestHelper.deleteForRest(url);
+ }
+
+ /**
+ * f.璁＄畻闈㈢Н
+ */
+ public String calcArea(String sjfl, String id, String wjlj, HttpServletRequest req) {
+ String url = getUrl("datax/task/run/鏁版嵁鍗犲湴闈㈢Н璁＄畻", req);
+
+ List<NameValueEntity> list = new ArrayList<>();
+ list.add(new NameValueEntity("_name", String.format("%s_%s", "鏁版嵁鍗犲湴闈㈢Н璁＄畻", StringHelper.YMDHMS2_FORMAT.format(new Date()))));
+ list.add(new NameValueEntity("_terminate_on_error", false));
+ list.add(new NameValueEntity("_priority", 100));
+ list.add(new NameValueEntity("SJFL", sjfl));
+ list.add(new NameValueEntity("ID", id));
+ list.add(new NameValueEntity("WJLJ", wjlj));
return RestHelper.postForRest(url, list);
}
@@ -212,9 +345,9 @@
/**
* 鑾峰彇鍚嶇О鍊煎闆嗗悎
*/
- public List<NameValueEntity> getKeyValues(String guid) {
+ public List<NameValueEntity> getKeyValues(String name) {
List<NameValueEntity> list = new ArrayList<>();
- list.add(new NameValueEntity("_name", guid));
+ list.add(new NameValueEntity("_name", String.format("%s_%s", name, StringHelper.YMDHMS2_FORMAT.format(new Date()))));
list.add(new NameValueEntity("_priority", 100));
list.add(new NameValueEntity("_terminate_on_error", false));
list.add(new NameValueEntity("IID", ""));
--
Gitblit v1.9.3