From 60a470582d8ddf5d45441d6f73bdac235ecfc40f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 21 二月 2023 09:41:50 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/sys/ReportController.java |  116 +++++++++++----------------------------------------------
 1 files changed, 23 insertions(+), 93 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/sys/ReportController.java b/src/main/java/com/lf/server/controller/sys/ReportController.java
index 1be13e0..52cefed 100644
--- a/src/main/java/com/lf/server/controller/sys/ReportController.java
+++ b/src/main/java/com/lf/server/controller/sys/ReportController.java
@@ -5,6 +5,7 @@
 import com.lf.server.entity.all.ResponseMsg;
 import com.lf.server.entity.sys.ReportEntity;
 import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.service.all.UploadAttachService;
 import com.lf.server.service.sys.ReportService;
 import com.lf.server.service.sys.TokenService;
 import io.swagger.annotations.Api;
@@ -13,15 +14,17 @@
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
  * 鎶ュ憡妯℃澘
  * @author WWW
  */
-@Api(tags = "杩愮淮绠$悊\\鎶ュ憡妯℃澘")
+@Api(tags = "杩愮淮绠$悊\\妯℃澘绠$悊")
 @RestController
 @RequestMapping("/report")
 public class ReportController extends BaseController {
@@ -31,43 +34,10 @@
     @Autowired
     TokenService tokenService;
 
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ璁板綍鏁�")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", required = false, example = "")
-    })
-    @GetMapping({"/selectCount"})
-    public ResponseMsg<Integer> selectCount(String name) {
-        try {
-            int count = reportService.selectCount(name);
+    @Autowired
+    UploadAttachService uploadAttachService;
 
-            return success(count);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
-        }
-    }
-
-    @SysLog()
-    @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<ReportEntity>> selectByPage(String name, Integer pageSize, Integer pageIndex) {
-        try {
-            if (pageSize < 1 || pageIndex < 1) {
-                return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
-            }
-
-            List<ReportEntity> rs = reportService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
-
-            return success(rs);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
+    private final static String TAB_NAME = "lf.sys_report";
 
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@@ -83,27 +53,14 @@
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            int count = reportService.selectCount(name);
+            int count = reportService.selectCount(name, null);
             if (count == 0) {
                 return success(0, null);
             }
 
-            List<ReportEntity> rs = reportService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+            List<ReportEntity> rs = reportService.selectByPage(name, null, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鏌ヨ鎵�鏈�")
-    @GetMapping(value = "/selectAll")
-    public ResponseMsg<List<ReportEntity>> selectAll() {
-        try {
-            List<ReportEntity> list = reportService.selectAll();
-
-            return success(list);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }
@@ -139,29 +96,6 @@
             }
 
             int count = reportService.insert(entity);
-
-            return success(count);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "鎻掑叆澶氭潯")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ReportEntity", paramType = "body")
-    })
-    @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> inserts(@RequestBody List<ReportEntity> list, HttpServletRequest req) {
-        try {
-            UserEntity ue = tokenService.getCurrentUser(req);
-            if (ue != null) {
-                for (ReportEntity entity : list) {
-                    entity.setCreateUser(ue.getId());
-                }
-            }
-
-            int count = reportService.inserts(list);
 
             return success(count);
         } catch (Exception ex) {
@@ -228,26 +162,22 @@
     }
 
     @SysLog()
-    @ApiOperation(value = "鏇存柊澶氭潯")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "ReportEntity", paramType = "body")
-    })
+    @ApiOperation(value = "涓婁紶鏂囦欢")
     @ResponseBody
-    @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> updates(@RequestBody List<ReportEntity> list, HttpServletRequest req) {
-        try {
-            UserEntity ue = tokenService.getCurrentUser(req);
-            if (ue != null) {
-                for (ReportEntity entity : list) {
-                    entity.setUpdateUser(ue.getId());
-                }
-            }
+    @PostMapping(value = "/upload")
+    public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
+        UserEntity ue = tokenService.getCurrentUser(req);
 
-            int count = reportService.updates(list);
+        return uploadAttachService.upload(ue, TAB_NAME, file, this);
+    }
 
-            return success(count);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), -1);
-        }
+    @SysLog()
+    @ApiOperation(value = "涓嬭浇鏂囦欢")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
+    })
+    @GetMapping(value = "/download")
+    public void download(String guid, HttpServletResponse res) {
+        uploadAttachService.download(guid, res);
     }
 }

--
Gitblit v1.9.3