From b9af2a4e8554dcf71d59ffbe1d735f25d3fee385 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Thu, 31 Aug 2023 11:42:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E9=99=8D=E4=BA=8B=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dto/CsEquipmentDeliveryDTO.java | 14 +------------- .../service/impl/AppProjectServiceImpl.java | 14 +++++++++++--- .../service/impl/TemperatureServiceImpl.java | 17 ++++++++++++++++- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java index 1ccd6c1..04a08d7 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java @@ -28,25 +28,21 @@ public class CsEquipmentDeliveryDTO { /** * id */ - @TableField(value = "id") private String id; /** * 装置名称 */ - @TableField(value = "name") private String name; /** * 网关识别码 */ - @TableField(value = "ndid") private String ndid; /** * 装置mac地址 */ - @TableField(value = "mac") private String mac; /** @@ -58,31 +54,26 @@ public class CsEquipmentDeliveryDTO { /** * 装置类型(直连设备、网关设备、装置) */ - @TableField(value = "dev_type") private String devType; /** * 装置型号（pqs588、pqs680...） */ - @TableField(value = "dev_model") private String devModel; /** * 装置接入方式（mqtt、cloud） */ - @TableField(value = "dev_access_method") private String devAccessMethod; /** * 装置程序版本 */ - @TableField(value = "program_version") private String programVersion; /** * 调试人员 */ - @TableField(value = "debug_person") private String debugPerson; @@ -90,26 +81,23 @@ public class CsEquipmentDeliveryDTO { /** * 合同号 */ - @TableField(value = "cntract_no") private String cntractNo; /** * 营销经理 */ - @TableField(value = "sales_manager") private String salesManager; /** * 接入状态(1:未注册 2:注册 3:接入) */ - @TableField(value = "status") private String status; /** * 设备状态(0:删除 1:离线 2:在线) */ - @TableField(value = "run_status") private Integer runStatus; + private Integer moduleNumber; } \ No newline at end of file diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java index 78cc42d..f21b5d7 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java @@ -261,8 +261,10 @@ class AppProjectServiceImpl extends ServiceImpl // userId = null; // } /*如何为空前端没传，查询所有*/ + List device = new ArrayList<>(); if(StringUtils.isEmpty(appProjectQueryParm.getEngineeringId())){ List roleengineer = roleEngineerDevService.getRoleengineer(); + device = roleEngineerDevService.getDevice(); appProjectQueryParm.setEngineeringIds(roleengineer); if(CollectionUtils.isEmpty(roleengineer)){ @@ -274,11 +276,17 @@ class AppProjectServiceImpl extends ServiceImpl QueryWrapper queryWrapper = new QueryWrapper<>(); returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm); + List finalDevice = device; List collect = returnpage.getRecords().stream().map(temp -> { AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm(); - queryWrapper.clear(); - queryWrapper.lambda().eq(CsLedger::getPid,temp.getId()).eq(CsLedger::getState,1); - Integer integer = csLedgerMapper.selectCount(queryWrapper); + Integer integer =0; + if(!CollectionUtils.isEmpty(finalDevice)){ + queryWrapper.clear(); + queryWrapper.lambda().eq(CsLedger::getPid,temp.getId()).eq(CsLedger::getState,1).in(CsLedger::getId, finalDevice); + + integer = csLedgerMapper.selectCount(queryWrapper); + } + temp.setDevNum(integer); appTopologyDiagramQueryParm.setProjectId(temp.getId()); diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java index dbbcaf6..171f360 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/TemperatureServiceImpl.java @@ -2,7 +2,9 @@ package com.njcn.csharmonic.service.impl; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.csdevice.api.CsLineFeignClient; +import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.enums.AlgorithmResponseEnum; +import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csharmonic.pojo.vo.TemperatureVO; import com.njcn.csharmonic.service.TemperatureService; @@ -15,10 +17,12 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Description: @@ -33,8 +37,11 @@ public class TemperatureServiceImpl implements TemperatureService { private final CommonService commonService; private final CsLineFeignClient csLineFeignClient; private final DicDataFeignClient dicDataFeignClient; + private final EquipmentFeignClient equipmentFeignClient; @Override public List queryTemperature(String devId) { + List data1 = equipmentFeignClient.queryDeviceById(Stream.of(devId).collect(Collectors.toList())).getData(); + Integer moduleNumber = data1.get(0).getModuleNumber(); List csLinePOList = csLineFeignClient.queryLineByDevId(devId).getData(); Optional.ofNullable(csLinePOList).orElseThrow(()-> new BusinessException(AlgorithmResponseEnum.LINE_DATA_ERROR)); DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.OUTPUT_SIDE.getCode()).getData(); @@ -43,6 +50,14 @@ public class TemperatureServiceImpl implements TemperatureService { throw new BusinessException("不存在输出侧监测点，无温度信息"); } List topTemperature = commonService.getTopTemperature(collect.get(0).getLineId(), "apf_data", "Apf_Temp_Env"); - return topTemperature; + List result = new ArrayList<>(); + for(int i = 0; i Objects.equals(tem.getClDid(), finalI + "")).findFirst().orElse(new StatisticalDataDTO()); + statisticalDataDTO.setClDid(finalI+""); + result.add(statisticalDataDTO); + } + return result; } }