From d80ca95c3c0cf4b1a14f335feb13cdf30820839c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 28 Jan 2021 14:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
index 367b41f..8cca2a2 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/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.*;
/**
* 控制器
@@ -226,8 +224,24 @@
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();
- return R.data(list);
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+ List<Map<String, Object>> listc = new ArrayList<>();
+ String[] str={"内部","周边","挟持","救护","旁路","火警","紧急","出入","防拆"};
+ Map<String, Object> map = new HashMap<String, Object>();
+ String endTime = df.format(new Date());// new Date()为获取当前系统时间
+ String beginTime = getPastDate(7);
+ List<Map<String, Object>> list = catalogService.selectWar(beginTime,endTime);
+ map.put("lists",list);
+ map.put("type",str);
+ listc.add(map);
+ return R.data(listc);
}
-
+ 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