From b5bb69ff301470233bf193959f1a1c4553aaf86b Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 23 一月 2024 09:20:51 +0800
Subject: [PATCH] app指挥端查看指挥端位置及车辆位置审批加入nickName提交
---
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java b/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
index 2ab4bf3..796bfae 100644
--- a/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
+++ b/ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java
@@ -78,7 +78,7 @@
//绉诲姩缁堢
return Results.succeed(statisticalService.apponekeyYear(esParam));
}else if("1008".equals(type)){
- //绉诲姩缁堢
+ //闆疯揪鍋滄満
return Results.succeed(statisticalService.pumpYear(esParam));
}else if("1010".equals(type)){
//鐢靛瓙鍥存爮
@@ -98,13 +98,14 @@
*/
@ApiOperation("鎶ヨ鏁伴噺鍒嗘瀽鏈�")
@GetMapping("alarm/month")
- public Results alarmMonth(String month,String type){
+ public Results alarmMonth(Integer month,String type){
LocalDate today = LocalDate.now();
int year = today.getYear();
- int day = getDaysInMonth(Integer.valueOf(month));
+ int day = getDaysInMonth(month);
ESParam esParam = new ESParam();
esParam.setStart(year+"-"+month+"-01");
esParam.setEnd(year+"-"+month+"-"+day);
+ esParam.setMonth(month);
if("1001".equals(type)){
//鐩楃數鎶ヨ
return Results.succeed(statisticalService.stealelecMonth(esParam));
@@ -242,4 +243,13 @@
return Results.succeed(statisticalService.pump());
}
+ /**
+ * 鏁版嵁澶勭悊
+ */
+ @ApiOperation("鏁版嵁澶勭悊")
+ @GetMapping("data")
+ public void data(String msg){
+ statisticalService.data(msg);
+ }
+
}
--
Gitblit v1.9.3