From 3d4e14a8ee14658591fc9ea38ce8c9a789149fe4 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 01 三月 2024 10:45:48 +0800
Subject: [PATCH] 解决空指针异常
---
src/main/java/com/lf/server/controller/data/DataCountController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 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 2de4bb1..6f0bd88 100644
--- a/src/main/java/com/lf/server/controller/data/DataCountController.java
+++ b/src/main/java/com/lf/server/controller/data/DataCountController.java
@@ -63,7 +63,7 @@
return success(count, rs);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -76,7 +76,20 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎸夋枃浠剁被鍨嬬粺璁�")
+ @GetMapping(value = "/countSizesByType")
+ public ResponseMsg<Object> countSizesByType() {
+ try {
+ List<CountEntity> list = reportService.countSizesByType();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@@ -89,7 +102,7 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -102,14 +115,40 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎸夐」鐩粺璁℃暟鎹�")
+ @GetMapping(value = "/countSizesByPrj")
+ public ResponseMsg<Object> countSizesByPrj() {
+ try {
+ List<CountEntity> list = reportService.countSizesByPrj();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
+ }
+ }
+
+ @SysLog()
+ @ApiOperation(value = "鎸夐」鐩粺璁￠捇瀛旀暟鎹�")
+ @GetMapping(value = "/countExplorationPoints")
+ public ResponseMsg<Object> countExplorationPoints() {
+ try {
+ List<CountEntity> list = reportService.countExplorationPoints();
+
+ return success(list);
+ } catch (Exception ex) {
+ return fail(ex, null);
}
}
@SysLog()
@ApiOperation(value = "涓嬭浇鎶ュ憡")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "7")
+ @ApiImplicitParam(name = "id", value = "鎶ュ憡ID", dataType = "Integer", paramType = "query", example = "18")
})
@GetMapping(value = "/downloadReport")
public void downloadReport(Integer id, HttpServletRequest req, HttpServletResponse res) {
--
Gitblit v1.9.3