fix(event): 修复事件详情波形路径更新逻辑
- 修正CsEventPOServiceImpl中wavePath更新时的对象引用错误 - 在EventDetailVO中新增startTime2字段用于显示不带毫秒的时间 - 优化DataTaskServiceImpl中的设备通信离线时段计算逻辑 - 完善DeviceMessageServiceImpl中设备消息映射的边界情况处理
This commit is contained in:
@@ -459,7 +459,7 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
|
||||
LambdaQueryWrapper<RmpEventDetailPO> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(RmpEventDetailPO::getEventId,id);
|
||||
RmpEventDetailPO po2 = wlRmpEventDetailMapper.selectOne(wrapper);
|
||||
po2.setWavePath(po2.getWavePath());
|
||||
po2.setWavePath(po.getWavePath());
|
||||
po2.setFileFlag(1);
|
||||
int row = wlRmpEventDetailMapper.updateById(po2);
|
||||
if (row > 0) {
|
||||
|
||||
@@ -46,6 +46,8 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -350,6 +352,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
|
||||
List<String> ids = returnpage.getRecords().stream().map(EventDetailVO::getId).collect(Collectors.toList());
|
||||
List<CsEventUserPO> userEvents = this.queryEventListByUserId(RequestUtil.getUserIndex(),ids);
|
||||
returnpage.getRecords().forEach(temp -> {
|
||||
if (!Objects.equals(csEventUserQueryPage.getType(),"0")) {
|
||||
temp.setStartTime2(temp.getStartTime());
|
||||
}
|
||||
//台账信息
|
||||
DevDetailDTO devDetail = csLedgerFeignClient.queryDevDetail(temp.getDeviceId()).getData();
|
||||
temp.setEquipmentName(devDetail.getEquipmentName());
|
||||
|
||||
Reference in New Issue
Block a user