Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

海南大屏bug修改，暂态事件列表功能新增两个字段

Browse Source
This commit is contained in:
hzj
2024-11-22 09:21:31 +08:00
parent 8fc1645b04
commit 04ce3eb97d
11 changed files with 120 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java
View File

@@ -14,6 +14,7 @@ import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
import com.njcn.device.pq.pojo.vo.LineDetailVO;
import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO;
import com.njcn.harmonic.mapper.RMpVThdMapper;
import com.njcn.harmonic.mapper.THDistortionMapper;
@@ -153,8 +154,9 @@ public class THDistortionServiceImpl implements THDistortionService {
RMpVThdVO rMpVThdVO = new RMpVThdVO();
BeanUtils.copyProperties(rMpVThd, rMpVThdVO);
/*查询监测点详情获取名称*/
LineDetailDataVO data = lineFeignClient.getLineDetailData(rMpVThd.getMeasurementPointId()).getData();
LineDetailVO data = lineFeignClient.getLineSubGdDetail(rMpVThd.getMeasurementPointId()).getData();
rMpVThdVO.setName(data.getLineName());
rMpVThdVO.setSubStationName(data.getSubName());
return rMpVThdVO;
}).collect(Collectors.toList());

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/LargeScreenServiceImpl.java
View File

@@ -69,7 +69,8 @@ public class LargeScreenServiceImpl implements LargeScreenService {
if (Objects.equals(generalDeviceDTOList.get(i).getIndex(), map.get("id"))) {
HomeostasisAreaVO homeostasisAreaVO = new HomeostasisAreaVO();
homeostasisAreaVO.setName(generalDeviceDTOList.get(i).getName());
f = Float.parseFloat(map.get("avg").toString()) * 100;
//数据库里已经*100了这里去掉*100，见RStatHarmonicOrgM 65行
f = Float.parseFloat(map.get("avg").toString());
homeostasisAreaVO.setAvg(String.valueOf(f));
result.add(homeostasisAreaVO);
}