diff --git a/gather-app/src/main/java/com/ruoyi/database/controller/MetaAlarmInfoController.java b/gather-app/src/main/java/com/ruoyi/database/controller/MetaAlarmInfoController.java index 41198bf..95ada51 100644 --- a/gather-app/src/main/java/com/ruoyi/database/controller/MetaAlarmInfoController.java +++ b/gather-app/src/main/java/com/ruoyi/database/controller/MetaAlarmInfoController.java @@ -1,25 +1,23 @@ package com.ruoyi.database.controller; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.StringKit; -import com.ruoyi.database.domain.MetaAlarmInfo; -import com.ruoyi.database.domain.vo.alarmInfoVO; -import com.ruoyi.database.service.MetaAlarmInfoService; +import com.github.pagehelper.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.PageUtils; +import com.ruoyi.common.utils.StringKit; import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.database.domain.MetaAlarmInfo; +import com.ruoyi.database.domain.vo.alarmInfoVO; +import com.ruoyi.database.service.MetaAlarmInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -29,7 +27,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; import java.util.*; /** @@ -50,6 +47,7 @@ public class MetaAlarmInfoController extends BaseController { @ApiOperation("查询接警信息表") public TableDataInfo list(MetaAlarmInfo metaAlarmInfo) { startPage(); + // 获取当前日期 QueryWrapper wrapper = new QueryWrapper<>(metaAlarmInfo); wrapper.and(w -> w.like("alarm_response_unit", "射阳县公安局临海派出所").or() .like("alarm_response_unit", "射阳县公安局临海派出所第一警务区").or() @@ -65,14 +63,16 @@ public class MetaAlarmInfoController extends BaseController { .like("alarm_response_unit", "射阳县公安局扁担港边防派出所第一警务区").or() .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所").or() .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第一警务区").or() - .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第三警务区")); + .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第三警务区") + .or() + .like("alarm_response_unit", "射阳县公安局交通警察大队临海中队")); List list = metaAlarmInfoService.list(wrapper); return getDataTable(list); } @GetMapping("/search") @ApiOperation("根据条件查询接警信息") - public AjaxResult searchAlarmInfo(alarmInfoVO alarmInfoVO) throws Exception { + public AjaxResult searchAlarmInfo(alarmInfoVO alarmInfoVO) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -104,13 +104,13 @@ public class MetaAlarmInfoController extends BaseController { @GetMapping("/time") @ApiOperation("根据时间查询接警信息") - public TableDataInfo timeList(MetaAlarmInfo metaAlarmInfo) throws Exception { - + public TableDataInfo timeList(MetaAlarmInfo metaAlarmInfo, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, + @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) throws Exception { +// startPage(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); Date parse = simpleDateFormat.parse(metaAlarmInfo.getInformantTime()); Calendar calendar = Calendar.getInstance(); calendar.setTime(parse); - calendar.add(Calendar.DAY_OF_MONTH, 1); SimpleDateFormat outputSdf = new SimpleDateFormat("yyyyMMddHHmmss"); @@ -118,10 +118,41 @@ public class MetaAlarmInfoController extends BaseController { String format = outputSdf.format(parse); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.between("alarm_response_time", format, resultDateString); + queryWrapper.between("informant_time", format, resultDateString); + queryWrapper.and(wrapper -> wrapper.like("alarm_response_unit", "射阳县公安局临海派出所") + .or() + .like("alarm_response_unit", "射阳县公安局临海派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临海派出所第二警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临海派出所第三警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临海派出所第四警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所社区警务责任区") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所第二警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局扁担港边防派出所") + .or() + .like("alarm_response_unit", "射阳县公安局扁担港边防派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所") + .or() + .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第三警务区") + .or() + .like("alarm_response_unit", "射阳县公安局交通警察大队临海中队")); int count = metaAlarmInfoService.count(queryWrapper); - PageUtils.startPage(); + PageUtils.startPage(pageNum, pageSize); List list = metaAlarmInfoService.list(queryWrapper); List alarmInfos = new ArrayList<>(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -132,11 +163,14 @@ public class MetaAlarmInfoController extends BaseController { metaAlarmInfo1.setInformantTime(format1); alarmInfos.add(metaAlarmInfo1); } + // 设置总数和返回数据 TableDataInfo dataTable = getDataTable(alarmInfos); dataTable.setTotal(count); return dataTable; } - +// dataTable.setTotal(((Page) list).getTotal()); +// return dataTable; +// dataTable.setTotal(list.size()); // Set total manually without pagination @GetMapping("/policeName") @ApiOperation("查询") @@ -176,7 +210,38 @@ public class MetaAlarmInfoController extends BaseController { String endDateString = endDateTime.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); QueryWrapper vehicleQueryWrapper = new QueryWrapper<>(metaAlarmInfo); - vehicleQueryWrapper.between("alarm_response_time", startDateString, endDateString); + vehicleQueryWrapper.between("informant_time", startDateString, endDateString) + .and(wrapper -> wrapper.like("alarm_response_unit", "射阳县公安局临海派出所") + .or() + .like("alarm_response_unit", "射阳县公安局临海派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临海派出所第二警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临海派出所第三警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临海派出所第四警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所社区警务责任区") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所第二警务区") + .or() + .like("alarm_response_unit", "射阳县公安局临港派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局扁担港边防派出所") + .or() + .like("alarm_response_unit", "射阳县公安局扁担港边防派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所") + .or() + .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第一警务区") + .or() + .like("alarm_response_unit", "射阳县公安局黄沙河边防派出所第三警务区") + .or() + .like("alarm_response_unit", "射阳县公安局交通警察大队临海中队")); // 查询当前日期的记录数据总数 long vehicleCount = metaAlarmInfoService.count(vehicleQueryWrapper); @@ -209,7 +274,7 @@ public class MetaAlarmInfoController extends BaseController { LocalDateTime startOfHour = startOfCurrentHour.minusHours(currentHour - i); LocalDateTime endOfHour = startOfHour.plusHours(1); QueryWrapper queryWrapper = new QueryWrapper<>(metaAlarmInfo); - queryWrapper.between("alarm_response_time", startOfHour.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")), + queryWrapper.between("informant_time", startOfHour.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")), endOfHour.format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); //查询当前小时的记录数据总数 long HourCount = metaAlarmInfoService.count(queryWrapper); diff --git a/gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java b/gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java index 4c727e7..0c5c0a5 100644 --- a/gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java +++ b/gather-app/src/main/java/com/ruoyi/database/mapper/MetaAlarmInfoMapper.java @@ -87,6 +87,7 @@ public interface MetaAlarmInfoMapper extends BaseMapper { " alarm_response_unit LIKE '射阳县公安局扁担港边防派出所第一警务区' OR " + " alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所' OR " + " alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所第一警务区' OR " + + "alarm_response_unit LIKE '射阳县公安局交通警察大队临海中队' OR " + " alarm_response_unit LIKE '射阳县公安局黄沙河边防派出所第三警务区' " + ") " + " AND DATE(informant_time) = CURDATE() " +