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

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

tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java

@@ -40,6 +40,7 @@ public class RmResourceRegistrationController extends BaseController
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody RmResourceRegistration rmResourceRegistration)
     {
+        rmResourceRegistration.setDelFlag(0);
         Map<String, Object> resultMap = rmResourceRegistrationService.getRegistrationTableInfoList(rmResourceRegistration);
         if((rmResourceRegistration.getQueryParam() != null &&
                 rmResourceRegistration.getQueryParam() != "") ||
@@ -49,6 +50,22 @@ public class RmResourceRegistrationController extends BaseController
         }
         return getDataTable((List<RmResourceRegistration>) resultMap.get("list"));
     }
+    /**
+     * 查询资源注册列表
+     */
+    @PostMapping("/lossList")
+    public TableDataInfo lossList(@RequestBody RmResourceRegistration rmResourceRegistration)
+    {
+        rmResourceRegistration.setDelFlag(1);
+        Map<String, Object> resultMap = rmResourceRegistrationService.getRegistrationTableInfoList(rmResourceRegistration);
+        if((rmResourceRegistration.getQueryParam() != null &&
+                rmResourceRegistration.getQueryParam() != "") ||
+                (rmResourceRegistration.getBandwidthResultSort() != null &&
+                        rmResourceRegistration.getBandwidthResultSort() != 3)){
+            return getDataTable((List<RmResourceRegistration>) resultMap.get("list"), (int) resultMap.get("total"));
+        }
+        return getDataTable((List<RmResourceRegistration>) resultMap.get("list"));
+    }
 
     /**
      * 导出资源注册列表
@@ -229,11 +246,8 @@ public class RmResourceRegistrationController extends BaseController
     @PostMapping("/getServerMsgByClientId")
     public AjaxResult getServerMsgByClientId(@RequestBody RmResourceRegistration rmResourceRegistration)
     {
-        List<RmResourceRegistration> list = rmResourceRegistrationService.selectRmResourceRegistrationList(rmResourceRegistration);
-        if(list != null && !list.isEmpty()){
-            return success(list.get(0));
-        }
-        return success(list);
+        RmResourceRegistration registration = rmResourceRegistrationService.selectRmResourceRegistrationByClientId(rmResourceRegistration);
+        return success(registration);
     }
     /**
      * 添加标签

tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceRegistrationMapper.java

@@ -132,4 +132,6 @@ public interface RmResourceRegistrationMapper
     int removeServer(Long[] ids);
 
     RmResourceRegistration getMaxAgentVersion();
+
+    RmResourceRegistration selectRmResourceRegistrationByClientId(@Param("clientId") String clientId);
 }

tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java

@@ -153,4 +153,8 @@ public interface IRmResourceRegistrationService
      * @return
      */
     int removeServer(Long[] ids);
+
+    RmResourceRegistration getMaxAgentVersion();
+
+    RmResourceRegistration selectRmResourceRegistrationByClientId(RmResourceRegistration rmResourceRegistration);
 }

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

@@ -1276,4 +1276,22 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
     {
         return rmResourceRegistrationMapper.removeServer(ids);
     }
+
+    @Override
+    public RmResourceRegistration getMaxAgentVersion() {
+        return rmResourceRegistrationMapper.getMaxAgentVersion();
+    }
+
+    @Override
+    public RmResourceRegistration selectRmResourceRegistrationByClientId(RmResourceRegistration rmResourceRegistration) {
+        if(rmResourceRegistration.getClientId()!= null){
+            RmResourceRegistration registration = rmResourceRegistrationMapper.selectRmResourceRegistrationByClientId(rmResourceRegistration.getClientId());
+            // set网卡信息
+            setNetWorkMsg(registration);
+            // set昨日95值
+            setBandwidthYestoday(registration);
+            return registration;
+        }
+        return new RmResourceRegistration();
+    }
 }

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>