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

二次版本提交

Browse Source
This commit is contained in:
hzj
2025-08-01 16:35:39 +08:00
parent a2f7b1b9de
commit 0d80e33d13
5 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@
<select id="selectDeviceDTOPage" resultType="com.njcn.gather.event.devcie.pojo.dto.DeviceDTO">
select
pq_device.dev_index devId,
DISTINCT pq_device.dev_index devId,
pq_device.name devName,
pq_device.UpdateTime updateTime,
pq_device.DevFlag devFlag,
@@ -63,18 +63,28 @@
PQ_SUBSTATION.sub_index stationId,
PQ_SUBSTATION.name stationName,
PQ_GDINFORMATION.Name gdName,
PQS_DICDATA.DIC_Name MANUFACTURER_Name
PQS_DICDATA.DIC_Name MANUFACTURER_Name,
PQ_DEVICEDETAIL.ThisTimeCheck thisTimeCheck,
PQ_DEVICEDETAIL.NextTimeCheck nextTimeCheck,
pq_device.LogonTime logonTime,
PQS_DEPTS.DEPTSNAME deptName
from
pq_device,
PQ_DEVICE,
PQ_SUBSTATION,
PQ_GDINFORMATION,
PQ_DEVICEDETAIL,
PQS_DICDATA
PQS_DICDATA,
PQ_LINE,
PQS_DEPTS,
PQS_DEPTSLINE
where
pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX
and pq_device.GD_INDEX =PQ_GDINFORMATION.GD_INDEX
and PQ_DEVICEDETAIL.dev_index =pq_device.dev_index
and PQ_DEVICEDETAIL.MANUFACTURER = PQS_DICDATA.DIC_INDEX
and PQ_LINE.DEV_INDEX = PQ_DEVICE.DEV_INDEX
and PQ_LINE.LINE_INDEX = PQS_DEPTSLINE.LINE_INDEX
and PQS_DEPTSLINE.DEPTS_INDEX=PQS_DEPTS.DEPTS_INDEX
<if test="searchValue!= null and searchValue!= ''">
AND (
pq_device.name LIKE '%' || #{searchValue} || '%'

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

@@ -24,6 +24,17 @@ public class DeviceDTO {
private String devFlag;
private String ip;
private String manufacturerName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime thisTimeCheck;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime nextTimeCheck;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime logonTime;
private String deptName;
//通讯状态
private Integer runFlag=0;
//装置通讯状态（0：中断；1：正常）

2
event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java
View File

@@ -36,6 +36,8 @@ public class EventDetailVO {
private Integer lineid;
private String pointname;
private String gdName;
private String busName;
private String persisttime;

2
event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/EventRightServiceImpl.java
View File

@@ -213,6 +213,8 @@ public class EventRightServiceImpl implements EventRightService {
eventDetailVO.setObjName(objName);
LedgerBaseInfoDTO dto = lineMap.get(pqsEventdetail.getLineid());
eventDetailVO.setBdname(dto.getStationName());
eventDetailVO.setGdName(dto.getGdName());
eventDetailVO.setBusName(dto.getBusBarName());
eventDetailVO.setLineid(dto.getLineId());
eventDetailVO.setPointname(dto.getLineName());
eventDetailVO.setEventdetail_index(pqsEventdetail.getEventdetailIndex());

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

@@ -426,6 +426,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());
eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName());
eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName());
eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName());
eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName());
eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName());
}
eventDetailVO.setNeedDealFlag(finalNoticeLineIds.contains(temp.getLineid())?1:0);
@@ -516,6 +518,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());
eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName());
eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName());
eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName());
eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName());
}
result.add(eventDetailVO);
}
@@ -866,6 +870,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());
eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName());
eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName());
eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName());
eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName());
eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName());
}
resultList.add(eventDetailVO);
@@ -1062,6 +1068,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());
eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName());
eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName());
eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName());
eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName());
eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName());
}
return eventDetailVO;
@@ -1083,7 +1091,7 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
pqLineList = pqLineList.stream().filter(temp->deptslineIds.contains(temp.getLineIndex())).collect(Collectors.toList());
List<Integer> devIndexs = pqLineList.stream().map(PqLine::getDevIndex).collect(Collectors.toList());
List<Integer> devIndexs = pqLineList.stream().map(PqLine::getDevIndex).distinct().collect(Collectors.toList());
//在运总数
List<PqDevice> pqDeviceList = pqDeviceService.lambdaQuery().in(PqDevice::getDevIndex, devIndexs).eq(PqDevice::getDevflag, 0).list();
List<Integer> runDevList = pqDeviceList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList());
@@ -1155,6 +1163,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());
eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName());
eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName());
eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName());
eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName());
eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName());
}
return eventDetailVO;
@@ -1197,6 +1207,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId());
eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName());
eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName());
eventDetailVO.setGdName(ledgerBaseInfoDTO.getGdName());
eventDetailVO.setBusName(ledgerBaseInfoDTO.getBusBarName());
eventDetailVO.setObjName(ledgerBaseInfoDTO.getObjName());
}
return eventDetailVO;