1、修复虚拟网卡收益计算、流量图默认单位不正确问题。

2、联调告警阈值配置接口。
3、优化挂载点数据展示。

tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml

@@ -82,6 +82,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
+    <select id="selectRmResourceRegistrationByClientId" resultType="RmResourceRegistration">
+        select
+            a.id,
+            a.hardware_sn as hardwareSn,
+            a.agent_version as agentVersion,
+            a.registration_status as registrationStatus,
+            a.online_status as onlineStatus,
+            a.create_time as createTime,
+            a.update_time as updateTime,
+            a.client_id as clientId,
+            a.business_name as businessName,
+            a.logical_node_id as logicalNodeId,
+            a.multi_public_ip_status as multiPublicIpStatus,
+            a.heartbeat_count as heartbeatCount,
+            a.heartbeat_interval as heartbeatInterval,
+            a.onboard_time as onboardTime,
+            a.remark as remark,
+            a.reported_bandwidth as reportedBandwidth,
+            a.del_alarm_time as delAlarmTime,
+            b.machine_code as machineCode,
+            (select bandwidth_result from eps_node_bandwidth
+             where client_id=a.client_id and calculation_mode='1000' and bandwidth_type=1
+               AND create_time = DATE(DATE_SUB(NOW(), INTERVAL 1 DAY)) limit 1) as bandwidthResult
+        from rm_resource_registration a
+            left join rm_registration_machine b on a.client_id = b.client_id
+        where a.client_id = #{clientId}
+        limit 1
+    </select>
+
     <insert id="insertRmResourceRegistration" parameterType="RmResourceRegistration" useGeneratedKeys="true" keyProperty="id">
         insert into rm_resource_registration
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -253,7 +282,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join rm_registration_machine b on a.client_id = b.client_id
         left join rm_frpc_config_manage c on a.client_id=c.client_id
         <where>
-            and a.del_flag=0
+            <if test="delFlag != null"> and a.del_flag = #{delFlag}</if>
             <if test="hardwareSn != null  and hardwareSn != ''"> and a.hardware_sn = #{hardwareSn}</if>
             <if test="resourceType != null  and resourceType != ''"> and a.resource_type = #{resourceType}</if>
             <if test="agentVersion != null  and agentVersion != ''"> and a.agent_version = #{agentVersion}</if>