优化服务器管理详情

tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java

@@ -67,8 +67,6 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
         if(rmResourceRegistration.getClientId()!= null){
             // set网卡信息
             setNetWorkMsg(rmResourceRegistration);
-            // set金山machineCode
-            setMachineMsg(rmResourceRegistration);
             // set昨日95值
             setBandwidthYestoday(rmResourceRegistration);
         }

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

@@ -49,9 +49,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
     </select>
 
-    <select id="selectRmResourceRegistrationById" parameterType="Long" resultMap="RmResourceRegistrationResult">
+    <select id="selectRmResourceRegistrationById" parameterType="Long" resultType="RmResourceRegistration">
-        <include refid="selectRmResourceRegistrationVo"/>
+        select
-        where id = #{id}
+            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,
+            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.id = #{id}
     </select>
 
     <insert id="insertRmResourceRegistration" parameterType="RmResourceRegistration" useGeneratedKeys="true" keyProperty="id">