From 5feada6313b03dc13b348351807a4e29f8d2efd3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 23 十一月 2022 21:07:29 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/helper/WebHelper.java | 11 +++++
src/main/java/com/lf/server/controller/data/MetaController.java | 38 +++++++-----------
src/main/java/com/lf/server/helper/StringHelper.java | 2
src/main/java/com/lf/server/controller/show/ExportController.java | 20 +++-------
src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java | 45 ++++++++++++++++++++++
5 files changed, 78 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 0725947..d5c238a 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -4,6 +4,7 @@
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.HttpStatus;
import com.lf.server.entity.all.ResponseMsg;
+import com.lf.server.entity.ctrl.DownloadReqEntity;
import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.sys.UserEntity;
@@ -12,10 +13,7 @@
import com.lf.server.service.data.DownloadService;
import com.lf.server.service.data.MetaService;
import com.lf.server.service.sys.TokenService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -267,13 +265,14 @@
@ApiImplicitParam(name = "pwd", value = "瀵嗙爜", dataType = "String", paramType = "body", example = ""),
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "body", example = "1,2")
})
+ @ResponseBody
@PostMapping(value = "/downloadReq")
- public ResponseMsg<Object> downloadReq(@RequestParam String pwd, @RequestParam List<Integer> ids, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<Object> downloadReq(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
try {
- if (StringHelper.isEmpty(pwd)) {
+ if (null == reqEntity || StringHelper.isEmpty(reqEntity.getPwd())) {
return fail("瀵嗙爜涓嶈兘涓虹┖");
}
- if (null == ids || ids.isEmpty()) {
+ if (null == reqEntity.getIds() || reqEntity.getIds().isEmpty()) {
return fail("璇烽�夋嫨瑕佷笅杞界殑鏂囦欢");
}
@@ -288,18 +287,19 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "guid", value = "鏂囦欢GUID", dataType = "String", paramType = "query")
})
+ @ResponseBody
@RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
- public void downloadFile(String guid, HttpServletRequest req, HttpServletResponse res) {
+ public void downloadFile(@RequestBody DownloadReqEntity reqEntity, HttpServletRequest req, HttpServletResponse res) {
try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- writeInfo(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�", res);
+ if (StringHelper.isEmpty(reqEntity.getGuid())) {
+ WebHelper.writeInfo(HttpStatus.UNAUTHORIZED, "鎵句笉鍒版枃浠禝D", res);
return;
}
- DownloadEntity de = downloadService.selectByGuid(guid);
- if (de == null) {
- writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ DownloadEntity de = downloadService.selectByGuid(reqEntity.getGuid());
+ if (null == de) {
+ WebHelper.writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
return;
}
@@ -310,15 +310,7 @@
//String filePath = exportService.getDownloadFilePath(de);
//WebHelper.download(filePath, de.getName(), res);
} catch (Exception ex) {
- writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
- }
- }
-
- private void writeInfo(HttpStatus status, String info, HttpServletResponse res) {
- try {
- WebHelper.write2Page(res, WebHelper.getErrJson(status, info));
- } catch (Exception e) {
- log.error(e.getMessage(), e);
+ WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
}
}
}
diff --git a/src/main/java/com/lf/server/controller/show/ExportController.java b/src/main/java/com/lf/server/controller/show/ExportController.java
index 5bf50b2..f1c4d80 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -112,15 +112,15 @@
@RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
public void downloadFile(String guid, HttpServletRequest req, HttpServletResponse res) {
try {
- UserEntity ue = tokenService.getCurrentUser(req);
- if (ue == null) {
- writeInfo(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�", res);
+ if (StringHelper.isEmpty(guid)) {
+ WebHelper.writeInfo(HttpStatus.UNAUTHORIZED, "鎵句笉鍒版枃浠禝D", res);
return;
}
+ UserEntity ue = tokenService.getCurrentUser(req);
DownloadEntity de = downloadService.selectByGuid(guid);
- if (de == null) {
- writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
+ if (null == de) {
+ WebHelper.writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
return;
}
@@ -131,15 +131,7 @@
String filePath = exportService.getDownloadFilePath(de);
WebHelper.download(filePath, de.getName(), res);
} catch (Exception ex) {
- writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
- }
- }
-
- private void writeInfo(HttpStatus status, String info, HttpServletResponse res) {
- try {
- WebHelper.write2Page(res, WebHelper.getErrJson(status, info));
- } catch (Exception e) {
- log.error(e.getMessage(), e);
+ WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
}
}
}
diff --git a/src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java b/src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java
new file mode 100644
index 0000000..b0630b6
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/ctrl/DownloadReqEntity.java
@@ -0,0 +1,45 @@
+package com.lf.server.entity.ctrl;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 璇锋眰涓嬭浇瀹炰綋绫�
+ * @author WWW
+ */
+public class DownloadReqEntity implements Serializable {
+ private static final long serialVersionUID = -8624235184539814997L;
+
+ private String pwd;
+
+ private String guid;
+
+ private List<Integer> ids;
+
+ public DownloadReqEntity() {
+ }
+
+ public String getPwd() {
+ return pwd;
+ }
+
+ public void setPwd(String pwd) {
+ this.pwd = pwd;
+ }
+
+ public String getGuid() {
+ return guid;
+ }
+
+ public void setGuid(String guid) {
+ this.guid = guid;
+ }
+
+ public List<Integer> getIds() {
+ return ids;
+ }
+
+ public void setIds(List<Integer> ids) {
+ this.ids = ids;
+ }
+}
diff --git a/src/main/java/com/lf/server/helper/StringHelper.java b/src/main/java/com/lf/server/helper/StringHelper.java
index 184cbfc..912e0e9 100644
--- a/src/main/java/com/lf/server/helper/StringHelper.java
+++ b/src/main/java/com/lf/server/helper/StringHelper.java
@@ -110,7 +110,7 @@
* 瀛楃涓�,鏄惁涓虹┖null鍜岀┖鏍�
*/
public static boolean isEmpty(String str) {
- return str == null || "".equals(str.trim());
+ return null == str || "".equals(str.trim());
}
/**
diff --git a/src/main/java/com/lf/server/helper/WebHelper.java b/src/main/java/com/lf/server/helper/WebHelper.java
index 9957740..8fabfc5 100644
--- a/src/main/java/com/lf/server/helper/WebHelper.java
+++ b/src/main/java/com/lf/server/helper/WebHelper.java
@@ -277,6 +277,17 @@
}
/**
+ * 鍐欏搷搴斾俊鎭�
+ */
+ public static void writeInfo(HttpStatus status, String info, HttpServletResponse res) {
+ try {
+ WebHelper.write2Page(res, WebHelper.getErrJson(status, info));
+ } catch (Exception e) {
+ //
+ }
+ }
+
+ /**
* 鑾峰彇闅忔満鏁存暟
*/
public static int getRandomInt(int min, int max) {
--
Gitblit v1.9.3