liuyupeng/saas-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导出接收参数，增加服务器离线日志。

Browse Source
This commit is contained in:
gaoyutao
2025-09-09 09:40:43 +08:00
parent 6fa30134e8
commit 23bf338c8f
31 changed files with 1232 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsBusinessController.java
View File

@@ -62,7 +62,7 @@ public class EpsBusinessController extends BaseController
@RequiresPermissions("system:business:export")
@Log(title = "业务信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, EpsBusiness epsBusiness)
public void export(HttpServletResponse response, @RequestBody EpsBusiness epsBusiness)
{
List<EpsBusiness> list = epsBusinessService.selectEpsBusinessList(epsBusiness);
ExcelUtil<EpsBusiness> util = new ExcelUtil<EpsBusiness>(EpsBusiness.class);

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsMethodChangeRecordController.java
View File

@@ -52,7 +52,7 @@ public class EpsMethodChangeRecordController extends BaseController
@RequiresPermissions("system:record:export")
@Log(title = "收益方式修改记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, EpsMethodChangeRecord epsMethodChangeRecord)
public void export(HttpServletResponse response, @RequestBody EpsMethodChangeRecord epsMethodChangeRecord)
{
List<EpsMethodChangeRecord> list = epsMethodChangeRecordService.selectEpsMethodChangeRecordList(epsMethodChangeRecord);
ExcelUtil<EpsMethodChangeRecord> util = new ExcelUtil<EpsMethodChangeRecord>(EpsMethodChangeRecord.class);

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsNodeBandwidthController.java
View File

@@ -86,7 +86,7 @@ public class EpsNodeBandwidthController extends BaseController
@RequiresPermissions("system:bandwidth:export")
@Log(title = "节点带宽信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, EpsNodeBandwidth epsNodeBandwidth)
public void export(HttpServletResponse response, @RequestBody EpsNodeBandwidth epsNodeBandwidth)
{
List<EpsNodeBandwidth> list = epsNodeBandwidthService.selectEpsNodeBandwidthList(epsNodeBandwidth);
ExcelUtil<EpsNodeBandwidth> util = new ExcelUtil<EpsNodeBandwidth>(EpsNodeBandwidth.class);

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/EpsServerRevenueConfigController.java
View File

@@ -52,7 +52,7 @@ public class EpsServerRevenueConfigController extends BaseController
@RequiresPermissions("system:config:export")
@Log(title = "服务器收益方式配置", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, EpsServerRevenueConfig epsServerRevenueConfig)
public void export(HttpServletResponse response, @RequestBody EpsServerRevenueConfig epsServerRevenueConfig)
{
List<EpsServerRevenueConfig> list = epsServerRevenueConfigService.selectEpsServerRevenueConfigList(epsServerRevenueConfig);
ExcelUtil<EpsServerRevenueConfig> util = new ExcelUtil<EpsServerRevenueConfig>(EpsServerRevenueConfig.class);

1
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/KnowledgeBaseController.java
View File

@@ -54,6 +54,7 @@ public class KnowledgeBaseController extends BaseController
{
List<KnowledgeBase> list = knowledgeBaseService.selectKnowledgeBaseList(knowledgeBase);
ExcelUtil<KnowledgeBase> util = new ExcelUtil<KnowledgeBase>(KnowledgeBase.class);
util.showColumn(knowledgeBase.getProperties());
util.exportExcel(response, list, "知识库数据");
}

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmEpsTopologyManagementController.java
View File

@@ -60,7 +60,7 @@ public class RmEpsTopologyManagementController extends BaseController
@RequiresPermissions("system:management:export")
@Log(title = "拓扑管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, RmEpsTopologyManagement rmEpsTopologyManagement)
public void export(HttpServletResponse response, @RequestBody RmEpsTopologyManagement rmEpsTopologyManagement)
{
List<RmEpsTopologyManagement> list = rmEpsTopologyManagementService.selectRmEpsTopologyManagementList(rmEpsTopologyManagement);
ExcelUtil<RmEpsTopologyManagement> util = new ExcelUtil<RmEpsTopologyManagement>(RmEpsTopologyManagement.class);

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceGroupController.java
View File

@@ -50,7 +50,7 @@ public class RmResourceGroupController extends BaseController
@RequiresPermissions("system:group:export")
@Log(title = "资源分组", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, RmResourceGroup rmResourceGroup)
public void export(HttpServletResponse response, @RequestBody RmResourceGroup rmResourceGroup)
{
List<RmResourceGroup> list = rmResourceGroupService.selectRmResourceGroupList(rmResourceGroup);
ExcelUtil<RmResourceGroup> util = new ExcelUtil<RmResourceGroup>(RmResourceGroup.class);

18
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmResourceRegistrationController.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.system.controller;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -7,6 +8,7 @@ import com.ruoyi.common.core.web.page.PageDomain;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.system.domain.RmResourceRegistration;
import com.ruoyi.system.service.IRmResourceRegistrationService;
@@ -51,7 +53,7 @@ public class RmResourceRegistrationController extends BaseController
@RequiresPermissions("system:registration:export")
@Log(title = "资源注册", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, RmResourceRegistration rmResourceRegistration)
public void export(HttpServletResponse response, @RequestBody RmResourceRegistration rmResourceRegistration)
{
List<RmResourceRegistration> list = rmResourceRegistrationService.selectRmResourceRegistrationList(rmResourceRegistration);
ExcelUtil<RmResourceRegistration> util = new ExcelUtil<RmResourceRegistration>(RmResourceRegistration.class);
@@ -129,4 +131,18 @@ public class RmResourceRegistrationController extends BaseController
return list;
}
/**
* 检测到服务器离线，修改状态为离线
* @param rmResourceRegistration
* @return
*/
@InnerAuth
@PostMapping("/updateStatusByResource")
public R<String> updateStatusByResource(@RequestBody RmResourceRegistration rmResourceRegistration)
{
R<String> rows = rmResourceRegistrationService.updateStatusByResource(rmResourceRegistration);
return rows;
}
}

7
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/RmResourceRegistrationMapper.java
View File

@@ -77,4 +77,11 @@ public interface RmResourceRegistrationMapper
* @return 资源注册集合
*/
public List<Map> selectAllResourceNameByType(RmResourceRegistration resourceRegistration);
/**
* 检测到服务器离线，修改状态为离线
* @param rmResourceRegistration
* @return
*/
Integer updateStatusByResource(RmResourceRegistration rmResourceRegistration);
}

8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/IRmResourceRegistrationService.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.domain.RmResourceRegistration;
import java.util.List;
@@ -78,5 +79,10 @@ public interface IRmResourceRegistrationService
* @return 资源注册集合
*/
public List<Map> selectAllResourceNameByType(RmResourceRegistration resourceRegistration);
/**
* 检测到服务器离线，修改状态为离线
* @param rmResourceRegistration
* @return
*/
R<String> updateStatusByResource(RmResourceRegistration rmResourceRegistration);
}

34
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsInitialTrafficDataServiceImpl.java
View File

@@ -304,6 +304,8 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe
// 3. 计算各时间段95值
calculateTimeSegments95(queryParam, records, dailyStartTime, dailyEndTime);
}else{
calculateNormalDeviceBandwidth(queryParam, dailyStartTime, dailyEndTime);
}
}
/**
@@ -430,11 +432,20 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe
dailyResult = epsInitialTrafficData.getPackageBandwidth();
epsInitialTrafficData.setBandwidthType("3");
}else{
if("1".equals(dayOrMonth)){
epsInitialTrafficData.setBandwidthType("5");
}
if("2".equals(dayOrMonth)){
epsInitialTrafficData.setBandwidthType("6");
if(CalculateUtil.isEff(dataList)){
if("1".equals(dayOrMonth)){
epsInitialTrafficData.setBandwidthType("5");
}
if("2".equals(dayOrMonth)){
epsInitialTrafficData.setBandwidthType("6");
}
}else {
if("1".equals(dayOrMonth)){
epsInitialTrafficData.setBandwidthType("1");
}
if("2".equals(dayOrMonth)){
epsInitialTrafficData.setBandwidthType("2");
}
}
}
saveBandwidthResult(epsInitialTrafficData, dailyResult, startTime);
@@ -491,17 +502,4 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe
}
}
/**
* 判断是否为有效
* @param list
* @return
*/
private Boolean isEff(List<EpsInitialTrafficData> list){
if(!list.isEmpty()){
if(list.size()<288){
return true;
}
}
return false;
}
}

21
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java
View File

@@ -452,6 +452,8 @@ public class InitialSwitchInfoDetailsServiceImpl implements IInitialSwitchInfoDe
// 计算各时间段95值
calculateSwitchTimeSegments95(queryParam, records, dailyStartTime, dailyEndTime);
}else {
calculateNormalSwitchBandwidth(queryParam, dailyStartTime, dailyEndTime);
}
}
@@ -580,11 +582,20 @@ public class InitialSwitchInfoDetailsServiceImpl implements IInitialSwitchInfoDe
// 3. 保存结果
InitialSwitchInfoDetails switchInfo = dataList.get(0);
switchInfo.setResourceType("2");
if("1".equals(dayOrMonth)){
switchInfo.setBandwidthType("5");
}
if("2".equals(dayOrMonth)){
switchInfo.setBandwidthType("6");
if(CalculateUtil.isEff(dataList)){
if("1".equals(dayOrMonth)){
switchInfo.setBandwidthType("5");
}
if("2".equals(dayOrMonth)){
switchInfo.setBandwidthType("6");
}
}else {
if("1".equals(dayOrMonth)){
switchInfo.setBandwidthType("1");
}
if("2".equals(dayOrMonth)){
switchInfo.setBandwidthType("2");
}
}
saveSwitchBandwidthResult(switchInfo, dailyResult, startTime);
}

12
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RmResourceRegistrationServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.EpsNodeBandwidth;
@@ -229,4 +230,15 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
return rmResourceRegistrationMapper.selectAllResourceNameByType(resourceRegistration);
}
/**
* 检测到服务器离线，修改状态为离线
* @param rmResourceRegistration
* @return
*/
@Override
public R<String> updateStatusByResource(RmResourceRegistration rmResourceRegistration) {
rmResourceRegistrationMapper.updateStatusByResource(rmResourceRegistration);
return R.ok("状态修改成功");
}
}

14
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/util/CalculateUtil.java
View File

@@ -87,4 +87,18 @@ public class CalculateUtil {
throw new IllegalArgumentException("不支持的带宽类型: " + bandwidthType);
}
}
/**
* 判断是否为有效
* @param list
* @return
*/
public static Boolean isEff(List<?> list){
if(!list.isEmpty()){
if(list.size()<288){
return true;
}
}
return false;
}
}

35
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml
View File

@@ -234,4 +234,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) from rm_resource_registration
where hardware_sn = #{hardwareSn}
</select>
<update id="updateStatusByResource" parameterType="RmResourceRegistration">
update rm_resource_registration
<trim prefix="SET" suffixOverrides=",">
<if test="hardwareSn != null">hardware_sn = #{hardwareSn},</if>
<if test="resourceType != null">resource_type = #{resourceType},</if>
<if test="resourceName != null">resource_name = #{resourceName},</if>
<if test="ipAddress != null">ip_address = #{ipAddress},</if>
<if test="resourcePort != null">resource_port = #{resourcePort},</if>
<if test="otherPortName != null">other_port_name = #{otherPortName},</if>
<if test="agentVersion != null">agent_version = #{agentVersion},</if>
<if test="protocol != null">protocol = #{protocol},</if>
<if test="resourceVersion != null">resource_version = #{resourceVersion},</if>
<if test="rwPermission != null">rw_permission = #{rwPermission},</if>
<if test="snmpDetect != null">snmp_detect = #{snmpDetect},</if>
<if test="teamName != null">team_name = #{teamName},</if>
<if test="snmpCollectAddr != null">snmp_collect_addr = #{snmpCollectAddr},</if>
<if test="securityLevel != null">security_level = #{securityLevel},</if>
<if test="encryption != null">encryption = #{encryption},</if>
<if test="resourceUserName != null">resource_user_name = #{resourceUserName},</if>
<if test="resourcePwd != null">resource_pwd = #{resourcePwd},</if>
<if test="registrationStatus != null">registration_status = #{registrationStatus},</if>
<if test="onlineStatus != null">online_status = #{onlineStatus},</if>
<if test="description != null">description = #{description},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="serviceNumber != null">service_number = #{serviceNumber},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="creatorId != null">creator_id = #{creatorId},</if>
<if test="creatorName != null">creator_name = #{creatorName},</if>
<if test="updaterId != null">updater_id = #{updaterId},</if>
<if test="updaterName != null">updater_name = #{updaterName},</if>
</trim>
where id = #{id}
</update>
</mapper>