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 ++++++++++------------
1 files changed, 10 insertions(+), 12 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);
--
Gitblit v1.9.3