From 32ad7b8ff65622b54d1fb30bafc2d2758959566b Mon Sep 17 00:00:00 2001 From: tyty Date: Tue, 4 Jul 2023 13:59:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=AF=8A=E6=96=AD-=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=AF=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/fdp/dto/FdpFaultRealDataDTO.java | 51 ++++++++++++++++++++++ .../com/hnac/hzims/fdp/vo/FdpFaultRealDataVO.java | 9 ++-- .../fdp/service/impl/FdpMonitorServiceImpl.java | 35 ++++++--------- 3 files changed, 70 insertions(+), 25 deletions(-) create mode 100644 hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/dto/FdpFaultRealDataDTO.java diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/dto/FdpFaultRealDataDTO.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/dto/FdpFaultRealDataDTO.java new file mode 100644 index 0000000..ad6d7cd --- /dev/null +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/dto/FdpFaultRealDataDTO.java @@ -0,0 +1,51 @@ +package com.hnac.hzims.fdp.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; + +/** + * 模型VO + * + * @author tangyu + * @created 2023-07-03 17:38 + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class FdpFaultRealDataDTO { + + private static final long serialVersionUID = 1L; + + /** + * 监测点ID + */ + @ApiModelProperty("监测点ID") + private String monitorId; + + @ApiModelProperty("监测点名称") + private String name; + @ApiModelProperty("位置") + private String ord; + @ApiModelProperty("单代表对应一个实时数据，多代表对应一组实时数据") + private String multi; + @ApiModelProperty("数据的物模型id") + private String instance; + @ApiModelProperty("数据的物模型属性：如果multi是“多”，则包含该字符串起始的所有属性") + private String identifier; + @ApiModelProperty("物模型是否开机：无法获取当作开机处理") + private Boolean powerOn; + + @ApiModelProperty("获取的实时数据如果MULTI是“单”则为数值，MULTI是“多”则为数组") + private List real; + @ApiModelProperty("获取的实时数据如果MULTI是“单”则为数值，MULTI是“多”则为数组") + private List realIdentifier; + @ApiModelProperty("获取的实时数据如果MULTI是“单”则为数值，MULTI是“多”则为数组") + private List realName; + @ApiModelProperty("实时数据时间，如果MULTI是“单”则为数值，MULTI是“多”则为数组") + private List realTime; +} diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/vo/FdpFaultRealDataVO.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/vo/FdpFaultRealDataVO.java index af45be3..a5094a7 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/vo/FdpFaultRealDataVO.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/vo/FdpFaultRealDataVO.java @@ -6,7 +6,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; -import java.util.List; /** * 模型VO @@ -41,7 +40,11 @@ public class FdpFaultRealDataVO { private Boolean powerOn; @ApiModelProperty("获取的实时数据如果MULTI是“单”则为数值，MULTI是“多”则为数组") - private List real; + private String real; + @ApiModelProperty("获取的实时数据如果MULTI是“单”则为数值，MULTI是“多”则为数组") + private String realIdentifier; + @ApiModelProperty("获取的实时数据如果MULTI是“单”则为数值，MULTI是“多”则为数组") + private String realName; @ApiModelProperty("实时数据时间，如果MULTI是“单”则为数值，MULTI是“多”则为数组") - private List realTime; + private Date realTime; } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java index c1bb70a..718e538 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java @@ -13,6 +13,7 @@ import com.hnac.hzims.EquipmentConstants; import com.hnac.hzims.equipment.entity.EmInfoEntity; import com.hnac.hzims.equipment.service.IEmInfoService; import com.hnac.hzims.fdp.constants.DeviceInstanceTypeConstant; +import com.hnac.hzims.fdp.dto.FdpFaultRealDataDTO; import com.hnac.hzims.fdp.dto.FdpMonitorDTO; import com.hnac.hzims.fdp.dto.FdpMonitorExtendDTO; import com.hnac.hzims.fdp.dto.FdpTaskDTO; @@ -816,38 +817,28 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl() {}); if (1==fdpHttpResponseVo.getSuccess()) { if (Func.isNotEmpty(fdpHttpResponseVo.getData())) { - List list = JSONObject.parseObject(fdpHttpResponseVo.getData(), new TypeReference>() {}); + List list = JSONObject.parseObject(fdpHttpResponseVo.getData(), new TypeReference>() {}); if (CollectionUtil.isEmpty(list)){ return R.success("暂无数据，请稍后重试"); } List res =new ArrayList<>(); - for (FdpFaultRealDataVO fdpFaultRealDataVO : list) { - if (null!=fdpFaultRealDataVO.getReal()){ - for (int i = 0; i < fdpFaultRealDataVO.getReal().size(); i++ ) { + for (FdpFaultRealDataDTO fdpFaultRealDataDTO : list) { + if (null!=fdpFaultRealDataDTO.getReal()){ + for (int i = 0; i < fdpFaultRealDataDTO.getReal().size(); i++ ) { FdpFaultRealDataVO dataVO=new FdpFaultRealDataVO(); - BeanUtils.copyProperties(fdpFaultRealDataVO,dataVO); - String real = fdpFaultRealDataVO.getReal().get(i); - Date time = fdpFaultRealDataVO.getRealTime().get(i); - dataVO.setReal(Arrays.asList(real)); - dataVO.setRealTime(Arrays.asList(time)); + BeanUtils.copyProperties(fdpFaultRealDataDTO,dataVO); + dataVO.setReal(fdpFaultRealDataDTO.getReal().get(i)); + dataVO.setRealTime(fdpFaultRealDataDTO.getRealTime().get(i)); + dataVO.setRealName(fdpFaultRealDataDTO.getRealName().get(i)); + dataVO.setRealIdentifier(fdpFaultRealDataDTO.getRealIdentifier().get(i)); res.add(dataVO); } }else { - res.add(fdpFaultRealDataVO); + FdpFaultRealDataVO dataVO=new FdpFaultRealDataVO(); + BeanUtils.copyProperties(fdpFaultRealDataDTO,dataVO); + res.add(dataVO); } } -// JSONObject jsonParams = JSONObject.parseObject(fdpHttpResponseVo.getData()); -// list=list.stream().map(s -> { -// if ("单".equals(s.getMulti())) { -// if (null == s.getReal()) { -// s.setReal(new ArrayList<>().toString()); -// } else { -// String real = jsonParams.get("real").toString(); -// s.setReal(Arrays.asList(Double.valueOf(real)).toString()); -// } -// } -// return s; -// }).collect(Collectors.toList()); return R.data(res); } return R.success("暂无数据，请稍后重试");