|
@@ -23,7 +23,11 @@ import org.springframework.http.HttpStatus;
|
|
|
import org.springframework.http.ResponseEntity;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
+import java.text.ParseException;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
|
+import java.util.GregorianCalendar;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -118,5 +122,44 @@ public class TAlarmRecordController {
|
|
|
IPage<TAlarmRecord> iPage = tAlarmRecordService.page(page, query);
|
|
|
return R.ok(iPage);
|
|
|
}
|
|
|
+
|
|
|
+ @ApiOperation(value = "查询今天是否有报警")
|
|
|
+ @GetMapping("/isAlarm")
|
|
|
+ public ResponseModel<?> isAlarm(Long adminId, String todayDate){
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ Date date = null;
|
|
|
+ try {
|
|
|
+ date = sdf.parse(todayDate);
|
|
|
+ } catch (ParseException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ Calendar calendar = new GregorianCalendar();
|
|
|
+ Calendar calendarEnd = new GregorianCalendar();
|
|
|
+ calendar.setTime(date);
|
|
|
+ calendarEnd.setTime(date);
|
|
|
+
|
|
|
+ calendar.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
+ calendar.set(Calendar.MINUTE, 0);
|
|
|
+ calendar.set(Calendar.SECOND, 0);
|
|
|
+ calendar.set(Calendar.MILLISECOND, 0);
|
|
|
+
|
|
|
+ calendarEnd.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
+ calendarEnd.set(Calendar.MINUTE, 59);
|
|
|
+ calendarEnd.set(Calendar.SECOND, 59);
|
|
|
+ calendarEnd.set(Calendar.MILLISECOND, 999);
|
|
|
+ Date dateStart = calendar.getTime();
|
|
|
+ Date dateEnd = calendarEnd.getTime();
|
|
|
+ LambdaQueryWrapper<TAlarmRecord> tAlarmRecord = new LambdaQueryWrapper<>();
|
|
|
+ tAlarmRecord.eq(TAlarmRecord::getAdminId, adminId);
|
|
|
+ tAlarmRecord.eq(TAlarmRecord::getIsEliminate, 0);
|
|
|
+ tAlarmRecord.gt(TAlarmRecord::getOccurrenceTime, dateStart);
|
|
|
+ tAlarmRecord.le(TAlarmRecord::getOccurrenceTime, dateEnd);
|
|
|
+ List<TAlarmRecord> list = tAlarmRecordService.list(tAlarmRecord);
|
|
|
+ if (list.size() > 0) {
|
|
|
+ return R.ok(list);
|
|
|
+ }
|
|
|
+ return R.ok();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|