nnnjjj123
2021-01-28 71b6b716361c52af290493d365a328fc1a3467e2
src/main/java/org/springblade/modules/alarm/controller/AlarmController.java
@@ -312,6 +312,8 @@
      String time = df.format(new Date());// new Date()为获取当前系统时间
      String pastDate = getPastDate(7);
      List<AlarmVO> alarmVOS = alarmService.selectListSe(pastDate, time);
      for (int i=0;i<alarmVOS.size();i++){
      }
      return R.data(alarmVOS);
   }
@@ -320,11 +322,11 @@
    * 修改警情类型
    */
   @PostMapping("/updateJtype")
   public R updateJtype(String id,HttpServletResponse response) {
   public R updateJtype(String id,String czTime,String bz,String jjTime,HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials","true");
      alarmService.updateJtype(id);
      alarmService.updateJtype(id,czTime,bz,jjTime);
      return R.success("修改成功");
   }