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/MetaController.java |   72 ++++++++++++++++-------------------
 1 files changed, 33 insertions(+), 39 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 2658252..570b643 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -38,10 +38,10 @@
 import java.util.List;
 
 /**
- * 婧愭暟鎹�
+ * 鍏冩暟鎹�
  * @author WWW
  */
-@Api(tags = "鏁版嵁绠$悊\\婧愭暟鎹鐞�")
+@Api(tags = "鏁版嵁绠$悊\\淇℃伅绠$悊")
 @RestController
 @RequestMapping("/meta")
 public class MetaController extends BaseController {
@@ -89,7 +89,7 @@
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -120,7 +120,7 @@
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -143,7 +143,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -159,14 +159,14 @@
 
             return success(entity);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
     @SysLog()
     @ApiOperation(value = "鏌ヨ琛ㄤ腑鏁版嵁")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "婧愭暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
+            @ApiImplicitParam(name = "id", value = "鍏冩暟鎹甀D", dataType = "Integer", paramType = "query", example = "115"),
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1"),
             @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10")
     })
@@ -175,12 +175,12 @@
         // noinspection AlibabaRemoveCommentedCode
         try {
             if (null == id || id < 0) {
-                return fail("婧愭暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
+                return fail("鍏冩暟鎹甀D涓嶈兘涓虹┖鎴栧皬浜�0", null);
             }
 
             MetaEntity meta = metaService.selectById(id);
             if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
-                return fail("鎵句笉鍒版簮鏁版嵁淇℃伅", null);
+                return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
             }
 
             String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
@@ -193,12 +193,12 @@
             wrapper.eq("parentid", meta.getEventid());
 
             Page<Object> page = new Page<>(pageIndex, pageSize);
-            page.addOrder(OrderItem.asc("gid"));
+            page.addOrder(OrderItem.desc("gid"));
             IPage<Object> paged = baseMapper.selectPage(page, wrapper);
 
             return success(paged.getTotal(), paged.getRecords());
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -219,7 +219,7 @@
 
             return success(list);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -241,7 +241,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -264,23 +264,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鍒犻櫎涓�鏉�")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
-    })
-    @GetMapping(value = "/delete")
-    public ResponseMsg<Integer> delete(int id) {
-        try {
-            int count = metaService.delete(id);
-
-            return success(count);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -300,7 +284,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -322,7 +306,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -346,7 +330,7 @@
 
             return success(count);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
+            return fail(ex, -1);
         }
     }
 
@@ -369,15 +353,15 @@
                 return fail("鐢ㄦ埛鏈櫥褰�", null);
             }
 
-            int count = downloadService.selectCountForUser(ue.getCreateUser(), 3, name);
+            int count = downloadService.selectCountForUser(ue.getId(), 3, name);
             if (count == 0) {
                 return success(0, null);
             }
-            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getCreateUser(), 3, name, pageSize, pageSize * (pageIndex - 1));
+            List<DownloadEntity> rs = downloadService.selectByPageForUser(ue.getId(), 3, name, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -406,7 +390,7 @@
 
             List<MetaEntity> list = metaService.selectMetaFiles(reqEntity.getIds());
             if (null == list || list.isEmpty()) {
-                return fail("娌℃湁鎵惧埌婧愭暟鎹�");
+                return fail("娌℃湁鎵惧埌鍏冩暟鎹�");
             }
 
             UserEntity ue = tokenService.getCurrentUser(req);
@@ -414,7 +398,7 @@
 
             return success(guid);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex, null);
         }
     }
 
@@ -452,7 +436,7 @@
 
             return success(file.exists());
         } catch (Exception ex) {
-            return fail(ex.getMessage(), false);
+            return fail(ex, false);
         }
     }
 
@@ -496,4 +480,14 @@
             WebHelper.writeInfo(HttpStatus.ERROR, ex.getMessage(), res);
         }
     }
+
+    @SysLog()
+    @ApiOperation(value = "鏌ョ湅鏂囦欢")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+    })
+    @GetMapping(value = "/downloadForView")
+    public void downloadForView(String guid, HttpServletResponse res) {
+        metaService.downloadForView(guid, true, res);
+    }
 }

--
Gitblit v1.9.3