冷源站监控接口

mh-admin/src/main/java/com/mh/web/controller/device/OperationController.java

@@ -60,7 +60,7 @@ public class OperationController extends BaseController {
      * @return
      */
     @PreAuthorize("@ss.hasPermi('device:cpm:operation')")
-    @PostMapping("/operation/list")
+    @GetMapping("/operation/list")
     public TableDataInfo operationDeviceList(@RequestParam(name = "systemType") String systemType) {
         try {
             List<DeviceOperateMonitorVO> deviceOperateMonitorVOS = iCollectionParamsManageService.operationDeviceList(systemType);

mh-common/src/main/java/com/mh/common/core/domain/vo/DeviceOperateMonitorVO.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author LJF
@@ -25,112 +26,34 @@ public class DeviceOperateMonitorVO {
     private String id;
 
     /**
-     * 设备台账ID
+     * 设备名称或者别名
      */
-    private String deviceLedgerId;
+    private String name;
 
     /**
-     * 点位名称
+     * 点位值
      */
-    private String collectName;
+    private String value;
-
-    /**
-     * 设备类型
-     */
-    private String deviceType;
 
     /**
      * 采集时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date collectTime;
+    private Date time;
 
-    /**
+    private String paramType;
-     * 运行状态
-     */
-    private Integer runStatus;
 
-    /**
+    private List<DeviceOperateMonitorVO> children;
-     * 设置启停
-     */
-    private Integer setRunOrStop;
-
-    /**
-     * 故障报警状态
-     */
-    private Integer alarmStatus;
-
-    /**
-     * 手自动状态
-     */
-    private Integer handOrAuto;
-
-    /**
-     * 阀门状态
-     */
-    private Integer valveStatus;
-
-    /**
-     * 设置阀门开度
-     */
-    private Integer setValveOpen;
-
-    /**
-     * 设置阀门关闭
-     */
-    private Integer setValveClose;
-
-    /**
-     * 频率
-     */
-    private BigDecimal frequency;
-
-    /**
-     * 频率设置
-     */
-    private BigDecimal setFrequency;
-
-    /**
-     * 供水温度
-     */
-    private BigDecimal outTemp;
-
-    /**
-     * 回水温度
-     */
-    private BigDecimal inTemp;
-
-    /**
-     * 供水压力
-     */
-    private BigDecimal outPressure;
-
-    /**
-     * 回水压力
-     */
-    private BigDecimal inPressure;
 
     @Override
     public String toString() {
         return new ToStringBuilder(this)
                 .append("id", id)
-                .append("deviceLedgerId", deviceLedgerId)
+                .append("name", name)
-                .append("collectName", collectName)
+                .append("value", value)
-                .append("deviceType", deviceType)
+                .append("time", time)
-                .append("collectTime", collectTime)
+                .append("paramType", paramType)
-                .append("runStatus", runStatus)
+                .append("children", children)
-                .append("alarmStatus", alarmStatus)
-                .append("handOrAuto", handOrAuto)
-                .append("valveStatus", valveStatus)
-                .append("setValveOpen", setValveOpen)
-                .append("setValveClose", setValveClose)
-                .append("frequency", frequency)
-                .append("setFrequency", setFrequency)
-                .append("outTemp", outTemp)
-                .append("inTemp", inTemp)
-                .append("outPressure", outPressure)
-                .append("inPressure", inPressure)
                 .toString();
     }
-
 }

mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java

@@ -257,114 +257,45 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag
         if (collectionParamsManages.isEmpty()) {
             return List.of();
         }
-        // 得出的collectionParamsManages进行数据赋值，如果paramType="1',则是运行状态，则赋值给runStatus,
+        // 根据deviceLedgerId进行分组，然后得出deviceLedgerId，deviceName赋值给DeviceOperateMonitorVO的id和name
-        // 如果paramType="5",则是故障报警，则赋值给alarmStatus
+        // 按设备台账ID分组
-        // 如果paramType="6",则是手自动状态，则赋值给handOrAuto
+        Map<String, List<CollectionParamsManageVO>> groupedByDevice = collectionParamsManages.stream()
-        // 如果paramType="4",则是频率反馈，则赋值给frequency
+                .collect(Collectors.groupingBy(CollectionParamsManageVO::getDeviceLedgerId));
-        // 使用Stream API处理数据
-        Map<String, List<DeviceOperateMonitorVO>> groupedByDeviceType = collectionParamsManages.stream()
-                .collect(Collectors.groupingBy(CollectionParamsManageVO::getId))
-                .values()
-                .stream()
-                .map(params -> {
-                    DeviceOperateMonitorVO deviceOperateMonitorVO = new DeviceOperateMonitorVO();
-                    for (CollectionParamsManageVO param : params) {
-                        switch (param.getParamType()) {
-                            case "1":
-                                deviceOperateMonitorVO.setRunStatus(param.getCurValue().intValue());
-                                break;
-                            case "2":
-                                deviceOperateMonitorVO.setRunStatus(param.getCurValue().intValue());
-                                break;
-                            case "3":
-                                deviceOperateMonitorVO.setSetFrequency(param.getCurValue());
-                                break;
-                            case "4":
-                                deviceOperateMonitorVO.setFrequency(param.getCurValue());
-                                break;
-                            case "5":
-                                deviceOperateMonitorVO.setAlarmStatus(param.getCurValue().intValue());
-                                break;
-                            case "6":
-                                deviceOperateMonitorVO.setHandOrAuto(param.getCurValue().intValue());
-                                break;
-                            case "7":
-                                if ("阀开反馈".contains(param.getOtherName()) && param.getCurValue().intValue() == 1) {
-                                    deviceOperateMonitorVO.setValveStatus(1);
-                                } else if ("阀关反馈".contains(param.getOtherName()) && param.getCurValue().intValue() == 1) {
-                                    deviceOperateMonitorVO.setValveStatus(0);
-                                } else {
-                                    deviceOperateMonitorVO.setValveStatus(0);
-                                }
-                            case "8":
-                                deviceOperateMonitorVO.setSetValveOpen(param.getCurValue().intValue());
-                                break;
-                            case "9":
-                                deviceOperateMonitorVO.setSetValveClose(param.getCurValue().intValue());
-                                break;
-                            default:
-                                // 处理未知的paramType
-                                break;
-                        }
-                        deviceOperateMonitorVO.setId(param.getId());
-                        deviceOperateMonitorVO.setDeviceType(param.getMtType());
-                        deviceOperateMonitorVO.setCollectName(param.getDeviceName());
-                        deviceOperateMonitorVO.setCollectTime(param.getCurTime());
-                        deviceOperateMonitorVO.setDeviceLedgerId(param.getDeviceLedgerId());
-                    }
-                    return deviceOperateMonitorVO;
-                })
-                .collect(Collectors.groupingBy(DeviceOperateMonitorVO::getDeviceLedgerId));
-        // 根据得出的分组数据之后，同样类型的分组数据进行合并起来变成一条数据，这里合并的规则就是某个值为空的，拿同样另一个值不为空的补上，得出List<DeviceMonitorVO>结果集
-        // 创建最终结果集合
-        List<DeviceOperateMonitorVO> result = new ArrayList<>();
 
-        // 遍历分组后的数据
+        // 转换分组结果为监控VO列表
-        groupedByDeviceType.forEach((deviceLedgerId, voList) -> {
+        List<DeviceOperateMonitorVO> monitorData = groupedByDevice.values().stream()
-            // 创建合并后的VO对象
+                .map(group -> {
-            DeviceOperateMonitorVO mergedVO = new DeviceOperateMonitorVO();
+                    // 取组内第一个元素获取公共信息（假设同设备台账ID的设备名称相同）
+                    CollectionParamsManageVO firstItem = group.get(0);
 
-            // 设置设备类型
+                    DeviceOperateMonitorVO vo = new DeviceOperateMonitorVO();
-            mergedVO.setDeviceLedgerId(deviceLedgerId);
+                    vo.setId(firstItem.getDeviceLedgerId());
+                    vo.setName(firstItem.getDeviceName());
 
-            // 设置设备类型
+                    // 可补充其他需要聚合的字段
-            mergedVO.setDeviceType(voList.getFirst().getDeviceType());
+                    // vo.setStatus(calculateStatus(group));
 
-            // 遍历同类型设备的所有监控数据
+                    return vo;
-            voList.forEach(vo -> {
+                })
-                // 合并规则：当目标字段为空时，用当前VO的对应字段值补上
+                .toList();
-                if (mergedVO.getRunStatus() == null) {
+        // 在遍历monitorData,根据deviceLedgerId查询出collectionParamsManages集合对应的设备id,otherName对应name,curValue对应value,curTime对应time,paramType对应paramType,然后拼接到monitorData中children中
-                    mergedVO.setRunStatus(vo.getRunStatus());
+        // 处理子节点数据
-                }
+        monitorData.forEach(mainVO -> {
-                if (mergedVO.getAlarmStatus() == null) {
+            // 根据主设备ID过滤参数
-                    mergedVO.setAlarmStatus(vo.getAlarmStatus());
+            List<DeviceOperateMonitorVO> children = collectionParamsManages.stream()
-                }
+                    .filter(p -> mainVO.getId().equals(p.getDeviceLedgerId()))
-                if (mergedVO.getHandOrAuto() == null) {
+                    .map(param -> {
-                    mergedVO.setHandOrAuto(vo.getHandOrAuto());
+                        DeviceOperateMonitorVO child = new DeviceOperateMonitorVO();
-                }
+                        child.setId(param.getId());
-                if (mergedVO.getFrequency() == null) {
+                        child.setName(param.getOtherName());
-                    mergedVO.setFrequency(vo.getFrequency());
+                        child.setValue(String.valueOf(param.getCurValue()));
-                }
+                        child.setTime(param.getCurTime());
-                if (mergedVO.getValveStatus() == null) {
+                        child.setParamType(param.getParamType());
-                    mergedVO.setValveStatus(vo.getValveStatus());
+                        return child;
-                }
+                    })
-
+                    .collect(Collectors.toList());
-                // 合并基础字段（取第一个有效值）
+            mainVO.setChildren(children);
-                if (mergedVO.getId() == null) {
-                    mergedVO.setId(vo.getId());
-                }
-                if (mergedVO.getCollectName() == null) {
-                    mergedVO.setCollectName(vo.getCollectName());
-                }
-                if (mergedVO.getCollectTime() == null ||
-                        vo.getCollectTime().after(mergedVO.getCollectTime())) {
-                    // 取最新的采集时间
-                    mergedVO.setCollectTime(vo.getCollectTime());
-                }
-            });
-
-            result.add(mergedVO);
         });
-        return result;
+        return monitorData;
     }
 }