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 |   45 +++++++++++++++++++++------------------------
 1 files changed, 21 insertions(+), 24 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 abd0c49..77e0046 100644
--- a/src/main/java/com/lf/server/controller/show/ExportController.java
+++ b/src/main/java/com/lf/server/controller/show/ExportController.java
@@ -11,6 +11,7 @@
 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;
@@ -38,17 +39,20 @@
     ExportService exportService;
 
     @Autowired
+    DownlogService downlogService;
+
+    @Autowired
     DownloadService downloadService;
 
     @SysLog()
-    @ApiOperation(value = "鍒嗛〉鏌ヨ")
+    @ApiOperation(value = "鍒嗛〉鏌ヨ涓嬭浇鏂囦欢")
     @ApiImplicitParams({
             @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<DownloadEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
+    public ResponseMsg<List<DownloadEntity>> selectPageCountForDownload(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -59,15 +63,15 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            int count = downloadService.selectCountForExport(ue.getCreateUser(), name);
+            int count = downloadService.selectCountForUser(ue.getId(), "2", name);
             if (count == 0) {
                 return success(0, null);
             }
-            List<DownloadEntity> rs = downloadService.selectByPageForExport(ue.getCreateUser(), name, pageSize, pageSize * (pageIndex - 1));
+            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);
         }
     }
 
@@ -81,10 +85,7 @@
     public ResponseMsg<String> insertMap(@RequestBody ExportEntity entity, HttpServletRequest req) {
         try {
             boolean flag = entity.getXmin() == 0 && entity.getYmin() == 0 && entity.getXmax() == 0 && entity.getYmax() == 0;
-            if (entity == null ||
-                    StringHelper.isEmpty(entity.getLayers()) ||
-                    StringHelper.isEmpty(entity.getToken()) ||
-                    flag) {
+            if (StringHelper.isEmpty(entity.getLayers()) || StringHelper.isEmpty(entity.getToken()) || flag) {
                 return fail("鍙傛暟涓嶅畬鏁�");
             }
 
@@ -100,7 +101,7 @@
 
             return success("鍑哄浘鎴愬姛", str);
         } catch (Exception ex) {
-            return fail(ex.getMessage());
+            return fail(ex, null);
         }
     }
 
@@ -112,28 +113,24 @@
     @RequestMapping(value = "/downloadFile", method = RequestMethod.GET)
     public void downloadFile(String guid, HttpServletRequest req, HttpServletResponse res) {
         try {
-            UserEntity ue = tokenService.getCurrentUser(req);
-            if (ue == null) {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, "鐢ㄦ埛鏈櫥褰�"));
+            if (StringHelper.isEmpty(guid)) {
+                WebHelper.writeInfo(HttpStatus.BAD_REQUEST, "鎵句笉鍒版枃浠禝D", res);
+                return;
             }
 
             DownloadEntity de = downloadService.selectByGuid(guid);
-            if (de == null) {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�"));
+            if (null == de) {
+                WebHelper.writeInfo(HttpStatus.NOT_FOUND, "鏂囦欢涓嶅瓨鍦�", res);
+                return;
             }
 
-            de.setDcount(de.getDcount() + 1);
-            de.setDownloadUser(ue.getId());
-            int rows = downloadService.update(de);
+            UserEntity ue = tokenService.getCurrentUser(req);
+            downlogService.updateInfos(ue, de, req);
 
-            String filePath = exportService.getDownloadFilePath(de);
+            String filePath = downloadService.getDownloadFilePath(de);
             WebHelper.download(filePath, de.getName(), res);
         } catch (Exception ex) {
-            try {
-                WebHelper.write2Page(res, WebHelper.getErrJson(HttpStatus.UNAUTHORIZED, ex.getMessage()));
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-            }
+            WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
         }
     }
 }

--
Gitblit v1.9.3