From 0a5573804cbca105f41f487e85d21adc96808832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Wed, 29 Mar 2023 09:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/pojo/param/DeviceInfoParam.java | 6 ++ .../device/pq/pojo/po/RStatIntegrityD.java | 35 ++++++++++ .../device/pq/pojo/po/RStatOnlinerateD.java | 34 +++++++++ .../TerminalOnlineRateDataController.java | 3 +- .../pq/mapper/RStatIntegrityDMapper.java | 17 +++++ .../pq/mapper/RStatOnlinerateDMapper.java | 17 +++++ .../pq/mapper/TerminalMaintainMapper.java | 2 +- .../mapper/TerminalOnlineRateDataMapper.java | 11 +++ .../mapper/mapping/TerminalMaintainMapper.xml | 5 +- .../mapping/TerminalOnlineRateDataMapper.xml | 12 ++++ .../pq/service/IRStatIntegrityDService.java | 17 +++++ .../pq/service/IRStatOnlinerateDService.java | 17 +++++ .../pq/service/TerminalMaintainService.java | 1 + .../TerminalOnlineRateDataService.java | 1 + .../impl/RStatIntegrityDServiceImpl.java | 21 ++++++ .../impl/RStatOnlinerateDServiceImpl.java | 21 ++++++ .../impl/TerminalMaintainServiceImpl.java | 69 +++++++++++++------ .../TerminalOnlineRateDataServiceImpl.java | 15 ++-- .../DeviceAbnormaStatisticsServiceImpl.java | 1 - .../user/service/impl/DeptServiceImpl.java | 2 +- 20 files changed, 276 insertions(+), 31 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatIntegrityD.java create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatOnlinerateDMapper.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IRStatIntegrityDService.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IRStatOnlinerateDService.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatOnlinerateDServiceImpl.java diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java index a6d12acb0..6a551fc6e 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java @@ -79,6 +79,12 @@ public class DeviceInfoParam implements Serializable { @Range(min = 0, max = 2, message = "电网侧标识" + ValidMessage.PARAM_FORMAT_ERROR) private Integer powerFlag; + /** + * 0-极重要 + * 1-重要 + * 2-普通 + * 3-不重要 + */ @ApiModelProperty("监测点等级") private String lineGrade; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatIntegrityD.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatIntegrityD.java new file mode 100644 index 000000000..4923aa97e --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatIntegrityD.java @@ -0,0 +1,35 @@ +package com.njcn.device.pq.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; + +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * 数据完整性日表 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +@Data +@TableName("r_stat_integrity_d") +public class RStatIntegrityD { + + private static final long serialVersionUID = 1L; + + private LocalDateTime timeId; + + private String lineIndex; + + private Integer dueTime; + + private Integer realTime; + + +} diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java new file mode 100644 index 000000000..639934583 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/RStatOnlinerateD.java @@ -0,0 +1,34 @@ +package com.njcn.device.pq.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import java.io.Serializable; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +/** + *

+ * 在线率日表 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +@Getter +@Setter +@TableName("r_stat_onlinerate_d") +public class RStatOnlinerateD extends BaseEntity { + + private static final long serialVersionUID = 1L; + + private LocalDateTime timeId; + + private String devIndex; + + private Integer onlineMin; + + private Integer offlineMin; + + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java index 7993252ea..1c4904041 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalOnlineRateDataController.java @@ -5,6 +5,7 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam; import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO; import com.njcn.device.pq.service.TerminalOnlineRateDataService; @@ -33,7 +34,7 @@ import java.util.List; @RequestMapping("/terminalOnlineRateData") @RequiredArgsConstructor public class TerminalOnlineRateDataController extends BaseController { - + private final TerminalOnlineRateDataService terminalOnlineRateDataService; /** diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java new file mode 100644 index 000000000..adbe9b076 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatIntegrityDMapper.java @@ -0,0 +1,17 @@ +package com.njcn.device.pq.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pq.pojo.po.RStatIntegrityD; + +/** + *

+ * 数据完整性日表 Mapper 接口 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +public interface RStatIntegrityDMapper extends BaseMapper { + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatOnlinerateDMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatOnlinerateDMapper.java new file mode 100644 index 000000000..fa0e56a9f --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/RStatOnlinerateDMapper.java @@ -0,0 +1,17 @@ +package com.njcn.device.pq.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pq.pojo.po.RStatOnlinerateD; + +/** + *

+ * 在线率日表 Mapper 接口 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +public interface RStatOnlinerateDMapper extends BaseMapper { + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java index e392433c0..b94ca9b00 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalMaintainMapper.java @@ -19,7 +19,7 @@ public interface TerminalMaintainMapper { * @author cdf * @date 2022/5/11 */ - List getTerminalDevInfo(); + List getTerminalDevInfo(@Param("devIds")List devIds); /** * 获取区域 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalOnlineRateDataMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalOnlineRateDataMapper.java index 3b980cc76..d1db278bb 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalOnlineRateDataMapper.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalOnlineRateDataMapper.java @@ -1,11 +1,13 @@ package com.njcn.device.pq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.device.pq.pojo.po.TerminalOnlineRateData; import com.njcn.device.pq.pojo.vo.LineIntegrityDataVO; import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.time.LocalDateTime; import java.util.List; /** @@ -59,4 +61,13 @@ public interface TerminalOnlineRateDataMapper extends BaseMapper getDevOnlineByDevIds(@Param("devIds")List devIds, @Param("startTime")String startTime,@Param("endTime")String endTime); + } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml index d713f1c7a..4d9e21b8b 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalMaintainMapper.xml @@ -26,7 +26,10 @@ FROM LEFT JOIN cld_version g on f.version_id = g.id LEFT JOIN (select * from cld_month_flow where date_format(time_id,'%Y-%m' ) = date_format(CURRENT_TIME(),'%Y-%m')) mo on a.id = mo.line_id - where b.dev_model = 1 + where a.id in + + #{item} + + + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IRStatIntegrityDService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IRStatIntegrityDService.java new file mode 100644 index 000000000..3b3a36040 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IRStatIntegrityDService.java @@ -0,0 +1,17 @@ +package com.njcn.device.pq.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pq.pojo.po.RStatIntegrityD; + +/** + *

+ * 数据完整性日表 服务类 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +public interface IRStatIntegrityDService extends IService { + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IRStatOnlinerateDService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IRStatOnlinerateDService.java new file mode 100644 index 000000000..66c15b7a7 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IRStatOnlinerateDService.java @@ -0,0 +1,17 @@ +package com.njcn.device.pq.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.device.pq.pojo.po.RStatOnlinerateD; + +/** + *

+ * 在线率日表 服务类 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +public interface IRStatOnlinerateDService extends IService { + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java index ba8cf9a0e..23d8591e6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalMaintainService.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.service; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.param.TerminalParam; import com.njcn.device.pq.pojo.vo.TerminalMaintainVO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java index d6114aaed..c3a2b81a3 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalOnlineRateDataService.java @@ -1,5 +1,6 @@ package com.njcn.device.pq.service; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam; import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java new file mode 100644 index 000000000..f7d7082a1 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java @@ -0,0 +1,21 @@ +package com.njcn.device.pq.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.device.pq.mapper.RStatIntegrityDMapper; +import com.njcn.device.pq.pojo.po.RStatIntegrityD; +import com.njcn.device.pq.service.IRStatIntegrityDService; +import org.springframework.stereotype.Service; + +/** + *

+ * 数据完整性日表 服务实现类 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +@Service +public class RStatIntegrityDServiceImpl extends ServiceImpl implements IRStatIntegrityDService { + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatOnlinerateDServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatOnlinerateDServiceImpl.java new file mode 100644 index 000000000..e48be5efd --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatOnlinerateDServiceImpl.java @@ -0,0 +1,21 @@ +package com.njcn.device.pq.service.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.device.pq.mapper.RStatOnlinerateDMapper; +import com.njcn.device.pq.pojo.po.RStatOnlinerateD; +import com.njcn.device.pq.service.IRStatOnlinerateDService; +import org.springframework.stereotype.Service; + +/** + *

+ * 在线率日表 服务实现类 + *

+ * + * @author hongawen + * @since 2023-03-28 + */ +@Service +public class RStatOnlinerateDServiceImpl extends ServiceImpl implements IRStatOnlinerateDService { + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java index bc7f62385..b6e02ce02 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalMaintainServiceImpl.java @@ -1,10 +1,14 @@ package com.njcn.device.pq.service.impl; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pq.enums.DeviceResponseEnum; import com.njcn.device.pq.mapper.TerminalMaintainMapper; +import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.TerminalMainQueryParam; import com.njcn.device.pq.pojo.param.TerminalParam; import com.njcn.device.pq.pojo.po.DevMeal; @@ -15,12 +19,16 @@ import com.njcn.device.pq.service.IDevMealService; import com.njcn.device.pq.service.IDevStrategyService; import com.njcn.device.pq.service.IDeviceService; import com.njcn.device.pq.service.TerminalMaintainService; +import com.njcn.system.pojo.enums.StatisticsEnum; +import com.njcn.user.api.DeptFeignClient; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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.stream.Collectors; /** @@ -42,34 +50,51 @@ public class TerminalMaintainServiceImpl implements TerminalMaintainService { private final IDevStrategyService iDevStrategyService; + private final GeneralDeviceService generalDeviceService; + + private final DeptFeignClient deptFeignClient; + @Override public List getTerminalMainList(TerminalMainQueryParam terminalMainQueryParam) { - List devList = terminalMaintainMapper.getTerminalDevInfo(); - if(CollectionUtil.isEmpty(devList)){ - throw new BusinessException(DeviceResponseEnum.DEVICE_EMPTY); - } - List subIndexes = devList.stream().map(TerminalMaintainVO::getPid).collect(Collectors.toList()); - List subList = terminalMaintainMapper.getPqLineGdAndSubList(subIndexes); - if(CollectionUtil.isEmpty(subList)){ - throw new BusinessException(DeviceResponseEnum.SUB_NO); - } - List gdIds = subList.stream().map(TerminalMaintainVO::getPid).collect(Collectors.toList()); - List gdList = terminalMaintainMapper.getPqLineGdAndSubList(gdIds); - if(CollectionUtil.isEmpty(gdList)){ - throw new BusinessException(DeviceResponseEnum.GD_NO); - } - List proIds = gdList.stream().map(TerminalMaintainVO::getPid).collect(Collectors.toList()); - List proList = terminalMaintainMapper.getPqLineProvList(proIds); - if(CollectionUtil.isEmpty(proList)){ - throw new BusinessException(DeviceResponseEnum.PROVINCE_EMPTY); - } + List resList = new ArrayList<>(); - List subListTem = subList.stream().peek(item->item.setChildren(getChildren(item.getId(),devList))).collect(Collectors.toList()); - List gdListTem = gdList.stream().peek(item->item.setChildren(getChildren(item.getId(),subListTem))).collect(Collectors.toList()); - return proList.stream().peek(item->item.setChildren(getChildren(item.getId(),gdListTem))).collect(Collectors.toList()); + DeviceInfoParam deviceInfoParam = new DeviceInfoParam(); + deviceInfoParam.setLineGrade(terminalMainQueryParam.getLineGrade()); + deviceInfoParam.setDeptIndex(deptFeignClient.getRootDept().getData().getId()); + SimpleDTO simpleDTO = new SimpleDTO(); + simpleDTO.setCode(StatisticsEnum.POWER_NETWORK.getCode()); + deviceInfoParam.setStatisticalType(simpleDTO); + List generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Objects.isNull(terminalMainQueryParam.getRunFlag())?null: CollUtil.newArrayList(terminalMainQueryParam.getRunFlag()), CollUtil.newArrayList(1)); + if(CollectionUtil.isNotEmpty(generalDeviceDTOList)){ + + for(GeneralDeviceDTO generalDeviceDTO:generalDeviceDTOList){ + List devIds = generalDeviceDTO.getDeviceIndexes(); + if (CollectionUtils.isEmpty(devIds)) { + continue; + } + + TerminalMaintainVO terminalMaintainVO = new TerminalMaintainVO(); + terminalMaintainVO.setName(generalDeviceDTO.getName()); + terminalMaintainVO.setId(generalDeviceDTO.getIndex()); + terminalMaintainVO.setLevel(1); + + List devList = terminalMaintainMapper.getTerminalDevInfo(devIds); + List subList = terminalMaintainMapper.getPqLineGdAndSubList(generalDeviceDTO.getSubIndexes()); + List gdList = terminalMaintainMapper.getPqLineGdAndSubList(generalDeviceDTO.getGdIndexes()); + + dealTerminalData(subList,devList); + dealTerminalData(gdList,subList); + terminalMaintainVO.setChildren(gdList); + resList.add(terminalMaintainVO); + } + } + return resList; + } + List dealTerminalData(List parent,List children){ + return parent.stream().peek(item->item.setChildren(getChildren(item.getId(),children))).collect(Collectors.toList()); } @Override diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java index b03c551d1..20f39bea5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalOnlineRateDataServiceImpl.java @@ -1,7 +1,11 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.graphbuilder.math.func.AvgFunction; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pq.api.AlarmClient; import com.njcn.device.pq.enums.DeviceResponseEnum; @@ -9,9 +13,11 @@ import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.mapper.TerminalOnlineRateDataMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.TerminalOnlineRateDataParam; + import com.njcn.device.pq.pojo.po.TerminalOnlineRateData; import com.njcn.device.pq.pojo.vo.AlarmStrategyVO; import com.njcn.device.pq.pojo.vo.TerminalOnlineRateDataVO; +import com.njcn.device.pq.service.IRStatOnlinerateDService; import com.njcn.device.pq.service.TerminalOnlineRateDataService; import com.njcn.device.pq.utils.DataStatisticsUtil; import com.njcn.influxdb.param.InfluxDBPublicParam; @@ -29,6 +35,8 @@ import org.influxdb.impl.InfluxDBResultMapper; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -55,6 +63,8 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData private final DicDataFeignClient dicDataFeignClient; + private final IRStatOnlinerateDService irStatOnlinerateDService; + /** * 终端在线率列表 * @@ -101,10 +111,7 @@ public class TerminalOnlineRateDataServiceImpl implements TerminalOnlineRateData List devIds = deviceList.stream().map(TerminalOnlineRateDataVO::getId).collect(Collectors.toList()); - // 通过工具类得到查询influxdb的条件（相当于mysql中的in） - StringBuilder devForInfluxdb = InfluxDBCommUtils.assToInfluxParamDev(devIds); - // 通过装置id - List terminalOnlineRateData = getPercentageOfOnlineRate(terminalOnlineRateDataParam.getSearchBeginTime(), terminalOnlineRateDataParam.getSearchEndTime(), devForInfluxdb); + List terminalOnlineRateData = terminalOnlineRateDataMapper.getDevOnlineByDevIds(devIds,terminalOnlineRateDataParam.getSearchBeginTime(),terminalOnlineRateDataParam.getSearchEndTime()); // 处理终端在线率 DataStatisticsUtil.getTerminalOnlineRateData(terminalOnlineRateData, deviceList); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index 483e932e9..18055bc52 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -6,7 +6,6 @@ import com.njcn.device.pq.pojo.po.Communicate; import com.njcn.influxdb.param.InfluxDBPublicParam; import com.njcn.influxdb.utils.InfluxDbUtils; import com.njcn.prepare.harmonic.mapper.mysql.device.DeviceAbnormaStatisticsMapper; -import com.njcn.prepare.harmonic.pojo.dto.GeneralDeviceDTO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmPO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.AlarmStrategyVO; import com.njcn.prepare.harmonic.pojo.mysql.po.line.LinePO; diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java index 52eced822..b4ee6a945 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/DeptServiceImpl.java @@ -390,7 +390,7 @@ public class DeptServiceImpl extends ServiceImpl implements ID @Override public Dept getRootDept(){ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Dept::getState,DataStateEnum.ENABLE.getCode()).eq(Dept::getPid,0); + lambdaQueryWrapper.eq(Dept::getState,DataStateEnum.ENABLE.getCode()).eq(Dept::getPid,'0'); return this.getOne(lambdaQueryWrapper); }