From 455ae79cebf0b6363b515282e08035fd4d7ee5cd Mon Sep 17 00:00:00 2001 From: weitang Date: Mon, 26 May 2025 09:30:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A3=B0=E7=BA=B9=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VoicePatrolLogController.java | 38 ++----------------- .../basedata/mapper/VoicePatrolLogMapper.java | 15 ++++++++ .../service/IVoicePatrolLogService.java | 16 ++++++++ .../impl/VoicePatrolLogServiceImpl.java | 22 +++++++++++ .../mapper/basedata/VoicePatrolLogMapper.xml | 23 +++++++++++ 5 files changed, 79 insertions(+), 35 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/VoicePatrolLogController.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/VoicePatrolLogController.java index d11361f..78a8cb2 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/VoicePatrolLogController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/VoicePatrolLogController.java @@ -54,41 +54,9 @@ public class VoicePatrolLogController { @GetMapping("/getVoicePatrolPage") @ApiOperation("分页查看声纹检测数据") public ResponseResult getVoicePatrolPage(Page> page, String stationId, String patroldeviceId, - String patroldeviceName - , String startDate, String endDate) { - if (StrUtil.isBlank(stationId)) { - return ResponseResult.error("未传变电站信息"); - } - String startFormat = ""; - if (StrUtil.isNotBlank(startDate)) { - Date parseStart = DateUtil.parse(startDate); - //一天的开始 - Date beginOfDay = DateUtil.beginOfDay(parseStart); - startFormat = DateUtil.format(beginOfDay, "yyyy-MM-dd HH:mm:ss"); - } - String endFormat = ""; - if (StrUtil.isNotBlank(startDate)) { - Date parseEnd = DateUtil.parse(endDate); - //一天的结束 - Date endOfDay = DateUtil.endOfDay(parseEnd); - endFormat = DateUtil.format(endOfDay, "yyyy-MM-dd HH:mm:ss"); - } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StrUtil.isNotBlank(stationId)) { - queryWrapper.eq(VoicePatrolLog::getStationId, stationId); - } - if (StrUtil.isNotBlank(patroldeviceId)) { - queryWrapper.eq(VoicePatrolLog::getPatroldeviceId, patroldeviceId); - } - if (StrUtil.isNotBlank(patroldeviceName)) { - queryWrapper.like(VoicePatrolLog::getPatroldeviceName, patroldeviceName); - } - if (StrUtil.isNotBlank(startFormat) && StrUtil.isNotBlank(endFormat)) { - queryWrapper.le(VoicePatrolLog::getDate, endFormat); - queryWrapper.ge(VoicePatrolLog::getDate, startFormat); - } - queryWrapper.orderByDesc(VoicePatrolLog::getDate); - Page> mapPage = voicePatrolLogService.pageMaps(page, queryWrapper); + String patroldeviceName, String startDate, String endDate) { + + Page> mapPage = voicePatrolLogService.getVoicePatrolPage(page, stationId, patroldeviceId, patroldeviceName,startDate,endDate); return ResponseResult.successData(mapPage); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/mapper/VoicePatrolLogMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/mapper/VoicePatrolLogMapper.java index 8083a8d..9ebb27e 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/mapper/VoicePatrolLogMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/mapper/VoicePatrolLogMapper.java @@ -1,8 +1,11 @@ package com.yfd.platform.modules.basedata.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.basedata.domain.VoicePatrolLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.Map; + /** *

* Mapper 接口 @@ -13,4 +16,16 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface VoicePatrolLogMapper extends BaseMapper { + /********************************** + * 用途说明: + * 参数说明 page分页查看声纹检测数据 + * 参数说明 stationId 变电站Id + * 参数说明 patroldeviceId 巡视设备Id + * 参数说明 patroldeviceName 巡视设备名称 + * 参数说明 startDate 开始时间 + * 参数说明 endDate 结束时间 + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page> + ***********************************/ + Page> getVoicePatrolPage(Page> page, String stationId, String patroldeviceId, String patroldeviceName, String startDate, String endDate); + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/IVoicePatrolLogService.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/IVoicePatrolLogService.java index 3d242f4..cd51e07 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/IVoicePatrolLogService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/IVoicePatrolLogService.java @@ -1,8 +1,11 @@ package com.yfd.platform.modules.basedata.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.basedata.domain.VoicePatrolLog; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Map; + /** *

* 服务类 @@ -13,4 +16,17 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IVoicePatrolLogService extends IService { + /********************************** + * 用途说明: + * 参数说明 page分页查看声纹检测数据 + * 参数说明 stationId 变电站Id + * 参数说明 patroldeviceId 巡视设备Id + * 参数说明 patroldeviceName 巡视设备名称 + * 参数说明 startDate 开始时间 + * 参数说明 endDate 结束时间 + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page> + ***********************************/ + Page> getVoicePatrolPage(Page> page, String stationId, String patroldeviceId, + String patroldeviceName, String startDate, String endDate); + } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/VoicePatrolLogServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/VoicePatrolLogServiceImpl.java index 4afa485..3974f79 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/VoicePatrolLogServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/service/impl/VoicePatrolLogServiceImpl.java @@ -1,11 +1,15 @@ package com.yfd.platform.modules.basedata.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.modules.basedata.domain.VoicePatrolLog; import com.yfd.platform.modules.basedata.mapper.VoicePatrolLogMapper; import com.yfd.platform.modules.basedata.service.IVoicePatrolLogService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.Map; + /** *

* 服务实现类 @@ -17,4 +21,22 @@ import org.springframework.stereotype.Service; @Service public class VoicePatrolLogServiceImpl extends ServiceImpl implements IVoicePatrolLogService { + @Resource + private VoicePatrolLogMapper voicePatrolLogMapper; + + /********************************** + * 用途说明: + * 参数说明 page分页查看声纹检测数据 + * 参数说明 stationId 变电站Id + * 参数说明 patroldeviceId 巡视设备Id + * 参数说明 patroldeviceName 巡视设备名称 + * 参数说明 startDate 开始时间 + * 参数说明 endDate 结束时间 + * 返回值说明: com.baomidou.mybatisplus.extension.plugins.pagination.Page> + ***********************************/ + @Override + public Page> getVoicePatrolPage(Page> page,String stationId, String patroldeviceId, + String patroldeviceName, String startDate, String endDate) { + return voicePatrolLogMapper.getVoicePatrolPage(page, stationId, patroldeviceId, patroldeviceName,startDate,endDate); + } } diff --git a/riis-system/src/main/resources/mapper/basedata/VoicePatrolLogMapper.xml b/riis-system/src/main/resources/mapper/basedata/VoicePatrolLogMapper.xml index dd8f1ee..d5dd9da 100644 --- a/riis-system/src/main/resources/mapper/basedata/VoicePatrolLogMapper.xml +++ b/riis-system/src/main/resources/mapper/basedata/VoicePatrolLogMapper.xml @@ -2,4 +2,27 @@ +