ThbTech/SmartSubstationPlatform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据曲线逻辑优化

Browse Source
This commit is contained in:
weitang 2025-05-27 12:00:12 +08:00
parent b300e5d47b
commit f3015b6a6f
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
riis-system/src/main/java/com/yfd/platform/modules/algorithm/service/impl/AlgorithmDeviceServiceImpl.java
View File

@ -110,7 +110,7 @@ public class AlgorithmDeviceServiceImpl extends ServiceImpl<AlgorithmDeviceMappe
} }
} }
if (signalIdList != null && signalIdList.size() > 0) { if (signalIdList != null && signalIdList.size() > 0) {
List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurveList(signalIdList); List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurveList(signalIdList,type);
Map<String, List<DeviceWorkData>> collect = Map<String, List<DeviceWorkData>> collect =
deviceWorkDataList.stream().collect(Collectors.groupingBy(DeviceWorkData::getSignalId)); deviceWorkDataList.stream().collect(Collectors.groupingBy(DeviceWorkData::getSignalId));

2
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceWorkDataController.java
View File

@ -221,7 +221,7 @@ public class DeviceWorkDataController {
@GetMapping("/getHistoricalCurve") @GetMapping("/getHistoricalCurve")
@ApiOperation("查询历史曲线") @ApiOperation("查询历史曲线")
public ResponseResult getHistoricalCurve(String signalId, String type) { public ResponseResult getHistoricalCurve(String signalId, String type) {
List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurve(signalId); List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurve(signalId,type);
type = StrUtil.isBlank(type) ? "1" : type; type = StrUtil.isBlank(type) ? "1" : type;
Map<String, Object> map = processDeviceData(deviceWorkDataList, signalId, type); Map<String, Object> map = processDeviceData(deviceWorkDataList, signalId, type);
return ResponseResult.successData(map); return ResponseResult.successData(map);

4
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/mapper/DeviceWorkDataMapper.java
View File

@ -34,11 +34,11 @@ public interface DeviceWorkDataMapper extends BaseMapper<DeviceWorkData> {
* 参数说明 signalId 信号id * 参数说明 signalId 信号id
* 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData> * 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData>
***********************************/ ***********************************/
List<DeviceWorkData> getHistoricalCurve(String signalId); List<DeviceWorkData> getHistoricalCurve(String signalId, String type);
List<Map<String, Object>> getDeviceWorkData(String stationId); List<Map<String, Object>> getDeviceWorkData(String stationId);
List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList); List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList,String type);
} }

4
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceWorkDataService.java
View File

@ -46,14 +46,14 @@ public interface IDeviceWorkDataService extends IService<DeviceWorkData> {
* 参数说明 signalId 信号id * 参数说明 signalId 信号id
* 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData> * 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData>
***********************************/ ***********************************/
List<DeviceWorkData> getHistoricalCurve(String signalId); List<DeviceWorkData> getHistoricalCurve(String signalId, String type);
/********************************** /**********************************
* 用途说明: 查询历史曲线 * 用途说明: 查询历史曲线
* 参数说明 signalList 信号id集合 * 参数说明 signalList 信号id集合
* 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData> * 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData>
***********************************/ ***********************************/
List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList); List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList,String type);
List<Map<String, Object>> getDeviceWorkData(String stationId); List<Map<String, Object>> getDeviceWorkData(String stationId);

8
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceWorkDataServiceImpl.java
View File

@ -94,13 +94,13 @@ public class DeviceWorkDataServiceImpl extends ServiceImpl<DeviceWorkDataMapper,
* 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData> * 返回值说明: java.util.List<com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData>
***********************************/ ***********************************/
@Override @Override
public List<DeviceWorkData> getHistoricalCurve(String signalId) { public List<DeviceWorkData> getHistoricalCurve(String signalId, String type) {
return deviceWorkDataMapper.getHistoricalCurve(signalId); return deviceWorkDataMapper.getHistoricalCurve(signalId,type);
} }
@Override @Override
public List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList) { public List<DeviceWorkData> getHistoricalCurveList(List<String> signalIdList,String type) {
return deviceWorkDataMapper.getHistoricalCurveList(signalIdList); return deviceWorkDataMapper.getHistoricalCurveList(signalIdList,type);
} }
@Override @Override

14
riis-system/src/main/resources/mapper/auxcontrol/DeviceWorkDataMapper.xml
View File

@ -38,7 +38,12 @@
fk_device_work_data fk_device_work_data
WHERE WHERE
signal_id=#{signalId} signal_id=#{signalId}
AND start_time >= NOW() - INTERVAL 1 HOUR <if test="type == 1">
AND start_time >= NOW() - INTERVAL 1 HOUR
</if>
<if test="type == 2">
AND start_time >= NOW() - INTERVAL 1 DAY
</if>
ORDER BY ORDER BY
start_time start_time
</select> </select>
@ -108,7 +113,12 @@
close=")"> close=")">
#{signalId} #{signalId}
</foreach> </foreach>
AND start_time >= NOW() - INTERVAL 1 HOUR <if test="type == 1">
AND start_time >= NOW() - INTERVAL 1 HOUR
</if>
<if test="type == 2">
AND start_time >= NOW() - INTERVAL 1 DAY
</if>
ORDER BY ORDER BY
start_time start_time
</select> </select>