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

暂降事件推送日志

Browse Source
This commit is contained in:
zhuxinyu
2023-04-26 09:51:39 +08:00
parent 8ef30d0f22
commit 1819b87c6a
10 changed files with 199 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/EventPushLogs.java
View File

@@ -1,10 +1,12 @@
package com.njcn.device.pq.pojo.po; package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime;
/** /**
* @version 1.0.0 * @version 1.0.0
@@ -12,27 +14,25 @@ import java.time.Instant;
* @date: 2022/06/09 11:00 * @date: 2022/06/09 11:00
*/ */
@Data @Data
@Measurement(name = "pqs_event_push_logs") @TableName("cld_event_push_log")
public class EventPushLogs { public class EventPushLogs {
@Column(name = "time") @TableId("Time_Id")
private Instant timeId; private LocalDateTime timeId;
@Column(name = "line_id") @TableField("Line_Id")
private String lineId; private String lineId;
@Column(name = "create_time") @TableField("Create_Time")
private String createTime; private LocalDateTime createTime;
@Column(name = "update_time") @TableField("Update_Time")
private String updateTime; private LocalDateTime updateTime;
@Column(name = "push_failed") @TableField("Push_Failed")
private Integer pushFailed; private Integer pushFailed;
@Column(name = "result") @TableField("Result")
private Integer result; private Integer result;
} }

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalDaliyFlowVO.java
View File

@@ -1,5 +1,6 @@
package com.njcn.device.pq.pojo.vo; package com.njcn.device.pq.pojo.vo;
import com.njcn.device.pq.pojo.po.DevFuction;
import com.njcn.device.pq.pojo.po.influxdb.DeviceDayFlow; import com.njcn.device.pq.pojo.po.influxdb.DeviceDayFlow;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@@ -32,6 +33,8 @@ public class TerminalDaliyFlowVO {
private Float flowMeal; private Float flowMeal;
@ApiModelProperty(name = "deviceDayFlowsList",value = "装置日流量统计集合") @ApiModelProperty(name = "deviceDayFlowsList",value = "装置日流量统计集合")
private List<DeviceDayFlow> deviceDayFlowsList; private List<DeviceDayFlow> deviceDayFlowsList;
@ApiModelProperty(name = "functions",value = "装置功能码集合")
private List<DevFuction> functions;
} }

8
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/EventPushLogsMapper.java Normal file
View File

@@ -0,0 +1,8 @@
package com.njcn.device.pq.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.device.pq.pojo.po.EventPushLogs;
public interface EventPushLogsMapper extends BaseMapper<EventPushLogs> {
}

5
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/EventPushLogsMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.device.pq.mapper.EventPushLogsMapper">
</mapper>

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/RateOfFlowMapper.xml
View File

@@ -38,7 +38,7 @@
`Update_Time` updateTime `Update_Time` updateTime
FROM FROM
cld_flow_meal cld_flow_meal
WHERE Type =0 OR Type =1 AND Flag =1 WHERE Type =0 AND Flag =1
</select> </select>
<update id="updateByState"> <update id="updateByState">

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml
View File

@@ -15,7 +15,7 @@
ifnull(d.flow,(select flow from cld_flow_meal where type = 0 and flag = 1)) baseFlowMeal, ifnull(d.flow,(select flow from cld_flow_meal where type = 0 and flag = 1)) baseFlowMeal,
ifnull(d1.flow,0) reamFlowMeal, ifnull(d1.flow,0) reamFlowMeal,
ROUND(ifnull(mo.Actual_Value,0)/1024/1024,2) statisValue ROUND(ifnull(mo.Actual_Value,0)/1024/1024,2) statisValue
FROM FROM
pq_line a pq_line a
INNER JOIN pq_device b ON a.id = b.id INNER JOIN pq_device b ON a.id = b.id
LEFT JOIN cld_dev_meal c ON b.id = c.line_id LEFT JOIN cld_dev_meal c ON b.id = c.line_id

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/FlowMealServiceImpl.java
View File

@@ -53,13 +53,13 @@ public class FlowMealServiceImpl extends ServiceImpl<FlowMealMapper, FlowMeal> i
@Override @Override
public boolean updateRateOfFlowData(FlowMealParam.FlowMealUpdateParam flowMealUpdateParam) { public boolean updateRateOfFlowData(FlowMealParam.FlowMealUpdateParam flowMealUpdateParam) {
if (flowMealUpdateParam.getType() ==0 ) {
checkCode(flowMealUpdateParam, true); checkCode(flowMealUpdateParam, true);
}
FlowMeal flowMeal = new FlowMeal(); FlowMeal flowMeal = new FlowMeal();
BeanUtils.copyProperties(flowMealUpdateParam, flowMeal); BeanUtils.copyProperties(flowMealUpdateParam, flowMeal);
flowMeal.setUpdateBy(RequestUtil.getUserIndex()); flowMeal.setUpdateBy(RequestUtil.getUserIndex());
flowMeal.setUpdateTime(LocalDateTime.now()); flowMeal.setUpdateTime(LocalDateTime.now());
//查询修改前的数据
FlowMeal newFlowMeal = this.getById(flowMeal.getId());
boolean b = this.updateById(flowMeal); boolean b = this.updateById(flowMeal);
if (b) { if (b) {
return true; return true;

149
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LogManageServiceImpl.java
View File

@@ -1,13 +1,19 @@
package com.njcn.device.pq.service.impl; package com.njcn.device.pq.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.njcn.device.pq.mapper.EventPushLogsMapper;
import com.njcn.device.pq.mapper.LineMapper;
import com.njcn.device.pq.mapper.LogManageMapper; import com.njcn.device.pq.mapper.LogManageMapper;
import com.njcn.device.pq.pojo.constant.DeviceValidMessage; import com.njcn.device.pq.pojo.constant.DeviceValidMessage;
import com.njcn.device.pq.pojo.param.DeviceLogParam; import com.njcn.device.pq.pojo.param.DeviceLogParam;
import com.njcn.device.pq.pojo.param.EventLogParam; import com.njcn.device.pq.pojo.param.EventLogParam;
import com.njcn.device.pq.pojo.po.EventPushLogs; import com.njcn.device.pq.pojo.po.EventPushLogs;
import com.njcn.device.pq.pojo.po.TerminalLogs; import com.njcn.device.pq.pojo.po.TerminalLogs;
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
import com.njcn.device.pq.pojo.vo.DeviceLogVO; import com.njcn.device.pq.pojo.vo.DeviceLogVO;
import com.njcn.device.pq.pojo.vo.EventLogVO; import com.njcn.device.pq.pojo.vo.EventLogVO;
import com.njcn.device.pq.service.LogManageService; import com.njcn.device.pq.service.LogManageService;
@@ -27,6 +33,7 @@ import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -45,6 +52,10 @@ public class LogManageServiceImpl implements LogManageService {
private final InfluxDbUtils influxDbUtils; private final InfluxDbUtils influxDbUtils;
private final EventPushLogsMapper eventPushLogsMapper;
private final LineMapper lineMapper;
@Override @Override
public Page<DeviceLogVO> getDeviceLogData(DeviceLogParam deviceLogParam) { public Page<DeviceLogVO> getDeviceLogData(DeviceLogParam deviceLogParam) {
Page<DeviceLogVO> page = new Page<>(); Page<DeviceLogVO> page = new Page<>();
@@ -90,62 +101,124 @@ public class LogManageServiceImpl implements LogManageService {
page.setSize(eventLogParam.getPageSize()); page.setSize(eventLogParam.getPageSize());
page.setCurrent(eventLogParam.getPageNum()); page.setCurrent(eventLogParam.getPageNum());
List<EventLogVO> list = new ArrayList<>(); List<EventLogVO> list = new ArrayList<>();
/** 查询event_push_logs表数据*/ // influxDB改查MySQL cld_event_push_log
List<EventPushLogs> eventPushLogs = getEventPushLogs(eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getResult()); Page<EventPushLogs> p = new Page<>();
//待分页数据总量 p.setSize(eventLogParam.getPageSize());
page.setTotal(eventPushLogs.size()); p.setCurrent(eventLogParam.getPageNum());
//分页总页数 LambdaQueryWrapper<EventPushLogs> wrapper = new LambdaQueryWrapper<>();
int pages = (int)Math.ceil(eventPushLogs.size()*1.0/eventLogParam.getPageSize()); wrapper.between(EventPushLogs::getTimeId,DateUtil.beginOfDay(DateUtil.parse(eventLogParam.getSearchBeginTime())),DateUtil.beginOfDay(DateUtil.parse(eventLogParam.getSearchEndTime())));
page.setPages(pages); wrapper.eq(EventPushLogs::getResult,eventLogParam.getResult());
if (!CollectionUtils.isEmpty(eventPushLogs)) { Page<EventPushLogs> rawPage = eventPushLogsMapper.selectPage(p, wrapper);
List<String> lineIndexes = eventPushLogs.stream().map(EventPushLogs::getLineId).collect(Collectors.toList()); List<EventPushLogs> rawLogs = rawPage.getRecords();
lineIndexes = lineIndexes.stream().distinct().collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(rawLogs)) {
/** 分页查询pqs_eventdetail表数据*/ List<String> lineIndexes = rawLogs.stream().map(EventPushLogs::getLineId).distinct().collect(Collectors.toList());
List<EventDetail> eventDetailData = eventDetailFeignClient.getEventDetailLimit(lineIndexes, eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getPageSize(), eventLogParam.getPageNum()).getData(); List<EventDetail> rawEventDetailData = eventDetailFeignClient.getEventDetailLimit(lineIndexes, eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getPageSize(), eventLogParam.getPageNum()).getData();
if (!CollectionUtils.isEmpty(eventDetailData)) { List<EventDetail> eventDetails = rawEventDetailData.stream().filter(eventDetail -> filterLineIdAndTime(eventDetail, rawLogs)).collect(Collectors.toList());
for (EventPushLogs pushLogs: eventPushLogs) { Map<String, List<EventDetail>> eventDetailMap = eventDetails.stream().collect(Collectors.groupingBy(EventDetail::getLineId));
for (EventDetail eventDetail: eventDetailData) { List<String> lineList = eventDetails.stream().map(EventDetail::getLineId).collect(Collectors.toList());
if (pushLogs.getLineId().equals(eventDetail.getLineId()) && pushLogs.getTimeId().equals(eventDetail.getStartTime())) { List<AreaLineInfoVO> lineAreaInfos = lineMapper.getBaseLineAreaInfo(lineList, null, null);
EventLogVO event = logManageMapper.getEventLogData(pushLogs.getLineId()); Map<String, List<AreaLineInfoVO>> areaMap = lineAreaInfos.stream().collect(Collectors.groupingBy(AreaLineInfoVO::getLineId));
if (Objects.isNull(event)) { DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
for (EventPushLogs rawLog : rawLogs) {
if (Objects.isNull(areaMap.get(rawLog.getLineId()).get(0)) || Objects.isNull(eventDetailMap.get(rawLog.getLineId()).get(0))) {
continue; continue;
} }
EventLogVO eventLogVO = new EventLogVO(); EventLogVO eventLogVO = new EventLogVO();
eventLogVO.setLineId(pushLogs.getLineId()); eventLogVO.setLineId(rawLog.getLineId());
LocalDateTime localDateTime = LocalDateTime.ofInstant(pushLogs.getTimeId(), ZoneId.systemDefault()); eventLogVO.setTime(dateTimeFormatter.format(rawLog.getTimeId()));
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); eventLogVO.setLine(areaMap.get(rawLog.getLineId()).get(0).getLineName());
String format = dateTimeFormatter.format(localDateTime); eventLogVO.setSubstation(areaMap.get(rawLog.getLineId()).get(0).getSubName());
eventLogVO.setTime(format); eventLogVO.setPowerCompany(areaMap.get(rawLog.getLineId()).get(0).getGdName());
eventLogVO.setLine(event.getLine()); Double e=eventDetailMap.get(rawLog.getLineId()).get(0).getFeatureAmplitude();
eventLogVO.setSubstation(event.getSubstation());
eventLogVO.setPowerCompany(event.getPowerCompany());
Double e = eventDetail.getFeatureAmplitude();
BigDecimal bd = new BigDecimal(e); BigDecimal bd = new BigDecimal(e);
e= bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue(); e= bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
eventLogVO.setEventValue(String.valueOf(e*100)); eventLogVO.setEventValue(String.valueOf(e*100));
double i = eventDetail.getDuration() / 1000; double i = eventDetailMap.get(rawLog.getLineId()).get(0).getDuration();
eventLogVO.setPersistTime(String.valueOf(i)); eventLogVO.setPersistTime(String.valueOf(i));
eventLogVO.setCreatTime(pushLogs.getCreateTime()); eventLogVO.setCreatTime(dateTimeFormatter.format(rawLog.getCreateTime()));
eventLogVO.setCreatTimed(pushLogs.getCreateTime()); eventLogVO.setCreatTimed(dateTimeFormatter.format(rawLog.getCreateTime()));
eventLogVO.setPushFailed(pushLogs.getPushFailed()); eventLogVO.setPushFailed(rawLog.getPushFailed());
if (pushLogs.getResult()==0) { if (rawLog.getResult()==0) {
eventLogVO.setResult("失败"); eventLogVO.setResult("失败");
eventLogVO.setState("未推送"); eventLogVO.setState("未推送");
} else { } else {
eventLogVO.setResult("成功"); eventLogVO.setResult("成功");
eventLogVO.setState("已推送"); eventLogVO.setState("已推送");
} }
eventLogVO.setUpdateTime(pushLogs.getUpdateTime()); eventLogVO.setUpdateTime(dateTimeFormatter.format(rawLog.getUpdateTime()));
list.add(eventLogVO); list.add(eventLogVO);
} }
} }
}
}
//当前页数据
page.setRecords(list);
}
return page; return page;
// /** 查询event_push_logs表数据*/
// List<EventPushLogs> eventPushLogs = getEventPushLogs(eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getResult());
// //待分页数据总量
// page.setTotal(eventPushLogs.size());
// //分页总页数
// int pages = (int)Math.ceil(eventPushLogs.size()*1.0/eventLogParam.getPageSize());
// page.setPages(pages);
// if (!CollectionUtils.isEmpty(eventPushLogs)) {
// List<String> lineIndexes = eventPushLogs.stream().map(EventPushLogs::getLineId).collect(Collectors.toList());
// lineIndexes = lineIndexes.stream().distinct().collect(Collectors.toList());
// /** 分页查询pqs_eventdetail表数据*/
// List<EventDetail> eventDetailData = eventDetailFeignClient.getEventDetailLimit(lineIndexes, eventLogParam.getSearchBeginTime(), eventLogParam.getSearchEndTime(), eventLogParam.getPageSize(), eventLogParam.getPageNum()).getData();
// if (!CollectionUtils.isEmpty(eventDetailData)) {
// for (EventPushLogs pushLogs: eventPushLogs) {
// for (EventDetail eventDetail: eventDetailData) {
// if (pushLogs.getLineId().equals(eventDetail.getLineId()) && pushLogs.getTimeId().equals(eventDetail.getStartTime())) {
// EventLogVO event = logManageMapper.getEventLogData(pushLogs.getLineId());
// if (Objects.isNull(event)) {
// continue;
// }
// EventLogVO eventLogVO = new EventLogVO();
// eventLogVO.setLineId(pushLogs.getLineId());
// LocalDateTime localDateTime = LocalDateTime.ofInstant(pushLogs.getTimeId(), ZoneId.systemDefault());
// DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
// String format = dateTimeFormatter.format(localDateTime);
// eventLogVO.setTime(format);
// eventLogVO.setLine(event.getLine());
// eventLogVO.setSubstation(event.getSubstation());
// eventLogVO.setPowerCompany(event.getPowerCompany());
// Double e = eventDetail.getFeatureAmplitude();
// BigDecimal bd = new BigDecimal(e);
// e= bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
// eventLogVO.setEventValue(String.valueOf(e*100));
// double i = eventDetail.getDuration() / 1000;
// eventLogVO.setPersistTime(String.valueOf(i));
// eventLogVO.setCreatTime(pushLogs.getCreateTime());
// eventLogVO.setCreatTimed(pushLogs.getCreateTime());
// eventLogVO.setPushFailed(pushLogs.getPushFailed());
// if (pushLogs.getResult()==0) {
// eventLogVO.setResult("失败");
// eventLogVO.setState("未推送");
// } else {
// eventLogVO.setResult("成功");
// eventLogVO.setState("已推送");
// }
// eventLogVO.setUpdateTime(pushLogs.getUpdateTime());
//
// list.add(eventLogVO);
// }
// }
// }
// }
// //当前页数据
// page.setRecords(list);
// }
// return page;
}
private boolean filterLineIdAndTime(EventDetail eventDetail, List<EventPushLogs> eventPushLogs) {
boolean flag = false;
for (EventPushLogs log : eventPushLogs) {
if (log.getLineId().equals(eventDetail.getLineId()) && eventDetail.getStartTime().isEqual(log.getTimeId())) {
flag=true;
}
}
return flag;
} }
/** /**

15
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.njcn.common.pojo.dto.SimpleDTO;
import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.pq.mapper.DevFuctionMapper;
import com.njcn.device.pq.mapper.TerminalMaintainMapper; import com.njcn.device.pq.mapper.TerminalMaintainMapper;
import com.njcn.device.pq.mapper.UserMapper; import com.njcn.device.pq.mapper.UserMapper;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -72,10 +73,11 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
private final IPqsTerminalLogsService iPqsTerminalLogsService; private final IPqsTerminalLogsService iPqsTerminalLogsService;
private final DevFuctionMapper devFuctionMapper;
@Override @Override
public List<TerminalMaintainVO> getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) { public List<TerminalMaintainVO> getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) {
List<TerminalMaintainVO> resList = new ArrayList<>(); List<TerminalMaintainVO> resList = new ArrayList<>();
DeviceInfoParam deviceInfoParam = new DeviceInfoParam(); DeviceInfoParam deviceInfoParam = new DeviceInfoParam();
deviceInfoParam.setLineGrade(terminalMainQueryParam.getLineGrade()); deviceInfoParam.setLineGrade(terminalMainQueryParam.getLineGrade());
deviceInfoParam.setDeptIndex(deptFeignClient.getRootDept().getData().getId()); deviceInfoParam.setDeptIndex(deptFeignClient.getRootDept().getData().getId());
@@ -84,7 +86,6 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
deviceInfoParam.setStatisticalType(simpleDTO); deviceInfoParam.setStatisticalType(simpleDTO);
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Objects.isNull(terminalMainQueryParam.getRunFlag()) ? null : CollUtil.newArrayList(terminalMainQueryParam.getRunFlag()), CollUtil.newArrayList(1)); List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Objects.isNull(terminalMainQueryParam.getRunFlag()) ? null : CollUtil.newArrayList(terminalMainQueryParam.getRunFlag()), CollUtil.newArrayList(1));
if (CollectionUtil.isNotEmpty(generalDeviceDTOList)) { if (CollectionUtil.isNotEmpty(generalDeviceDTOList)) {
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
List<String> devIds = generalDeviceDTO.getDeviceIndexes(); List<String> devIds = generalDeviceDTO.getDeviceIndexes();
if (CollectionUtils.isEmpty(devIds)) { if (CollectionUtils.isEmpty(devIds)) {
@@ -282,12 +283,10 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService {
public List<TerminalDaliyFlowVO> getFlowManageDetail(TerminalMainQueryParam param) { public List<TerminalDaliyFlowVO> getFlowManageDetail(TerminalMainQueryParam param) {
List<TerminalDaliyFlowVO> list = new ArrayList<>(); List<TerminalDaliyFlowVO> list = new ArrayList<>();
TerminalDaliyFlowVO flowManageDetail = terminalMaintainMapper.getFlowManageDetail(param.getDevId()); TerminalDaliyFlowVO flowManageDetail = terminalMaintainMapper.getFlowManageDetail(param.getDevId());
// if (flowManageDetail ==null) { QueryWrapper<DevFuction> funQueryWrapper = new QueryWrapper<>();
// flowManageDetail = new TerminalDaliyFlowVO(); funQueryWrapper.lambda().eq(DevFuction::getLineId,param.getDevId());
// flowManageDetail.setBaseFlow(1024f); List<DevFuction> functions = devFuctionMapper.selectList(funQueryWrapper);
// flowManageDetail.setExtendFlow(0f); flowManageDetail.setFunctions(functions);
// flowManageDetail.setFlowMeal(1024f);
// }
List<DeviceDayFlow> deviceDayFlowList = getFlowManageDetailFromInfluxDB(param); List<DeviceDayFlow> deviceDayFlowList = getFlowManageDetailFromInfluxDB(param);
float sum = (float) deviceDayFlowList.stream().mapToDouble(DeviceDayFlow::getDailyActualValue).sum(); float sum = (float) deviceDayFlowList.stream().mapToDouble(DeviceDayFlow::getDailyActualValue).sum();
flowManageDetail.setDeviceDayFlowsList(deviceDayFlowList); flowManageDetail.setDeviceDayFlowsList(deviceDayFlowList);

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

@@ -119,15 +119,11 @@ public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEv
@Override @Override
public List<EventDetail> getEventDetailLimit(List<String> lineIndexes, String startTime, String endTime, Integer pageSize, Integer pageNum, List<String> waveType) { public List<EventDetail> getEventDetailLimit(List<String> lineIndexes, String startTime, String endTime, Integer pageSize, Integer pageNum, List<String> waveType) {
Page<RmpEventDetailPO> pageInfo = this.page(new Page<>(pageNum, pageSize), new LambdaQueryWrapper<RmpEventDetailPO>() Page<RmpEventDetailPO> pageInfo = this.page(new Page<>(pageNum, pageSize), new LambdaQueryWrapper<RmpEventDetailPO>()
.in(RmpEventDetailPO::getMeasurementPointId, lineIndexes) .in(RmpEventDetailPO::getMeasurementPointId, lineIndexes)
.ge(StrUtil.isNotBlank(startTime), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(startTime))) .ge(StrUtil.isNotBlank(startTime), RmpEventDetailPO::getStartTime,DateUtil.beginOfDay(DateUtil.parse(startTime)))
.le(StrUtil.isNotBlank(endTime), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(endTime))) .le(StrUtil.isNotBlank(endTime), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(endTime)))
); );
return BeanUtil.copyToList(pageInfo.getRecords(), EventDetail.class); return BeanUtil.copyToList(pageInfo.getRecords(), EventDetail.class);
} }
} }