From bf9f5d506d34cbbcc68f77cdf71e30a6cf3cd7d4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 09 八月 2023 13:50:07 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/FmeService.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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 c1f510d..3d380bc 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -4,13 +4,11 @@
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.entity.data.PublishEntity;
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 org.springframework.web.client.RestTemplate;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@@ -223,7 +221,36 @@
}
/**
- * 13.琛ㄦ牸鍏ュ簱锛歋_RKBG銆乨irid銆乸arentid锛屽涓互鑻辨枃閫楀彿闅斿紑
+ * 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);
@@ -241,7 +268,7 @@
}
/**
- * 14.CRDS骞冲彴浜や粯
+ * b.CRDS骞冲彴浜や粯
*/
public String crdsPackaging(String dirCode, String major, String isCut, HttpServletRequest req) {
// datax/task/run/CRDS骞冲彴浜や粯_娴嬭瘯
@@ -256,31 +283,32 @@
}
/**
- * 15.鏈嶅姟娉ㄥ唽
+ * c.鏈嶅姟娉ㄥ唽
*/
- public String serverRegister(String name, String serverUri, String type, HttpServletRequest req) {
+ 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);
- return RestHelper.postForRest(url, entity);
+ String resid = RestHelper.postForRest(url, entity);
+ entity.setSerialnum(resid);
+
+ return entity;
}
/**
- * 16.鏈嶅姟鐢宠
+ * d.鏈嶅姟鐢宠
*/
- public String serverApply(String id, Integer pubid, HttpServletRequest req) {
+ public void serverApply(String id, Integer pubid, HttpServletRequest req) {
String url = getUrl("resource/res/request", req) + "&resourceid=" + id;
- List<NameValueEntity> list = new ArrayList<>();
- list.add(new NameValueEntity("reason", "娉ㄥ唽"));
- list.add(new NameValueEntity("serialnum", pubid.toString()));
+ RegisterEntity entity = new RegisterEntity(pubid);
- return RestHelper.postForRest(url, list);
+ RestHelper.postForRest(url, entity);
}
/**
- * 17.鍒犻櫎璧勬簮
+ * e.鍒犻櫎璧勬簮
*/
public void deleteRes(String id, HttpServletRequest req) {
String url = getUrl("resource/res/hashid", req) + "&hashid=" + id;
--
Gitblit v1.9.3