From 6c88c54982f239bc260176f669bb0c9aa82e4830 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Thu, 31 Jul 2025 09:37:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=89=88=E6=9C=AC=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/gather/event/devcie/mapper/PqDeviceMapper.java | 2 +- .../event/devcie/mapper/mapping/PqDeviceMapper.xml | 9 +++++++-- .../com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java | 1 + .../gather/event/devcie/service/PqDeviceService.java | 2 +- .../event/devcie/service/impl/PqDeviceServiceImpl.java | 2 +- .../transientes/pojo/param/LargeScreenCountParam.java | 2 +- .../service/impl/LargeScreenCountServiceImpl.java | 9 ++++++--- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java index 76982993..082a2810 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/PqDeviceMapper.java @@ -19,5 +19,5 @@ import java.util.List; public interface PqDeviceMapper extends BaseMapper { List queryListByIds(@Param("ids") List ids); - Page selectDeviceDTOPage(Page pqsEventdetailPage, @Param("searchValue") String searchValue,@Param("devIndexs") List devIndexs, @Param("state") Integer state); + Page selectDeviceDTOPage(Page pqsEventdetailPage, @Param("searchValue") String searchValue,@Param("devIndexs") List devIndexs, @Param("state") String state); } \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml index fe14f939..3be17059 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqDeviceMapper.xml @@ -62,14 +62,19 @@ pq_device.status status, PQ_SUBSTATION.sub_index stationId, PQ_SUBSTATION.name stationName, - PQ_GDINFORMATION.Name gdName + PQ_GDINFORMATION.Name gdName, + PQS_DICDATA.DIC_Name MANUFACTURER_Name from pq_device, PQ_SUBSTATION, - PQ_GDINFORMATION + PQ_GDINFORMATION, + PQ_DEVICEDETAIL, + PQS_DICDATA 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_device.name LIKE '%' || #{searchValue} || '%' diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java index a0107b4a..1e43b50a 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/pojo/dto/DeviceDTO.java @@ -23,6 +23,7 @@ public class DeviceDTO { private LocalDateTime updateTime; private String devFlag; private String ip; + private String manufacturerName; //通讯状态 private Integer runFlag=0; //装置通讯状态（0：中断；1：正常） diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java index c2000854..6dc40065 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/PqDeviceService.java @@ -19,5 +19,5 @@ public interface PqDeviceService extends IService{ List queryListByIds(List lineIds); - Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs, Integer state); + Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs, String state); } diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java index 8a74efc6..a3607369 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/service/impl/PqDeviceServiceImpl.java @@ -26,7 +26,7 @@ public class PqDeviceServiceImpl extends ServiceImpl i } @Override - public Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs, Integer state) { + public Page selectDeviceDTOPage(Page pqsEventdetailPage, String searchValue, List devIndexs, String state) { return this.baseMapper.selectDeviceDTOPage(pqsEventdetailPage,searchValue,devIndexs,state); } } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java index 3764007a..2b8243c7 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/param/LargeScreenCountParam.java @@ -29,7 +29,7 @@ public class LargeScreenCountParam extends BaseParam { private Integer eventDeep; @ApiModelProperty(name="t通讯状态",value="0.离线 1.在线") - private Integer state; + private String state; private Integer sendResult; @JsonFormat(pattern = "yyyy-MM-dd") diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index a2a36df9..6e9d7409 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java @@ -1084,15 +1084,18 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { pqLineList = pqLineList.stream().filter(temp->deptslineIds.contains(temp.getLineIndex())).collect(Collectors.toList()); List devIndexs = pqLineList.stream().map(PqLine::getDevIndex).collect(Collectors.toList()); - List list = pqsOnlinerateService.lambdaQuery().in(PqsOnlinerate::getDevIndex,devIndexs).between(PqsOnlinerate::getTimeid, startTime, endTime).list(); + //在运总数 + List pqDeviceList = pqDeviceService.lambdaQuery().in(PqDevice::getDevIndex, devIndexs).eq(PqDevice::getDevflag, 0).list(); + List runDevList = pqDeviceList.stream().map(PqDevice::getDevIndex).collect(Collectors.toList()); + List list = pqsOnlinerateService.lambdaQuery().in(PqsOnlinerate::getDevIndex,runDevList).between(PqsOnlinerate::getTimeid, startTime, endTime).list(); - pqsEventdetailPage = pqDeviceService.selectDeviceDTOPage(pqsEventdetailPage,largeScreenCountParam.getSearchValue(),devIndexs,largeScreenCountParam.getState()); + pqsEventdetailPage = pqDeviceService.selectDeviceDTOPage(pqsEventdetailPage,largeScreenCountParam.getSearchValue(),runDevList,largeScreenCountParam.getState()); if(!CollectionUtils.isEmpty(list)){ for (DeviceDTO record : pqsEventdetailPage.getRecords()) { List tempList = list.stream().filter(temp -> Objects.equals(temp.getDevIndex(), record.getDevId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(tempList)){ double asDouble = tempList.stream().mapToDouble(temp -> { - return Double.valueOf(temp.getOnlinemin()) / (temp.getOfflinemin() + temp.getOnlinemin()); + return Double.valueOf(temp.getOnlinemin()*100) / (temp.getOfflinemin() + temp.getOnlinemin()); }).average().getAsDouble(); record.setOnLineRate(new BigDecimal(asDouble).setScale(2, RoundingMode.UP).doubleValue());