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-04-28 16:08:00 +08:00
parent 2ba0005426
commit 7699025441
7 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,9 @@ import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.modules.auxcontrol.domain.DeviceAlarmRecord;
import com.yfd.platform.modules.auxcontrol.domain.DeviceSignal;
import com.yfd.platform.modules.auxcontrol.domain.DeviceWorkData;
import com.yfd.platform.modules.auxcontrol.service.IDeviceSignalService;
import com.yfd.platform.modules.auxcontrol.service.IDeviceWorkDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -36,6 +38,8 @@ public class DeviceWorkDataController {
@Resource
private IDeviceWorkDataService deviceWorkDataService;
@Resource
private IDeviceSignalService deviceSignalService;
@GetMapping("/page")
@ApiOperation("分页查询变电站设备运行记录")
@ -46,7 +50,7 @@ public class DeviceWorkDataController {
return ResponseResult.successData(deviceWorkDataPage);
}
public Map<String, Object> processDeviceData(List<DeviceWorkData> deviceWorkDataList) {
public Map<String, Object> processDeviceData(List<DeviceWorkData> deviceWorkDataList, String signalId) {
// 生成过去60分钟的分钟时间槽
LocalDateTime now = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES);
LocalDateTime startTime = now.minusMinutes(59);
@ -83,10 +87,11 @@ public class DeviceWorkDataController {
Map<String, Object> yAxis = new HashMap<>();
yAxis.put("type", "value");
result.put("yAxis", yAxis);
DeviceSignal deviceSignal = deviceSignalService.getById(signalId);
String name = deviceSignal == null ? "" : deviceSignal.getSignalName();
List<Map<String, Object>> seriesList = new ArrayList<>();
Map<String, Object> series = new HashMap<>();
series.put("name", "Step Start");
series.put("name", name);
series.put("type", "line");
series.put("step", "start");
series.put("data", seriesData);
@ -104,7 +109,7 @@ public class DeviceWorkDataController {
@ApiOperation("查询历史曲线")
public ResponseResult getHistoricalCurve(String signalId, String type) {
List<DeviceWorkData> deviceWorkDataList = deviceWorkDataService.getHistoricalCurve(signalId);
Map<String, Object> map = processDeviceData(deviceWorkDataList);
Map<String, Object> map = processDeviceData(deviceWorkDataList, signalId);
return ResponseResult.successData(map);
}

3
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmParameter.java
View File

@ -1,5 +1,7 @@
package com.yfd.platform.modules.auxcontrol.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.sql.Timestamp;
@ -28,6 +30,7 @@ public class DeviceAlarmParameter implements Serializable {
/**
* 参数ID
*/
@TableId(type = IdType.ASSIGN_UUID)
private String paramId;
/**

3
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/DeviceAlarmRecord.java
View File

@ -1,6 +1,8 @@
package com.yfd.platform.modules.auxcontrol.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import java.io.Serializable;
@ -27,6 +29,7 @@ public class DeviceAlarmRecord implements Serializable {
/**
* 记录ID
*/
@TableId(type = IdType.ASSIGN_UUID)
private String recordId;
/**

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

@ -1,6 +1,9 @@
package com.yfd.platform.modules.auxcontrol.domain;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.sql.Timestamp;
@ -29,6 +32,7 @@ public class DeviceSignal implements Serializable {
/**
* 信号ID
*/
@TableId(type = IdType.ASSIGN_UUID)
private String signalId;
/**

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

@ -1,6 +1,9 @@
package com.yfd.platform.modules.auxcontrol.domain;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import java.io.Serializable;
@ -27,6 +30,7 @@ public class DeviceWorkData implements Serializable {
/**
* ID
*/
@TableId(type = IdType.ASSIGN_UUID)
private String id;
/**

3
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/GatewayDevice.java
View File

@ -1,5 +1,7 @@
package com.yfd.platform.modules.auxcontrol.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.sql.Timestamp;
@ -29,6 +31,7 @@ public class GatewayDevice implements Serializable {
/**
* ID
*/
@TableId(type = IdType.ASSIGN_UUID)
private String id;
/**

3
riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/domain/MeterDevice.java
View File

@ -1,5 +1,7 @@
package com.yfd.platform.modules.auxcontrol.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.sql.Timestamp;
@ -28,6 +30,7 @@ public class MeterDevice implements Serializable {
/**
* 设备ID
*/
@TableId(type = IdType.ASSIGN_UUID)
private String deviceId;
/**