From e26af85e049516e6ce2b082bc2bc90bf71643e95 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 24 三月 2023 09:06:30 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/upload/CheckController.java | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 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 66b9850..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,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;
@@ -13,6 +15,9 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -46,7 +51,7 @@
return fmeService.getTaskStatus(id, req);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -60,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);
@@ -69,8 +77,12 @@
@SysLog()
@ApiOperation(value = "鎻愪氦鏁版嵁璐ㄦ")
- @GetMapping(value = "/uploadChecks")
- public ResponseMsg<Object> uploadChecks(FmeReqEntity entity, HttpServletRequest req) {
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "entity", value = "FME璇锋眰瀹炰綋绫�", dataType = "FmeReqEntity", paramType = "body")
+ })
+ @ResponseBody
+ @PostMapping(value = "/uploadChecks")
+ public ResponseMsg<Object> uploadChecks(@RequestBody FmeReqEntity entity, HttpServletRequest req) {
try {
if (StringHelper.isEmpty(entity.names)) {
return fail("浠诲姟鍚嶇О涓嶈兘涓虹┖");
@@ -98,14 +110,20 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
+ /**
+ * 鑾峰彇鏂囦欢璺緞
+ */
private String getFullPath(String filePath) {
return null == filePath ? null : pathHelper.getConfig().getTempPath() + File.separator + filePath;
}
+ /**
+ * 鏄�/鍚︿负Zip鏂囦欢
+ */
private boolean isZipFile(String filePath) {
if (null == filePath || !filePath.toLowerCase().endsWith(StaticData.ZIP)) {
return false;
@@ -116,6 +134,9 @@
return zipFile.exists() && !zipFile.isDirectory();
}
+ /**
+ * 鏄�/鍚︿负Excel鏂囦欢
+ */
private boolean isXlsFile(String filePath) {
if (null == filePath) {
return false;
@@ -163,7 +184,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -185,7 +206,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -207,7 +228,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -230,7 +251,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -252,7 +273,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -280,7 +301,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -302,7 +323,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -323,7 +344,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -347,7 +368,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -369,7 +390,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -391,7 +412,7 @@
return success(rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -416,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