From 619dde49c0a813d78059872665395839cc69f5ff Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 20 二月 2023 18:58:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/DataCountController.java | 71 +++++++++++++++++++++++++++++++----
src/main/java/com/lf/server/controller/sys/ReportController.java | 17 +++++++-
2 files changed, 78 insertions(+), 10 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
index 87af627..82c632b 100644
--- a/src/main/java/com/lf/server/controller/data/DataCountController.java
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -3,6 +3,7 @@
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.ctrl.CountEntity;
import com.lf.server.entity.sys.ReportEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
@@ -15,10 +16,10 @@
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;
/**
* 鏁版嵁缁熻
@@ -37,16 +38,70 @@
@Autowired
UploadAttachService uploadAttachService;
- private final static String TAB_NAME = "lf.sys_report";
+ @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 = "/selectByPageAndCount")
+ public ResponseMsg<List<ReportEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+ try {
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+
+ int count = reportService.selectCount(name);
+ if (count == 0) {
+ return success(0, null);
+ }
+
+ List<ReportEntity> rs = reportService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+
+ return success(count, rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
@SysLog()
- @ApiOperation(value = "涓婁紶鏂囦欢")
- @ResponseBody
- @PostMapping(value = "/upload")
- public ResponseMsg<String> upload(@RequestParam("file") MultipartFile file, HttpServletRequest req) {
- UserEntity ue = tokenService.getCurrentUser(req);
+ @ApiOperation(value = "鏌ヨ鏁版嵁閲忕粺璁�")
+ @GetMapping(value = "/selectCountSizes")
+ public ResponseMsg<Object> selectCountSizes() {
+ try {
+ List<CountEntity> list = reportService.countSizes();
- return uploadAttachService.upload(ue, TAB_NAME, file, this);
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鏈嶅姟璋冪敤閲忕粺璁�")
+ @GetMapping(value = "/selectCountServices")
+ public ResponseMsg<Object> selectCountServices() {
+ try {
+ List<CountEntity> list = reportService.countServices();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鏌ヨ鐢ㄦ埛娴侀噺缁熻")
+ @GetMapping(value = "/selectCountOperates")
+ public ResponseMsg<Object> selectCountOperates() {
+ try {
+ List<CountEntity> list = reportService.countOperates();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
}
@SysLog()
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 2b0bf94..98ee9e3 100644
--- a/src/main/java/com/lf/server/controller/sys/ReportController.java
+++ b/src/main/java/com/lf/server/controller/sys/ReportController.java
@@ -5,7 +5,6 @@
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;
@@ -18,7 +17,6 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -34,6 +32,11 @@
@Autowired
TokenService tokenService;
+
+ @Autowired
+ UploadAttachService uploadAttachService;
+
+ private final static String TAB_NAME = "lf.sys_report";
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@@ -156,4 +159,14 @@
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);
+ }
}
--
Gitblit v1.9.3