南昌市物联网技防平台-后台
nnnjjj123
2021-01-28 0ddc1f8a76db258155f5ce36388b98bc75be7d0b
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/catalog/controller/catalogController.java
@@ -225,10 +225,16 @@
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      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);
      return R.data(list);
      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();