From 2b853296db60c2ff7bf6d242e8918d990cbd85be Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 23 三月 2023 16:28:48 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 22 +++++------
src/main/java/com/lf/server/entity/ctrl/RegisterEntity.java | 38 +++++++++++++++++++
src/main/java/com/lf/server/service/data/FmeService.java | 15 ++++---
3 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/upload/CheckController.java b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
index bb1bd8b..1f23338 100644
--- a/src/main/java/com/lf/server/controller/data/upload/CheckController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/CheckController.java
@@ -5,6 +5,7 @@
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.ctrl.FmeReqEntity;
+import com.lf.server.entity.ctrl.RegisterEntity;
import com.lf.server.helper.HttpHelper;
import com.lf.server.helper.PathHelper;
import com.lf.server.helper.StringHelper;
@@ -445,8 +446,8 @@
@GetMapping(value = "/selectServerRegister")
public ResponseMsg<Object> selectServerRegister(HttpServletRequest req) {
try {
- String rs = fmeService.serverRegister("瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116DT02锛�", "http://127.0.0.1/LFData/2d/tiles/01/{z}/{x}/{y}.png", "DOM", req);
- if (StringHelper.isEmpty(rs)) {
+ RegisterEntity rs = fmeService.serverRegister("瑗挎皵涓滆緭鍥涚嚎澶╃劧姘旂閬撳伐绋嬶紙鍚愰瞾鐣�-涓崼锛夛紙00116DT02锛�", "http://127.0.0.1/LFData/2d/tiles/01/{z}/{x}/{y}.png", "DOM", req);
+ if (null == rs || StringHelper.isEmpty(rs.getSerialnum())) {
return fail("澶辫触");
}
@@ -462,15 +463,12 @@
@ApiImplicitParam(name = "id", value = "鏈嶅姟ID", dataType = "String", paramType = "query", example = "195f77eb-19dd-4e34-afc1-fcff8f758f7b"),
@ApiImplicitParam(name = "pubid", value = "鍙戝竷ID", dataType = "Integer", paramType = "query", example = "1"),
})
- @GetMapping(value = "/serverApply")
- public ResponseMsg<Object> serverApply(String id, Integer pubid, HttpServletRequest req) {
+ @GetMapping(value = "/selectServerApply")
+ public ResponseMsg<Object> selectServerApply(String id, Integer pubid, HttpServletRequest req) {
try {
- String rs = fmeService.serverApply(id, pubid, req);
- if (StringHelper.isEmpty(rs)) {
- return fail("澶辫触");
- }
+ fmeService.serverApply(id, pubid, req);
- return success(rs);
+ return success("OK");
} catch (Exception ex) {
return fail(ex, null);
}
@@ -479,10 +477,10 @@
@SysLog()
@ApiOperation(value = "鍒犻櫎璧勬簮")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鏈嶅姟ID", dataType = "String", paramType = "query", example = "195f77eb-19dd-4e34-afc1-fcff8f758f7b")
+ @ApiImplicitParam(name = "id", value = "鏈嶅姟ID", dataType = "String", paramType = "query", example = "6f4b6783-4b98-4d46-a0d9-43cdb5f339dc")
})
- @GetMapping(value = "/deleteRes")
- public ResponseMsg<Object> deleteRes(String id, HttpServletRequest req) {
+ @GetMapping(value = "/selectDeleteRes")
+ public ResponseMsg<Object> selectDeleteRes(String id, HttpServletRequest req) {
try {
fmeService.deleteRes(id, req);
diff --git a/src/main/java/com/lf/server/entity/ctrl/RegisterEntity.java b/src/main/java/com/lf/server/entity/ctrl/RegisterEntity.java
index 403aceb..90145ad 100644
--- a/src/main/java/com/lf/server/entity/ctrl/RegisterEntity.java
+++ b/src/main/java/com/lf/server/entity/ctrl/RegisterEntity.java
@@ -1,5 +1,7 @@
package com.lf.server.entity.ctrl;
+import com.lf.server.helper.StringHelper;
+
import java.util.ArrayList;
import java.util.List;
@@ -21,6 +23,12 @@
this.type = type;
this.description = name;
this.isrequest = true;
+ this.hashid = StringHelper.getGuid();
+ }
+
+ public RegisterEntity(Integer pubid) {
+ this.reason = "娉ㄥ唽";
+ this.serialnum = pubid.toString();
}
private List<String> tags;
@@ -36,6 +44,12 @@
private String description;
private Boolean isrequest;
+
+ private String hashid;
+
+ private String reason;
+
+ private String serialnum;
public List<String> getTags() {
return tags;
@@ -92,4 +106,28 @@
public void setIsrequest(Boolean isrequest) {
this.isrequest = isrequest;
}
+
+ public String getHashid() {
+ return hashid;
+ }
+
+ public void setHashid(String hashid) {
+ this.hashid = hashid;
+ }
+
+ public String getReason() {
+ return reason;
+ }
+
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ public String getSerialnum() {
+ return serialnum;
+ }
+
+ public void setSerialnum(String serialnum) {
+ this.serialnum = serialnum;
+ }
}
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..2a60708 100644
--- a/src/main/java/com/lf/server/service/data/FmeService.java
+++ b/src/main/java/com/lf/server/service/data/FmeService.java
@@ -258,25 +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);
RegisterEntity entity = new RegisterEntity(name, serverUri, type);
- return RestHelper.postForRest(url, entity);
+ 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