Переглянути джерело

bugfix:
1、设备登录-筛选-请求标识和唯一标识统一名称
2、设备登录-筛选-筛选、重置功能无效,按照IP筛选失败,报错乱码

lihao16 5 місяців тому
батько
коміт
a6921295d1

+ 5 - 5
smsb-modules/smsb-device/src/main/resources/mapper/device/SmsbDeviceLoginMapper.xml

@@ -13,15 +13,15 @@
         FROM
             smsb_device_login sdl
         LEFT JOIN smsb_device sd ON sdl.identifier = sd.identifier
-        WHERE 1=1
-        <if test="bo.identifier != null and bo.identifier != ''">
-            AND sdl.identifier = #{bo.identifier}
+        WHERE 1 = 1
+        <if test="bo.reqIdentifier != null and bo.reqIdentifier != ''">
+            AND sdl.req_identifier like concat('%',#{bo.reqIdentifier},'%')
         </if>
         <if test="bo.reqIp != null and bo.reqIp != ''">
-            AND sdl.reqIp = #{bo.reqIp}
+            AND sdl.req_ip like concat('%',#{bo.reqIp},'%')
         </if>
         <if test="bo.loginResult != null">
-            AND sdl.loginResult = #{bo.loginResult}
+            AND sdl.login_result = #{bo.loginResult}
         </if>
         ORDER BY sdl.create_time DESC
     </select>

+ 2 - 2
smsb-plus-ui/src/views/smsb/deviceLogin/index.vue

@@ -5,7 +5,7 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="70px">
-            <el-form-item label="唯一标识" prop="reqIdentifier">
+            <el-form-item label="请求标识" prop="reqIdentifier">
               <el-input v-model="queryParams.reqIdentifier" placeholder="请输入请求标识" clearable
                 @keyup.enter="handleQuery" />
             </el-form-item>
@@ -13,7 +13,7 @@
               <el-input v-model="queryParams.reqIp" placeholder="请输入请求IP" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="登录结果" prop="loginResult">
-              <el-select v-model="form.loginResult" placeholder="请选择设备型号" clearable @keyup.enter="handleQuery">
+              <el-select v-model="queryParams.loginResult" placeholder="请选择设备型号" clearable @keyup.enter="handleQuery">
                 <el-option v-for="dict in smsb_device_login_result" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>