增加交换机心跳、优化用户自定义列表功能

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

@@ -165,7 +165,10 @@ public class RmResourceRegistrationController extends BaseController
     public R<RmResourceRegistration> getListByHardwareSn(@RequestBody RmResourceRegistration rmResourceRegistration)
     {
         List<RmResourceRegistration> list = rmResourceRegistrationService.selectRmResourceRegistrationList(rmResourceRegistration);
-        return R.ok(list.get(0));
+        if(list != null && !list.isEmpty()){
+            return R.ok(list.get(0));
+        }
+        return R.ok(new RmResourceRegistration());
     }
     /**
      * 查询资源注册列表

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java

@@ -132,4 +132,13 @@ public class RmSwitchManagementController extends BaseController
         List<RmSwitchManagement> list = rmSwitchManagementService.getAllSwitchNameTree();
         return success(list);
     }
+    /**
+     * 修改交换机管理
+     */
+    @PostMapping("/updateSwitchMsgByClientId")
+    @InnerAuth
+    public R<Integer> updateSwitchMsgByClientId(@RequestBody RmSwitchManagement rmSwitchManagement)
+    {
+        return R.ok(rmSwitchManagementService.updateRmSwitchManagement(rmSwitchManagement));
+    }
 }

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

@@ -487,7 +487,7 @@ public class InitialSwitchInfoDetailsServiceImpl implements IInitialSwitchInfoDe
         if(!serverSnList.isEmpty()){
             for (RmEpsTopologyManagement rmEpsTopologyManagement : serverSnList) {
                 queryParam.setName(rmEpsTopologyManagement.getInterfaceName());
-                if("1".equals(rmEpsTopologyManagement.getConnectedDeviceType())){
+                if("1".equals(rmEpsTopologyManagement.getConnectedDeviceType()) && rmEpsTopologyManagement.getServerClientId() != null){
                     queryParam.setServerClientId(rmEpsTopologyManagement.getServerClientId());
                     // 根据业务变更情况选择计算方式
                     calculateChangedSwitchBandwidth(queryParam, dailyStartTime, dailyEndTime, calculationMode);

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml

@@ -143,7 +143,19 @@
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
         </trim>
-        where id = #{id}
+        <where>
+            <choose>
+                <when test="id != null">
+                    and id = #{id}
+                </when>
+                <when test="clientId != null and clientId != ''">
+                    and client_id = #{clientId}
+                </when>
+                <otherwise>
+                    and 1=0
+                </otherwise>
+            </choose>
+        </where>
     </update>
 
     <delete id="deleteRmSwitchManagementById" parameterType="Long">

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/UserTableColumnConfigMapper.xml

@@ -61,7 +61,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateUserTableColumnConfig" parameterType="UserTableColumnConfig">
         update user_table_column_config
         <trim prefix="SET" suffixOverrides=",">
-            <if test="pageRoute != null and pageRoute != ''">page_route = #{pageRoute},</if>
             <if test="columnConfig != null and columnConfig != ''">column_config = #{columnConfig},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>