From 71726a1cb05790d6841595ef7daef5173f2cddfa Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:43:11 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/data/FmeService.java |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 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 1302924..2a60708 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -2,6 +2,7 @@
 
 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.entity.data.PublishEntity;
 import com.lf.server.helper.RestHelper;
@@ -9,6 +10,7 @@
 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;
@@ -256,32 +258,26 @@
     /**
      * 15.鏈嶅姟娉ㄥ唽
      */
-    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);
 
-        List<NameValueEntity> list = new ArrayList<>();
-        list.add(new NameValueEntity("tags", new String[]{name}));
-        list.add(new NameValueEntity("name", name));
-        list.add(new NameValueEntity("address", serverUri));
-        list.add(new NameValueEntity("detailUrl", serverUri));
-        list.add(new NameValueEntity("type", type));
-        list.add(new NameValueEntity("description", name));
-        list.add(new NameValueEntity("isrequest", true));
+        RegisterEntity entity = new RegisterEntity(name, serverUri, type);
 
-        return RestHelper.postForRest(url, list);
+        String resid= RestHelper.postForRest(url, entity);
+        entity.setSerialnum(resid);
+
+        return entity;
     }
 
     /**
      * 16.鏈嶅姟鐢宠
      */
-    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);
     }
 
     /**

--
Gitblit v1.9.3