From f3015b6a6f9bb7d999110b580ab2c5b48789d2cd Mon Sep 17 00:00:00 2001 From: weitang Date: Tue, 27 May 2025 12:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B2=E7=BA=BF=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AlgorithmDeviceServiceImpl.java | 2 +- .../controller/DeviceWorkDataController.java | 2 +- .../auxcontrol/mapper/DeviceWorkDataMapper.java | 4 ++-- .../auxcontrol/service/IDeviceWorkDataService.java | 4 ++-- .../service/impl/DeviceWorkDataServiceImpl.java | 8 ++++---- .../mapper/auxcontrol/DeviceWorkDataMapper.xml | 14 ++++++++++++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java index 98b4129..16daca6 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java @@ -110,7 +110,7 @@ public class AlgorithmDeviceServiceImpl extends ServiceImpl 0) { - List deviceWorkDataList = deviceWorkDataService.getHistoricalCurveList(signalIdList); + List deviceWorkDataList = deviceWorkDataService.getHistoricalCurveList(signalIdList,type); Map> collect = deviceWorkDataList.stream().collect(Collectors.groupingBy(DeviceWorkData::getSignalId)); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java index 4a0895b..4a28401 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java @@ -221,7 +221,7 @@ public class DeviceWorkDataController { @GetMapping("/getHistoricalCurve") @ApiOperation("查询历史曲线") public ResponseResult getHistoricalCurve(String signalId, String type) { - List deviceWorkDataList = deviceWorkDataService.getHistoricalCurve(signalId); + List deviceWorkDataList = deviceWorkDataService.getHistoricalCurve(signalId,type); type = StrUtil.isBlank(type) ? "1" : type; Map map = processDeviceData(deviceWorkDataList, signalId, type); return ResponseResult.successData(map); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java index 9e8475a..c5f9b11 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java @@ -34,11 +34,11 @@ public interface DeviceWorkDataMapper extends BaseMapper { * 参数说明 signalId 信号id * 返回值说明: java.util.List ***********************************/ - List getHistoricalCurve(String signalId); + List getHistoricalCurve(String signalId, String type); List> getDeviceWorkData(String stationId); - List getHistoricalCurveList(List signalIdList); + List getHistoricalCurveList(List signalIdList,String type); } diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java index eda217b..7e95bbe 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java @@ -46,14 +46,14 @@ public interface IDeviceWorkDataService extends IService { * 参数说明 signalId 信号id * 返回值说明: java.util.List ***********************************/ - List getHistoricalCurve(String signalId); + List getHistoricalCurve(String signalId, String type); /********************************** * 用途说明: 查询历史曲线 * 参数说明 signalList 信号id集合 * 返回值说明: java.util.List ***********************************/ - List getHistoricalCurveList(List signalIdList); + List getHistoricalCurveList(List signalIdList,String type); List> getDeviceWorkData(String stationId); diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java index 5c41b54..d47f9d7 100644 --- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java +++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java @@ -94,13 +94,13 @@ public class DeviceWorkDataServiceImpl extends ServiceImpl ***********************************/ @Override - public List getHistoricalCurve(String signalId) { - return deviceWorkDataMapper.getHistoricalCurve(signalId); + public List getHistoricalCurve(String signalId, String type) { + return deviceWorkDataMapper.getHistoricalCurve(signalId,type); } @Override - public List getHistoricalCurveList(List signalIdList) { - return deviceWorkDataMapper.getHistoricalCurveList(signalIdList); + public List getHistoricalCurveList(List signalIdList,String type) { + return deviceWorkDataMapper.getHistoricalCurveList(signalIdList,type); } @Override diff --git a/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml b/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml index 39bb521..0cd7b8e 100644 --- a/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml +++ b/riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml @@ -38,7 +38,12 @@ fk_device_work_data WHERE signal_id=#{signalId} - AND start_time >= NOW() - INTERVAL 1 HOUR + + AND start_time >= NOW() - INTERVAL 1 HOUR + + + AND start_time >= NOW() - INTERVAL 1 DAY + ORDER BY start_time @@ -108,7 +113,12 @@ close=")"> #{signalId} - AND start_time >= NOW() - INTERVAL 1 HOUR + + AND start_time >= NOW() - INTERVAL 1 HOUR + + + AND start_time >= NOW() - INTERVAL 1 DAY + ORDER BY start_time