From cb9fbcd27a288d0c61d85fa13ff5fc8eb1f4deab Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 16:44:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/sys/ReportController.java | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 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 b44c6f4..f51c527 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;
@@ -54,16 +53,16 @@
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);
+ return fail(ex, null);
}
}
@@ -79,7 +78,7 @@
return success(entity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -100,7 +99,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -116,7 +115,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -136,7 +135,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -158,7 +157,7 @@
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -180,28 +179,5 @@
@GetMapping(value = "/download")
public void download(String guid, HttpServletResponse res) {
uploadAttachService.download(guid, res);
- }
-
- @SysLog()
- @ApiOperation(value = "涓嬭浇鎶ュ憡")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "guid", value = "闄勪欢Guid", dataType = "String", paramType = "body")
- })
- @GetMapping(value = "/downloadReport")
- public void downloadReport(Integer id, 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;
- }
-
- reportService.createReport(re, res);
- } catch (Exception ex) {
- log.error(ex.getMessage(), ex);
- }
}
}
--
Gitblit v1.9.3