From 71b6b716361c52af290493d365a328fc1a3467e2 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 11:15:06 +0800
Subject: [PATCH] 1.统计接口 2.健康码
---
src/main/java/org/springblade/modules/catalog/controller/catalogController.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/catalog/controller/catalogController.java b/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
index 6243e4b..03ab3be 100644
--- a/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
+++ b/src/main/java/org/springblade/modules/catalog/controller/catalogController.java
@@ -35,10 +35,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.regex.Pattern;
/**
@@ -164,23 +162,23 @@
Map<String, Object> maps = new HashMap<String, Object>();
Map<String, Object> mapse = new HashMap<String, Object>();
mapa.put("value",list1.get(0).get("counta"));
- mapa.put("backgroundColor","#FF0000");
+ mapa.put("backgroundColor","#F56C6C");
mapa.put("prefixText","警情总数");
mapa.put("suffixText","条");
mape.put("value",list1.get(1).get("counta"));
- mape.put("backgroundColor","#000000");
+ mape.put("backgroundColor","#67C23A");
mape.put("prefixText","设备总数");
mape.put("suffixText","个");
maps.put("value",list1.get(2).get("counta"));
- maps.put("backgroundColor","#6CDEFF");
+ maps.put("backgroundColor","#409EFF");
maps.put("prefixText","用户总数");
maps.put("suffixText","个");
mapse.put("value",list1.get(3).get("counta"));
- mapse.put("backgroundColor","#FF9900");
- mapse.put("prefixText","出警队伍总数");
- mapse.put("suffixText","队");
+ mapse.put("backgroundColor","#E6A23C");
+ mapse.put("prefixText","处警队伍总数");
+ mapse.put("suffixText","人");
lists.add(mapa);
lists.add(mape);
lists.add(maps);
@@ -227,8 +225,20 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials","true");
- List<Map<String, Object>> list = catalogService.selectWar();
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+ String endTime = df.format(new Date());// new Date()为获取当前系统时间
+ String beginTime = getPastDate(7);
+ List<Map<String, Object>> list = catalogService.selectWar(beginTime,endTime);
return R.data(list);
}
+ public static String getPastDate(int past) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) - past);
+ Date today = calendar.getTime();
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String result = format.format(today);
+ return result;
+ }
+
}
--
Gitblit v1.9.3