1、资讯模糊匹配修改

zengh

2022-05-26 4310c19a73f960dfd79c90cfe960cf564b068f72

 src/main/java/org/springblade/modules/alarm/controller/AlarmController.java

@@ -860,4 +860,23 @@
      return R.status(false);
   }

   /**
    * 一周警情统计(主动报警+被动报警类型（体温异常，红码，违禁品）)  2021-3-16 arsn  柱状图展示
    * @param response
    * @return
    */
   @GetMapping("/countAlarm")
   public R countAlarm(HttpServletResponse response,ConditionVo conditionVo) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      //创建类型，时间对象，分别存取类型，时间数据
      List<String> times = new ArrayList<>();
      times = DateUtils.pastDay(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
      Map<String, Object> alarmData = alarmService.selectAlarmData();
      alarmData.put("times",times);
      //返回数据
      return R.data(alarmData);
   }

}