diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmRegistrationMachineMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmRegistrationMachineMapper.java index a166d54..c1c37a6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmRegistrationMachineMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmRegistrationMachineMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.RmRegistrationMachine; +import java.util.List; + /** * 绑定金山machinecodeMapper接口 * @@ -58,4 +59,10 @@ public interface RmRegistrationMachineMapper * @return 结果 */ public int deleteRmRegistrationMachineByIds(Long[] ids); + + /** + * 获取绑定的clientId + * @return + */ + List getAllMachineClientId(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsInitialTrafficDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsInitialTrafficDataServiceImpl.java index 41a3ccd..0af2c77 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsInitialTrafficDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsInitialTrafficDataServiceImpl.java @@ -49,6 +49,8 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe private EpsBusinessDeployMapper epsBusinessDeployMapper; @Autowired private RmEpsTopologyManagementMapper rmEpsTopologyManagementMapper; + @Autowired + private RmRegistrationMachineMapper rmRegistrationMachineMapper; @Override public void createNextMonthTables() { LocalDate nextMonth = LocalDate.now().plusMonths(1); @@ -271,32 +273,34 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe @Override public void calculate95ByJinShan(EpsInitialTrafficData queryParam, String dailyStartTime, String dailyEndTime, String calculationMode) { - // 获取所有设备SN列表 - List snList = allInterfaceNameMapper.getAllDeviceSn(new AllInterfaceName()); - // 遍历处理每个设备 - snList.forEach(interfaceName -> { - queryParam.setServiceSn(interfaceName.getDeviceSn()); - queryParam.setStartTime(dailyStartTime); - queryParam.setEndTime(dailyEndTime); - List dataList = query(queryParam); + // 获取已绑定金山Code的clientId列表 + List rmRegistrationMachineList = rmRegistrationMachineMapper.getAllMachineClientId(); + if(rmRegistrationMachineList != null && !rmRegistrationMachineList.isEmpty()){ + // 遍历处理每个设备 + rmRegistrationMachineList.forEach(interfaceName -> { + queryParam.setClientId(interfaceName.getClientId()); + queryParam.setStartTime(dailyStartTime); + queryParam.setEndTime(dailyEndTime); + List dataList = query(queryParam); - if (!dataList.isEmpty()) { - // 1. 提取并转换带宽值 - List speedsInMbps = dataList.stream() - .map(data -> CalculateUtil.parseSpeedToMbps(data.getMachineFlow(), calculationMode)) - .sorted() - .collect(Collectors.toList()); + if (!dataList.isEmpty()) { + // 1. 提取并转换带宽值 + List speedsInMbps = dataList.stream() + .map(data -> CalculateUtil.parseSpeedToMbps(data.getMachineFlow(), calculationMode)) + .sorted() + .collect(Collectors.toList()); - // 2. 计算95百分位 - BigDecimal percentile95 = CalculateUtil.calculatePercentile(speedsInMbps, 0.95); + // 2. 计算95百分位 + BigDecimal percentile95 = CalculateUtil.calculatePercentile(speedsInMbps, 0.95); - // 3. 保存结果 - EpsInitialTrafficData epsInitialTrafficData = dataList.get(0); - epsInitialTrafficData.setResourceType("1"); - epsInitialTrafficData.setBandwidthType("8"); - saveBandwidthResult(epsInitialTrafficData, percentile95, dailyStartTime, calculationMode); - } - }); + // 3. 保存结果 + EpsInitialTrafficData epsInitialTrafficData = dataList.get(0); + epsInitialTrafficData.setResourceType("1"); + epsInitialTrafficData.setBandwidthType("8"); + saveBandwidthResult(epsInitialTrafficData, percentile95, dailyStartTime, calculationMode); + } + }); + } } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml index a8f275e..75c39e9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmRegistrationMachineMapper.xml @@ -74,4 +74,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file diff --git a/ruoyi-rocketmq/src/main/resources/logback.xml b/ruoyi-rocketmq/src/main/resources/logback.xml new file mode 100644 index 0000000..5046963 --- /dev/null +++ b/ruoyi-rocketmq/src/main/resources/logback.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + ${log.path}/trace.log + + ${log.path}/trace.%d{yyyy-MM-dd}.log + 30 + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + DEBUG + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file