From 19e5e9ebb4c01f4560711fe7f649b52b4749a6f6 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 四月 2023 16:48:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 86 +++++++++++++++++++++++++++++++++++--------
1 files changed, 70 insertions(+), 16 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 c4bc149..7fd9de0 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,8 @@
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;
import com.lf.server.service.data.FmeService;
@@ -49,12 +51,12 @@
return fmeService.getTaskStatus(id, req);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "涓嬭浇璐ㄦ閿欒缁撴灉")
+ @ApiOperation(value = "涓嬭浇璐ㄦ缁撴灉")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "浠诲姟ID", dataType = "String", paramType = "query", example = "29db09ee-2aae-4c62-bec0-0b5c5d8084e4")
})
@@ -63,7 +65,10 @@
try {
if (!StringHelper.isEmpty(id)) {
String url = fmeService.getDownloadUrl(id, req);
- res.sendRedirect(url);
+
+ HttpHelper httpHelper = new HttpHelper();
+ // res.sendRedirect(url)
+ httpHelper.service(req, res, url, null);
}
} catch (Exception ex) {
log.error(ex.getMessage(), ex);
@@ -105,7 +110,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -179,7 +184,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -201,7 +206,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -223,7 +228,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -246,7 +251,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -268,7 +273,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -296,7 +301,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -318,7 +323,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -339,7 +344,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -363,7 +368,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -385,7 +390,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -407,7 +412,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -432,7 +437,56 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}*/
+
+ @SysLog()
+ @ApiOperation(value = "鏈嶅姟娉ㄥ唽")
+ @GetMapping(value = "/selectServerRegister")
+ public ResponseMsg<Object> selectServerRegister(HttpServletRequest req) {
+ try {
+ 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("澶辫触");
+ }
+
+ return success(rs);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏈嶅姟鐢宠")
+ @ApiImplicitParams({
+ @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 = "/selectServerApply")
+ public ResponseMsg<Object> selectServerApply(String id, Integer pubid, HttpServletRequest req) {
+ try {
+ fmeService.serverApply(id, pubid, req);
+
+ return success("OK");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鍒犻櫎璧勬簮")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鏈嶅姟ID", dataType = "String", paramType = "query", example = "6f4b6783-4b98-4d46-a0d9-43cdb5f339dc")
+ })
+ @GetMapping(value = "/selectDeleteRes")
+ public ResponseMsg<Object> selectDeleteRes(String id, HttpServletRequest req) {
+ try {
+ fmeService.deleteRes(id, req);
+
+ return success("OK");
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
}
--
Gitblit v1.9.3