From e836d9bd077ff57e142dc983402e9d48611197bd Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Tue, 24 Sep 2024 09:08:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=97=A0=E7=BA=BFbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/pojo/vo/DataGroupEventVO.java |  3 ---
 .../impl/CsEquipmentDeliveryServiceImpl.java        |  2 +-
 .../csdevice/service/impl/CsGroupServiceImpl.java   | 13 ++++---------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java
index 6961dca..fdc5635 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java
@@ -20,9 +20,6 @@ public class DataGroupEventVO {
     @ApiModelProperty("事件ID")
     private String eventId;
 
-    @ApiModelProperty("变电站名称")
-    private String subName;
-
     @ApiModelProperty("监测点ID")
     private String lineId;
 
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index b17ad4b..7ecfcac 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -346,7 +346,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
             for (CsDataSet item : dataSet) {
                 DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
                 dataSetVO.setId(item.getId());
-                dataSetVO.setName("准实时数据");
+                dataSetVO.setName("history".equals(type) ? "准实时数据":item.getAnotherName());
                 dataSetVO.setType("rt");
                 dataSetList.add(dataSetVO);
                 deviceManagerVo.setDataLevel(item.getDataLevel());
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
index ac219ff..b044323 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java
@@ -288,7 +288,9 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
     @Override
     public Object deviceDataByType(CommonStatisticalQueryParam commonStatisticalQueryParam) {
         String type = commonStatisticalQueryParam.getType();
-        if (type == null) throw new BusinessException(LineBaseEnum.NOTYPE_FAIL.getMessage());
+        if (type == null){
+            throw new BusinessException(LineBaseEnum.NOTYPE_FAIL.getMessage());
+        }
         //传1 则是趋势数据tab页面
         if("1".equals(type)){
             formatQueryParamList(commonStatisticalQueryParam);
@@ -419,14 +421,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                         temp.setPhaseType(evtParamPhase.get(0).getValue()+(Objects.isNull(evtParamPhase.get(0).getUnit())?"":evtParamPhase.get(0).getUnit()));
                     }
                 }
-                //变电站名称
-                List<LineDetailVO.Detail> lineDetailVOS = lineFeignClient.getLineDetailByIds(Arrays.asList(temp.getLineId())).getData();
-                if(!lineDetailVOS.isEmpty()){
-                    temp.setSubName(lineDetailVOS.get(0).getSubName());
-                }
-                //暂降幅值
-                List<RmpEventDetailPO> eventDetails = eventDetailFeignClient.getEventDetailByIdsList(Arrays.asList(temp.getEventId())).getData();
-                if(eventDetails !=null && !eventDetails.isEmpty()) temp.setFeatureAmplitude(PubUtils.floatRound(2, eventDetails.get(0).getFeatureAmplitude().floatValue()));
+
 
             });
             return returnpage;