From 95da38d29cc4a88d1ee8b852f54b37fc5052a0ee Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 20 二月 2023 18:45:19 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/data/DataCountController.java |   86 ++++++++++++++++++++++++++++
 src/main/java/com/lf/server/controller/sys/ReportController.java     |   50 ----------------
 src/main/java/com/lf/server/controller/data/WmtsController.java      |    2 
 3 files changed, 86 insertions(+), 52 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/data/DataCountController.java b/src/main/java/com/lf/server/controller/data/DataCountController.java
new file mode 100644
index 0000000..87af627
--- /dev/null
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -0,0 +1,86 @@
+package com.lf.server.controller.data;
+
+import com.lf.server.annotation.SysLog;
+import com.lf.server.controller.all.BaseQueryController;
+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.helper.StringHelper;
+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;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+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;
+
+/**
+ * 鏁版嵁缁熻
+ * @author WWW
+ */
+@Api(tags = "鏁版嵁绠$悊\\鏁版嵁缁熻")
+@RestController
+@RequestMapping("/dataCount")
+public class DataCountController extends BaseQueryController {
+    @Autowired
+    ReportService reportService;
+
+    @Autowired
+    TokenService tokenService;
+
+    @Autowired
+    UploadAttachService uploadAttachService;
+
+    private final static String TAB_NAME = "lf.sys_report";
+
+    @SysLog()
+    @ApiOperation(value = "涓婁紶鏂囦欢")
+    @ResponseBody
+    @PostMapping(value = "/upload")
+    public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
+        UserEntity ue = tokenService.getCurrentUser(req);
+
+        return uploadAttachService.upload(ue, TAB_NAME, file, this);
+    }
+
+    @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);
+    }
+
+    @SysLog()
+    @ApiOperation(value = "涓嬭浇鎶ュ憡")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "7")
+    })
+    @GetMapping(value = "/downloadReport")
+    public void downloadReport(Integer id, HttpServletRequest req, HttpServletResponse res) {
+        try {
+            if (null == id || id < 1) {
+                return;
+            }
+
+            ReportEntity re = reportService.selectById(id);
+            if (null == re || StringHelper.isEmpty(re.getGuid()) || StringHelper.isEmpty(re.getType()) || StringHelper.isEmpty(re.getCode())) {
+                return;
+            }
+
+            UserEntity ue = tokenService.getCurrentUser(req);
+
+            reportService.createReport(ue, re, res);
+        } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
+        }
+    }
+}
diff --git a/src/main/java/com/lf/server/controller/data/WmtsController.java b/src/main/java/com/lf/server/controller/data/WmtsController.java
index a91bfc5..a60a642 100644
--- a/src/main/java/com/lf/server/controller/data/WmtsController.java
+++ b/src/main/java/com/lf/server/controller/data/WmtsController.java
@@ -21,8 +21,6 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
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 1ac223a..2b0bf94 100644
--- a/src/main/java/com/lf/server/controller/sys/ReportController.java
+++ b/src/main/java/com/lf/server/controller/sys/ReportController.java
@@ -35,11 +35,6 @@
     @Autowired
     TokenService tokenService;
 
-    @Autowired
-    UploadAttachService uploadAttachService;
-
-    private final static String TAB_NAME = "lf.sys_report";
-
     @SysLog()
     @ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
     @ApiImplicitParams({
@@ -159,51 +154,6 @@
             return success(count);
         } catch (Exception ex) {
             return fail(ex.getMessage(), -1);
-        }
-    }
-
-    @SysLog()
-    @ApiOperation(value = "涓婁紶鏂囦欢")
-    @ResponseBody
-    @PostMapping(value = "/upload")
-    public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
-        UserEntity ue = tokenService.getCurrentUser(req);
-
-        return uploadAttachService.upload(ue, TAB_NAME, file, this);
-    }
-
-    @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);
-    }
-
-    @SysLog()
-    @ApiOperation(value = "涓嬭浇鎶ュ憡")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "7")
-    })
-    @GetMapping(value = "/downloadReport")
-    public void downloadReport(Integer id, HttpServletRequest req, HttpServletResponse res) {
-        try {
-            if (null == id || id < 1) {
-                return;
-            }
-
-            ReportEntity re = reportService.selectById(id);
-            if (null == re || StringHelper.isEmpty(re.getGuid()) || StringHelper.isEmpty(re.getType()) || StringHelper.isEmpty(re.getCode())) {
-                return;
-            }
-
-            UserEntity ue = tokenService.getCurrentUser(req);
-
-            reportService.createReport(ue, re, res);
-        } catch (Exception ex) {
-            log.error(ex.getMessage(), ex);
         }
     }
 }

--
Gitblit v1.9.3