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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wurui
2023-02-17 09:06:17 +08:00
parent b580ca931e 5ee0d5782e
commit 3a602068a4
16 changed files with 216 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
View File

@@ -239,8 +239,7 @@ public class TransientServiceImpl implements TransientService {
Page<EventDetailNew> page = new Page<>();
page.setSize(transientParam.getPageSize());
page.setCurrent(transientParam.getPageNum());
//List<TransientVO> transientVos = new ArrayList<>();
//transientParam.setServerName(ServerEnum.HARMONIC.getName());
//按部门分类的实际运行终端综合信息
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(transientParam).getData();
if (!CollectionUtils.isEmpty(generalDeviceDTOList)) {
@@ -266,7 +265,7 @@ public class TransientServiceImpl implements TransientService {
List<DictData> reasonList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_REASON.getName()).getData();
List<DictData> typeList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.EVENT_TYPE.getName()).getData();
//List<TransientVO> transientData = transientMapper.getTransientData(lineIds);
for (EventDetailNew eventDetail : eventDetailData) {
for(AreaLineInfoVO areaLineInfoVO : r){
if(eventDetail.getLineId().equals(areaLineInfoVO.getLineId())){
@@ -276,6 +275,7 @@ public class TransientServiceImpl implements TransientService {
eventDetail.setSubName(areaLineInfoVO.getSubName());
eventDetail.setIp(areaLineInfoVO.getIp());
eventDetail.setScale(areaLineInfoVO.getVoltageScale());
eventDetail.setIp(areaLineInfoVO.getIp());
break;
}
}
@@ -405,7 +405,7 @@ public class TransientServiceImpl implements TransientService {
stringBuilder.append("LIMIT ").append(transientParam.getPageSize()).append(" OFFSET ").append(i).append(" tz('Asia/Shanghai')");
//sql语句
String sql = "SELECT * FROM pqs_eventdetail WHERE " + stringBuilder;
System.out.println("sql====================="+sql);
//结果集
QueryResult queryresult = influxDbUtils.query(sql);
//结果集映射到对象中