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

资源监控模块接口新增,agent下发信息配置

Browse Source
This commit is contained in:
gaoyutao
2025-09-17 18:14:42 +08:00
parent f922fb752f
commit a797147d95
30 changed files with 422 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRevenueConfigService.java
View File

@@ -7,7 +7,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.system.api.domain.*;
import com.ruoyi.system.api.factory.RemoteRevenueConfigFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
@@ -61,8 +60,8 @@ public interface RemoteRevenueConfigService
* @param source
* @return
*/
@GetMapping("/group/getResourceGroupMsgById")
public R<RmResourceGroupRemote> getResourceGroupMsgById(Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
@PostMapping("/group/getResourceGroupMsgById")
public R<RmResourceGroupRemote> getResourceGroupMsgById(@RequestBody Long id, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
* 根据id查询资源信息

4
ruoyi-common/ruoyi-common-core/pom.xml
View File

@@ -106,6 +106,10 @@
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>

3
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/enums/MsgEnum.java → ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/MsgEnum.java
View File

@@ -1,4 +1,5 @@
package com.ruoyi.rocketmq.enums;
package com.ruoyi.common.core.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;

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

@@ -107,8 +107,8 @@ public class RmResourceGroupController extends BaseController
* 获取资源分组详细信息
*/
@InnerAuth
@GetMapping(value = "/getResourceGroupMsgById")
public R<RmResourceGroup> getResourceGroupMsgById(Long id)
@PostMapping(value = "/getResourceGroupMsgById")
public R<RmResourceGroup> getResourceGroupMsgById(@RequestBody Long id)
{
return R.ok(rmResourceGroupService.selectRmResourceGroupById(id));
}

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

@@ -149,8 +149,8 @@ public class RmResourceRegistrationController extends BaseController
* @param ids
* @return
*/
@GetMapping("/getRegistrationByIds")
public R<List<RmResourceRegistration>> getRegistrationByIds(String[] ids)
@PostMapping("/getRegistrationByIds")
public R<List<RmResourceRegistration>> getRegistrationByIds(@RequestBody String[] ids)
{
List<RmResourceRegistration> list = rmResourceRegistrationService.getRegistrationByIds(ids);
return R.ok(list);

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmResourceRegistration.java
View File

@@ -91,6 +91,8 @@ public class RmResourceRegistration extends BaseEntity
/** 在线状态 0-离线，1-在线 */
@Excel(name = "在线状态",readConverterExp = "0=离线,1=在线")
private String onlineStatus;
@Excel(name = "交换机在线状态",readConverterExp = "0=离线,1=在线")
private String switchOnlineStatus;
/** 描述 */
@Excel(name = "描述")

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

@@ -3,6 +3,7 @@ package com.ruoyi.system.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.MsgEnum;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -189,8 +190,7 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
}
// 发送消息通知
// sendRegistrationMessage(rmResourceRegistration);
sendRegistrationMessage(rmResourceRegistration);
// 更新注册状态
return updateRegistrationStatus(rmResourceRegistration);
}
@@ -219,7 +219,7 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
* 发送注册/断开连接消息
*/
private void sendRegistrationMessage(RmResourceRegistration registration) {
String messageType = "1".equals(registration.getRegistrationStatus()) ? "REGISTER" : "DISCONNECT";
String messageType = "1".equals(registration.getRegistrationStatus()) ? MsgEnum.注册.getValue() : MsgEnum.断开.getValue();
ResourceVo resourceVo = createResourceVo(registration);
MessageVo messageVo = new MessageVo();

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

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="resourcePwd" column="resource_pwd" />
<result property="registrationStatus" column="registration_status" />
<result property="onlineStatus" column="online_status" />
<result property="switchOnlineStatus" column="switch_online_status" />
<result property="description" column="description" />
<result property="customerId" column="customer_id" />
<result property="customerName" column="customer_name" />
@@ -38,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectRmResourceRegistrationVo">
select id, hardware_sn, resource_type, resource_name, ip_address, resource_port, other_port_name, agent_version, protocol, resource_version, rw_permission, snmp_detect, team_name, snmp_collect_addr, security_level, encryption, resource_user_name, resource_pwd, registration_status, online_status, description, customer_id, customer_name, service_number, create_time, update_time, creator_id, creator_name, updater_id, updater_name from rm_resource_registration
select id, hardware_sn, resource_type, resource_name, ip_address, resource_port, other_port_name, agent_version, protocol, resource_version, rw_permission, snmp_detect, team_name, snmp_collect_addr, security_level, encryption, resource_user_name, resource_pwd, registration_status, online_status, switch_online_status, description, customer_id, customer_name, service_number, create_time, update_time, creator_id, creator_name, updater_id, updater_name from rm_resource_registration
</sql>
<select id="selectRmResourceRegistrationList" parameterType="RmResourceRegistration" resultMap="RmResourceRegistrationResult">
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="resourcePwd != null and resourcePwd != ''"> and resource_pwd = #{resourcePwd}</if>
<if test="registrationStatus != null and registrationStatus != ''"> and registration_status = #{registrationStatus}</if>
<if test="onlineStatus != null and onlineStatus != ''"> and online_status = #{onlineStatus}</if>
<if test="switchOnlineStatus != null and switchOnlineStatus != ''"> and switch_online_status = #{switchOnlineStatus}</if>
<if test="description != null and description != ''"> and description = #{description}</if>
<if test="customerId != null "> and customer_id = #{customerId}</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
@@ -102,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="resourcePwd != null">resource_pwd,</if>
<if test="registrationStatus != null">registration_status,</if>
<if test="onlineStatus != null">online_status,</if>
<if test="switchOnlineStatus != null">switch_online_status,</if>
<if test="description != null">description,</if>
<if test="customerId != null">customer_id,</if>
<if test="customerName != null">customer_name,</if>
@@ -133,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="resourcePwd != null">#{resourcePwd},</if>
<if test="registrationStatus != null">#{registrationStatus},</if>
<if test="onlineStatus != null">#{onlineStatus},</if>
<if test="switchOnlineStatus != null">#{switchOnlineStatus},</if>
<if test="description != null">#{description},</if>
<if test="customerId != null">#{customerId},</if>
<if test="customerName != null">#{customerName},</if>
@@ -168,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="switchOnlineStatus != null">switch_online_status = #{switchOnlineStatus},</if>
<if test="description != null">description = #{description},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
@@ -257,6 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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="switchOnlineStatus != null">switch_online_status = #{switchOnlineStatus},</if>
<if test="description != null">description = #{description},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="customerName != null">customer_name = #{customerName},</if>

48
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialDiskInfoController.java
View File

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 磁盘监控信息Controller
@@ -99,4 +100,51 @@ public class InitialDiskInfoController extends BaseController
{
return toAjax(initialDiskInfoService.deleteInitialDiskInfoByIds(ids));
}
/**
* 磁盘设备/dev/sda基础信息
* @param initialDiskInfo
* @return
*/
@RequiresPermissions("rocketmq:distInfo:list")
@PostMapping("/getDistDetailsMsg")
public AjaxResult distDetailsMsg(@RequestBody InitialDiskInfo initialDiskInfo){
return success(initialDiskInfoService.getDistDetailsMsg(initialDiskInfo));
}
/**
* /dev/sda读写速率(KB/s)
* @param initialDiskInfo
* @return
*/
@RequiresPermissions("rocketmq:distInfo:list")
@PostMapping("/rwSpeedEcharts")
public AjaxResult rwSpeedEcharts(@RequestBody InitialDiskInfo initialDiskInfo){
Map<String, Object> echartsData = initialDiskInfoService.rwSpeedEcharts(initialDiskInfo);
return success(echartsData);
}
/**
* /dev/sda读写次数
* @param initialDiskInfo
* @return
*/
@RequiresPermissions("rocketmq:distInfo:list")
@PostMapping("/rwTimesEcharts")
public AjaxResult rwTimesEcharts(@RequestBody InitialDiskInfo initialDiskInfo){
Map<String, Object> echartsData = initialDiskInfoService.rwTimesEcharts(initialDiskInfo);
return success(echartsData);
}
/**
* /dev/sda读写字节
* @param initialDiskInfo
* @return
*/
@RequiresPermissions("rocketmq:distInfo:list")
@PostMapping("/rwBytesEcharts")
public AjaxResult rwBytesEcharts(@RequestBody InitialDiskInfo initialDiskInfo){
Map<String, Object> echartsData = initialDiskInfoService.rwBytesEcharts(initialDiskInfo);
return success(echartsData);
}
}

47
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialDockerInfoController.java
View File

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 容器监控信息Controller
@@ -99,4 +100,50 @@ public class InitialDockerInfoController extends BaseController
{
return toAjax(initialDockerInfoService.deleteInitialDockerInfoByIds(ids));
}
/**
* 容器基础信息
* @param initialDockerInfo
* @return
*/
@RequiresPermissions("rocketmq:dockerInfo:list")
@PostMapping("/getDockerDetailsMsg")
public AjaxResult dockerDetailsMsg(@RequestBody InitialDockerInfo initialDockerInfo){
return success(initialDockerInfoService.getDockerDetailsMsg(initialDockerInfo));
}
/**
* cpu利用率
* @param initialDockerInfo
* @return
*/
@RequiresPermissions("rocketmq:dockerInfo:list")
@PostMapping("/cpuUtilEcharts")
public AjaxResult cpuUtilEcharts(@RequestBody InitialDockerInfo initialDockerInfo){
Map<String, Object> echartsData = initialDockerInfoService.cpuUtilEcharts(initialDockerInfo);
return success(echartsData);
}
/**
* 内存利用率
* @param initialDockerInfo
* @return
*/
@RequiresPermissions("rocketmq:dockerInfo:list")
@PostMapping("/memUtilEcharts")
public AjaxResult memUtilEcharts(@RequestBody InitialDockerInfo initialDockerInfo){
Map<String, Object> echartsData = initialDockerInfoService.memUtilEcharts(initialDockerInfo);
return success(echartsData);
}
/**
* 容器的网络速率(KB/s)
* @param initialDockerInfo
* @return
*/
@RequiresPermissions("rocketmq:dockerInfo:list")
@PostMapping("/netSpeedEcharts")
public AjaxResult netSpeedEcharts(@RequestBody InitialDockerInfo initialDockerInfo){
Map<String, Object> echartsData = initialDockerInfoService.netSpeedEcharts(initialDockerInfo);
return success(echartsData);
}
}

49
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchInfoController.java
View File

@@ -1,26 +1,20 @@
package com.ruoyi.rocketmq.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
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.RequiresPermissions;
import com.ruoyi.rocketmq.domain.InitialSwitchInfo;
import com.ruoyi.rocketmq.service.IInitialSwitchInfoService;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
import com.ruoyi.common.core.web.page.TableDataInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 交换机流量监控信息Controller
@@ -102,4 +96,27 @@ public class InitialSwitchInfoController extends BaseController
{
return toAjax(initialSwitchInfoService.deleteInitialSwitchInfoByIds(ids));
}
/**
* 获取网络端口基础信息
* @param initialSwitchInfo
* @return
*/
@RequiresPermissions("rocketmq:switchInfo:list")
@PostMapping("/getSwitchNetDetailsMsg")
public AjaxResult switchNetDetailsMsg(@RequestBody InitialSwitchInfo initialSwitchInfo){
return success(initialSwitchInfoService.getSwitchNetDetailsMsg(initialSwitchInfo));
}
/**
* 获取网络端口网络速率
* @param initialSwitchInfo
* @return
*/
@RequiresPermissions("rocketmq:switchInfo:list")
@PostMapping("/switchNetSpeedEcharts")
public AjaxResult switchNetSpeedEcharts(@RequestBody InitialSwitchInfo initialSwitchInfo){
Map<String, Object> echartsData = initialSwitchInfoService.switchNetSpeedEcharts(initialSwitchInfo);
return success(echartsData);
}
}

5
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/DeviceMessage.java
View File

@@ -1,15 +1,10 @@
package com.ruoyi.rocketmq.domain;
import com.ruoyi.common.core.utils.DateUtils;
import lombok.Data;
import java.util.Date;
@Data
public class DeviceMessage {
private String clientId;
private String dataType;
private String data;
private Date receiveTime = DateUtils.getNowDate();
private String duringTime;
}

3
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/vo/RmMonitorPolicyVo.java
View File

@@ -1,6 +1,5 @@
package com.ruoyi.rocketmq.domain.vo;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;
/**
@@ -10,7 +9,7 @@ import lombok.Data;
* @date 2025-09-10
*/
@Data
public class RmMonitorPolicyVo extends BaseEntity
public class RmMonitorPolicyVo
{
private static final long serialVersionUID = 1L;

7
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialDiskInfoMapper.java
View File

@@ -68,4 +68,11 @@ public interface InitialDiskInfoMapper
* @return 结果
*/
public int batchInsertInitialDiskInfo(@Param("list") List<InitialDiskInfo> list);
/**
* 获取磁盘设备基础信息
* @param initialDiskInfo
* @return
*/
InitialDiskInfo getDistDetailsMsgByClientId(InitialDiskInfo initialDiskInfo);
}

7
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialDockerInfoMapper.java
View File

@@ -62,4 +62,11 @@ public interface InitialDockerInfoMapper
public int deleteInitialDockerInfoByIds(Long[] autoId);
int batchInsertInitialDockerInfo(@Param("list") List<InitialDockerInfo> list);
/**
* 容器基础信息
* @param initialDockerInfo
* @return
*/
InitialDockerInfo getDockerDetailsMsg(InitialDockerInfo initialDockerInfo);
}

2
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchInfoMapper.java
View File

@@ -68,4 +68,6 @@ public interface InitialSwitchInfoMapper
* @return 结果
*/
public int batchInsertInitialSwitchInfo(@Param("list") List<InitialSwitchInfo> list);
InitialSwitchInfo getSwitchNetDetailsMsg(InitialSwitchInfo initialSwitchInfo);
}

26
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialDiskInfoService.java
View File

@@ -3,6 +3,7 @@ package com.ruoyi.rocketmq.service;
import com.ruoyi.rocketmq.domain.InitialDiskInfo;
import java.util.List;
import java.util.Map;
/**
* 磁盘监控信息Service接口
@@ -66,4 +67,29 @@ public interface IInitialDiskInfoService
* @return 结果
*/
public int batchInsertInitialDiskInfo(List<InitialDiskInfo> list);
/**
* 磁盘设备/dev/sda基础信息
* @param initialDiskInfo
* @return
*/
InitialDiskInfo getDistDetailsMsg(InitialDiskInfo initialDiskInfo);
/**
* /dev/sda读写速率(KB/s)
* @param initialDiskInfo
* @return
*/
Map<String, Object> rwSpeedEcharts(InitialDiskInfo initialDiskInfo);
/**
* /dev/sda读写次数
* @param initialDiskInfo
* @return
*/
Map<String, Object> rwTimesEcharts(InitialDiskInfo initialDiskInfo);
/**
* /dev/sda读写字节
* @param initialDiskInfo
* @return
*/
Map<String, Object> rwBytesEcharts(InitialDiskInfo initialDiskInfo);
}

27
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialDockerInfoService.java
View File

@@ -3,6 +3,7 @@ package com.ruoyi.rocketmq.service;
import com.ruoyi.rocketmq.domain.InitialDockerInfo;
import java.util.List;
import java.util.Map;
/**
* 容器监控信息Service接口
@@ -67,4 +68,30 @@ public interface IInitialDockerInfoService
* @return 结果
*/
public int batchInsertInitialDockerInfo(List<InitialDockerInfo> initialDockerInfo);
/**
* 容器基础信息
* @param initialDockerInfo
* @return
*/
InitialDockerInfo getDockerDetailsMsg(InitialDockerInfo initialDockerInfo);
/**
* 容器的cpu利用率
* @param initialDockerInfo
* @return
*/
Map<String, Object> cpuUtilEcharts(InitialDockerInfo initialDockerInfo);
/**
* 容器的内存利用率
* @param initialDockerInfo
* @return
*/
Map<String, Object> memUtilEcharts(InitialDockerInfo initialDockerInfo);
/**
* 容器的网络速率(KB/s)
* @param initialDockerInfo
* @return
*/
Map<String, Object> netSpeedEcharts(InitialDockerInfo initialDockerInfo);
}

15
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchInfoService.java
View File

@@ -3,6 +3,7 @@ package com.ruoyi.rocketmq.service;
import com.ruoyi.rocketmq.domain.InitialSwitchInfo;
import java.util.List;
import java.util.Map;
/**
* 交换机流量监控信息Service接口
@@ -66,4 +67,18 @@ public interface IInitialSwitchInfoService
* @return 结果
*/
public int batchInsertInitialSwitchInfo(List<InitialSwitchInfo> list);
/**
* 交换机网络基础信息
* @param initialSwitchInfo
* @return
*/
InitialSwitchInfo getSwitchNetDetailsMsg(InitialSwitchInfo initialSwitchInfo);
/**
* 获取接口的网络速率
* @param initialSwitchInfo
* @return
*/
Map<String, Object> switchNetSpeedEcharts(InitialSwitchInfo initialSwitchInfo);
}

55
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialDiskInfoServiceImpl.java
View File

@@ -4,13 +4,17 @@ import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.rocketmq.domain.InitialDiskInfo;
import com.ruoyi.rocketmq.mapper.InitialDiskInfoMapper;
import com.ruoyi.rocketmq.service.IInitialDiskInfoService;
import com.ruoyi.rocketmq.utils.EchartsDataUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
/**
* 磁盘监控信息Service业务层处理
@@ -114,4 +118,55 @@ public class InitialDiskInfoServiceImpl implements IInitialDiskInfoService
throw new RuntimeException("批量保存失败",e);
}
}
/**
* 磁盘设备/dev/sda基础信息
* @param initialDiskInfo
* @return
*/
@Override
public InitialDiskInfo getDistDetailsMsg(InitialDiskInfo initialDiskInfo) {
return initialDiskInfoMapper.getDistDetailsMsgByClientId(initialDiskInfo);
}
/**
* /dev/sda读写速率(KB/s)
* @param initialDiskInfo
* @return
*/
@Override
public Map<String, Object> rwSpeedEcharts(InitialDiskInfo initialDiskInfo) {
initialDiskInfo.setName("/dev/sda");
List<InitialDiskInfo> list = initialDiskInfoMapper.selectInitialDiskInfoList(initialDiskInfo);
Map<String, Function<InitialDiskInfo, ?>> extractors = new LinkedHashMap<>();
extractors.put("readSpeedData", info -> info.getReadSpeed() / 1024.0);
extractors.put("writeSpeedData", info -> info.getWriteSpeed() / 1024.0);
return EchartsDataUtils.buildEchartsData(list, InitialDiskInfo::getCreateTime, extractors);
}
/**
* /dev/sda读写次数
* @param initialDiskInfo
* @return
*/
@Override
public Map<String, Object> rwTimesEcharts(InitialDiskInfo initialDiskInfo) {
initialDiskInfo.setName("/dev/sda");
List<InitialDiskInfo> list = initialDiskInfoMapper.selectInitialDiskInfoList(initialDiskInfo);
Map<String, Function<InitialDiskInfo, ?>> extractors = new LinkedHashMap<>();
extractors.put("readTimesData", info -> info.getReadTimes());
extractors.put("writeTimesData", info -> info.getWriteTimes());
return EchartsDataUtils.buildEchartsData(list, InitialDiskInfo::getCreateTime, extractors);
}
/**
* /dev/sda读写字节
* @param initialDiskInfo
* @return
*/
@Override
public Map<String, Object> rwBytesEcharts(InitialDiskInfo initialDiskInfo) {
initialDiskInfo.setName("/dev/sda");
List<InitialDiskInfo> list = initialDiskInfoMapper.selectInitialDiskInfoList(initialDiskInfo);
Map<String, Function<InitialDiskInfo, ?>> extractors = new LinkedHashMap<>();
extractors.put("readBytesData", info -> info.getReadBytes());
extractors.put("writeBytesData", info -> info.getWriteBytes());
return EchartsDataUtils.buildEchartsData(list, InitialDiskInfo::getCreateTime, extractors);
}
}

52
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialDockerInfoServiceImpl.java
View File

@@ -4,13 +4,17 @@ import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.rocketmq.domain.InitialDockerInfo;
import com.ruoyi.rocketmq.mapper.InitialDockerInfoMapper;
import com.ruoyi.rocketmq.service.IInitialDockerInfoService;
import com.ruoyi.rocketmq.utils.EchartsDataUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
/**
* 容器监控信息Service业务层处理
@@ -115,4 +119,52 @@ public class InitialDockerInfoServiceImpl implements IInitialDockerInfoService
throw new RuntimeException("批量保存失败",e);
}
}
/**
* 容器基础信息
* @param initialDockerInfo
* @return
*/
@Override
public InitialDockerInfo getDockerDetailsMsg(InitialDockerInfo initialDockerInfo) {
return initialDockerInfoMapper.getDockerDetailsMsg(initialDockerInfo);
}
/**
* cou利用率
* @param initialDockerInfo
* @return
*/
@Override
public Map<String, Object> cpuUtilEcharts(InitialDockerInfo initialDockerInfo) {
List<InitialDockerInfo> list = initialDockerInfoMapper.selectInitialDockerInfoList(initialDockerInfo);
Map<String, Function<InitialDockerInfo, ?>> extractors = new LinkedHashMap<>();
extractors.put("cpuUtilData", info -> info.getCpuUtil());
return EchartsDataUtils.buildEchartsData(list, InitialDockerInfo::getCreateTime, extractors);
}
/**
* 容器的内存利用率
* @param initialDockerInfo
* @return
*/
@Override
public Map<String, Object> memUtilEcharts(InitialDockerInfo initialDockerInfo) {
List<InitialDockerInfo> list = initialDockerInfoMapper.selectInitialDockerInfoList(initialDockerInfo);
Map<String, Function<InitialDockerInfo, ?>> extractors = new LinkedHashMap<>();
extractors.put("memUtilData", info -> info.getMemUtil());
return EchartsDataUtils.buildEchartsData(list, InitialDockerInfo::getCreateTime, extractors);
}
/**
* 容器的网络速率(KB/s)
* @param initialDockerInfo
* @return
*/
@Override
public Map<String, Object> netSpeedEcharts(InitialDockerInfo initialDockerInfo) {
List<InitialDockerInfo> list = initialDockerInfoMapper.selectInitialDockerInfoList(initialDockerInfo);
Map<String, Function<InitialDockerInfo, ?>> extractors = new LinkedHashMap<>();
extractors.put("netInSpeedData", info -> info.getNetInSpeed());
extractors.put("netOutSpeedData", info -> info.getNetOutSpeed());
return EchartsDataUtils.buildEchartsData(list, InitialDockerInfo::getCreateTime, extractors);
}
}

29
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java
View File

@@ -4,13 +4,17 @@ import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.rocketmq.domain.InitialSwitchInfo;
import com.ruoyi.rocketmq.mapper.InitialSwitchInfoMapper;
import com.ruoyi.rocketmq.service.IInitialSwitchInfoService;
import com.ruoyi.rocketmq.utils.EchartsDataUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
/**
* 交换机流量监控信息Service业务层处理
@@ -115,4 +119,29 @@ public class InitialSwitchInfoServiceImpl implements IInitialSwitchInfoService
throw new RuntimeException("批量保存失败",e);
}
}
/**
* 获取交换机网络端口的基础信息
* @param initialSwitchInfo
* @return
*/
@Override
public InitialSwitchInfo getSwitchNetDetailsMsg(InitialSwitchInfo initialSwitchInfo) {
return initialSwitchInfoMapper.getSwitchNetDetailsMsg(initialSwitchInfo);
}
/**
* 获取交换机网口网络速率
* @param initialSwitchInfo
* @return
*/
@Override
public Map<String, Object> switchNetSpeedEcharts(InitialSwitchInfo initialSwitchInfo) {
List<InitialSwitchInfo> list = initialSwitchInfoMapper.selectInitialSwitchInfoList(initialSwitchInfo);
Map<String, Function<InitialSwitchInfo, ?>> extractors = new LinkedHashMap<>();
extractors.put("netInSpeedData", info -> info.getInSpeed());
extractors.put("netOutSpeedData", info -> info.getOutSpeed());
return EchartsDataUtils.buildEchartsData(list, InitialSwitchInfo::getCreateTime, extractors);
}
}

13
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmAlarmPolicyServiceImpl.java
View File

@@ -12,7 +12,6 @@ import com.ruoyi.rocketmq.model.ProducerMode;
import com.ruoyi.rocketmq.producer.MessageProducer;
import com.ruoyi.rocketmq.service.IRmAlarmPolicyService;
import com.ruoyi.rocketmq.utils.DataProcessUtil;
import com.ruoyi.system.api.RemoteRevenueConfigService;
import com.ruoyi.system.api.domain.RmResourceRegistrationRemote;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,9 +38,9 @@ public class RmAlarmPolicyServiceImpl implements IRmAlarmPolicyService
@Autowired
private RmAlarmPolicyMapper rmAlarmPolicyMapper;
@Autowired
private RemoteRevenueConfigService remoteRevenueConfigService;
@Autowired
private RmAlarmRuleMapper rmAlarmRuleMapper;
@Autowired
private DataProcessUtil dataProcessUtil;
/**
* 查询告警策略
@@ -67,9 +66,9 @@ public class RmAlarmPolicyServiceImpl implements IRmAlarmPolicyService
List<RmAlarmPolicy> list = rmAlarmPolicyMapper.selectRmAlarmPolicyList(rmAlarmPolicy);
for (RmAlarmPolicy alarmPolicy : list) {
// 资源组名称
alarmPolicy.setResourceGroupName(DataProcessUtil.getResourceGroupNameById(alarmPolicy.getResourceGroupId()));
alarmPolicy.setResourceGroupName(dataProcessUtil.getResourceGroupNameById(alarmPolicy.getResourceGroupId()));
// 包含设备
alarmPolicy.setResourceName(DataProcessUtil.getResourceMsgById(alarmPolicy.getResourceGroupId()).getIncludedDevicesName());
alarmPolicy.setResourceName(dataProcessUtil.getResourceMsgById(alarmPolicy.getResourceGroupId()).getIncludedDevicesName());
}
return list;
}
@@ -143,7 +142,7 @@ public class RmAlarmPolicyServiceImpl implements IRmAlarmPolicyService
Map map = new HashMap();
// 告警策略基础信息
RmAlarmPolicy alarmPolicy = rmAlarmPolicyMapper.selectRmAlarmPolicyById(id);
alarmPolicy.setResourceGroupName(DataProcessUtil.getResourceGroupNameById(alarmPolicy.getResourceGroupId()));
alarmPolicy.setResourceGroupName(dataProcessUtil.getResourceGroupNameById(alarmPolicy.getResourceGroupId()));
map.put("alarmPolicy", alarmPolicy);
// 策略内容
RmAlarmRule alarmRule = new RmAlarmRule();
@@ -187,7 +186,7 @@ public class RmAlarmPolicyServiceImpl implements IRmAlarmPolicyService
return 0;
}
// 资源信息
List<RmResourceRegistrationRemote> devices = DataProcessUtil.getResourceDevices(rmAlarmPolicy.getResourceGroupId());
List<RmResourceRegistrationRemote> devices = dataProcessUtil.getResourceDevices(rmAlarmPolicy.getResourceGroupId());
// 告警规则信息
Map<String,Object> alarmPolicyMsg = getRmAlarmPolicyMsgById(id);
// 构建消息内容

21
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.rocketmq.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.core.enums.MsgEnum;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.rocketmq.domain.*;
import com.ruoyi.rocketmq.domain.vo.CollectVo;
@@ -13,17 +14,18 @@ import com.ruoyi.rocketmq.producer.MessageProducer;
import com.ruoyi.rocketmq.service.IRmMonitorPolicyService;
import com.ruoyi.rocketmq.utils.DataProcessUtil;
import com.ruoyi.rocketmq.utils.FieldNameConverterUtil;
import com.ruoyi.system.api.RemoteRevenueConfigService;
import com.ruoyi.system.api.domain.RmResourceRegistrationRemote;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 资源监控策略Service业务层处理
@@ -46,7 +48,7 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService
@Autowired
private RmMonitorTemplateMapper rmMonitorTemplateMapper;
@Autowired
private RemoteRevenueConfigService remoteRevenueConfigService;
private DataProcessUtil dataProcessUtil;
@@ -158,16 +160,16 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService
// 1. 获取资源监控策略基础信息
RmMonitorPolicy rmMonitorPolicy = rmMonitorPolicyMapper.selectRmMonitorPolicyById(id);
if(rmMonitorPolicy != null){
rmMonitorPolicy.setResourceGroupName(DataProcessUtil.getResourceGroupNameById(rmMonitorPolicy.getResourceGroupId()));
rmMonitorPolicy.setResourceGroupName(dataProcessUtil.getResourceGroupNameById(rmMonitorPolicy.getResourceGroupId()));
result.put("policy", rmMonitorPolicy);
// 模板id
Long templateId = rmMonitorPolicy.getTemplateId();
// 2. 处理Linux模板数据
DataProcessUtil.processLinuxTemplateData(templateId, result);
dataProcessUtil.processLinuxTemplateData(templateId, result);
// 3. 处理Switch模板数据
DataProcessUtil.processSwitchTemplateData(templateId, result);
dataProcessUtil.processSwitchTemplateData(templateId, result);
}
return result;
@@ -188,7 +190,7 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService
return 0;
}
List<RmResourceRegistrationRemote> devices = DataProcessUtil.getResourceDevices(policy.getResourceGroupId());
List<RmResourceRegistrationRemote> devices = dataProcessUtil.getResourceDevices(policy.getResourceGroupId());
if (CollectionUtils.isEmpty(devices)) {
return 0;
}
@@ -196,7 +198,9 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService
// 构建并发送采集配置
Map<String, Object> policyDetails = getRmMonitorPolicyMsgById(id);
List<CollectVo> collectVos = buildCollectConfigurations(policyDetails);
sendConfigurationsToDevices(devices, collectVos);
// 去重
List<CollectVo> uniqueList = collectVos.stream().distinct().collect(Collectors.toList());
sendConfigurationsToDevices(devices, uniqueList);
// 更新策略状态为已下发
RmMonitorPolicy policyUpdate = new RmMonitorPolicy();
policyUpdate.setId(id);
@@ -273,6 +277,7 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService
MessageProducer messageProducer = new MessageProducer();
Map map = new HashMap();
map.put("collects", collectVos);
map.put("timestamp", Instant.now().getEpochSecond());
String configJson = JSONObject.toJSONString(map);
for (RmResourceRegistrationRemote device : devices) {
@@ -280,7 +285,7 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService
DeviceMessage message = new DeviceMessage();
message.setClientId(device.getHardwareSn());
message.setData(configJson);
message.setDataType("SYSTEM_COLLECT_START");
message.setDataType(MsgEnum.开启系统采集.getValue());
messageProducer.sendAsyncProducerMessage(
producerMode.getAgentTopic(),

17
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorTemplateServiceImpl.java
View File

@@ -1,11 +1,6 @@
package com.ruoyi.rocketmq.service.impl;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.web.page.PageDomain;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.rocketmq.domain.RmInitialMonitorItem;
import com.ruoyi.rocketmq.domain.RmMonitorTemplate;
import com.ruoyi.rocketmq.domain.RmTemplateLinux;
@@ -17,8 +12,6 @@ import com.ruoyi.rocketmq.mapper.RmTemplateLinuxMapper;
import com.ruoyi.rocketmq.mapper.RmTemplateSwitchMapper;
import com.ruoyi.rocketmq.service.IRmMonitorTemplateService;
import com.ruoyi.rocketmq.utils.DataProcessUtil;
import com.ruoyi.system.api.RemoteRevenueConfigService;
import com.ruoyi.system.api.domain.RmResourceRegistrationRemote;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,8 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.ruoyi.common.core.utils.PageUtils.startPage;
/**
* 监控模板Service业务层处理
*
@@ -48,7 +39,7 @@ public class RmMonitorTemplateServiceImpl implements IRmMonitorTemplateService
@Autowired
private RmInitialMonitorItemMapper rmInitialMonitorItemMapper;
@Autowired
private RemoteRevenueConfigService remoteRevenueConfigService;
private DataProcessUtil dataProcessUtil;
/**
* 查询监控模板
*
@@ -207,15 +198,15 @@ public class RmMonitorTemplateServiceImpl implements IRmMonitorTemplateService
// 1. 获取模板基础信息
RmMonitorTemplate template = rmMonitorTemplateMapper.selectRmMonitorTemplateById(id);
if(template.getResourceGroupId() != null){
template.setResourceGroupName(DataProcessUtil.getResourceGroupNameById(template.getResourceGroupId()));
template.setResourceGroupName(dataProcessUtil.getResourceGroupNameById(template.getResourceGroupId()));
}
result.put("template", template);
// 2. 处理Linux模板数据
DataProcessUtil.processLinuxTemplateData(id, result);
dataProcessUtil.processLinuxTemplateData(id, result);
// 3. 处理Switch模板数据
DataProcessUtil.processSwitchTemplateData(id, result);
dataProcessUtil.processSwitchTemplateData(id, result);
return result;
}

21
ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/utils/DataProcessUtil.java
View File

@@ -5,7 +5,6 @@ import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.rocketmq.domain.RmTemplateLinux;
import com.ruoyi.rocketmq.domain.RmTemplateSwitch;
import com.ruoyi.rocketmq.mapper.RmMonitorTemplateMapper;
import com.ruoyi.rocketmq.mapper.RmTemplateLinuxMapper;
import com.ruoyi.rocketmq.mapper.RmTemplateSwitchMapper;
import com.ruoyi.system.api.RemoteRevenueConfigService;
@@ -13,6 +12,7 @@ import com.ruoyi.system.api.domain.RmResourceGroupRemote;
import com.ruoyi.system.api.domain.RmResourceRegistrationRemote;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.lang.reflect.Field;
import java.util.Collections;
@@ -21,20 +21,19 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Slf4j
@Component
public class DataProcessUtil {
@Autowired
private RmMonitorTemplateMapper rmMonitorTemplateMapper;
private RmTemplateLinuxMapper rmTemplateLinuxMapper;
@Autowired
private static RmTemplateLinuxMapper rmTemplateLinuxMapper;
private RmTemplateSwitchMapper rmTemplateSwitchMapper;
@Autowired
private static RmTemplateSwitchMapper rmTemplateSwitchMapper;
@Autowired
private static RemoteRevenueConfigService remoteRevenueConfigService;
private RemoteRevenueConfigService remoteRevenueConfigService;
/**
* 补充资源组信息
*/
public static String getResourceGroupNameById(Long resourceGroupId) {
public String getResourceGroupNameById(Long resourceGroupId) {
try {
R<RmResourceGroupRemote> resourceGroupResponse = remoteRevenueConfigService
.getResourceGroupMsgById(resourceGroupId, SecurityConstants.INNER);
@@ -50,7 +49,7 @@ public class DataProcessUtil {
/**
* 资源组信息
*/
public static RmResourceGroupRemote getResourceMsgById(Long resourceGroupId) {
public RmResourceGroupRemote getResourceMsgById(Long resourceGroupId) {
try {
R<RmResourceGroupRemote> resourceGroupResponse = remoteRevenueConfigService
.getResourceGroupMsgById(resourceGroupId, SecurityConstants.INNER);
@@ -66,7 +65,7 @@ public class DataProcessUtil {
/**
* 处理Linux模板数据
*/
public static void processLinuxTemplateData(Long templateId, Map<String, Object> result) {
public void processLinuxTemplateData(Long templateId, Map<String, Object> result) {
RmTemplateLinux query = new RmTemplateLinux();
query.setTemplateId(templateId);
List<RmTemplateLinux> linuxItems = rmTemplateLinuxMapper.selectRmTemplateLinuxList(query);
@@ -87,7 +86,7 @@ public class DataProcessUtil {
/**
* 处理Switch模板数据
*/
public static void processSwitchTemplateData(Long templateId, Map<String, Object> result) {
public void processSwitchTemplateData(Long templateId, Map<String, Object> result) {
RmTemplateSwitch query = new RmTemplateSwitch();
query.setTemplateId(templateId);
List<RmTemplateSwitch> switchItems = rmTemplateSwitchMapper.selectRmTemplateSwitchList(query);
@@ -123,7 +122,7 @@ public class DataProcessUtil {
/**
* 获取资源设备列表
*/
public static List<RmResourceRegistrationRemote> getResourceDevices(Long resourceGroupId) {
public List<RmResourceRegistrationRemote> getResourceDevices(Long resourceGroupId) {
R<RmResourceGroupRemote> groupResponse = remoteRevenueConfigService
.getResourceGroupMsgById(resourceGroupId, SecurityConstants.INNER);

5
ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialDiskInfoMapper.xml
View File

@@ -163,4 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</foreach>
</insert>
<select id="getDistDetailsMsgByClientId" parameterType="InitialDiskInfo" resultMap="InitialDiskInfoResult">
<include refid="selectInitialDiskInfoVo"/>
where client_id = #{clientId} and `name`= #{name}
limit 1
</select>
</mapper>

5
ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialDockerInfoMapper.xml
View File

@@ -147,4 +147,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</foreach>
</insert>
<select id="getDockerDetailsMsg" parameterType="InitialDockerInfo" resultMap="InitialDockerInfoResult">
<include refid="selectInitialDockerInfoVo"/>
where client_id = #{clientId} and `name` = #{name}
</select>
</mapper>

5
ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchInfoMapper.xml
View File

@@ -140,4 +140,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
)
</foreach>
</insert>
<select id="getSwitchNetDetailsMsg" parameterType="String" resultMap="InitialSwitchInfoResult">
<include refid="selectInitialSwitchInfoVo"/>
where client_id = #{clientId}
limit 1
</select>
</mapper>

2
ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmInitialMonitorItemMapper.xml
View File

@@ -112,7 +112,7 @@
<select id="selectRmInitialMonitorItemByIds" parameterType="java.lang.Long" resultMap="RmInitialMonitorItemResult">
<include refid="selectRmInitialMonitorItemVo"/>
where id in
<foreach item="id" collection="monitorIds" open="(" separator="," close=")">
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</select>