From ed0fb1e88b2851234052b503c2390750044645dd Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 12 十月 2023 09:28:50 +0800
Subject: [PATCH] mq测试
---
ard-work/src/main/java/com/ruoyi/statistical/controller/StatisticalController.java | 102 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 30 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 7d9a463..4708e92 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
@@ -3,6 +3,7 @@
import com.ruoyi.statistical.param.ESParam;
import com.ruoyi.statistical.service.StatisticalService;
import com.ruoyi.statistical.vo.NumVo;
+import com.ruoyi.statistical.vo.TenVo;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -10,7 +11,9 @@
import javax.annotation.Resource;
import java.time.LocalDate;
+import java.util.ArrayList;
import java.util.Calendar;
+import java.util.List;
import java.util.Map;
/**
@@ -75,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)){
//鐢靛瓙鍥存爮
@@ -95,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));
@@ -140,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");
}
@@ -177,19 +177,52 @@
@ApiOperation("鎶ヨ鏁伴噺")
@GetMapping("alarm/num")
public Results num(){
- NumVo numVo = new NumVo();
- numVo.setStealelec(statisticalService.stealelecNum());
- numVo.setCamera(statisticalService.cameraNum());
- numVo.setMove(statisticalService.moveNum());
- numVo.setFire(statisticalService.fireNum());
- numVo.setExternal(statisticalService.externalNum());
- numVo.setAccess(statisticalService.accessNum());
- numVo.setApponekey(statisticalService.apponekeyNum());
- numVo.setPump(statisticalService.pumpNum());
- numVo.setWall(statisticalService.wallNum());
- numVo.setDigitization(statisticalService.digitizationNum());
- numVo.setTube(statisticalService.tubeNum());
- return Results.succeed(numVo);
+ List<TenVo> tenVo = new ArrayList<>();
+ TenVo stealelec = new TenVo();
+ stealelec.setName("鐩楃數鎶ヨ");
+ stealelec.setValue(statisticalService.stealelecNum());
+ tenVo.add(stealelec);
+ TenVo camera = new TenVo();
+ camera.setName("閫氱敤鍏夌數");
+ camera.setValue(statisticalService.cameraNum());
+ tenVo.add(camera);
+ TenVo move = new TenVo();
+ move.setName("闆疯揪绉诲姩");
+ move.setValue(statisticalService.moveNum());
+ tenVo.add(move);
+ TenVo fire = new TenVo();
+ fire.setName("闆疯揪闃茬伀");
+ fire.setValue(statisticalService.fireNum());
+ tenVo.add(fire);
+ TenVo external = new TenVo();
+ external.setName("澶栬仈鎶ヨ");
+ external.setValue(statisticalService.externalNum());
+ tenVo.add(external);
+ TenVo access = new TenVo();
+ access.setName("闂ㄧ鎶ヨ");
+ access.setValue(statisticalService.accessNum());
+ tenVo.add(access);
+ TenVo apponekey = new TenVo();
+ apponekey.setName("绉诲姩缁堢");
+ apponekey.setValue(statisticalService.apponekeyNum());
+ tenVo.add(apponekey);
+ TenVo pump = new TenVo();
+ pump.setName("闆疯揪鍋滄満");
+ pump.setValue(statisticalService.pumpNum());
+ tenVo.add(pump);
+ TenVo wall = new TenVo();
+ wall.setName("鐢靛瓙鍥存爮");
+ wall.setValue(statisticalService.wallNum());
+ tenVo.add(wall);
+ TenVo digitization = new TenVo();
+ digitization.setName("棰勮鎶ヨ");
+ digitization.setValue(statisticalService.digitizationNum());
+ tenVo.add(digitization);
+ TenVo tube = new TenVo();
+ tube.setName("绠＄嚎娉勯湶");
+ tube.setValue(statisticalService.tubeNum());
+ tenVo.add(tube);
+ return Results.succeed(tenVo);
}
/**
@@ -201,4 +234,13 @@
return Results.succeed(statisticalService.ten());
}
+ /**
+ * 鎶芥补鏈鸿繍琛岀姸鎬�
+ */
+ @ApiOperation("鎶芥补鏈鸿繍琛岀姸鎬�")
+ @GetMapping("alarm/pump")
+ public Results pump(){
+ return Results.succeed(statisticalService.pump());
+ }
+
}
--
Gitblit v1.9.3