From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/show/ExportController.java | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 15 deletions(-)
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 25a8365..77e0046 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -1,13 +1,17 @@
package com.lf.server.controller.show;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
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.data.DictEntity;
+import com.lf.server.entity.data.DownloadEntity;
import com.lf.server.entity.show.ExportEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
+import com.lf.server.helper.WebHelper;
+import com.lf.server.service.data.DownloadService;
import com.lf.server.service.show.ExportService;
+import com.lf.server.service.sys.DownlogService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -17,6 +21,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -28,31 +33,45 @@
@RequestMapping("/export")
public class ExportController extends BaseController {
@Autowired
+ TokenService tokenService;
+
+ @Autowired
ExportService exportService;
@Autowired
- TokenService tokenService;
+ DownlogService downlogService;
+
+ @Autowired
+ DownloadService downloadService;
@SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "鍒嗛〉鏌ヨ涓嬭浇鏂囦欢")
@ApiImplicitParams({
- @ApiImplicitParam(name = "ns", value = "琛ㄧ┖闂�", dataType = "String", paramType = "query", example = "bd"),
- @ApiImplicitParam(name = "tab", value = "琛ㄥ悕", dataType = "String", paramType = "query", example = "dlg_25w_hyda"),
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPage")
- public ResponseMsg<List<DictEntity>> selectByPage(String ns, String tab, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<DownloadEntity>> selectPageCountForDownload(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- //
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
- return success(null);
+ int count = downloadService.selectCountForUser(ue.getId(), "2", name);
+ if (count == 0) {
+ return success(0, null);
+ }
+ List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), "2", name, pageSize, pageSize * (pageIndex - 1));
+
+ return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -65,10 +84,8 @@
@PostMapping(value = "/insertMap", produces = "application/json; charset=UTF-8")
public ResponseMsg<String> insertMap(@RequestBody ExportEntity entity, HttpServletRequest req) {
try {
- if (entity == null ||
- StringHelper.isEmpty(entity.getLayers()) ||
- StringHelper.isEmpty(entity.getToken()) ||
- (entity.getXmin() == 0 && entity.getYmin() == 0 && entity.getXmax() == 0 && entity.getYmax() == 0)) {
+ boolean flag = entity.getXmin() == 0 && entity.getYmin() == 0 && entity.getXmax() == 0 && entity.getYmax() == 0;
+ if (StringHelper.isEmpty(entity.getLayers()) || StringHelper.isEmpty(entity.getToken()) || flag) {
return fail("鍙傛暟涓嶅畬鏁�");
}
@@ -84,7 +101,36 @@
return success("鍑哄浘鎴愬姛", str);
} catch (Exception ex) {
- return fail(ex.getMessage());
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "涓嬭浇鍑哄浘")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "guid", value = "鏂囦欢GUID", dataType = "String", paramType = "query")
+ })
+ @RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
+ public void downloadFile(String guid, HttpServletRequest req, HttpServletResponse res) {
+ try {
+ if (StringHelper.isEmpty(guid)) {
+ WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "鎵句笉鍒版枃浠禝D", res);
+ return;
+ }
+
+ DownloadEntity de = downloadService.selectByGuid(guid);
+ if (null == de) {
+ WebHelper.writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
+ return;
+ }
+
+ UserEntity ue = tokenService.getCurrentUser(req);
+ downlogService.updateInfos(ue, de, req);
+
+ String filePath = downloadService.getDownloadFilePath(de);
+ WebHelper.download(filePath, de.getName(), res);
+ } catch (Exception ex) {
+ WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
}
}
}
--
Gitblit v1.9.3