From d8e90a9bd8f6098fe5739b28fefe5868d8a2b47d Mon Sep 17 00:00:00 2001 From: weitang Date: Thu, 22 May 2025 17:22:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WeatherLogController.java | 36 ------ .../controller/AlarmLogController.java | 16 +-- .../controller/TaskTodoController.java | 105 ++---------------- .../service/impl/DefectDeviceServiceImpl.java | 22 +--- .../mapper/patroltask/AlarmLogMapper.xml | 2 +- .../mapper/patroltask/DefectDeviceMapper.xml | 2 +- .../mapper/patroltask/TaskMapper.xml | 2 +- .../mapper/patroltask/TaskResultMapper.xml | 10 +- .../mapper/patroltask/TaskTodoMapper.xml | 8 +- 9 files changed, 23 insertions(+), 180 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/WeatherLogController.java b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/WeatherLogController.java index 3df65c0..b2aa9dd 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/WeatherLogController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/basedata/controller/WeatherLogController.java @@ -44,40 +44,4 @@ public class WeatherLogController { return ResponseResult.successData(weatherDevice); } - @GetMapping("/getWeatherLogPage") - @ApiOperation("分页查询环境信息") - public ResponseResult getWeatherLogPage(Page> page, String stationId, 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(WeatherLog::getStationId, stationId); - } - if (StrUtil.isNotBlank(patroldeviceName)) { - queryWrapper.like(WeatherLog::getPatroldeviceName, patroldeviceName); - } - if (StrUtil.isNotBlank(startFormat) && StrUtil.isNotBlank(endFormat)) { - queryWrapper.le(WeatherLog::getTime, endFormat); - queryWrapper.ge(WeatherLog::getTime, startFormat); - } - Page> mapPage = weatherLogService.pageMaps(page, queryWrapper); - return ResponseResult.successData(mapPage); - } - } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java index 83053cb..d412d8a 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/AlarmLogController.java @@ -183,22 +183,8 @@ public class AlarmLogController { @ApiOperation("根据设备编号查询告警列表") public ResponseResult getAlarmListPage(Page> page, String patrolDeviceCode, String monitorType, String startDate, String endDate) { - 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"); - } Page> alarmList = alarmLogService.getAlarmListPage(page, patrolDeviceCode, monitorType, - startFormat, endFormat); + startDate, endDate); return ResponseResult.successData(alarmList); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskTodoController.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskTodoController.java index 69e79e7..9bdb619 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskTodoController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/controller/TaskTodoController.java @@ -494,21 +494,8 @@ public class TaskTodoController { public ResponseResult getTaskToDoStatList(String stationCode, String currentDate, String startDate, String endDate, String taskName) { - 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"); - } - List> taskToDoStatList = taskTodoService.getTaskToDoStatList(stationCode, currentDate, startFormat, endFormat, null); + + List> taskToDoStatList = taskTodoService.getTaskToDoStatList(stationCode, currentDate, startDate, endDate, null); Map map = new HashMap<>(); map.put("allCount", taskToDoStatList.size()); @@ -540,28 +527,8 @@ public class TaskTodoController { @ApiOperation("分页查询巡视报告") public ResponseResult getTaskReportList(Page> page, String stationCode, String areaId, String taskName, String type, String startDate, String endDate, String bayId, String patrolType, String mainDeviceId) { - 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"); - } Page> mapPage = taskTodoService.getTaskReportList(page, stationCode, areaId, taskName, - type, startFormat, endFormat, bayId, patrolType); - // List> records = mapPage.getRecords(); - // records.forEach(r -> { - // String taskTodoId = r.get("taskTodoId").toString(); - // Map map = taskTodoService.getTaskTodoById(taskTodoId,areaId,bayId,mainDeviceId); - // r.put("result", map); - // }); + type, startDate, endDate, bayId, patrolType); return ResponseResult.successData(mapPage); } @@ -1185,23 +1152,9 @@ public class TaskTodoController { String deviceName, String patroldeviceName, String componentName, String recognitionType, String status, String startDate, String endDate, HttpServletResponse response) throws IOException { - 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"); - } // 获取任务执行id List> records = taskTodoService.getAbnormalDevice(stationCode, taskName, deviceName, - patroldeviceName, componentName, recognitionType, status, startFormat, endFormat); + patroldeviceName, componentName, recognitionType, status, startDate, endDate); taskTodoService.exportAbnormalDevice(records, response); } @@ -1242,22 +1195,8 @@ public class TaskTodoController { if (StrUtil.isBlank(mainDeviceId)) { 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"); - } List> maps = taskTodoService.getDeviceByMainDevice(mainDeviceId, meterType, recognitionType, - startFormat, endFormat); + startDate, endDate); return ResponseResult.successData(maps); } @@ -1391,23 +1330,9 @@ public class TaskTodoController { if (StrUtil.isBlank(stationCode)) { 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"); - } Page> mapPage = taskTodoService.getLinkTaskTodoList(page, stationCode, linkageDeviceName, - taskName, linkageType, linkageDeviceType, startFormat, endFormat); + taskName, linkageType, linkageDeviceType, startDate, endDate); return ResponseResult.successData(mapPage); } @@ -1668,23 +1593,9 @@ public class TaskTodoController { public ResponseResult getResultByPatroldevice(Page> page, String patroldeviceId, String mainDeviceId, String taskName, String recognitionType, String valid, String isReport, String startDate, String endDate) { - // SubstationPatroldevice substationPatroldevice = substationPatroldeviceService.getById(patroldeviceId); - 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"); - } + Page> mapPage = taskTodoService.getResultByPatroldevice(page, null, mainDeviceId, - taskName, recognitionType, valid, isReport, startFormat, endFormat); + taskName, recognitionType, valid, isReport, startDate, endDate); List> records = mapPage.getRecords(); records.forEach(m -> { String flag = m.get("flag").toString(); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/DefectDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/DefectDeviceServiceImpl.java index f0f455f..1e652b5 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/DefectDeviceServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/patroltask/service/impl/DefectDeviceServiceImpl.java @@ -58,27 +58,9 @@ public class DefectDeviceServiceImpl extends ServiceImpl> mapPage = defectDeviceMapper.getDefectDeviceList(page, stationCode, areaId, bayId, - taskName, deviceName, patroldeviceName, componentName, recognitionType, isDefectFlag, startFormat, - endFormat); + taskName, deviceName, patroldeviceName, componentName, recognitionType, isDefectFlag, startDate, + endDate); List> records = mapPage.getRecords(); records.forEach(m -> { String flag = m.get("flag").toString(); diff --git a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml index ade1aaf..b535348 100644 --- a/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/AlarmLogMapper.xml @@ -54,7 +54,7 @@ and str_to_date(alarm_date, '%Y-%m-%d %H:%i:%s') >= #{startDate} - and str_to_date(alarm_date, '%Y-%m-%d %H:%i:%s') <= #{endDate} + and alarm_date < DATE_ADD(#{endDate}, INTERVAL 1 DAY) ORDER By alarm_date DESC diff --git a/riis-system/src/main/resources/mapper/patroltask/DefectDeviceMapper.xml b/riis-system/src/main/resources/mapper/patroltask/DefectDeviceMapper.xml index da37735..5d00741 100644 --- a/riis-system/src/main/resources/mapper/patroltask/DefectDeviceMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/DefectDeviceMapper.xml @@ -46,7 +46,7 @@ and str_to_date(time, '%Y-%m-%d %H:%i:%s') >= #{startDate} - and str_to_date(time, '%Y-%m-%d %H:%i:%s') <= #{endDate} + and time < DATE_ADD(#{endDate}, INTERVAL 1 DAY) ORDER BY d.patroldevice_date diff --git a/riis-system/src/main/resources/mapper/patroltask/TaskMapper.xml b/riis-system/src/main/resources/mapper/patroltask/TaskMapper.xml index faa9e18..000e267 100644 --- a/riis-system/src/main/resources/mapper/patroltask/TaskMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/TaskMapper.xml @@ -9,7 +9,7 @@ and str_to_date(t.fixed_start_time, '%Y-%m-%d') >= #{startDate} - and str_to_date(t.fixed_start_time, '%Y-%m-%d') <= #{endDate} + and t.fixed_start_time < DATE_ADD(#{endDate}, INTERVAL 1 DAY) and t.isenable = #{enable} diff --git a/riis-system/src/main/resources/mapper/patroltask/TaskResultMapper.xml b/riis-system/src/main/resources/mapper/patroltask/TaskResultMapper.xml index d68953d..ef17963 100644 --- a/riis-system/src/main/resources/mapper/patroltask/TaskResultMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/TaskResultMapper.xml @@ -241,7 +241,7 @@ ORDER BY and str_to_date(time, '%Y-%m-%d %H:%i:%s') >= #{startDate} - and str_to_date(time, '%Y-%m-%d %H:%i:%s') <= #{endDate} + and time < DATE_ADD(#{endDate}, INTERVAL 1 DAY) ORDER BY t.patroldevice_date @@ -720,7 +720,7 @@ ORDER BY AND tt.start_time >= #{startDate} - AND tt.end_time <= #{endDate} + AND tt.end_time < DATE_ADD(#{endDate}, INTERVAL 1 DAY) @@ -831,7 +831,7 @@ ORDER BY AND t.patroldevice_date >= #{startDate} - AND t.patroldevice_date <= #{endDate} + AND t.patroldevice_date < DATE_ADD(#{endDate}, INTERVAL 1 DAY) ORDER BY t.order_num ASC @@ -905,10 +905,10 @@ ORDER BY AND t.device_id = #{deviceId} - AND t.patroldevice_date >= #{startDate} + AND t.time >= #{startDate} - AND t.patroldevice_date <= #{endDate} + and t.time < DATE_ADD(#{endDate}, INTERVAL 1 DAY) ORDER BY t.time DESC diff --git a/riis-system/src/main/resources/mapper/patroltask/TaskTodoMapper.xml b/riis-system/src/main/resources/mapper/patroltask/TaskTodoMapper.xml index 8301deb..c255510 100644 --- a/riis-system/src/main/resources/mapper/patroltask/TaskTodoMapper.xml +++ b/riis-system/src/main/resources/mapper/patroltask/TaskTodoMapper.xml @@ -36,7 +36,7 @@ and str_to_date(tt.plan_start_time, '%Y-%m-%d %H:%i:%s') >= #{startDate} - and str_to_date(tt.plan_start_time, '%Y-%m-%d %H:%i:%s') <= #{endDate} + and tt.plan_start_time < DATE_ADD(#{endDate}, INTERVAL 1 DAY) ORDER BY tt.plan_start_time ASC,tt.priority DESC,tt.task_todo_id ASC @@ -66,7 +66,7 @@ and str_to_date(tt.examine_date, '%Y-%m-%d %H:%i:%s') >= #{startDate} - and str_to_date(tt.examine_date, '%Y-%m-%d %H:%i:%s') <= #{endDate} + and tt.examine_date < DATE_ADD(#{endDate}, INTERVAL 1 DAY) ORDER BY tt.examine_date,tt.task_todo_id @@ -99,7 +99,7 @@ and str_to_date(ts.time, '%Y-%m-%d %H:%i:%s') >= #{startDate} - and str_to_date(ts.time, '%Y-%m-%d %H:%i:%s') <= #{endDate} + and ts.time < DATE_ADD(#{endDate}, INTERVAL 1 DAY)