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 | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 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 09168d6..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),year);
+ 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));
@@ -143,23 +144,19 @@
}
//杩斿洖姣忔湀澶╂暟
- public int getDaysInMonth(int month, int year) {
+ public int getDaysInMonth(int month) {
+ Calendar calendar = Calendar.getInstance();
switch (month) {
- case Calendar.JANUARY:
- case Calendar.MARCH:
- case Calendar.MAY:
- case Calendar.JULY:
- case Calendar.AUGUST:
- case Calendar.OCTOBER:
- case Calendar.DECEMBER:
+ case 1: case 3: case 5: case 7: case 8: case 10: case 12:
return 31;
- case Calendar.APRIL:
- case Calendar.JUNE:
- case Calendar.SEPTEMBER:
- case Calendar.NOVEMBER:
+ case 4: case 6: case 9: case 11:
return 30;
- case Calendar.FEBRUARY:
- return ((year % 4 == 0 && year % 100 != 0) || (year % 400 == 0)) ? 29 : 28;
+ case 2:
+ if (calendar.get(Calendar.YEAR) % 4 == 0 && (calendar.get(Calendar.YEAR) % 100 != 0 || calendar.get(Calendar.YEAR) % 400 == 0)) {
+ return 29;
+ } else {
+ return 28;
+ }
default:
throw new IllegalArgumentException("Invalid Month");
}
@@ -237,4 +234,22 @@
return Results.succeed(statisticalService.ten());
}
+ /**
+ * 鎶芥补鏈鸿繍琛岀姸鎬�
+ */
+ @ApiOperation("鎶芥补鏈鸿繍琛岀姸鎬�")
+ @GetMapping("alarm/pump")
+ public Results pump(){
+ return Results.succeed(statisticalService.pump());
+ }
+
+ /**
+ * 鏁版嵁澶勭悊
+ */
+ @ApiOperation("鏁版嵁澶勭悊")
+ @GetMapping("data")
+ public void data(String msg){
+ statisticalService.data(msg);
+ }
+
}
--
Gitblit v1.9.3