警情

nnnjjj123

2021-01-29 f525a1e8a15491e82b8cb30e031bb081ffa2817c

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java

@@ -119,6 +119,16 @@
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入alarm")
   public R submit(@Valid @RequestBody Alarm alarm) {

      if (alarm.getCzTime() != null && alarm.getCzTime().equals("")){
         alarm.setCzTime(null);
      }
      if (alarm.getJjTime() != null && alarm.getJjTime().equals("")){
         alarm.setJjTime(null);
      }
      if (alarm.getAlarmTime() != null && alarm.getAlarmTime().equals("")){
         alarm.setAlarmTime(null);
      }
      return R.status(alarmService.saveOrUpdate(alarm));
   }

@@ -142,11 +152,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));
   }

   /**