ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
chendaofei
2025-06-30 16:08:37 +08:00
parent a9d2ba8dde de138328e9
commit dc366ae1c3
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml
View File

@@ -32,8 +32,9 @@
select select
pq_device.dev_index devId, pq_device.dev_index devId,
pq_device.name devName, pq_device.name devName,
PQ_SUBVOLTAGE.SUBV_INDEX busBarId, pq_device.UpdateTime updateTime,
PQ_SUBVOLTAGE.name busBarName, pq_device.DevFlag devFlag,
pq_device.IP ip,
PQ_SUBSTATION.sub_index stationId, PQ_SUBSTATION.sub_index stationId,
PQ_SUBSTATION.name stationName, PQ_SUBSTATION.name stationName,
PQ_GDINFORMATION.Name gdName PQ_GDINFORMATION.Name gdName
@@ -43,8 +44,7 @@
PQ_SUBSTATION, PQ_SUBSTATION,
PQ_GDINFORMATION PQ_GDINFORMATION
where where
PQ_SUBVOLTAGE.DEV_INDEX = pq_device.DEV_INDEX pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
and pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
and pq_device.GD_INDEX =PQ_GDINFORMATION.GD_INDEX and pq_device.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
and pq_device.DEV_INDEX in and pq_device.DEV_INDEX in
<foreach collection="ids" item="item" open="(" close=")" separator=","> <foreach collection="ids" item="item" open="(" close=")" separator=",">

9
event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java
View File

@@ -1,7 +1,10 @@
package com.njcn.gather.event.devcie.pojo.dto; package com.njcn.gather.event.devcie.pojo.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime;
/** /**
* Description: * Description:
* Date: 2025/06/27 下午 3:25【需求编号】 * Date: 2025/06/27 下午 3:25【需求编号】
@@ -13,10 +16,12 @@ import lombok.Data;
public class DeviceDTO { public class DeviceDTO {
private Integer devId; private Integer devId;
private String devName; private String devName;
private Integer busBarId;
private String busBarName;
private Integer stationId; private Integer stationId;
private String stationName; private String stationName;
private String gdName; private String gdName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
private String devFlag;
private String ip;
private Integer runFlag=0; private Integer runFlag=0;
} }

6
event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java
View File

@@ -138,7 +138,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
ledgerBaseInfoDTOS.stream().forEach(temp->temp.setRunFlag(runLineList.contains(temp.getLineId())?1:0)); ledgerBaseInfoDTOS.stream().forEach(temp->temp.setRunFlag(runLineList.contains(temp.getLineId())?1:0));
ledgerCountVO.setAllLineList(ledgerBaseInfoDTOS); ledgerCountVO.setAllLineList(ledgerBaseInfoDTOS);
List<DeviceDTO> deviceDTOS = pqDeviceService.queryListByIds(devList); List<DeviceDTO> deviceDTOS = pqDeviceService.queryListByIds(devList);
deviceDTOS.forEach(temp->temp.setRunFlag(runDevList.contains(temp.getDevId())?1:0)); deviceDTOS =deviceDTOS.stream().distinct().collect(Collectors.toList());
deviceDTOS.forEach(temp-> temp.setRunFlag(runDevList.contains(temp.getDevId())?1:0));
ledgerCountVO.setAllDevList(deviceDTOS); ledgerCountVO.setAllDevList(deviceDTOS);
List<SubstationDTO> substationDTOS = pqSubstationService.queryListByIds(allSubList); List<SubstationDTO> substationDTOS = pqSubstationService.queryListByIds(allSubList);
substationDTOS.forEach(temp->temp.setRunFlag(runSubList.contains(temp.getStationId())?1:0)); substationDTOS.forEach(temp->temp.setRunFlag(runSubList.contains(temp.getStationId())?1:0));
@@ -437,6 +438,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
Page<EventDetailVO> returnpage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize()); Page<EventDetailVO> returnpage = new Page<>(largeScreenCountParam.getPageNum(), largeScreenCountParam.getPageSize());
returnpage.setRecords(collect); returnpage.setRecords(collect);
returnpage.setTotal(list.getTotal());
return returnpage; return returnpage;
} }
@@ -670,7 +672,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
List<LedgerBaseInfoDTO> pqLineList = pqLineMapper.getBaseLineInfo(lineidList); List<LedgerBaseInfoDTO> pqLineList = pqLineMapper.getBaseLineInfo(lineidList);
Map<Integer,LedgerBaseInfoDTO> ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); Map<Integer,LedgerBaseInfoDTO> ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity()));
List<EventDetailVO> detailVOList = list.stream().map(temp -> { result = list.stream().map(temp -> {
EventDetailVO eventDetailVO = new EventDetailVO(); EventDetailVO eventDetailVO = new EventDetailVO();
eventDetailVO.setEventdetail_index(temp.getEventdetailIndex()); eventDetailVO.setEventdetail_index(temp.getEventdetailIndex());
eventDetailVO.setTimeid(temp.getTimeid()); eventDetailVO.setTimeid(temp.getTimeid());