南昌市物联网技防平台-后台
zengh
2021-02-24 d9409e54563b29cf6fcf4876e652dd6d6d5d1a36
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -88,6 +88,29 @@
   }
   /**
    * 查询所有
    * @return
    */
   @GetMapping("/listAll")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入alarm")
   public R<List> listAll() {
      List pages = alarmService.listAll();
      return R.data(pages);
   }
   /**
    * 获取最后一个记录
    */
   @GetMapping("/getLimit")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入alarm")
   public R<List<AlarmVO>> getLimit(AlarmVO alarm, Query query) {
      List<AlarmVO> pages = alarmService.getLimit();
      return R.data(pages);
   }
   /**
    * 新增
    */
   @PostMapping("/save")
@@ -152,11 +175,11 @@
    * @return
    */
   @PostMapping("/selectList")
   public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String jtype, String addvcd, String waringType, String beginTime, String endTime, HttpServletResponse response) {
   public R selectList(@ApiParam(value = "主键集合", required = true) @RequestParam String jtype, String district, String waringType, String beginTime, String endTime, 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");
      return R.data(alarmService.selectList(jtype,addvcd,waringType,beginTime,endTime));
      return R.data(alarmService.selectList(jtype,district,waringType,beginTime,endTime));
   }
   /**